Merge pull request #50 from osstotalsoft/update-export

fix export handlers

gql-bff/src/features/workflow/resolvers.js

@@ -45,7 +45,7 @@ const workflowResolvers = {
       else return filterResourcesByTenant(allWorkflows, tenant?.id);
     },
 
-    exportWorkflows: async (_parent, { workflowList }, context, _info) => {
+    exportWorkflows: async (_parent, { workflowList, allHandlers }, context, _info) => {
       const { dataSources, tenant } = context;
       const { code } = tenant ?? { code: "" };
 
@@ -68,12 +68,13 @@ const workflowResolvers = {
               ...conductorHandlers.filter((a) => h.includes(a.name))
             );
             handlers.push(
-              ...conductorHandlers.filter((a) =>
-                a.actions.some(
-                  (x) =>
-                    x.action === "start_workflow" &&
-                    x?.start_workflow?.name === flow.name
-                ) && !handlers.some((h) => h.name === a.name)
+              ...conductorHandlers.filter(
+                (a) =>
+                  a.actions.some(
+                    (x) =>
+                      x.action === "start_workflow" &&
+                      x?.start_workflow?.name === flow.name
+                  ) && !handlers.some((h) => h.name === a.name)
               )
             );
           }
@@ -88,12 +89,13 @@ const workflowResolvers = {
               ...conductorHandlers.filter((a) => h.includes(a.name))
             );
             handlers.push(
-              ...conductorHandlers.filter((a) =>
-                a.actions.some(
-                  (x) =>
-                    x.action === "start_workflow" &&
-                    x?.start_workflow?.name === flow.name
-                ) && !handlers.some((h) => h.name === a.name)
+              ...conductorHandlers.filter(
+                (a) =>
+                  a.actions.some(
+                    (x) =>
+                      x.action === "start_workflow" &&
+                      x?.start_workflow?.name === flow.name
+                  ) && !handlers.some((h) => h.name === a.name)
               )
             );
           }
@@ -112,32 +114,35 @@ const workflowResolvers = {
           const h = [...str.matchAll(regex)].map((a) => a[1]);
           handlers.push(...conductorHandlers.filter((a) => h.includes(a.name)));
           handlers.push(
-            ...conductorHandlers.filter((a) =>
-              a.actions.some(
-                (x) =>
-                  x.action === "start_workflow" &&
-                  x?.start_workflow?.name === name[0]
-              ) && !handlers.some((h) => h.name === a.name)
+            ...conductorHandlers.filter(
+              (a) =>
+                a.actions.some(
+                  (x) =>
+                    x.action === "start_workflow" &&
+                    x?.start_workflow?.name === name[0]
+                ) && !handlers.some((h) => h.name === a.name)
             )
           );
         }
       }
 
       //Add all handlers
-      if (isMultiTenant) {
-        const tenantHandlers = filterEvHandlersByTenant(
-          conductorHandlers,
-          tenant?.id
-        );
-        const newH = tenantHandlers.filter((a) =>
-          !handlers.some((h) => h.name === a.name)
-        );
-        handlers.push(...newH);
-      } else {
-        const newH = tenantHandlers.filter((a) =>
-          !handlers.some((h) => h.name === a.name)
-        );
-        handlers.push(...newH);
+      if (allHandlers) {
+        if (isMultiTenant) {
+          const tenantHandlers = filterEvHandlersByTenant(
+            conductorHandlers,
+            tenant?.id
+          );
+          const newH = tenantHandlers.filter(
+            (a) => !handlers.some((h) => h.name === a.name)
+          );
+          handlers.push(...newH);
+        } else {
+          const newH = conductorHandlers.filter(
+            (a) => !handlers.some((h) => h.name === a.name)
+          );
+          handlers.push(...newH);
+        }
       }
       return {
         data: JSON.stringify({ flows, handlers }),

gql-bff/src/features/workflow/schema.graphql

@@ -11,7 +11,7 @@ type ExportWorkflows {
 extend type Query {
   getWorkflow(name: String!, version: Int!): WorkflowDef
   getWorkflowList: [WorkflowDef]
-  exportWorkflows(workflowList: [String]): ExportWorkflows
+  exportWorkflows(workflowList: [String], allHandlers: Boolean): ExportWorkflows
 }
 
 extend input WorkflowTaskInput {

react-ui/public/static/locales/en/translations.json

@@ -523,6 +523,8 @@
     }
   },
   "Export": {
+    "AllHandlers": "All Handlers",
+    "WorkflowHandlers": "Workflow Handlers",
     "ExportButton": "Export workflows",
     "Download": "Download workflows",
     "Export": "Export workflows",

react-ui/public/static/locales/ro/translations.json

@@ -498,6 +498,8 @@
     }
   },
   "Export": {
+    "AllHandlers": "Toti Handlerii",
+    "WorkflowHandlers": "Handlerii Workflow-ului",
     "ExportButton": "Exporta workflows",
     "Download": "Download workflows",
     "Export": "Export workflows",

react-ui/src/features/workflow/edit/components/workflowHistory/components/WorkflowHistoryItem.js

@@ -90,10 +90,9 @@ const WorkflowHistoryItem = ({ history, workflow, isLatest, onRevert }) => {
         maxWidth='xs'
         open={revertDialog}
         showActions
+        defaultActions
         onYes={handleRevertWorkflow}
         onClose={toggleRevertDialog}
-        textDialogYes={t('Dialog.Yes')}
-        textDialogNo={t('Dialog.No')}
       />
       <CompareDefinitionDialog
         open={compareDialog}

react-ui/src/features/workflow/list/components/ExportDialog.js

@@ -43,9 +43,19 @@ const ExportDialog = ({ open, data, onClose, tenantCode }) => {
   const handleOnExport = useCallback(() => {
     const natsPrefix = data.match(/nats_stream:([A-Za-z.]+)ch\./)
     let templateData = data
-    if (namePrefix) {
+    let dataObj = JSON.parse(data);
+    dataObj.flows.forEach(element => {
+      const newName = element.name.replace(namePrefix, '{{NamePrefix}}');
+      templateData = templateData.replaceAll(element.name, newName);
+    });
+
+    dataObj.handlers.forEach(element => {
+      const newName = element.name.replace(namePrefix, '{{NamePrefix}}');
+      templateData = templateData.replaceAll(element.name, newName);
+    });
+    /*if (namePrefix) {
       templateData = templateData.replaceAll(namePrefix, '{{NamePrefix}}')
-    }
+    }*/
     if (natsPrefix && natsPrefix[1]) {
       templateData = templateData.replaceAll(`${natsPrefix[1]}`, '{{NatsPrefix}}')
     }

react-ui/src/features/workflow/list/components/WorkflowListContainer.js

@@ -10,7 +10,7 @@ import { fieldsToBeRemoved, sortingDirection, sortWorkflowsByField } from 'featu
 import { defaults } from 'apollo/defaultCacheData'
 import { workflowsPager } from 'apollo/cacheKeyFunctions'
 import { useMutation } from '@apollo/client'
-import { useToast } from '@totalsoft/rocket-ui'
+import { useToast, Dialog, Button } from '@totalsoft/rocket-ui'
 import { useNavigate } from 'react-router-dom'
 import { useReactOidc } from '@axa-fr/react-oidc-context'
 import { WORKFLOW_QUERY } from 'features/workflow/edit/queries/WorkflowQuery'
@@ -25,6 +25,7 @@ import ImportDialog from './ImportDialog'
 import { IMPORT_WORKFLOW_MUTATION } from '../mutations/ImportMutation'
 import { useApolloLocalStorage } from 'hooks/apolloLocalStorage'
 import { workflowListFilter } from 'apollo/cacheKeyFunctions'
+import SwitchWithInternalState from 'features/common/components/SwitchWithInternalState'
 
 const WorkflowListContainer = () => {
   const { t } = useTranslation()
@@ -35,6 +36,9 @@ const WorkflowListContainer = () => {
 
   const defaultPager = defaults[workflowsPager]
   const [pager, setPager] = useState(defaultPager)
+  const [allHandlers, setAllHandlers] = useState(false)
+  const [exportOptions, setExportOptions] = useState(false)
+  const [workflowList, setWorkflowList] = useState([])
   const [exportModal, setExportModal] = useState(false)
   const [exportData, setExportData] = useState('')
   const [importModal, setImportModal] = useState(false)
@@ -149,14 +153,20 @@ const WorkflowListContainer = () => {
   )
 
   const onExportButton = useCallback(
-    workflowList => {
-      getWorkflowsForExport({
-        variables: { workflowList }
-      })
+    list => {
+      setExportOptions(true)
+      setWorkflowList(list)
     },
-    [getWorkflowsForExport]
+    [setExportOptions, setWorkflowList]
   )
 
+  const onNextExportButton = useCallback(() => {
+    setExportOptions(false)
+    getWorkflowsForExport({
+      variables: { workflowList, allHandlers }
+    })
+  }, [getWorkflowsForExport, workflowList, allHandlers, setExportOptions])
+
   const onCloseExportModal = useCallback(() => setExportModal(false), [setExportModal])
   const onCloseImportModal = useCallback(() => {
     setImportModal(false)
@@ -183,10 +193,38 @@ const WorkflowListContainer = () => {
     [setImportData]
   )
 
+  const handleOnClose = useCallback(() => setExportOptions(false), [setExportOptions])
+  const handleChange = useCallback(() => {
+    setAllHandlers(prev => !prev)
+  }, [setAllHandlers])
+
   return (
     <>
       {importModal && <ImportDialog data={importData} open={importModal} onClose={onCloseImportModal} onImport={handleImport} />}
       {exportData && <ExportDialog data={exportData} open={exportModal} onClose={onCloseExportModal} tenantCode={tenantCode} />}
+      <>
+        <Dialog
+          fullWidth={true}
+          maxWidth={'md'}
+          id='exportOptions'
+          open={exportOptions}
+          title={t('Export.Export')}
+          onClose={handleOnClose}
+          actions={[
+            <Button key='export' color='primary' size='small' onClick={onNextExportButton}>
+              {t('Export.Next')}
+            </Button>
+          ]}
+          content={
+            <SwitchWithInternalState
+              labelOn={t('Export.AllHandlers')}
+              labelOff={t('Export.WorkflowHandlers')}
+              checked={allHandlers}
+              onChange={handleChange}
+            />
+          }
+        />
+      </>
       <WorkflowListFilter loading={loading} filters={filters} onChangeFilters={handleChangeFilters} />
       <WorkflowList
         pager={pager}

react-ui/src/features/workflow/list/queries/WorkflowListQuery.js

@@ -19,8 +19,8 @@ export const WORKFLOW_LIST_QUERY = gql`
 `
 
 export const WORKFLOW_EXPORT_QUERY = gql`
-   query exportWorkflows($workflowList: [String]) {
-    exportWorkflows(workflowList: $workflowList) {
+   query exportWorkflows($workflowList: [String], $allHandlers: Boolean) {
+    exportWorkflows(workflowList: $workflowList, allHandlers: $allHandlers) {
       data
       tenantCode
     }