@budibase/server 1.2.58-alpha.1 → 1.2.58-alpha.4

package/dist/api/controllers/application.js

@@ -36,6 +36,7 @@ const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const backend_core_2 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
+const layouts_1 = require("../../constants/layouts");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
 function getLayouts() {
@@ -209,26 +210,17 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     const instance = yield createInstance(instanceConfig);
     const appId = instance._id;
     const db = backend_core_1.context.getAppDB();
-    let _rev;
-    try {
-        // if template there will be an existing doc
-        const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
-        _rev = existing._rev;
-    }
-    catch (err) {
-        // nothing to do
-    }
-    const newApplication = {
+    let newApplication = {
         _id: utils_1.DocumentType.APP_METADATA,
-        _rev,
-        appId: instance._id,
+        _rev: undefined,
+        appId,
         type: "app",
         version: package_json_1.default.version,
         componentLibraries: ["@budibase/standard-components"],
         name: name,
         url: url,
-        template: ctx.request.body.template,
-        instance: instance,
+        template: templateKey,
+        instance,
         tenantId: getTenantId(),
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
@@ -250,6 +242,34 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
             buttonBorderRadius: "16px",
         },
     };
+    // If we used a template or imported an app there will be an existing doc.
+    // Fetch and migrate some metadata from the existing app.
+    try {
+        const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
+        const keys = [
+            "_rev",
+            "navigation",
+            "theme",
+            "customTheme",
+            "icon",
+        ];
+        keys.forEach(key => {
+            if (existing[key]) {
+                // @ts-ignore
+                newApplication[key] = existing[key];
+            }
+        });
+        // Migrate navigation settings and screens if required
+        if (existing && !existing.navigation) {
+            const navigation = yield migrateAppNavigation();
+            if (navigation) {
+                newApplication.navigation = navigation;
+            }
+        }
+    }
+    catch (err) {
+        // Nothing to do
+    }
     const response = yield db.put(newApplication, { force: true });
     newApplication._rev = response.rev;
     /* istanbul ignore next */
@@ -511,3 +531,49 @@ const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0
         return newAppPackage;
     }));
 });
+const migrateAppNavigation = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = backend_core_1.context.getAppDB();
+    const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
+    const layouts = yield getLayouts();
+    const screens = yield getScreens();
+    // Migrate all screens, removing custom layouts
+    for (let screen of screens) {
+        if (!screen.layoutId) {
+            return;
+        }
+        const layout = layouts.find(layout => layout._id === screen.layoutId);
+        screen.layoutId = undefined;
+        screen.showNavigation = (layout === null || layout === void 0 ? void 0 : layout.props.navigation) !== "None";
+        screen.width = (layout === null || layout === void 0 ? void 0 : layout.props.width) || "Large";
+        yield db.put(screen);
+    }
+    // Migrate layout navigation settings
+    const { name, customTheme } = existing;
+    const layout = layouts === null || layouts === void 0 ? void 0 : layouts.find((layout) => layout._id === layouts_1.BASE_LAYOUT_PROP_IDS.PRIVATE);
+    if (layout) {
+        let navigationSettings = {
+            navigation: "Top",
+            title: name,
+            navWidth: "Large",
+            navBackground: (customTheme === null || customTheme === void 0 ? void 0 : customTheme.navBackground) || "var(--spectrum-global-color-gray-50)",
+            navTextColor: (customTheme === null || customTheme === void 0 ? void 0 : customTheme.navTextColor) || "var(--spectrum-global-color-gray-800)",
+        };
+        if (layout) {
+            navigationSettings.hideLogo = layout.props.hideLogo;
+            navigationSettings.hideTitle = layout.props.hideTitle;
+            navigationSettings.title = layout.props.title || name;
+            navigationSettings.logoUrl = layout.props.logoUrl;
+            navigationSettings.links = layout.props.links;
+            navigationSettings.navigation = layout.props.navigation || "Top";
+            navigationSettings.sticky = layout.props.sticky;
+            navigationSettings.navWidth = layout.props.width || "Large";
+            if (navigationSettings.navigation === "None") {
+                navigationSettings.navigation = "Top";
+            }
+        }
+        return navigationSettings;
+    }
+    else {
+        return null;
+    }
+});

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.58-alpha.0",
+    "version": "1.2.58-alpha.3",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "1.2.58-alpha.0",
-        "@budibase/client": "1.2.58-alpha.0",
-        "@budibase/pro": "1.2.58-alpha.0",
-        "@budibase/string-templates": "1.2.58-alpha.0",
-        "@budibase/types": "1.2.58-alpha.0",
+        "@budibase/backend-core": "1.2.58-alpha.3",
+        "@budibase/client": "1.2.58-alpha.3",
+        "@budibase/pro": "1.2.58-alpha.3",
+        "@budibase/string-templates": "1.2.58-alpha.3",
+        "@budibase/types": "1.2.58-alpha.3",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",