fix: change optionActions schema to a more refined setup

bettyblocks · Dec 31, 2024 · c6e4ae4 · c6e4ae4
1 parent d5d8209
commit c6e4ae4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 56 deletions.
diff --git a/src/bb-components-build.ts b/src/bb-components-build.ts
@@ -19,7 +19,6 @@ import {
   Component,
   Interaction,
   Prefab,
-  ComponentStyleMap,
   PrefabReference,
   GroupedStyles,
   BuildPrefabReference,
@@ -48,7 +47,6 @@ import {
   buildReferenceStyle,
 } from './components-build';
 import { buildInteractions } from './components-build/v2/buildInteractions';
-import { reduce } from 'lodash';
 
 const { mkdir, readFile } = promises;
 
@@ -444,19 +442,24 @@ void (async (): Promise<void> => {
     const {
       availableNames: availableComponentNames,
       styleMap: componentStyleMap,
-    } = components.reduce(
-      ({ availableNames, styleMap }, c) => {
-        const newNames = availableNames.includes(c.name)
+    } = components.reduce<{
+      availableNames: string[];
+      styleMap: Record<string, { styleType: string }>;
+    }>(
+      ({ availableNames, styleMap }, component) => {
+        const newNames = availableNames.includes(component.name)
           ? availableNames
-          : [...availableNames, c.name];
+          : [...availableNames, component.name];
 
-        const newStyleMap = c.styleType
-          ? Object.assign(styleMap, { [c.name]: { styleType: c.styleType } })
+        const newStyleMap = component.styleType
+          ? Object.assign(styleMap, {
+              [component.name]: { styleType: component.styleType },
+            })
           : styleMap;
 
         return { availableNames: newNames, styleMap: newStyleMap };
       },
-      { availableNames: [] as string[], styleMap: {} },
+      { availableNames: [], styleMap: {} },
     );
 
     await Promise.all([

diff --git a/src/validations/prefab/component.ts b/src/validations/prefab/component.ts
@@ -23,11 +23,6 @@ import { linkedPartialSchema } from './linkedPartial';
 type StyleValidator = Record<Component['styleType'], Joi.ObjectSchema>;
 type PrefabTypes = 'partial' | 'page' | undefined;
 
-type TransformationActions = {
-  onChangeActions: string[];
-  onCreateActions: string[];
-};
-
 const shadows = [
   'none',
   '0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)',
@@ -202,29 +197,29 @@ const validateComponentStyle =
     return prefabObject;
   };
 
-const baseAction = (allowedActions: string[]) =>
-  Joi.object({
-    action: Joi.string()
-      .valid(...allowedActions)
-      .messages({
-        valid: `onChangeAction not of value: ${JSON.stringify(allowedActions)}`,
-      }),
-    target: Joi.string(),
-  });
+const allowedChangeActions = ['setVariable', 'setModel'];
 
-const optionActionsObject = ({
-  onChangeActions,
-  onCreateActions,
-}: TransformationActions) =>
-  Joi.object({
-    onChange: Joi.array().items(baseAction(onChangeActions)),
-    onCreate: Joi.array().items(baseAction(onCreateActions)),
-  });
+const onChangeAction = Joi.object({
+  action: Joi.string()
+    .valid(...allowedChangeActions)
+    .messages({
+      valid: `onChangeAction not of value: ${JSON.stringify(
+        allowedChangeActions,
+      )}`,
+    }),
+  format: Joi.string().when('action', {
+    is: 'setVariable',
+    then: Joi.valid('propertyLabel', 'propertyValue', 'static'),
+    otherwise: Joi.forbidden(),
+  }),
+  target: Joi.string(),
+});
 
-const optionTemplatesSchema = (
-  transformationActions: TransformationActions,
-  availableComponentNames?: string[],
-) =>
+const optionActionsObject = Joi.object({
+  onChange: Joi.array().items(onChangeAction),
+});
+
+const optionTemplatesSchema = (availableComponentNames?: string[]) =>
   Joi.object({
     addChild: Joi.object({
       condition: Joi.object({
@@ -233,10 +228,7 @@ const optionTemplatesSchema = (
         ),
       }),
       options: Joi.array().items(optionSchema).required(),
-      optionActions: Joi.object().pattern(
-        Joi.string(),
-        optionActionsObject(transformationActions),
-      ),
+      optionActions: Joi.object().pattern(Joi.string(), optionActionsObject),
     }),
   });
 
@@ -258,19 +250,6 @@ const componentSchema = (
     overwrite: overwriteSchema,
   });
 
-  // internal actions list.
-  const definedinternalTransformationActions = {
-    onChangeActions: [
-      'setVariableOptionWithPropertyLabel',
-      'setVariableOptionWithPropertyValue',
-      'setVariableOptionWithInputVariableName',
-    ],
-    onCreateActions: [
-      'createAndSetActionInputVariableOption',
-      'createAndSetPropertyOption',
-    ],
-  };
-
   const deprecatedStylesFlag = Object.keys(styles).length === 0;
 
   return Joi.object({
@@ -282,10 +261,7 @@ const componentSchema = (
     }),
     optionCategories: Joi.array().items(optionCategorySchema).min(1),
     options: Joi.array().items(optionSchema).required(),
-    optionTemplates: optionTemplatesSchema(
-      definedinternalTransformationActions,
-      availableComponentNames,
-    ),
+    optionTemplates: optionTemplatesSchema(availableComponentNames),
     type: Joi.string().valid('COMPONENT').default('COMPONENT'),
     descendants: Joi.array()
       .items(