From 55382f19795da12470671d4b5bedaac7738ceb94 Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Wed, 29 Jan 2025 19:12:55 +0100
Subject: [PATCH] Update modal and change open modal label in accountList

---
 src/react/account/AccountList.tsx             |   2 +-
 src/react/ui-elements/PartnerApp/ISVModal.tsx | 130 ++++++++++--------
 src/react/ui-elements/Veeam/WelcomeModal.tsx  |  72 +---------
 3 files changed, 78 insertions(+), 126 deletions(-)

diff --git a/src/react/account/AccountList.tsx b/src/react/account/AccountList.tsx
index fb8f8afc6..1927a8b42 100644
--- a/src/react/account/AccountList.tsx
+++ b/src/react/account/AccountList.tsx
@@ -136,7 +136,7 @@ function AccountList({ accounts }: { accounts: Account[] }) {
               <Stack>
                 {features.includes(VEEAM_FEATURE) && (
                   <Button
-                    label="Start Configuration for Veeam"
+                    label="Start Configuration for ISV"
                     variant="secondary"
                     onClick={() => setIsISVModalOpen(true)}
                     type="button"
diff --git a/src/react/ui-elements/PartnerApp/ISVModal.tsx b/src/react/ui-elements/PartnerApp/ISVModal.tsx
index 6cc1c91ca..a747a4a9c 100644
--- a/src/react/ui-elements/PartnerApp/ISVModal.tsx
+++ b/src/react/ui-elements/PartnerApp/ISVModal.tsx
@@ -21,10 +21,75 @@ export const StyledGrid = styled.div`
   border-radius: ${spacing.f8};
 `;
 
+export const ISVModalContent = ({ selectedISV, setSelectedISV }) => {
+  const theme = useTheme();
+
+  return (
+    <Stack direction="vertical" gap="r8">
+      <Text isEmphazed variant="Large" style={{ marginBottom: spacing.r16 }}>
+        Which application would you like to configure with your ARTESCA?
+      </Text>
+      <Text style={{ paddingLeft: spacing.r16 }}>
+        Scality provides products that are certified with some of the most
+        esteemed applications in the industry.
+      </Text>
+      <form
+        style={{
+          backgroundColor: theme.backgroundLevel2,
+          borderRadius: spacing.f8,
+          overflowY: 'auto',
+          overflowX: 'hidden',
+          height: '50vh',
+        }}
+      >
+        <Stack
+          direction="vertical"
+          gap="r8"
+          style={{
+            backgroundColor: theme.backgroundLevel2,
+            padding: spacing.r16,
+            borderRadius: spacing.f8,
+          }}
+        >
+          <Text isEmphazed color="textPrimary">
+            Automatic configuration via assistant
+          </Text>
+          <StyledGrid>
+            {ISVList.map((isv) => {
+              return (
+                <CardISV
+                  name={isv.name}
+                  logo={isv.logo}
+                  application={isv.type}
+                  selected={selectedISV === isv.id}
+                  onChange={() => setSelectedISV(isv.id)}
+                ></CardISV>
+              );
+            })}
+          </StyledGrid>
+          <Text isEmphazed color="textPrimary">
+            Manual configuration
+          </Text>
+          <StyledGrid>
+            {ISVManualList.map((isv) => {
+              return (
+                <ManualISVCard
+                  logo={isv.logo}
+                  application={isv.application}
+                  link={isv.documentationLink}
+                ></ManualISVCard>
+              );
+            })}
+          </StyledGrid>
+        </Stack>
+      </form>
+    </Stack>
+  );
+};
+
 const ISVModal = ({ isOpen, setIsOpen }) => {
   const navigate = useBasenameRelativeNavigate();
   const [selectedISV, setSelectedISV] = useState<string>('');
-  const theme = useTheme();
 
   if (!isOpen) {
     return <></>;
@@ -59,65 +124,10 @@ const ISVModal = ({ isOpen, setIsOpen }) => {
         </Wrap>
       }
     >
-      <Stack direction="vertical" gap="r8">
-        <Text isEmphazed variant="Large" style={{ marginBottom: spacing.r16 }}>
-          Which application would you like to configure with your ARTESCA?
-        </Text>
-        <Text style={{ paddingLeft: spacing.r16 }}>
-          Scality provides products that are certified with some of the most
-          esteemed applications in the industry.
-        </Text>
-        <form
-          style={{
-            backgroundColor: theme.backgroundLevel2,
-            borderRadius: spacing.f8,
-            overflowY: 'auto',
-            overflowX: 'hidden',
-            height: '50vh',
-          }}
-        >
-          <Stack
-            direction="vertical"
-            gap="r8"
-            style={{
-              backgroundColor: theme.backgroundLevel2,
-              padding: spacing.r16,
-              borderRadius: spacing.f8,
-            }}
-          >
-            <Text isEmphazed color="textPrimary">
-              Automatic configuration via assistant
-            </Text>
-            <StyledGrid>
-              {ISVList.map((isv) => {
-                return (
-                  <CardISV
-                    name={isv.name}
-                    logo={isv.logo}
-                    application={isv.type}
-                    selected={selectedISV === isv.id}
-                    onChange={() => setSelectedISV(isv.id)}
-                  ></CardISV>
-                );
-              })}
-            </StyledGrid>
-            <Text isEmphazed color="textPrimary">
-              Manual configuration
-            </Text>
-            <StyledGrid>
-              {ISVManualList.map((isv) => {
-                return (
-                  <ManualISVCard
-                    logo={isv.logo}
-                    application={isv.application}
-                    link={isv.documentationLink}
-                  ></ManualISVCard>
-                );
-              })}
-            </StyledGrid>
-          </Stack>
-        </form>
-      </Stack>
+      <ISVModalContent
+        selectedISV={selectedISV}
+        setSelectedISV={setSelectedISV}
+      ></ISVModalContent>
     </CustomModal>
   );
 };
diff --git a/src/react/ui-elements/Veeam/WelcomeModal.tsx b/src/react/ui-elements/Veeam/WelcomeModal.tsx
index ee7491c22..b372f321f 100644
--- a/src/react/ui-elements/Veeam/WelcomeModal.tsx
+++ b/src/react/ui-elements/Veeam/WelcomeModal.tsx
@@ -1,7 +1,7 @@
-import { Icon, Modal, spacing, Stack, Text, Wrap } from '@scality/core-ui';
+import { Icon, Modal, Stack, Text, Wrap } from '@scality/core-ui';
 import { Button } from '@scality/core-ui/dist/components/buttonv2/Buttonv2.component';
 import { useMemo, useState } from 'react';
-import styled, { useTheme } from 'styled-components';
+import styled from 'styled-components';
 
 import { InternalRouter } from '../../FederableApp';
 
@@ -14,9 +14,7 @@ import AlertProvider, {
   useAlerts,
 } from '../../next-architecture/ui/AlertProvider';
 import { useShellHooks } from '@scality/module-federation';
-import { StyledGrid } from '../PartnerApp/ISVModal';
-import { ISVList, ISVManualList } from '../PartnerApp/ISVList';
-import { CardISV, ManualISVCard } from '../PartnerApp/CardISV';
+import { ISVModalContent } from '../PartnerApp/ISVModal';
 
 const CustomModal = styled(Modal)`
   background-color: ${(props) => props.theme.backgroundLevel1};
@@ -71,7 +69,6 @@ const ModalComponent = () => {
     (app: { kind: string }) => app.kind === 'zenko-ui',
   );
 
-  const theme = useTheme();
   const currentApp =
     deployedApps.find(
       (app) =>
@@ -146,65 +143,10 @@ const ModalComponent = () => {
         </Wrap>
       }
     >
-      <Stack direction="vertical" gap="r8">
-        <Text isEmphazed variant="Large" style={{ marginBottom: spacing.r16 }}>
-          Which application would you like to configure with your ARTESCA?
-        </Text>
-        <Text style={{ paddingLeft: spacing.r16 }}>
-          Scality provides products that are certified with some of the most
-          esteemed applications in the industry.
-        </Text>
-        <form
-          style={{
-            backgroundColor: theme.backgroundLevel2,
-            borderRadius: spacing.f8,
-            overflowY: 'auto',
-            overflowX: 'hidden',
-            height: '50vh',
-          }}
-        >
-          <Stack
-            direction="vertical"
-            gap="r8"
-            style={{
-              backgroundColor: theme.backgroundLevel2,
-              padding: spacing.r16,
-              borderRadius: spacing.f8,
-            }}
-          >
-            <Text isEmphazed color="textPrimary">
-              Automatic configuration via assistant
-            </Text>
-            <StyledGrid>
-              {ISVList.map((isv) => {
-                return (
-                  <CardISV
-                    name={isv.name}
-                    logo={isv.logo}
-                    application={isv.type}
-                    selected={selectedISV === isv.id}
-                    onChange={() => setSelectedISV(isv.id)}
-                  ></CardISV>
-                );
-              })}
-            </StyledGrid>
-            <Text isEmphazed color="textPrimary">
-              Manual configuration
-            </Text>
-            <StyledGrid>
-              {ISVManualList.map((isv) => {
-                return (
-                  <ManualISVCard
-                    logo={isv.logo}
-                    application={isv.application}
-                    link={isv.documentationLink}
-                  ></ManualISVCard>
-                );
-              })}
-            </StyledGrid>
-          </Stack>
-        </form>
-      </Stack>
+      <ISVModalContent
+        selectedISV={selectedISV}
+        setSelectedISV={setSelectedISV}
+      ></ISVModalContent>
     </CustomModal>
   );
 };