@budibase/frontend-core 3.18.2 → 3.18.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.18.2",
+  "version": "3.18.4",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -17,5 +17,5 @@
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
   },
-  "gitHead": "43d59f5579dd910575d8aebefb40fae25570c05d"
+  "gitHead": "b82c05d3d0949d198b49415d20980e72cc61ca5b"
 }

package/src/utils/validation/yup/app.ts

@@ -1,26 +1,26 @@
-import { string, mixed } from "yup"
-import { APP_NAME_REGEX, APP_URL_REGEX } from "../../../constants"
-import { App } from "@budibase/types"
+import { Workspace } from "@budibase/types"
+import { mixed, string } from "yup"
 import { ValidationStore } from "."
-import { Helpers } from "@budibase/bbui"
+import { APP_NAME_REGEX, APP_URL_REGEX } from "../../../constants"
 
 export const name = (
   validation: ValidationStore,
-  { apps, currentApp }: { apps: App[]; currentApp?: App } = { apps: [] },
-  appOrWorkspace: "app" | "workspace"
+  { apps, currentApp }: { apps: Workspace[]; currentApp?: Workspace } = {
+    apps: [],
+  }
 ) => {
   validation.addValidator(
     "name",
     string()
       .trim()
-      .required(`Your ${appOrWorkspace} must have a name`)
+      .required(`Your workspace must have a name`)
       .matches(
         APP_NAME_REGEX,
-        `${Helpers.capitalise(appOrWorkspace)} name must be letters, numbers and spaces only`
+        "Workspace name must be letters, numbers and spaces only"
       )
       .test(
         "non-existing-app-name",
-        `Another ${appOrWorkspace} with the same name already exists`,
+        "Another workspace with the same name already exists",
         value => {
           if (!value) {
             // exit early, above validator will fail
@@ -39,19 +39,20 @@ export const name = (
 
 export const url = (
   validation: ValidationStore,
-  { apps, currentApp }: { apps: App[]; currentApp?: App } = { apps: [] },
-  appOrWorkspace: "app" | "workspace"
+  { apps, currentApp }: { apps: Workspace[]; currentApp?: Workspace } = {
+    apps: [],
+  }
 ) => {
   validation.addValidator(
     "url",
     string()
       .trim()
       .nullable()
-      .required(`Your ${appOrWorkspace} must have a url`)
+      .required(`Your workspace must have a url`)
       .matches(APP_URL_REGEX, "Please enter a valid url")
       .test(
         "non-existing-app-url",
-        `Another ${appOrWorkspace} with the same URL already exists`,
+        `Another workspace with the same URL already exists`,
         value => {
           if (!value) {
             return true