Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sitemap treeview: Fix arrows/chevrons shown if not expandable #3007

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

florian-h05
Copy link
Contributor

Regression from #2904.
Reported in #2970 (comment).

Regression from openhab#2904.
Reported in openhab#2970 (comment).

Signed-off-by: Florian Hotze <dev@florianhotze.com>
Copy link

relativeci bot commented Jan 12, 2025

#2695 Bundle Size — 10.98MiB (~+0.01%).

a8d2be5(current) vs e7d9b65 main#2689(baseline)

Warning

Bundle contains 2 duplicate packages – View duplicate packages

Bundle metrics  Change 1 change
                 Current
#2695
     Baseline
#2689
No change  Initial JS 1.9MiB 1.9MiB
No change  Initial CSS 577.21KiB 577.21KiB
Change  Cache Invalidation 17.51% 19.12%
No change  Chunks 227 227
No change  Assets 250 250
No change  Modules 2950 2950
No change  Duplicate Modules 154 154
No change  Duplicate Code 1.8% 1.8%
No change  Packages 98 98
No change  Duplicate Packages 2 2
Bundle size by type  Change 1 change Regression 1 regression
                 Current
#2695
     Baseline
#2689
Regression  JS 9.19MiB (~+0.01%) 9.19MiB
No change  CSS 867.02KiB 867.02KiB
No change  Fonts 526.1KiB 526.1KiB
No change  Media 295.6KiB 295.6KiB
No change  IMG 140.74KiB 140.74KiB
No change  HTML 1.38KiB 1.38KiB
No change  Other 871B 871B

Bundle analysis reportBranch florian-h05:sitemap-treeview-che...Project dashboard


Generated by RelativeCIDocumentationReport issue

@florian-h05 florian-h05 added bug Something isn't working main ui Main UI labels Jan 12, 2025
@mherwege
Copy link
Contributor

Thanks. I didn't test yet, but LGTM

@ghys
Copy link
Member

ghys commented Jan 12, 2025

Too late for 4.3.2?

@florian-h05
Copy link
Contributor Author

#2904 is no part of 4.3.x at all, no need to backport this at all.

@ghys
Copy link
Member

ghys commented Jan 12, 2025

Indeed, sorry.

@mherwege
Copy link
Contributor

mherwege commented Jan 12, 2025

@florian-h05 Did you test this? I tried replicating this logic for the model tree-view, but the expansion icons still show. I had to explicitely set the toggle parameter on the f7-treeview-item.

@florian-h05
Copy link
Contributor Author

Yes, I tested this and it worked fine.

@mherwege
Copy link
Contributor

mherwege commented Jan 13, 2025

OK, I now understand why this works here, but not in the model treeview. The difference is that I made sure there is an empty slot in the children in this case.
I tested this, and an alternative approach with a toggle that also works, which I have to use in the model treeview. My review proposal used in here uses this approach. It brings both in line, but yours will work as well. It is up to you what to choose.

Copy link
Contributor

@mherwege mherwege left a comment

Choose a reason for hiding this comment

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

Remove v-if="canHaveChildren" from line 10.
Add :toggle="canHaveChildren" around line 6.

Signed-off-by: Florian Hotze <dev@florianhotze.com>
@florian-h05
Copy link
Contributor Author

Let's align the implementation - I have just implemented your review comments.

@florian-h05 florian-h05 added this to the 5.0 milestone Jan 13, 2025
@florian-h05 florian-h05 merged commit 7ef5b6f into openhab:main Jan 13, 2025
5 checks passed
@florian-h05 florian-h05 deleted the sitemap-treeview-chevron branch January 13, 2025 12:13
@florian-h05 florian-h05 added regression and removed bug Something isn't working labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants