Initialize task draft before hydrating stores in workflows

Author: kiahna-tucker

Diff for: src/components/capture/Create/index.tsx

@@ -12,12 +12,12 @@ import {
 import EntityCreate from 'src/components/shared/Entity/Create';
 import EntityToolbar from 'src/components/shared/Entity/Header';
 import { MutateDraftSpecProvider } from 'src/components/shared/Entity/MutateDraftSpecContext';
+import WorkflowInitializer from 'src/components/shared/Entity/WorkflowInitializer';
 import useValidConnectorsExist from 'src/hooks/connectors/useHasConnectors';
 import useDraftSpecs from 'src/hooks/useDraftSpecs';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { CustomEvents } from 'src/services/types';
 import { useDetailsFormStore } from 'src/stores/DetailsForm/Store';
-import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
 import { MAX_DISCOVER_TIME } from 'src/utils/misc-utils';
 
 function CaptureCreate() {
@@ -75,7 +75,7 @@ function CaptureCreate() {
     }, [entityNameChanged]);
 
     return (
-        <WorkflowHydrator>
+        <WorkflowInitializer>
             <MutateDraftSpecProvider value={updateDraftSpecs}>
                 <EntityCreate
                     entityType={entityType}
@@ -113,7 +113,7 @@ function CaptureCreate() {
                     }
                 />
             </MutateDraftSpecProvider>
-        </WorkflowHydrator>
+        </WorkflowInitializer>
     );
 }
 

Diff for: src/components/capture/CreateExpress/index.tsx

@@ -11,12 +11,12 @@ import {
 import EntityCreateExpress from 'src/components/shared/Entity/Create/Express';
 import EntityToolbar from 'src/components/shared/Entity/Header';
 import { MutateDraftSpecProvider } from 'src/components/shared/Entity/MutateDraftSpecContext';
+import WorkflowInitializer from 'src/components/shared/Entity/WorkflowInitializer';
 import useValidConnectorsExist from 'src/hooks/connectors/useHasConnectors';
 import useDraftSpecs from 'src/hooks/useDraftSpecs';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { CustomEvents } from 'src/services/types';
 import { useDetailsFormStore } from 'src/stores/DetailsForm/Store';
-import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
 import { MAX_DISCOVER_TIME } from 'src/utils/misc-utils';
 
 export default function CaptureExpressCreate() {
@@ -73,7 +73,7 @@ export default function CaptureExpressCreate() {
     }, [entityNameChanged]);
 
     return (
-        <WorkflowHydrator expressWorkflow>
+        <WorkflowInitializer expressWorkflow>
             <MutateDraftSpecProvider value={updateDraftSpecs}>
                 <EntityCreateExpress
                     entityType={entityType}
@@ -104,6 +104,6 @@ export default function CaptureExpressCreate() {
                     }
                 />
             </MutateDraftSpecProvider>
-        </WorkflowHydrator>
+        </WorkflowInitializer>
     );
 }

Diff for: src/components/capture/Edit.tsx

@@ -11,14 +11,14 @@ import {
 import EntityEdit from 'src/components/shared/Entity/Edit';
 import EntityToolbar from 'src/components/shared/Entity/Header';
 import { MutateDraftSpecProvider } from 'src/components/shared/Entity/MutateDraftSpecContext';
+import WorkflowInitializer from 'src/components/shared/Entity/WorkflowInitializer';
 import useValidConnectorsExist from 'src/hooks/connectors/useHasConnectors';
 import useGlobalSearchParams, {
     GlobalSearchParams,
 } from 'src/hooks/searchParams/useGlobalSearchParams';
 import { useDraftSpecs_editWorkflow } from 'src/hooks/useDraftSpecs';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { CustomEvents } from 'src/services/types';
-import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
 import { MAX_DISCOVER_TIME } from 'src/utils/misc-utils';
 
 const entityType = 'capture';
@@ -49,7 +49,7 @@ function CaptureEdit() {
     }, [mutateDraftSpecs, mutate_advancedEditor]);
 
     return (
-        <WorkflowHydrator>
+        <WorkflowInitializer>
             <MutateDraftSpecProvider value={updateDraftSpecs}>
                 <EntityEdit
                     title="routeTitle.captureEdit"
@@ -85,7 +85,7 @@ function CaptureEdit() {
                     }
                 />
             </MutateDraftSpecProvider>
-        </WorkflowHydrator>
+        </WorkflowInitializer>
     );
 }
 

Diff for: src/components/connectors/Grid/Skeleton.tsx

@@ -1,6 +1,6 @@
 import { Box, Grid, Skeleton } from '@mui/material';
 
-import Tile from './Tile';
+import Tile from 'src/components/connectors/Grid/Tile';
 
 const tileCount = 6;
 

Diff for: src/components/materialization/Create/index.tsx

@@ -11,12 +11,12 @@ import MaterializeGenerateButton from 'src/components/materialization/GenerateBu
 import EntityCreate from 'src/components/shared/Entity/Create';
 import EntityToolbar from 'src/components/shared/Entity/Header';
 import { MutateDraftSpecProvider } from 'src/components/shared/Entity/MutateDraftSpecContext';
+import WorkflowInitializer from 'src/components/shared/Entity/WorkflowInitializer';
 import useValidConnectorsExist from 'src/hooks/connectors/useHasConnectors';
 import useDraftSpecs from 'src/hooks/useDraftSpecs';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { CustomEvents } from 'src/services/types';
 import { useDetailsFormStore } from 'src/stores/DetailsForm/Store';
-import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
 
 function MaterializationCreate() {
     usePageTitle({
@@ -57,7 +57,7 @@ function MaterializationCreate() {
     }, [imageTag, setDraftId]);
 
     return (
-        <WorkflowHydrator>
+        <WorkflowInitializer>
             <MutateDraftSpecProvider value={updateDraftSpecs}>
                 <EntityCreate
                     entityType={entityType}
@@ -81,7 +81,7 @@ function MaterializationCreate() {
                     }
                 />
             </MutateDraftSpecProvider>
-        </WorkflowHydrator>
+        </WorkflowInitializer>
     );
 }
 

Diff for: src/components/materialization/Edit.tsx

@@ -10,14 +10,14 @@ import MaterializeGenerateButton from 'src/components/materialization/GenerateBu
 import EntityEdit from 'src/components/shared/Entity/Edit';
 import EntityToolbar from 'src/components/shared/Entity/Header';
 import { MutateDraftSpecProvider } from 'src/components/shared/Entity/MutateDraftSpecContext';
+import WorkflowInitializer from 'src/components/shared/Entity/WorkflowInitializer';
 import useValidConnectorsExist from 'src/hooks/connectors/useHasConnectors';
 import useGlobalSearchParams, {
     GlobalSearchParams,
 } from 'src/hooks/searchParams/useGlobalSearchParams';
 import { useDraftSpecs_editWorkflow } from 'src/hooks/useDraftSpecs';
 import usePageTitle from 'src/hooks/usePageTitle';
 import { CustomEvents } from 'src/services/types';
-import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
 
 function MaterializationEdit() {
     usePageTitle({
@@ -47,7 +47,7 @@ function MaterializationEdit() {
     }, [mutateDraftSpecs, mutate_advancedEditor]);
 
     return (
-        <WorkflowHydrator>
+        <WorkflowInitializer>
             <MutateDraftSpecProvider value={updateDraftSpecs}>
                 <EntityEdit
                     title="routeTitle.materializationEdit"
@@ -73,7 +73,7 @@ function MaterializationEdit() {
                     }
                 />
             </MutateDraftSpecProvider>
-        </WorkflowHydrator>
+        </WorkflowInitializer>
     );
 }
 

Diff for: src/components/shared/Entity/Edit/DraftInitializer.tsx

@@ -14,7 +14,7 @@ import { useFormStateStore_status } from 'src/stores/FormState/hooks';
 import { FormStatus } from 'src/stores/FormState/types';
 
 function DraftInitializer({ children }: BaseComponentProps) {
-    const initializeTaskDraft = useInitializeTaskDraft();
+    const { initializeTaskDraft } = useInitializeTaskDraft();
 
     // Draft Editor Store
     const draftInitializationError = useEditorStore_draftInitializationError();

Diff for: src/components/shared/Entity/Edit/useInitializeTaskDraft.ts

@@ -203,7 +203,7 @@ function useInitializeTaskDraft() {
         [taskSpecType]
     );
 
-    return useCallback(
+    const initializeTaskDraft = useCallback(
         async (
             setLoading: Dispatch<SetStateAction<boolean>>
         ): Promise<void> => {
@@ -289,6 +289,8 @@ function useInitializeTaskDraft() {
             taskSpecType,
         ]
     );
+
+    return { initializeTaskDraft };
 }
 
 export default useInitializeTaskDraft;

Diff for: src/components/shared/Entity/WorkflowInitializer.tsx

@@ -0,0 +1,26 @@
+import type { WorkflowInitializerProps } from './types';
+
+import { Fragment } from 'react';
+
+import DraftInitializer from './Edit/DraftInitializer';
+
+import { useEntityWorkflow_Editing } from 'src/context/Workflow';
+import WorkflowHydrator from 'src/stores/Workflow/Hydrator';
+
+const WorkflowInitializer = ({
+    children,
+    expressWorkflow,
+}: WorkflowInitializerProps) => {
+    const isEdit = useEntityWorkflow_Editing();
+    const InitializerComponent = isEdit ? DraftInitializer : Fragment;
+
+    return (
+        <InitializerComponent>
+            <WorkflowHydrator expressWorkflow={expressWorkflow}>
+                {children}
+            </WorkflowHydrator>
+        </InitializerComponent>
+    );
+};
+
+export default WorkflowInitializer;

Diff for: src/components/shared/Entity/types.ts

@@ -4,7 +4,7 @@ import type {
     EntityTestButtonProps,
 } from 'src/components/shared/Entity/Actions/types';
 import type { DataPlaneOption } from 'src/stores/DetailsForm/types';
-import type { Entity } from 'src/types';
+import type { BaseComponentProps, Entity } from 'src/types';
 
 export interface AddCollectionDialogCTAProps {
     entity?: Entity;
@@ -61,3 +61,7 @@ export interface TableHydratorProps {
     entity?: Entity;
     selectedCollections: string[];
 }
+
+export interface WorkflowInitializerProps extends BaseComponentProps {
+    expressWorkflow?: boolean;
+}