From a35e18a904881d4b0639843a56008b5310be07d7 Mon Sep 17 00:00:00 2001 From: Prabhat Khera <91852476+prabhat-org@users.noreply.github.com> Date: Thu, 18 May 2023 10:19:37 +1200 Subject: [PATCH] fix(UI): update icons for beta and experimental features EE-5435 (#8952) --- app/assets/ico/beta.svg | 3 +++ .../helm/helm-templates/helm-templates.html | 15 ++++------- .../views/applications/helm/helm.html | 9 ++++--- .../components/beta-panel/betaPanel.html | 8 ------ .../components/beta-panel/betaPanel.js | 3 --- .../components/theme/theme-settings.html | 5 ---- app/react/components/Svg.tsx | 2 ++ app/react/components/Tip/TextTip/TextTip.tsx | 9 ++++--- .../CreateView/CreateView.tsx | 5 +++- .../update-schedules/ItemView/ItemView.tsx | 5 +++- .../update-schedules/ListView/ListView.tsx | 5 +++- .../update-schedules/common/BetaAlert.tsx | 27 +++++++++++++------ .../SettingsFDO/SettingsFDO.tsx | 4 +-- 13 files changed, 54 insertions(+), 46 deletions(-) create mode 100644 app/assets/ico/beta.svg delete mode 100644 app/portainer/components/beta-panel/betaPanel.html delete mode 100644 app/portainer/components/beta-panel/betaPanel.js diff --git a/app/assets/ico/beta.svg b/app/assets/ico/beta.svg new file mode 100644 index 000000000..23261c7a1 --- /dev/null +++ b/app/assets/ico/beta.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates.html b/app/kubernetes/components/helm/helm-templates/helm-templates.html index 6a655922a..e81f71031 100644 --- a/app/kubernetes/components/helm/helm-templates/helm-templates.html +++ b/app/kubernetes/components/helm/helm-templates/helm-templates.html @@ -1,16 +1,11 @@ + -

- - This is a first version for Helm charts, for more information see this blog post.

The Global Helm Repository is not configured. @@ -23,7 +18,7 @@

-
+
{{ $ctrl.state.chart.name }}
diff --git a/app/kubernetes/views/applications/helm/helm.html b/app/kubernetes/views/applications/helm/helm.html index d8e019f86..0e3846c9d 100644 --- a/app/kubernetes/views/applications/helm/helm.html +++ b/app/kubernetes/views/applications/helm/helm.html @@ -20,10 +20,11 @@ Release
-
- - This is a first version for Helm charts, for more information see this  - blog post. +
+
diff --git a/app/portainer/components/beta-panel/betaPanel.html b/app/portainer/components/beta-panel/betaPanel.html deleted file mode 100644 index ff2caeef6..000000000 --- a/app/portainer/components/beta-panel/betaPanel.html +++ /dev/null @@ -1,8 +0,0 @@ - - -

- - This is a beta feature. -

- - diff --git a/app/portainer/components/beta-panel/betaPanel.js b/app/portainer/components/beta-panel/betaPanel.js deleted file mode 100644 index 9af432eac..000000000 --- a/app/portainer/components/beta-panel/betaPanel.js +++ /dev/null @@ -1,3 +0,0 @@ -angular.module('portainer.app').component('betaPanel', { - templateUrl: './betaPanel.html', -}); diff --git a/app/portainer/components/theme/theme-settings.html b/app/portainer/components/theme/theme-settings.html index 58f2dc752..6c3065d17 100644 --- a/app/portainer/components/theme/theme-settings.html +++ b/app/portainer/components/theme/theme-settings.html @@ -4,11 +4,6 @@
- -

- - Dark and High-contrast theme are experimental. Some UI components might not display properly. -

diff --git a/app/react/components/Svg.tsx b/app/react/components/Svg.tsx index 5aa055d64..a5dcb67b2 100644 --- a/app/react/components/Svg.tsx +++ b/app/react/components/Svg.tsx @@ -36,6 +36,7 @@ import nomadicon from '@/assets/ico/vendor/nomad-icon.svg?c'; import openldap from '@/assets/ico/vendor/openldap.svg?c'; import proget from '@/assets/ico/vendor/proget.svg?c'; import quay from '@/assets/ico/vendor/quay.svg?c'; +import beta from '@/assets/ico/beta.svg?c'; const placeholder = Placeholder; @@ -76,6 +77,7 @@ export const SvgIcons = { proget, quay, kube, + beta, }; interface SvgProps { diff --git a/app/react/components/Tip/TextTip/TextTip.tsx b/app/react/components/Tip/TextTip/TextTip.tsx index aff8a40e0..a19e12280 100644 --- a/app/react/components/Tip/TextTip/TextTip.tsx +++ b/app/react/components/Tip/TextTip/TextTip.tsx @@ -10,6 +10,7 @@ export interface Props { icon?: React.ReactNode; color?: Color; className?: string; + childrenWrapperClassName?: string; } export function TextTip({ @@ -17,11 +18,13 @@ export function TextTip({ icon = AlertCircle, className, children, + childrenWrapperClassName = 'text-muted', }: PropsWithChildren) { return ( -
- - {children} +
+ + + {children}
); } diff --git a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx index e43430587..1557af374 100644 --- a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx +++ b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx @@ -55,7 +55,10 @@ function CreateView() { breadcrumbs="Edge agent update and rollback" /> - +
diff --git a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx index 5a70f8b57..774de45f5 100644 --- a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx +++ b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx @@ -77,7 +77,10 @@ function ItemView() { ]} /> - +
diff --git a/app/react/portainer/environments/update-schedules/ListView/ListView.tsx b/app/react/portainer/environments/update-schedules/ListView/ListView.tsx index c84d74f4f..4da367502 100644 --- a/app/react/portainer/environments/update-schedules/ListView/ListView.tsx +++ b/app/react/portainer/environments/update-schedules/ListView/ListView.tsx @@ -42,7 +42,10 @@ export function ListView() { breadcrumbs="Update and rollback" /> - + - - This feature is currently in beta and is limited to standalone linux - edge devices. - - + + {!isHtml ? ( + message + ) : ( + // eslint-disable-next-line react/no-danger + + )} + ); } diff --git a/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx b/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx index c709ed57c..eca5a3708 100644 --- a/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx +++ b/app/react/portainer/settings/EdgeComputeView/SettingsFDO/SettingsFDO.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { Formik, Field, Form } from 'formik'; -import { Laptop } from 'lucide-react'; +import { FlaskConical, Laptop } from 'lucide-react'; import { FDOConfiguration } from '@/portainer/hostmanagement/fdo/model'; import { @@ -38,7 +38,7 @@ export function SettingsFDO({ settings, onSubmit }: Props) { return ( - + Since FDO is still an experimental feature that requires additional infrastructure, it has been temporarily hidden in the UI.