Fixed reset to old theme (#2802)

Author: ygrik

src/utils.ts

@@ -37,11 +37,13 @@ export class Utils {
      * @returns Suffixed url
      */
     public static getDataApiUrl(settings: object): string {
-        const [backendUrl, dataApiUrl, directDataApi] = [
-            settings[SettingNames.backendUrl],
-            settings[SettingNames.dataApiUrl],
-            settings[SettingNames.directDataApi]
-        ];
+        if (!settings) {
+            return undefined;
+        }
+        const directDataApi = settings[SettingNames.directDataApi];
+        const dataApiUrl = settings[SettingNames.dataApiUrl];
+        const backendUrl = settings[SettingNames.backendUrl];
+
         return directDataApi ? dataApiUrl : `${ensureTrailingSlash(backendUrl)}developer`;
     }
 
@@ -576,7 +578,7 @@ export class Utils {
             if (!featureFlags || !featureFlags.has(featureFlagName)) {
                 return false;
             }
-            
+
             return featureFlags.get(featureFlagName) == true;
         } catch (error) {
             logger?.trackEvent("FeatureFlag", { message: "Feature flag check failed", data: error.message });

webpack.designer.arm.js

@@ -85,7 +85,8 @@ async function generateWebpackConfig() {
                     { from: `./src/config.design.json`, to: `./config.json` },
                     { from: `./src/themes/designer/assets/index.html`, to: "index.html" },
                     { from: `./src/themes/designer/styles/fonts`, to: "editors/styles/fonts" },
-                    { from: `./templates/default.json`, to: "editors/templates/default.json" }
+                    { from: `./templates/default.json`, to: "editors/templates/default.json" },
+                    { from: `./templates/default-old.json`, to: "editors/templates/default-old.json" }
                 ]
             }),
             new webpack.ProvidePlugin({ Buffer: ["buffer", "Buffer"] }),

webpack.publisher.arm.js

@@ -88,7 +88,8 @@ async function generateWebpackConfig() {
                 patterns: [
                     { from: `./src/config.publish.json`, to: `config.json` },
                     { from: `./src/config.runtime.json`, to: `assets/config.json` },
-                    { from: `./templates/default.json`, to: "editors/templates/default.json" }
+                    { from: `./templates/default.json`, to: "editors/templates/default.json" },
+                    { from: `./templates/default-old.json`, to: "editors/templates/default-old.json" }
                 ]
             }),
             new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),