From 5356d1feeb77479d7537bd73b831322e6f406a56 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 18 Apr 2023 04:40:12 +0300 Subject: [PATCH] fix(edge/updates): add padding for edge groups [EE-5349] (#8772) --- .../environments/ItemView/EdgeKeyDisplay.tsx | 6 +++-- .../CreateView/CreateView.tsx | 6 +++-- .../update-schedules/ItemView/ItemView.tsx | 24 ++++++++++--------- .../gitops/AuthFieldset/AuthFieldset.tsx | 2 +- .../gitops/AuthFieldset/NewCredentialForm.tsx | 2 +- .../AutoUpdateFieldset/AutoUpdateFieldset.tsx | 2 +- .../AutoUpdateFieldset/AutoUpdateSettings.tsx | 2 +- .../ComposePathField/ComposePathField.tsx | 2 +- .../portainer/gitops/RefField/RefField.tsx | 2 +- .../portainer/gitops/TimeWindowDisplay.tsx | 2 +- .../EdgeComputeSettings.tsx | 2 +- .../SettingsFDO/SettingsFDO.tsx | 4 ++-- .../SettingsOpenAMT/SettingsOpenAMT.tsx | 2 +- 13 files changed, 32 insertions(+), 26 deletions(-) diff --git a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx index 6e1f77d88..97b1c2f13 100644 --- a/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx +++ b/app/react/portainer/environments/ItemView/EdgeKeyDisplay.tsx @@ -11,14 +11,16 @@ export function EdgeKeyDisplay({ edgeKey }: { edgeKey: string }) { associate the Edge agent with this environment. -

+

You can read more about pre-staging in the user-guide available{' '} here.

{edgeKey} - Copy token + + Copy token + ); } diff --git a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx index 59a2ca926..e43430587 100644 --- a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx +++ b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx @@ -62,7 +62,7 @@ function CreateView() { - + Devices need to be allocated to an Edge group, visit the{' '} Edge Groups page to assign environments and create groups. @@ -91,7 +91,9 @@ function CreateView() { for 2.15.0+ only. - +
+ +
diff --git a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx index cd340918b..5a70f8b57 100644 --- a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx +++ b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx @@ -129,17 +129,19 @@ function ItemView() { error={errors.groupIds} /> - {isScheduleActive ? ( - - - {environmentsCount} environment(s) will be updated to - version {item.version} on {item.scheduledTime} (local - time) - - - ) : ( - - )} +
+ {isScheduleActive ? ( + + + {environmentsCount} environment(s) will be updated + to version {item.version} on {item.scheduledTime}{' '} + (local time) + + + ) : ( + + )} +
diff --git a/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx b/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx index daaea88b0..d18b92583 100644 --- a/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx +++ b/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx @@ -57,7 +57,7 @@ export function AuthFieldset({ {value.RepositoryAuthentication && ( <> {isAuthExplanationVisible && ( - + Enabling authentication will store the credentials and it is advisable to use a git service account diff --git a/app/react/portainer/gitops/AuthFieldset/NewCredentialForm.tsx b/app/react/portainer/gitops/AuthFieldset/NewCredentialForm.tsx index e61f71a80..b0c653bd7 100644 --- a/app/react/portainer/gitops/AuthFieldset/NewCredentialForm.tsx +++ b/app/react/portainer/gitops/AuthFieldset/NewCredentialForm.tsx @@ -43,7 +43,7 @@ export function NewCredentialForm({ )} {value.SaveCredential && ( - + This git credential can be managed through your account page )} diff --git a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx index 638770f31..978f66251 100644 --- a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx +++ b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx @@ -30,7 +30,7 @@ export function AutoUpdateFieldset({ <>
- + When enabled, at each polling interval or webhook invocation, if the git repo differs from what was stored locally on the last git pull, the changes are deployed. diff --git a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateSettings.tsx b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateSettings.tsx index 426ca2c85..2f8e2c659 100644 --- a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateSettings.tsx +++ b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateSettings.tsx @@ -33,7 +33,7 @@ export function AutoUpdateSettings({ }) { return ( <> - + Any changes to this stack or application that have been made locally via Portainer or directly in the cluster will be overwritten by the git repository content, which may cause service interruption. diff --git a/app/react/portainer/gitops/ComposePathField/ComposePathField.tsx b/app/react/portainer/gitops/ComposePathField/ComposePathField.tsx index c8b1bd06b..a6901c9d9 100644 --- a/app/react/portainer/gitops/ComposePathField/ComposePathField.tsx +++ b/app/react/portainer/gitops/ComposePathField/ComposePathField.tsx @@ -31,7 +31,7 @@ export function ComposePathField({ return (
- + Indicate the path to the {isCompose ? 'Compose' : 'Manifest'} file from the root of your repository (requires a yaml, yml, json, or hcl diff --git a/app/react/portainer/gitops/RefField/RefField.tsx b/app/react/portainer/gitops/RefField/RefField.tsx index fb65af145..ba0dcecaa 100644 --- a/app/react/portainer/gitops/RefField/RefField.tsx +++ b/app/react/portainer/gitops/RefField/RefField.tsx @@ -80,7 +80,7 @@ function Wrapper({ }: PropsWithChildren<{ tip: ReactNode; errors?: string }>) { return (
- + {tip}
diff --git a/app/react/portainer/gitops/TimeWindowDisplay.tsx b/app/react/portainer/gitops/TimeWindowDisplay.tsx index 8318485d0..76ed3bbaa 100644 --- a/app/react/portainer/gitops/TimeWindowDisplay.tsx +++ b/app/react/portainer/gitops/TimeWindowDisplay.tsx @@ -36,7 +36,7 @@ function TimeWindowDisplay() { ); return ( - + A change window is enabled, automatic updates will not occur outside of{' '} {shortTime(startTimeUtc)} - {shortTime(endTimeUtc)} UTC ( diff --git a/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.tsx b/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.tsx index 70e3313b6..b17c6586f 100644 --- a/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.tsx +++ b/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.tsx @@ -78,7 +78,7 @@ export function EdgeComputeSettings({ settings, onSubmit }: Props) { /> - + Enable this setting to use Portainer Edge Compute capabilities. diff --git a/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx b/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx index b5042fb73..c709ed57c 100644 --- a/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx +++ b/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx @@ -109,7 +109,7 @@ export function SettingsFDOForm({ settings, onSubmit }: Props) { /> - + When enabled, this will allow Portainer to interact with FDO Services. @@ -185,7 +185,7 @@ export function SettingsFDOForm({ settings, onSubmit }: Props) { {edgeComputeFeaturesEnabled && isFDOEnabled && (
Device Profiles - + Add, Edit and Manage the list of device profiles available during FDO device setup diff --git a/app/react/portainer/settings/EdgeComputeView/SettingsOpenAMT/SettingsOpenAMT.tsx b/app/react/portainer/settings/EdgeComputeView/SettingsOpenAMT/SettingsOpenAMT.tsx index 760fbea7a..53056551f 100644 --- a/app/react/portainer/settings/EdgeComputeView/SettingsOpenAMT/SettingsOpenAMT.tsx +++ b/app/react/portainer/settings/EdgeComputeView/SettingsOpenAMT/SettingsOpenAMT.tsx @@ -130,7 +130,7 @@ export function SettingsOpenAMT({ settings, onSubmit }: Props) { /> - + When enabled, this will allow Portainer to interact with an OpenAMT MPS API.