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 editor: Add Buttongrid Button support #2755

Merged
merged 12 commits into from
Oct 4, 2024

Conversation

mherwege
Copy link
Contributor

@mherwege mherwege commented Sep 12, 2024

Refs openhab/openhab-core#4377.

The most recent addition to the sitemap syntax allows defining buttons nested as components inside the Buttongrid component.

@mherwege mherwege requested a review from a team as a code owner September 12, 2024 21:00
@florian-h05 florian-h05 added awaiting other PR Depends on another PR enhancement New feature or request main ui Main UI labels Sep 12, 2024
@mherwege mherwege marked this pull request as draft September 12, 2024 23:51
@mherwege
Copy link
Contributor Author

Probably better to first finish #2720 first and then rebase on that. The impact starts to be pretty big.

Copy link

relativeci bot commented Sep 13, 2024

#2339 Bundle Size — 10.84MiB (+0.06%).

011bec8(current) vs 2975d78 main#2338(baseline)

Warning

Bundle contains 2 duplicate packages – View duplicate packages

Bundle metrics  Change 2 changes Regression 1 regression
                 Current
#2339
     Baseline
#2338
Regression  Initial JS 1.89MiB(+0.02%) 1.89MiB
No change  Initial CSS 576.8KiB 576.8KiB
Change  Cache Invalidation 22.9% 22.78%
No change  Chunks 226 226
No change  Assets 249 249
No change  Modules 2918 2918
No change  Duplicate Modules 149 149
No change  Duplicate Code 1.8% 1.8%
No change  Packages 96 96
No change  Duplicate Packages 2 2
Bundle size by type  Change 1 change Regression 1 regression
                 Current
#2339
     Baseline
#2338
Regression  JS 9.05MiB (+0.07%) 9.04MiB
No change  CSS 863.56KiB 863.56KiB
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 mherwege:buttongrid_buttonProject dashboard


Generated by RelativeCIDocumentationReport issue

@mherwege mherwege force-pushed the buttongrid_button branch 3 times, most recently from 3e3939d to 26f3384 Compare September 16, 2024 07:23
@mherwege mherwege marked this pull request as ready for review September 16, 2024 07:28
@florian-h05 florian-h05 removed the request for review from a team September 16, 2024 13:48
@mherwege
Copy link
Contributor Author

Dependency openhab/openhab-core#4377 Is now merged.

@lolodomo lolodomo added rebuild trigger a new Jenkins job and removed awaiting other PR Depends on another PR rebuild trigger a new Jenkins job labels Sep 28, 2024
@lolodomo
Copy link
Contributor

Dependency openhab/openhab-core#4377 Is now merged.

I just triggered a rebuild of your PR.

Copy link
Contributor

@florian-h05 florian-h05 left a comment

Choose a reason for hiding this comment

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

I wanted to give this a try by creating a new (hence empty) sitemap, but I cannot save that empty sitemap.
If I add a widget to it, I can save it.

@mherwege Can you please have a look?

Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>

Signed-off-by: Mark Herwege <[email protected]>
This reverts commit 7f23b21.

Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
Signed-off-by: Mark Herwege <[email protected]>
@mherwege
Copy link
Contributor Author

mherwege commented Oct 4, 2024

I wanted to give this a try by creating a new (hence empty) sitemap, but I cannot save that empty sitemap.

It looks like that bug was there before this PR. It should be fixed now.

@florian-h05
Copy link
Contributor

florian-h05 commented Oct 4, 2024

I though it was a regression from this PR, anyway thanks for the fix!
And please do NOT force push during review!! It normally does not matter if a PR is not in sync with main.

@mherwege
Copy link
Contributor Author

mherwege commented Oct 4, 2024

And please do NOT force push during review!! It normally does not matter if a PR is not in sync with main.

Sorry for that. I normally don’t, but I made the mistake a few weeks ago to merge main into the branch from the web, and I couldn’t get it to push anymore without a rebase and force push.

Copy link
Contributor

@florian-h05 florian-h05 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@florian-h05 florian-h05 added this to the 4.3 milestone Oct 4, 2024
@florian-h05 florian-h05 changed the title [mainUI] Sitemap editor Buttongrid Button support Sitemap editor: Add Buttongrid Button support Oct 4, 2024
@florian-h05 florian-h05 merged commit 6c46b79 into openhab:main Oct 4, 2024
8 checks passed
@mherwege mherwege deleted the buttongrid_button branch October 4, 2024 21:02
stefan-hoehn pushed a commit to stefan-hoehn/openhab-webui that referenced this pull request Oct 5, 2024
Refs openhab/openhab-core#4377.

The most recent addition to the sitemap syntax allows defining buttons
nested as components inside the Buttongrid component.

---------

Signed-off-by: Mark Herwege <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request main ui Main UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants