feat(AstBuilder): add save method

checkmarble · Aug 31, 2023 · dda24da · dda24da
1 parent ec3b42a
commit dda24da
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/packages/app-builder/src/models/ast-node.ts b/packages/app-builder/src/models/ast-node.ts
@@ -1,12 +1,12 @@
 import { type NodeDto } from '@marble-api';
 import * as R from 'remeda';
 
-export interface AstNode {
+export type AstNode = {
   name: string | null;
   constant?: ConstantType;
   children: AstNode[];
   namedChildren: Record<string, AstNode>;
-}
+};
 
 export const undefinedAstNodeName = 'Undefined';
 

diff --git a/...builder/src/routes/__builder/scenarios/$scenarioId/i/$iterationId/edit2.rules.$ruleId.tsx b/...builder/src/routes/__builder/scenarios/$scenarioId/i/$iterationId/edit2.rules.$ruleId.tsx
@@ -92,13 +92,11 @@ export async function action({ request, params }: ActionArgs) {
   try {
     const ruleId = fromParams(params, 'ruleId');
 
-    const expression = (await request.json()) as {
-      astNode: AstNode;
-    };
+    const astNode = (await request.json()) as AstNode;
 
     await editor.saveRule({
       ruleId,
-      astNode: expression.astNode,
+      astNode,
     });
 
     setToastMessage(session, {
@@ -109,7 +107,7 @@ export async function action({ request, params }: ActionArgs) {
       {
         success: true as const,
         error: null,
-        values: expression,
+        astNode,
       },
       { headers: { 'Set-Cookie': await commitSession(session) } }
     );
@@ -122,7 +120,7 @@ export async function action({ request, params }: ActionArgs) {
       {
         success: false as const,
         error: null,
-        values: null,
+        astNode: null,
       },
       { headers: { 'Set-Cookie': await commitSession(session) } }
     );
@@ -146,7 +144,7 @@ export default function RuleEdit() {
     identifiers,
     operators,
     onSave: (astNodeToSave: AstNode) => {
-      fetcher.submit(JSON.stringify(astNodeToSave), {
+      fetcher.submit(astNodeToSave, {
         method: 'PATCH',
         encType: 'application/json',
       });
@@ -183,7 +181,13 @@ export default function RuleEdit() {
           <Paper.Container scrollable={false}>
             <AstBuilder builder={astEditor} />
             <div className="flex flex-row justify-end">
-              <Button type="submit" className="w-fit">
+              <Button
+                type="submit"
+                className="w-fit"
+                onClick={() => {
+                  astEditor.save();
+                }}
+              >
                 {t('common:save')}
               </Button>
             </div>

diff --git a/packages/app-builder/src/services/editor/ast-editor.ts b/packages/app-builder/src/services/editor/ast-editor.ts
@@ -81,13 +81,15 @@ export interface AstBuilder {
   setOperator(nodeId: string, name: string): void;
   appendChild(nodeId: string, childAst: AstNode): void;
   remove(nodeId: string): void;
+  save(): void;
 }
 
 export function useAstBuilder({
   ast,
   validation,
   identifiers,
   operators,
+  onSave,
 }: {
   ast: AstNode;
   validation: NodeEvaluation;
@@ -211,6 +213,12 @@ export function useAstBuilder({
     // Todo: debonced save
   }, []);
 
+  const save = useCallback(() => {
+    onSave(adaptAstNodeFromEditorViewModel(astViewModel));
+
+    // Todo: debonced save
+  }, [astViewModel, onSave]);
+
   return {
     astViewModel,
     identifiers,
@@ -220,5 +228,6 @@ export function useAstBuilder({
     setOperator,
     appendChild,
     remove,
+    save,
   };
 }