Skip to content

Sort interfaces#3284

Merged
DL6ER merged 2 commits into
developmentfrom
fix/interfaces_overview
Mar 8, 2025
Merged

Sort interfaces#3284
DL6ER merged 2 commits into
developmentfrom
fix/interfaces_overview

Conversation

@DL6ER

@DL6ER DL6ER commented Mar 6, 2025

Copy link
Copy Markdown
Member

What does this implement/fix?

Sort interfaces

  • interfaces that do not depend on others (and have no children) are placed at the top of the tree view
  • interfaces that do have children get them directly assigned below them

image


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

 - interfaces that do not depend on others (and have no children) are placed at the top of the treeview
 - interfaces that do have children get them directly assigned below them

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team March 6, 2025 17:47

@yubiuser yubiuser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a way to test this, as I don't have any virtual interfaces. But looking at your screenshot I noticed three veth interfaces blow br-99. I guess this is the master and the 3 child interfaces. To make it clearer that they belong together, could the children get a small indention?

@rdwebdesign

Copy link
Copy Markdown
Member

I don't have a way to test this, as I don't have any virtual interfaces.

Same issue here... I will try this later in a different machine.

@rdwebdesign

Copy link
Copy Markdown
Member

Maybe we can try using indentation and a single icon, instead of using 2 icons, similar to this image:

image

I will try something.

Comment thread scripts/js/interfaces.js Outdated
Comment thread scripts/js/interfaces.js Outdated
@rdwebdesign

Copy link
Copy Markdown
Member

Or maybe something like this:

image

@rdwebdesign rdwebdesign force-pushed the fix/interfaces_overview branch from acfc2f6 to 85dd3de Compare March 7, 2025 22:09
@rdwebdesign rdwebdesign requested a review from yubiuser March 7, 2025 22:21
@DL6ER DL6ER requested a review from a team March 8, 2025 05:53
@DL6ER

DL6ER commented Mar 8, 2025

Copy link
Copy Markdown
Member Author

I'd approve it if I could ;-)

image

@yubiuser yubiuser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should squash down to 1-2 commits. Otherwise can go.


Before
2025-03-08_14-12

After
2025-03-08_14-13_1

- Add and format the arrow
- Remove the icon used to indent child interfaces (the arrow is enough)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign

Copy link
Copy Markdown
Member

We should squash down to 1-2 commits.

I will squash my commits and FP.

@rdwebdesign rdwebdesign force-pushed the fix/interfaces_overview branch from d081571 to 90f71a4 Compare March 8, 2025 17:35
@DL6ER DL6ER requested a review from yubiuser March 8, 2025 18:09
@DL6ER DL6ER enabled auto-merge March 8, 2025 18:18
@DL6ER

DL6ER commented Mar 8, 2025

Copy link
Copy Markdown
Member Author

GHA seems to be having a hard time, set this to auto merge once it's done the CI stuff

@DL6ER DL6ER merged commit 3f19392 into development Mar 8, 2025
@DL6ER DL6ER deleted the fix/interfaces_overview branch March 8, 2025 18:34
@PromoFaux PromoFaux mentioned this pull request Mar 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants