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

Add UI for Device Group Env Setup #4661

Merged
merged 8 commits into from
Oct 21, 2024

Conversation

Steve-Mcl
Copy link
Contributor

@Steve-Mcl Steve-Mcl commented Oct 18, 2024

closes #4660

Description

  • Re-arranges the Device Group settings into 2 sub-tabs of
    • General - this includes the original settings (like editing name/desc and deleting the device group)
    • Environment - this hosts the new Env Var editor for device groups
      • NOTE: As discussed in the issue, a warning was added near the save button to ensure users are aware that saving env changes could cause the member devices to restart
  • Updates the TemplateSettingsEnvironment to permit helptext popup
    • The newly added Environment.vue uses this to explain the merge rules
  • Updates audit log to properly render Device Group Settings Updated

Screenshots

Original settings section moved to "general" in new tabbed layout

image

New Environment Variables section in new tabbed layout

image

Info text

image

Unsaved changes

Demonstrating what happens if you have edited env vars but forgotten to save
image

Related Issue(s)

Owner: #4660
Parent: #4538

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on FlowFuse/helm to update ConfigMap Template
    • Issue/PR raised on FlowFuse/CloudProject to update values for Staging/Production

Labels

  • Includes a DB migration? -> add the area:migration label

@Steve-Mcl Steve-Mcl requested a review from joepavitt October 18, 2024 16:43
@Steve-Mcl Steve-Mcl linked an issue Oct 18, 2024 that may be closed by this pull request
Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.59%. Comparing base (6bf7127) to head (c93366e).
Report is 35 commits behind head on 4658-device-group-env-api.

Additional details and impacted files
@@                      Coverage Diff                      @@
##           4658-device-group-env-api    #4661      +/-   ##
=============================================================
- Coverage                      78.59%   78.59%   -0.01%     
=============================================================
  Files                            304      304              
  Lines                          14470    14469       -1     
  Branches                        3303     3303              
=============================================================
- Hits                           11373    11372       -1     
  Misses                          3097     3097              
Flag Coverage Δ
backend 78.59% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@joepavitt
Copy link
Contributor

Screenshot 2024-10-21 at 10 51 47

Dialled down the note a little, as the "red" felt too much. I've also moved the banner to be above the "Save" button, and (I know this wasn't introduced here) made the "Save Settings" button larger.

@Steve-Mcl
Copy link
Contributor Author

As this and the API branch are approved, I am merging this branch into the API feature branch for final CI test run and update before merge..

@Steve-Mcl Steve-Mcl merged commit 50590fb into 4658-device-group-env-api Oct 21, 2024
14 checks passed
@Steve-Mcl Steve-Mcl deleted the 4660-device-group-env-ui branch October 21, 2024 11:10
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.

Provide UI for editing Device Group Env Vars
2 participants