Fix PR feedbacks

checkmarble · Jan 7, 2025 · ae4f548 · ae4f548
1 parent 10591f9
commit ae4f548
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 27 deletions.
diff --git a/...Node/Operand/OperandEditor/OperandEditModal/StringTemplateEdit/StringTemplateEdit.hook.ts b/...Node/Operand/OperandEditor/OperandEditModal/StringTemplateEdit/StringTemplateEdit.hook.ts
@@ -74,10 +74,10 @@ const adaptStringTemplateEditState = ({
   initialNode: StringTemplateAstNode;
   initialErrors: AstNodeErrors | undefined;
 }) => {
-  const template = initialNode.children[0]?.constant ?? '';
-  // const templateErrors = initialErrors.children[0]?.errors ?? [];
-
-  return { template, variables: initialNode.namedChildren };
+  return {
+    template: initialNode.children[0]?.constant ?? '',
+    variables: initialNode.namedChildren,
+  };
 };
 
 export const useStringTemplateEditState = (

diff --git a/packages/app-builder/src/components/Scenario/Workflow/DetailPanel/CaseNameEditor.hook.ts b/packages/app-builder/src/components/Scenario/Workflow/DetailPanel/CaseNameEditor.hook.ts
@@ -17,20 +17,6 @@ export const useDefaultCaseName = (triggerObjectType: string) => {
     });
   }, [defaultCaseTemplate]);
 
-  // const isDefaultCaseName = (astNode: StringTemplateAstNode) => {
-  //   return R.isDeepEqual(astNode, defaultCaseNameNode);
-  //   // if (astNode.children[0]?.constant !== defaultCaseTemplate) {
-  //   //   return false;
-  //   // }
-  //   // const objectIdVariable = astNode.namedChildren['object_id'];
-
-  //   // return (
-  //   //   objectIdVariable &&
-  //   //   isPayload(objectIdVariable) &&
-  //   //   objectIdVariable.children[0]?.constant === 'object_id'
-  //   // );
-  // };
-
   return {
     defaultCaseNameNode,
   };

diff --git a/packages/app-builder/src/models/node-evaluation.ts b/packages/app-builder/src/models/node-evaluation.ts
@@ -16,6 +16,8 @@ export type ReturnValue =
       isOmitted: true;
     };
 
+export type ReturnValueType = 'string' | 'int' | 'float' | 'bool' | 'datetime';
+
 export type NonOmittedReturnValue = { value: ConstantType; isOmitted: false };
 
 export function hasReturnValue(

diff --git a/packages/app-builder/src/repositories/ScenarioRepository.ts b/packages/app-builder/src/repositories/ScenarioRepository.ts
@@ -11,6 +11,7 @@ import {
 import {
   adaptNodeEvaluation,
   type NodeEvaluation,
+  type ReturnValueType,
 } from '@app-builder/models/node-evaluation';
 import {
   adaptSnoozesOfIteration,
@@ -76,7 +77,7 @@ export interface ScenarioRepository {
   }): Promise<ScenarioValidation['rules']['ruleItems'][number]>;
   validateAst(
     scenarioId: string,
-    payload: { node: AstNode; returnType?: string },
+    payload: { node: AstNode; expectedReturnType?: ReturnValueType },
   ): Promise<NodeEvaluation>;
   commitScenarioIteration(args: {
     iterationId: string;
@@ -174,12 +175,12 @@ export function makeGetScenarioRepository() {
         ruleId,
       );
     },
-    validateAst: async (scenarioId, { node, returnType }) => {
+    validateAst: async (scenarioId, { node, expectedReturnType }) => {
       const { ast_validation } = await marbleCoreApiClient.validateAstNode(
         scenarioId,
         {
           node: adaptNodeDto(node),
-          return_type: returnType,
+          expected_return_type: expectedReturnType,
         },
       );
 

diff --git a/packages/app-builder/src/routes/ressources+/scenarios+/$scenarioId+/validate-ast.tsx b/packages/app-builder/src/routes/ressources+/scenarios+/$scenarioId+/validate-ast.tsx
@@ -1,4 +1,5 @@
 import { type AstNode } from '@app-builder/models';
+import { type ReturnValueType } from '@app-builder/models/node-evaluation';
 import { serverServices } from '@app-builder/services/init.server';
 import { getRoute } from '@app-builder/utils/routes';
 import { fromParams, fromUUID } from '@app-builder/utils/short-uuid';
@@ -8,7 +9,7 @@ import { useCallback } from 'react';
 
 type AstValidationPayload = {
   node: AstNode;
-  returnType?: string;
+  expectedReturnType?: ReturnValueType;
 };
 
 export async function action({ request, params }: ActionFunctionArgs) {
@@ -22,7 +23,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   const res = await scenario.validateAst(scenarioId, {
     node: body.node,
-    returnType: body.returnType,
+    expectedReturnType: body.expectedReturnType,
   });
 
   console.dir(res, { depth: null });
@@ -34,10 +35,10 @@ export function useAstValidationFetcher(scenarioId: string) {
   const { submit, data } = useFetcher<typeof action>();
 
   const validate = useCallback(
-    (ast: AstNode, returnType?: string) => {
+    (ast: AstNode, expectedReturnType?: ReturnValueType) => {
       const args: AstValidationPayload = {
         node: ast,
-        returnType,
+        expectedReturnType,
       };
       submit(args, {
         method: 'POST',

diff --git a/packages/marble-api/openapis/marblecore-api.yaml b/packages/marble-api/openapis/marblecore-api.yaml
@@ -4838,8 +4838,9 @@ components:
           type: object
           allOf:
             - $ref: '#/components/schemas/NodeDto'
-        return_type:
+        expected_return_type:
           type: string
+          enum: ['string', 'int', 'float', 'bool', 'datetime']
     ScenarioUpdateInputDto:
       type: object
       properties:

diff --git a/packages/marble-api/src/generated/marblecore-api.ts b/packages/marble-api/src/generated/marblecore-api.ts
@@ -364,7 +364,7 @@ export type ScenarioUpdateInputDto = {
 };
 export type ScenarioAstValidateInputDto = {
     node?: NodeDto;
-    return_type?: string;
+    expected_return_type?: "string" | "int" | "float" | "bool" | "datetime";
 };
 export type ScenarioIterationDto = {
     id: string;