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

feat(zigbee2mqtt): Add z2m ui link in Setup page #1903

Merged
merged 1 commit into from
Oct 27, 2023

Conversation

cicoub13
Copy link
Contributor

Fix #1893

@cicoub13
Copy link
Contributor Author

CleanShot 2023-09-28 at 15 53 01

message is shown only when service is activated

@cicoub13 cicoub13 force-pushed the feat-zigbee2mqtt-doc branch from 9c70cf4 to 7871ab4 Compare September 28, 2023 13:55
@codecov
Copy link

codecov bot commented Sep 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

📢 Thoughts on this report? Let us know!.

@relativeci
Copy link

relativeci bot commented Sep 28, 2023

Job #1939: Bundle Size — 8.82MiB (+0.01%).

9b2c66d(current) vs f87a192 master#1925(baseline)

Warning

Bundle contains 3 duplicate packages – View duplicate packages

Bundle metrics  Change 1 change Regression 1 regression
                 Current
Job #1939
     Baseline
Job #1925
Regression  Initial JS 4.77MiB(+0.02%) 4.77MiB
No change  Initial CSS 301.31KiB 301.31KiB
No change  Cache Invalidation 53.91% 53.91%
No change  Chunks 48 48
No change  Assets 152 152
No change  Modules 1377 1377
No change  Duplicate Modules 19 19
No change  Duplicate Code 0.69% 0.69%
No change  Packages 124 124
No change  Duplicate Packages 3 3
Bundle size by type  Change 1 change Regression 1 regression
                 Current
Job #1939
     Baseline
Job #1925
Regression  JS 6.39MiB (+0.02%) 6.39MiB
Not changed  IMG 2MiB 2MiB
Not changed  CSS 316.97KiB 316.97KiB
Not changed  Fonts 93.55KiB 93.55KiB
Not changed  Other 15.48KiB 15.48KiB
Not changed  HTML 13.58KiB 13.58KiB

View job #1939 reportView cicoub13:feat-zigbee2mqtt-doc branch activity

@atrovato
Copy link
Contributor

atrovato commented Oct 3, 2023

What will be the URL if I'm not on localhost? Using a raspberry ou a NAS hosting Gladys? Or via Gladys Plus?

@cicoub13
Copy link
Contributor Author

cicoub13 commented Oct 3, 2023

Using a raspberry ou a NAS hosting Gladys?

It will be something like http://192.168.1.11:8080 with device IP

Or via Gladys Plus?

Link will not be showned (because not accessible from Internet)

@atrovato
Copy link
Contributor

atrovato commented Oct 3, 2023

I just check your code, it will use the "localApiUrl" configuration variable to define de base URL, which means that default "localhost" will be used for most of Gladys user.
I didn't set the LAN IP of my NAS as a docker variable (LOCAL_API_URL).

@cicoub13
Copy link
Contributor Author

cicoub13 commented Oct 3, 2023

I took code from @callemand about node-red

const isGladysPlus = this.props.session.gatewayClient !== undefined;

But let me test it in real world with a docker image 🤔

@atrovato
Copy link
Contributor

atrovato commented Oct 3, 2023

Maybe you should build the entire url from the front side, according to the window.location.hostname, and concat with configured the port.

@cicoub13
Copy link
Contributor Author

cicoub13 commented Oct 3, 2023

It's working (I don't have LOCAL_API_URL in Docker envs)
Port is fixed in Gladys to 8080. If you change it, you are a power user so you know where is the UI 😉

CleanShot 2023-10-03 at 16 28 46

Copy link
Contributor

@atrovato atrovato left a comment

Choose a reason for hiding this comment

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

Good for my tired eyes ;)

Copy link
Contributor

@Pierre-Gilles Pierre-Gilles left a comment

Choose a reason for hiding this comment

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

I'm not 100% sure the Gladys Plus part is working!

@cicoub13 cicoub13 force-pushed the feat-zigbee2mqtt-doc branch from 7871ab4 to 9b2c66d Compare October 19, 2023 19:42
Copy link
Contributor

@Pierre-Gilles Pierre-Gilles left a comment

Choose a reason for hiding this comment

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

Thanks for the changes 🙏 Good for me !

@Pierre-Gilles Pierre-Gilles merged commit 45c2f07 into GladysAssistant:master Oct 27, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Zigbee2mqtt: Add link to Zigbee2Mqtt instance in UI
3 participants