Integrations: Update delete modal to support custom verify prompt (op…

…ensearch-project#1567) (opensearch-project#1570) * Update delete modal to support custom verify prompt * Update cypress for new delete flow --------- (cherry picked from commit 46c23ee) Signed-off-by: Simeon Widdis <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Simeon Widdis <[email protected]> (cherry picked from commit cb78382)
amsiglan · Apr 7, 2024 · a526be0 · a526be0
1 parent d4d6953
commit a526be0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/.cypress/integration/integrations_test/integrations.spec.js b/.cypress/integration/integrations_test/integrations.spec.js
@@ -107,7 +107,7 @@ describe('Add nginx integration instance flow', () => {
 
     cy.get('button[data-test-subj="popoverModal__deleteButton"]').should('be.disabled');
 
-    cy.get('input.euiFieldText[placeholder="delete"]').focus().type('delete', {
+    cy.get(`input.euiFieldText[placeholder="${testInstance}"]`).focus().type(testInstance, {
       delay: 50,
     });
     cy.get('button[data-test-subj="popoverModal__deleteButton"]').should('not.be.disabled');

diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json
@@ -1,4 +1,4 @@
 {
-    "last_github_commit": "a707810d63b0867a4ca014cb5c36700f95347e73",
-    "last_gitfarm_commit": "04a2358f2f91d9fe5ac98974c8ab3f66f513f0f0"
+    "last_github_commit": "cb78382d5f47de5d72c8fa4b001ad5d49a8bdad2",
+    "last_gitfarm_commit": "abe8ba92a7f16c4a241a21b27afe1694394bae79"
 }
diff --git a/public/components/common/helpers/delete_modal.tsx b/public/components/common/helpers/delete_modal.tsx
@@ -25,18 +25,21 @@ export const DeleteModal = ({
   onConfirm,
   title,
   message,
+  prompt,
 }: {
   onCancel: (
     event?: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLButtonElement, MouseEvent>
   ) => void;
   onConfirm: (event?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
   title: string;
   message: string;
+  prompt?: string;
 }) => {
   const [value, setValue] = useState('');
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setValue(e.target.value);
   };
+  const deletePrompt = prompt ?? 'delete';
   return (
     <EuiOverlayMask>
       <EuiModal onClose={onCancel} initialFocus="[name=input]">
@@ -49,10 +52,10 @@ export const DeleteModal = ({
           <EuiText>The action cannot be undone.</EuiText>
           <EuiSpacer />
           <EuiForm>
-            <EuiFormRow label={'To confirm deletion, enter "delete" in the text field'}>
+            <EuiFormRow label={`To confirm deletion, enter "${deletePrompt}" in the text field`}>
               <EuiFieldText
                 name="input"
-                placeholder="delete"
+                placeholder={deletePrompt}
                 value={value}
                 onChange={(e) => onChange(e)}
                 data-test-subj="popoverModal__deleteTextInput"
@@ -67,7 +70,7 @@ export const DeleteModal = ({
             onClick={() => onConfirm()}
             color="danger"
             fill
-            disabled={value !== 'delete'}
+            disabled={value !== deletePrompt}
             data-test-subj="popoverModal__deleteButton"
           >
             Delete

diff --git a/public/components/integrations/components/added_integration.tsx b/public/components/integrations/components/added_integration.tsx
@@ -50,7 +50,9 @@ export function AddedIntegration(props: AddedIntegrationProps) {
 
   const { setToast } = useToast();
 
-  const [stateData, setData] = useState<any>({ data: {} });
+  const [stateData, setData] = useState<{ data: IntegrationInstanceResult | undefined }>({
+    data: undefined,
+  });
 
   useEffect(() => {
     chrome.setBreadcrumbs([
@@ -73,7 +75,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [modalLayout, setModalLayout] = useState(<EuiOverlayMask />);
 
-  const getModal = () => {
+  const activateDeleteModal = (integrationName?: string) => {
     setModalLayout(
       <DeleteModal
         onConfirm={() => {
@@ -83,8 +85,9 @@ export function AddedIntegration(props: AddedIntegrationProps) {
         onCancel={() => {
           setIsModalVisible(false);
         }}
-        title={`Delete Assets`}
-        message={`Are you sure you want to delete the selected asset(s)?`}
+        title={`Delete Integration`}
+        message={`Are you sure you want to delete the selected Integration?`}
+        prompt={integrationName}
       />
     );
     setIsModalVisible(true);
@@ -97,6 +100,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
         setToast(`${stateData.data?.name} integration successfully deleted!`, 'success');
       })
       .catch((err) => {
+        console.error(err);
         setToast(`Error deleting ${stateData.data?.name} or its assets`, 'danger');
       })
       .finally(() => {
@@ -110,7 +114,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
       .then((exists) => setData(exists));
   }
 
-  function AddedOverview(overviewProps: any) {
+  function AddedOverview(overviewProps: { data: { data?: IntegrationInstanceResult } }) {
     const { data } = overviewProps.data;
 
     return (
@@ -136,7 +140,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
                   aria-label="Delete"
                   color="danger"
                   onClick={() => {
-                    getModal();
+                    activateDeleteModal(data?.name);
                   }}
                   data-test-subj="deleteInstanceButton"
                 />
@@ -165,12 +169,12 @@ export function AddedIntegration(props: AddedIntegrationProps) {
     );
   }
 
-  function AddedAssets(assetProps: any) {
+  function AddedAssets(assetProps: { data: { data?: { assets: AssetReference[] } } }) {
     const { data } = assetProps.data;
 
     const assets = data?.assets || [];
 
-    const renderAsset = (record: any) => {
+    const renderAsset = (record: AssetReference) => {
       switch (record.assetType) {
         case 'dashboard':
           return (
@@ -259,13 +263,13 @@ export function AddedIntegration(props: AddedIntegrationProps) {
         name: 'Type',
         sortable: true,
         truncateText: true,
-        render: (value, record) => (
-          <EuiText data-test-subj={`${record.type}IntegrationDescription`}>
+        render: (_value, record) => (
+          <EuiText data-test-subj={`${record.assetType}AssetTypeDescription`}>
             {_.truncate(record.assetType, { length: 100 })}
           </EuiText>
         ),
       },
-    ] as Array<EuiTableFieldDataColumnType<any>>;
+    ] as Array<EuiTableFieldDataColumnType<AssetReference>>;
 
     return (
       <EuiPanel>

diff --git a/public/components/integrations/components/added_integration_table.tsx b/public/components/integrations/components/added_integration_table.tsx
@@ -79,7 +79,7 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
         <EuiIcon
           type={'trash'}
           onClick={() => {
-            getModal(record.id, record.templateName);
+            activateDeleteModal(record.id, record.name);
           }}
         />
       ),
@@ -103,7 +103,7 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
       });
   }
 
-  const getModal = (integrationInstanceId: string, name: string) => {
+  const activateDeleteModal = (integrationInstanceId: string, name: string) => {
     setModalLayout(
       <DeleteModal
         onConfirm={() => {
@@ -113,8 +113,9 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
         onCancel={() => {
           setIsModalVisible(false);
         }}
-        title={`Delete Assets`}
-        message={`Are you sure you want to delete the selected asset(s)?`}
+        title={`Delete Integration`}
+        message={`Are you sure you want to delete the selected integration?`}
+        prompt={name}
       />
     );
     setIsModalVisible(true);