JNG-5382 post create hook with component proxy params

BlackBeltTechnology · Jan 3, 2024 · 205fd02 · 205fd02
1 parent bf7d0b5
commit 205fd02
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 2 deletions.
diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiActionsHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiActionsHelper.java
@@ -105,6 +105,10 @@ public static ActionDefinition getGetTemplateActionDefinitionForContainer(PageCo
         return (ActionDefinition) container.getPageActionDefinitions().stream().filter(a -> ((ActionDefinition) a).getIsGetTemplateAction()).findFirst().orElse(null);
     }
 
+    public static ActionDefinition getCreateDefinitionForContainer(PageContainer container) {
+        return (ActionDefinition) container.getPageActionDefinitions().stream().filter(a -> ((ActionDefinition) a).getIsCreateAction()).findFirst().orElse(null);
+    }
+
     public static ActionDefinition getRefreshActionDefinitionForContainer(PageContainer container) {
         if (container.isTable()) {
             return getRefreshActionDefinitionForTable((Table) container.getTables().get(0));
@@ -287,6 +291,16 @@ public static String refreshActionDataParameter(Action action) {
         return "undefined";
     }
 
+    public static String postCreateActionParams(PageDefinition page, ActionDefinition actionDefinition) {
+        List<String> tokens = new ArrayList<>();
+        String type = classDataName(getReferenceClassType(page), "Stored");
+        tokens.add("data: " + classDataName(getReferenceClassType(page), ""));
+        tokens.add("res: " + type);
+        tokens.add("onSubmit: (result?: " + type + ") => Promise<void>");
+        tokens.add("onClose: () => Promise<void>");
+        return String.join(", ", tokens);
+    }
+
     public static String postCallOperationActionParams(PageDefinition page, ActionDefinition actionDefinition) {
         List<String> tokens = new ArrayList<>();
         if (actionDefinition.getTargetType() != null) {

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <BinaryInput

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs
@@ -8,6 +8,7 @@
       editMode={editMode}
       storeDiff={storeDiff}
       isLoading={isLoading}
+      actions={actions}
     >
   {{/ if }}
   {{# or child.actionDefinition.isCallOperationAction child.actionDefinition.isOpenFormAction }}

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs
@@ -9,6 +9,7 @@
         editMode={editMode}
         storeDiff={storeDiff}
         isLoading={isLoading}
+        actions={actions}
       >
     {{/ if }}
     {{# each (featuredButtonsForButtonGroup child) as |button| }}

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
         <FormControl error={!!validation.get('{{ child.attributeType.name }}')}>

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <DatePicker

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <DateTimePicker

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <Grid container sx={ { height: DIVIDER_HEIGHT } } alignItems="center">

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <TextField

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <FormControl

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     {{# if this.card }}

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <Grid container direction="row" alignItems="center" {{# if child.icon }}spacing={2}{{/ if }}>

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <Grid container direction="row" alignItems="center" justifyContent="flex-start">

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <NumericInput

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <Grid container sx={ { height: DIVIDER_HEIGHT } } id="{{ getXMIID child }}"></Grid>

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <ModeledTabs

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <Typography id="{{ getXMIID child }}">

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <TextField

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <TextField

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <TimePicker

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs
@@ -8,6 +8,7 @@
             editMode={editMode}
             storeDiff={storeDiff}
             isLoading={isLoading}
+            actions={actions}
         >
     {{/ if }}
     <TrinaryLogicCombobox

diff --git a/judo-ui-react/src/main/resources/actor/src/dialogs/index.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/dialogs/index.tsx.hbs
@@ -58,6 +58,9 @@ import { {{# unless page.container.table }}useCallback, useEffect, useRef, {{/ u
     {{# with (getGetTemplateActionDefinitionForContainer page.container) as |getTemplateActionDefinition| }}
       post{{ firstToUpper (simpleActionDefinitionName getTemplateActionDefinition) }}?: ({{{ postGetTemplateActionParams page getTemplateActionDefinition }}}) => Promise<void>;
     {{/ with }}
+    {{# with (getCreateDefinitionForContainer page.container) as |createActionDefinition| }}
+      post{{ firstToUpper (simpleActionDefinitionName createActionDefinition) }}?: ({{{ postCreateActionParams page createActionDefinition }}}) => Promise<void>;
+    {{/ with }}
   };
 
   export const {{ camelCaseNameToInterfaceKey (pageName page) }}_ACTIONS_HOOK_INTERFACE_KEY = '{{ containerComponentName page.container }}ActionsHook';

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/actions/CreateAction.fragment.hbs b/judo-ui-react/src/main/resources/actor/src/pages/actions/CreateAction.fragment.hbs
@@ -2,8 +2,12 @@ const {{ simpleActionDefinitionName action.actionDefinition }} = async () => {
   try {
     setIsLoading(true);
     const res = await {{ getServiceImplForPage page }}.create{{# if action.targetDataElement }}{{ firstToUpper action.targetDataElement.name }}{{/ if }}({{# unless action.ownerDataElement.isAccess }}ownerData, {{/ unless }}payloadDiff.current);
-    showSuccessSnack(t('judo.action.create.success', { defaultValue: 'Create successful' }));
-    onSubmit(res);
+    if (customActions?.post{{ firstToUpper (simpleActionDefinitionName action.actionDefinition) }}) {
+      await customActions.post{{ firstToUpper (simpleActionDefinitionName action.actionDefinition) }}(data, res, onSubmit, onClose);
+    } else {
+      showSuccessSnack(t('judo.action.create.success', { defaultValue: 'Create successful' }));
+      onSubmit(res);
+    }
   } catch (error) {
      handleError<{{ classDataName (getReferenceClassType page) '' }}>(error, { setValidation }, data);
   } finally {