From 3c4ac9ad5a7610645b83c8b8f3cdeb3b8c52c70a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 20 Jan 2025 16:04:39 +0100
Subject: [PATCH] Errors from builder store

---
 packages/client/manifest.json                 |  3 +--
 .../client/src/components/Component.svelte    | 20 ++++---------------
 packages/client/src/stores/builder.js         |  3 +++
 .../src/stores/derived/componentErrors.ts     |  6 ++++++
 packages/client/src/stores/derived/index.js   |  1 +
 .../client/src/utils/componentsValidator.ts   | 13 ------------
 6 files changed, 15 insertions(+), 31 deletions(-)
 create mode 100644 packages/client/src/stores/derived/componentErrors.ts
 delete mode 100644 packages/client/src/utils/componentsValidator.ts

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 7da7c60abe..c236dd1ad9 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -7206,8 +7206,7 @@
       {
         "type": "table",
         "label": "Data",
-        "key": "dataSource",
-        "validator": "checkValidDatasource"
+        "key": "dataSource"
       },
       {
         "type": "radio",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 4926965e45..7f825c0601 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -23,6 +23,7 @@
     appStore,
     dndComponentPath,
     dndIsDragging,
+    componentErrors,
   } from "stores"
   import { Helpers } from "@budibase/bbui"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
@@ -40,7 +41,6 @@
     getActionDependentContextKeys,
   } from "../utils/buttonActions.js"
   import { gridLayout } from "utils/grid"
-  import { validateComponentSetting } from "utils/componentsValidator"
 
   export let instance = {}
   export let parent = null
@@ -344,21 +344,6 @@
       return missing
     })
 
-    // Check for invalid settings
-    invalidSettings = settingsDefinition.reduce((invalidSettings, setting) => {
-      if (setting.validator) {
-        const error = validateComponentSetting(
-          setting.validator,
-          instance[setting.key]
-        )
-        if (error) {
-          invalidSettings.push(error)
-        }
-      }
-
-      return invalidSettings
-    }, [])
-
     // When considering bindings we can ignore children, so we remove that
     // before storing the reference stringified version
     const noChildren = JSON.stringify({ ...instance, _children: null })
@@ -389,6 +374,9 @@
     }
   }
 
+  // Check for invalid settings
+  $: invalidSettings = $componentErrors[id]
+
   // Extracts a map of all context keys which are required by action settings
   // to provide the functions to evaluate at runtime. This needs done manually
   // as the action definitions themselves do not specify bindings for action
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index faa37eddca..62123c07e5 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -19,6 +19,9 @@ const createBuilderStore = () => {
     eventResolvers: {},
     metadata: null,
     snippets: null,
+    componentErrors: {
+      c5ea93132725c48b2a365fcc1facaee86: ["Ups...!"],
+    }, // TODO
 
     // Legacy - allow the builder to specify a layout
     layout: null,
diff --git a/packages/client/src/stores/derived/componentErrors.ts b/packages/client/src/stores/derived/componentErrors.ts
new file mode 100644
index 0000000000..48185de9c3
--- /dev/null
+++ b/packages/client/src/stores/derived/componentErrors.ts
@@ -0,0 +1,6 @@
+import { derived } from "svelte/store"
+import { builderStore } from "../builder.js"
+
+export const componentErrors = derived([builderStore], ([$builderStore]) => {
+  return $builderStore.componentErrors as Record<string, string[]>
+})
diff --git a/packages/client/src/stores/derived/index.js b/packages/client/src/stores/derived/index.js
index 337c73831f..e7e70d8952 100644
--- a/packages/client/src/stores/derived/index.js
+++ b/packages/client/src/stores/derived/index.js
@@ -5,3 +5,4 @@ export { currentRole } from "./currentRole.js"
 export { dndComponentPath } from "./dndComponentPath.js"
 export { devToolsEnabled } from "./devToolsEnabled.js"
 export { snippets } from "./snippets.js"
+export { componentErrors } from "./componentErrors"
diff --git a/packages/client/src/utils/componentsValidator.ts b/packages/client/src/utils/componentsValidator.ts
deleted file mode 100644
index 6609f92ed6..0000000000
--- a/packages/client/src/utils/componentsValidator.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-const validators = {
-  checkValidDatasource: (a: any) => {
-    return `Ups... "${a.label}" not found`
-  },
-}
-
-export function validateComponentSetting(
-  key: keyof typeof validators,
-  value: any
-) {
-  const validator = validators[key]
-  return validator(value)
-}