fix wizard actions

Author: James-Baloyi

shesha-reactjs/src/designer-components/wizard/hooks.ts

@@ -9,9 +9,11 @@ import { useDeepCompareMemo } from '@/hooks';
 import { useFormExpression } from '@/hooks';
 import { useFormDesignerComponents } from '@/providers/form/hooks';
 import { useValidator } from '@/providers/validateProvider';
+import { useClosestModal } from '@/providers/dynamicModal';
 
 interface IWizardComponent {
   back: () => void;
+  close: () => void;
   components: IConfigurableFormComponent[];
   current: number;
   currentStep: IWizardStepProps;
@@ -28,6 +30,7 @@ export const useWizard = (model: Omit<IWizardComponentProps, 'size'>): IWizardCo
   const allData = useAvailableConstantsData();
   const toolbox = useFormDesignerComponents();
   const validator = useValidator(false);
+  const closestModal = useClosestModal();
 
   const formMode = useForm(false).formMode;
 
@@ -197,10 +200,15 @@ export const useWizard = (model: Omit<IWizardComponentProps, 'size'>): IWizardCo
       );
   };
 
+  const close = (): void => {
+    closestModal?.close();
+  };
+
   const cancel = (): void =>
     executeActionIfConfigured(
       (tab) => tab.beforeCancelActionConfiguration,
       (tab) => tab.afterCancelActionConfiguration,
+      () => close(),
     );
 
   const done = (): void => {
@@ -265,6 +273,20 @@ export const useWizard = (model: Omit<IWizardComponentProps, 'size'>): IWizardCo
     actionDependencies,
   );
 
+  useConfigurableAction(
+    {
+      name: 'Close',
+      owner: actionOwnerName,
+      ownerUid: actionsOwnerId,
+      hasArguments: false,
+      executer: () => {
+        close();
+        return Promise.resolve();
+      },
+    },
+    actionDependencies,
+  );
+
   useConfigurableAction(
     {
       name: 'Done',
@@ -313,5 +335,5 @@ export const useWizard = (model: Omit<IWizardComponentProps, 'size'>): IWizardCo
 
   const content = getStepDescritpion(showStepStatus, sequence, current);
 
-  return { components, current, currentStep, visibleSteps, back, cancel, done, content, next, setStep };
+  return { components, current, currentStep, visibleSteps, back, cancel, close, done, content, next, setStep };
 };

shesha-reactjs/src/designer-components/wizard/tabs.tsx

@@ -29,7 +29,7 @@ export const Tabs: FC<Omit<IWizardComponentProps, 'size'>> = ({ form, ...model }
   const { executeBooleanExpression } = useFormExpression();
   const onChangeContextData = useDataContextManager()?.onChangeContextData;
 
-  const { components, current, currentStep, visibleSteps, back, cancel, content, done, next, setStep } = useWizard(model);
+  const { components, current, currentStep, visibleSteps, back, cancel, close, content, done, next, setStep } = useWizard(model);
   useEffect(() => onChangeContextData(), [current]);
 
   const contextData = useMemo(
@@ -101,7 +101,7 @@ export const Tabs: FC<Omit<IWizardComponentProps, 'size'>> = ({ form, ...model }
       type="control"
       metadata={contextMetadata}
       data={contextData}
-      api={{ back, cancel, content, done, next, setStep }}
+      api={{ back, cancel, close, content, done, next, setStep }}
     >
       <ParentProvider model={model}>
         <div className={styles.shaWizard}>

shesha-reactjs/src/publicJsApis/wizardApi.ts

@@ -2,6 +2,7 @@ export interface IWizardActions {
   next: () => Promise<void>;
   back: () => void;
   cancel: () => void;
+  close: () => void;
   done: () => Promise<void>;
   setStep: (stepIndex) => void;
   content: (description: string, index: number) => string;