@budibase/frontend-core 3.20.0 → 3.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.20.0",
+  "version": "3.20.2",
   "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": "d4026ebc5f979585dd3f6cdc6558a7dfb3329be4"
+  "gitHead": "3582592cff6b755c0e6f5cf7d04f32be18d7a9a8"
 }

package/src/api/app.ts

@@ -52,7 +52,8 @@ export interface AppEndpoints {
   ) => Promise<DuplicateWorkspaceResponse>
   updateAppFromExport: (
     appId: string,
-    body: ImportToUpdateWorkspaceRequest
+    body: ImportToUpdateWorkspaceRequest,
+    appExport: File
   ) => Promise<ImportToUpdateWorkspaceResponse>
   fetchSystemDebugInfo: () => Promise<GetDiagnosticsResponse>
   getApps: () => Promise<FetchWorkspacesResponse>
@@ -175,11 +176,16 @@ export const buildAppEndpoints = (API: BaseAPIClient): AppEndpoints => ({
    * converted to development ID.
    * @param body a FormData body with a file and password.
    */
-  updateAppFromExport: async (appId, body) => {
+  updateAppFromExport: async (appId, body, appExport) => {
     const devId = sdk.applications.getDevAppID(appId)
+    const formData = new FormData()
+    formData.append("appExport", appExport)
+    for (const [key, field] of Object.entries(body)) {
+      formData.append(key, field)
+    }
     return await API.post({
       url: `/api/applications/${devId}/import`,
-      body,
+      body: formData,
       json: false,
     })
   },

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

@@ -3,11 +3,18 @@ import { mixed, string } from "yup"
 import { ValidationStore } from "."
 import { APP_NAME_REGEX, APP_URL_REGEX } from "../../../constants"
 
+interface ValidationContext {
+  workspaces: Workspace[]
+  currentWorkspace?: Workspace
+}
+
+const defaultContext = {
+  workspaces: [],
+}
+
 export const name = (
   validation: ValidationStore,
-  { apps, currentApp }: { apps: Workspace[]; currentApp?: Workspace } = {
-    apps: [],
-  }
+  { workspaces, currentWorkspace }: ValidationContext = defaultContext
 ) => {
   validation.addValidator(
     "name",
@@ -26,12 +33,15 @@ export const name = (
             // exit early, above validator will fail
             return true
           }
-          return !apps
-            .filter(app => {
-              return app.appId !== currentApp?.appId
+          return !workspaces
+            .filter(workspace => {
+              return workspace.appId !== currentWorkspace?.appId
             })
-            .map(app => app.name)
-            .some(appName => appName.toLowerCase() === value.toLowerCase())
+            .map(workspace => workspace.name)
+            .some(
+              workspaceName =>
+                workspaceName.toLowerCase() === value.toLowerCase()
+            )
         }
       )
   )
@@ -39,9 +49,7 @@ export const name = (
 
 export const url = (
   validation: ValidationStore,
-  { apps, currentApp }: { apps: Workspace[]; currentApp?: Workspace } = {
-    apps: [],
-  }
+  { workspaces, currentWorkspace }: ValidationContext = defaultContext
 ) => {
   validation.addValidator(
     "url",
@@ -57,17 +65,19 @@ export const url = (
           if (!value) {
             return true
           }
-          if (currentApp) {
-            // filter out the current app if present
-            apps = apps.filter(app => app.appId !== currentApp.appId)
+          if (currentWorkspace) {
+            // filter out the current workspace if present
+            workspaces = workspaces.filter(
+              workspace => workspace.appId !== currentWorkspace.appId
+            )
           }
-          return !apps
-            .map(app => app.url)
-            .some(appUrl => {
+          return !workspaces
+            .map(workspace => workspace.url)
+            .some(workspaceUrl => {
               const url =
-                appUrl?.[0] === "/"
-                  ? appUrl.substring(1, appUrl.length)
-                  : appUrl
+                workspaceUrl?.[0] === "/"
+                  ? workspaceUrl.substring(1, workspaceUrl.length)
+                  : workspaceUrl
               return url?.toLowerCase() === value.toLowerCase()
             })
         }