@localazy/strapi-plugin 0.1.13-rc.1 → 0.1.13-rc.3

package/admin/src/modules/plugin-settings/components/GlobalSettings/index.js

@@ -200,14 +200,16 @@ function GlobalSettings() {
               <Option value="updated">{t("plugin_settings.editing_data_entry")}</Option>
             </Select>
             {/* Deprecate source keys on deletion */}
-            <br /><br />
-            <ToggleInput
-              label={t("plugin_settings.deprecate_source_keys_on_delete")}
-              hint={t("plugin_settings.deprecate_source_keys_on_delete_info")}
-              offLabel={t("plugin_settings.off")}
-              onLabel={t("plugin_settings.on")}
-              checked={typeof formModel?.upload?.allowDeprecate === "boolean" ? formModel.upload.allowDeprecate : false}
-              onChange={e => patchFormModel("upload.allowDeprecate", e.target.checked)} />
+            <div style={{ display: "none" }}>
+              <br /><br />
+              <ToggleInput
+                label={t("plugin_settings.deprecate_source_keys_on_delete")}
+                hint={t("plugin_settings.deprecate_source_keys_on_delete_info")}
+                offLabel={t("plugin_settings.off")}
+                onLabel={t("plugin_settings.on")}
+                checked={typeof formModel?.upload?.allowDeprecate === "boolean" ? formModel.upload.allowDeprecate : false}
+                onChange={e => patchFormModel("upload.allowDeprecate", e.target.checked)} />
+            </div>
             <br /><br />
             <Divider />
             {/* Download Settings */}

package/admin/src/modules/plugin-settings/components/Tree/index.js

@@ -31,7 +31,6 @@ function Tree(props) {
             flattened = Object.fromEntries(Object.entries(flattened).filter(([key]) => !key.includes("__component__")));
             const flattenedKeys = Object.keys(flattened).map((k) => `${path}.${key}.${k}`);
 
-            // debugger;
             const hasTruthyValue = Object
               .values(flattened)
               .some(v => v);

package/admin/src/modules/plugin-settings/functions/build-content-transfer-setup-schema.js

@@ -1,5 +1,6 @@
 import set from "lodash-es/set";
 import get from "lodash-es/get";
+import uniq from "lodash-es/uniq";
 import deepKeys from "@david-vaclavek/deep-keys";
 import sortByModelName from "../../@common/utils/sort-by-model-name";
 import arrayOfModelsToObject from "../utils/array-of-models-to-object";
@@ -17,6 +18,31 @@ export default (
     storedSetupSchema.sort(sortByModelName)
   );
 
+  const unsortedCurrentModelsSchemaKeys = deepKeys(localizableTree);
+  const unsortedStoredSetupSchemaKeys = deepKeys(storedSetupSchema);
+  const unsortedAllModelsSchemaKeys = deepKeys(allModelsTree);
+
+  // components order may have changed; this would prevent properties from mixing up
+  const regex = /\.\d+\.__component__/;
+  let currentModelsSchemaComponentKeys = unsortedCurrentModelsSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  let storedSetupSchemaComponentKeys = unsortedStoredSetupSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  let allModelsSchemaComponentKeys = unsortedAllModelsSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  currentModelsSchemaComponentKeys = uniq(currentModelsSchemaComponentKeys);
+  storedSetupSchemaComponentKeys = uniq(storedSetupSchemaComponentKeys);
+  allModelsSchemaComponentKeys = uniq(allModelsSchemaComponentKeys);
+
+  currentModelsSchemaComponentKeys.forEach((key) => {
+    get(localizableTree, key).sort((a, b) => a.__component__ > b.__component__ ? 1 : -1);
+  });
+
+  storedSetupSchemaComponentKeys.forEach((key) => {
+    get(storedSetupSchema, key).sort((a, b) => a.__component__ > b.__component__ ? 1 : -1);
+  });
+
+  allModelsSchemaComponentKeys.forEach((key) => {
+    get(allModelsTree, key).sort((a, b) => a.__component__ > b.__component__ ? 1 : -1);
+  });
+
   const currentModelsSchemaKeys = deepKeys(localizableTree);
   const storedSetupSchemaKeys = deepKeys(storedSetupSchema);
 

package/admin/src/modules/plugin-settings/functions/has-model-changed.js

@@ -1,5 +1,6 @@
 import deepKeys from "@david-vaclavek/deep-keys";
 import get from "lodash-es/get";
+import uniq from "lodash-es/uniq";
 import PluginSettingsService from "../services/plugin-settings-service";
 import StrapiModelService from "../services/strapi-model-service";
 import getModelsTree from "../utils/get-models-tree";
@@ -43,9 +44,28 @@ export default async (
     storedSetupSchema.sort(sortByModelName)
   );
 
+  const currentModelsSchemaKeys = deepKeys(localizableTree);
+  const unsortedStoredSetupSchemaKeys = deepKeys(storedSetupSchema);
+
+  // components order may have changed; this would prevent properties from mixing up
+  const regex = /\.\d+\.__component__/;
+  let currentModelsSchemaComponentKeys = currentModelsSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  let storedSetupSchemaComponentKeys = unsortedStoredSetupSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  currentModelsSchemaComponentKeys = uniq(currentModelsSchemaComponentKeys);
+  storedSetupSchemaComponentKeys = uniq(storedSetupSchemaComponentKeys);
+
+  currentModelsSchemaComponentKeys.forEach((key) => {
+    get(localizableTree, key).sort((a, b) => a.__component__ > b.__component__ ? 1 : -1);
+  });
+
+  storedSetupSchemaComponentKeys.forEach((key) => {
+    get(storedSetupSchema, key).sort((a, b) => a.__component__ > b.__component__ ? 1 : -1);
+  });
+
   const modelsTreeKeys = deepKeys(localizableTree);
   const storedSetupSchemaKeys = deepKeys(storedSetupSchema);
 
+
   const removedKeys = storedSetupSchemaKeys.filter(
     (x) => !modelsTreeKeys.includes(x)
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.1.13-rc.1",
+  "version": "0.1.13-rc.3",
   "description": "The official Strapi Plugin by Localazy.",
   "strapi": {
     "name": "localazy",

package/server/bootstrap.js

@@ -2,7 +2,6 @@
 
 const deepPopulateHook = require('./lifecycles/deep-populate-hook');
 const uploadEventEntryToLocalazyHook = require('./lifecycles/upload-event-entry-to-localazy-hook');
-const deprecateEventEntryInLocalazyHook = require('./lifecycles/deprecate-event-entry-in-localazy-hook');
 const RequestInitiatorHelper = require('./utils/request-initiator-helper');
 
 module.exports = ({ strapi }) => {
@@ -35,24 +34,6 @@ module.exports = ({ strapi }) => {
           break;
         }
       }
-      case 'beforeDeleteMany':
-      case 'beforeDelete': {
-        try {
-          if (requestInitiatorHelper.isInitiatedByLocalazyWebhook() || requestInitiatorHelper.isInitiatedByLocalazyPluginUI()) {
-            break;
-          }
-
-          // have to await here
-          const result = await deprecateEventEntryInLocalazyHook(event);
-          if (typeof result !== 'undefined') {
-            strapi.log.info(`${action} hook result: ${JSON.stringify(result)}`);
-          }
-        } catch (e) {
-          strapi.log.error(e);
-        } finally {
-          break;
-        }
-      }
       default:
         break;
     }

package/server/controllers/localazy-transfer-controller.js

@@ -179,9 +179,10 @@ module.exports = {
       );
       await LocalazyUploadService.upload(
         importFile,
-        {
-          deprecate: "file"
-        });
+        // {
+        //   deprecate: "file"
+        // }
+      );
 
       ctx.body = {
         success,

package/server/services/plugin-settings-service.js

@@ -3,10 +3,6 @@
 const contentTransferSetupModel = require("../db/model/content-transfer-setup");
 
 const pluginSettingsModel = require("../db/model/plugin-settings");
-// {
-//   KEY,
-//   emptyPluginSettings,
-// } = require("../db/model/plugin-settings");
 const getStrapiStore = require("../db/model/utils/get-strapi-store");
 
 module.exports = ({ strapi }) => ({