From 2188005b48657a063d9da1733c2e5c480dbade26 Mon Sep 17 00:00:00 2001 From: Matt Hook Date: Mon, 12 Dec 2022 14:30:05 +1300 Subject: [PATCH] feat(kubernetes): add rolling restart button teaser [EE-4510] (#8126) * rolling restart teaser button * add be only rolling restart * move position of button --- .../yaml-inspector/yamlInspector.html | 8 +++- .../react/views/beOnlyButton/index.tsx | 44 +++++++++++++++++++ app/kubernetes/react/views/index.ts | 11 +++-- .../react/views/yamlReplace/index.tsx | 30 ------------- .../views/applications/edit/application.html | 18 +++++--- .../edit/applicationController.js | 3 ++ app/react/portainer/feature-flags/enums.ts | 1 + .../feature-flags/feature-flags.service.ts | 1 + 8 files changed, 75 insertions(+), 41 deletions(-) create mode 100644 app/kubernetes/react/views/beOnlyButton/index.tsx delete mode 100644 app/kubernetes/react/views/yamlReplace/index.tsx diff --git a/app/kubernetes/components/yaml-inspector/yamlInspector.html b/app/kubernetes/components/yaml-inspector/yamlInspector.html index 18870043f..33fc07656 100644 --- a/app/kubernetes/components/yaml-inspector/yamlInspector.html +++ b/app/kubernetes/components/yaml-inspector/yamlInspector.html @@ -22,6 +22,12 @@ copied - + diff --git a/app/kubernetes/react/views/beOnlyButton/index.tsx b/app/kubernetes/react/views/beOnlyButton/index.tsx new file mode 100644 index 000000000..c136815fc --- /dev/null +++ b/app/kubernetes/react/views/beOnlyButton/index.tsx @@ -0,0 +1,44 @@ +import { ReactNode } from 'react'; + +import { FeatureId } from '@/react/portainer/feature-flags/enums'; + +import { Button } from '@@/buttons'; +import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren'; + +interface Props { + featureId: FeatureId; + heading: string; + message: string; + buttonText: string; + className?: string; + icon?: ReactNode; +} + +export function BEOnlyButton({ + featureId, + heading, + message, + buttonText, + className, + icon, +}: Props) { + return ( + + + + ); +} diff --git a/app/kubernetes/react/views/index.ts b/app/kubernetes/react/views/index.ts index d2408b12e..deecb7a5b 100644 --- a/app/kubernetes/react/views/index.ts +++ b/app/kubernetes/react/views/index.ts @@ -4,7 +4,7 @@ import { r2a } from '@/react-tools/react2angular'; import { withCurrentUser } from '@/react-tools/withCurrentUser'; import { withReactQuery } from '@/react-tools/withReactQuery'; import { withUIRouter } from '@/react-tools/withUIRouter'; -import { YAMLReplace } from '@/kubernetes/react/views/yamlReplace'; +import { BEOnlyButton } from '@/kubernetes/react/views/beOnlyButton'; import { IngressesDatatableView } from '@/react/kubernetes/ingresses/IngressDatatable'; import { CreateIngressView } from '@/react/kubernetes/ingresses/CreateIngressView'; @@ -22,8 +22,13 @@ export const viewsModule = angular r2a(withUIRouter(withReactQuery(withCurrentUser(CreateIngressView))), []) ) .component( - 'yamlReplace', - r2a(withUIRouter(withReactQuery(withCurrentUser(YAMLReplace))), [ + 'beOnlyButton', + r2a(withUIRouter(withReactQuery(withCurrentUser(BEOnlyButton))), [ 'featureId', + 'heading', + 'message', + 'buttonText', + 'className', + 'icon', ]) ).name; diff --git a/app/kubernetes/react/views/yamlReplace/index.tsx b/app/kubernetes/react/views/yamlReplace/index.tsx deleted file mode 100644 index 35f24100d..000000000 --- a/app/kubernetes/react/views/yamlReplace/index.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import { FeatureId } from '@/react/portainer/feature-flags/enums'; - -import { Button } from '@@/buttons'; -import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren'; - -interface Props { - featureId: FeatureId; -} -export function YAMLReplace({ featureId }: Props) { - return ( - -
- -
-
- ); -} diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html index 5de3b7b29..1542e44e6 100644 --- a/app/kubernetes/views/applications/edit/application.html +++ b/app/kubernetes/views/applications/edit/application.html @@ -214,11 +214,11 @@
-
+
+