@localazy/strapi-plugin 0.1.13-rc.4 → 0.1.13-rc.6

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

@@ -200,16 +200,14 @@ function GlobalSettings() {
               <Option value="updated">{t("plugin_settings.editing_data_entry")}</Option>
             </Select>
             {/* Deprecate source keys on deletion */}
-            <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 />
+            <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)} />
             <br /><br />
             <Divider />
             {/* Download Settings */}

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

@@ -1,66 +1,26 @@
 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";
 import findModelValueByKey from "../utils/find-model-value-by-key";
+import getContentTransferSetupKeysSets from "./get-content-transfer-setup-keys-sets";
 
 export default (
   localizableTree = [],
   storedSetupSchema = [],
   allModelsTree = []
 ) => {
-  localizableTree = arrayOfModelsToObject(
-    localizableTree.sort(sortByModelName)
-  );
-  storedSetupSchema = arrayOfModelsToObject(
-    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);
-
-  const removedKeys = storedSetupSchemaKeys.filter(
-    (x) => !currentModelsSchemaKeys.includes(x)
-  );
-
-  const newKeys = currentModelsSchemaKeys.filter(
-    (key) => !storedSetupSchemaKeys.includes(key)
-  );
-
-  const filteredStoredSetupSchemaKeys = storedSetupSchemaKeys.filter(
-    (key) => !removedKeys.includes(key)
+  const {
+    oLocalizableTree,
+    oStoredSetupSchema,
+    newKeys,
+    filteredStoredSetupSchemaKeys
+  } = getContentTransferSetupKeysSets(
+    localizableTree,
+    storedSetupSchema,
   );
 
   const destinationObject = {};
   filteredStoredSetupSchemaKeys.forEach((key) => {
-    const localizableTreeValueToSet = get(storedSetupSchema, key);
+    const localizableTreeValueToSet = get(oStoredSetupSchema, key);
     const allModelsTreeValueToSet = findModelValueByKey(allModelsTree, key);
 
     if (allModelsTreeValueToSet === null) {
@@ -74,7 +34,7 @@ export default (
     }
   });
   newKeys.forEach((key) => {
-    set(destinationObject, key, get(localizableTree, key));
+    set(destinationObject, key, get(oLocalizableTree, key));
   });
 
   const destinationArray = [];

package/admin/src/modules/plugin-settings/functions/get-content-transfer-setup-keys-sets.js

@@ -0,0 +1,85 @@
+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";
+
+export default (
+  localizableTree = [],
+  storedSetupSchema = [],
+) => {
+  localizableTree = arrayOfModelsToObject(
+    localizableTree.sort(sortByModelName)
+  );
+  storedSetupSchema = arrayOfModelsToObject(
+    storedSetupSchema.sort(sortByModelName)
+  );
+
+  const currentModelsSchemaKeys = deepKeys(localizableTree);
+  const storedSetupSchemaKeys = 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 = storedSetupSchemaKeys.filter((key) => key.match(regex)).map((key) => key.replace(regex, ''));
+  currentModelsSchemaComponentKeys = uniq(currentModelsSchemaComponentKeys);
+  storedSetupSchemaComponentKeys = uniq(storedSetupSchemaComponentKeys);
+
+  const currentModelsSchemaComponentKeysComponentProp = currentModelsSchemaKeys.filter((key) => key.includes('__component__') && currentModelsSchemaComponentKeys.some((k) => key.includes(k)));
+  const storedSetupSchemaComponentKeysComponentProp = storedSetupSchemaKeys.filter((key) => key.includes('__component__') && storedSetupSchemaComponentKeys.some((k) => key.includes(k)));
+
+  /**
+   * Is in the "stored setup schema" but not in the "current model"
+   */
+  let removedKeys = [];
+  removedKeys.push(...storedSetupSchemaComponentKeysComponentProp.map((key) => {
+    const storedComponentName = get(storedSetupSchema, key);
+    const currentComponentName = get(localizableTree, key);
+
+    // this must return an array of keys
+    if (storedComponentName !== currentComponentName) {
+      const part = key.split('.').slice(0, -1).join('.');
+
+      return storedSetupSchemaKeys.filter((k) => k.includes(part));
+    }
+
+    return [];
+  }).reduce((acc, val) => acc.concat(val), []));
+  removedKeys.push(...storedSetupSchemaKeys.filter((key) => !currentModelsSchemaKeys.includes(key)));
+  removedKeys = uniq(removedKeys);
+
+  /**
+   * Is in the "current model" but not in the "stored setup schema"
+   */
+  let newKeys = [];
+  newKeys.push(...currentModelsSchemaComponentKeysComponentProp.map((key) => {
+    const storedComponentName = get(storedSetupSchema, key);
+    const currentComponentName = get(localizableTree, key);
+
+    // this must return an array of keys
+    if (storedComponentName !== currentComponentName) {
+      const part = key.split('.').slice(0, -1).join('.');
+
+      return currentModelsSchemaKeys.filter((k) => k.includes(part));
+    }
+
+    return [];
+  }).reduce((acc, val) => acc.concat(val), []));
+  newKeys.push(...currentModelsSchemaKeys.filter((key) => !storedSetupSchemaKeys.includes(key)));
+  newKeys = uniq(newKeys);
+
+  /**
+   * Filter out the removed keys
+  */
+  const filteredStoredSetupSchemaKeys = storedSetupSchemaKeys.filter(
+    (key) => !removedKeys.includes(key)
+  );
+
+  return {
+    oLocalizableTree: localizableTree,
+    oStoredSetupSchema: storedSetupSchema,
+    removedKeys,
+    newKeys,
+    filteredStoredSetupSchemaKeys,
+  }
+}

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

@@ -1,12 +1,9 @@
-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";
-import sortByModelName from "../../@common/utils/sort-by-model-name";
-import arrayOfModelsToObject from "../utils/array-of-models-to-object";
 import findModelValueByKey from "../utils/find-model-value-by-key";
+import getContentTransferSetupKeysSets from "./get-content-transfer-setup-keys-sets";
 
 /**
  * Pass parameters optionally so we don't have to fetch them again
@@ -37,53 +34,26 @@ export default async (
     allModelsTree = getModelsTree(models, models);
   }
 
-  localizableTree = arrayOfModelsToObject(
-    localizableTree.sort(sortByModelName)
-  );
-  storedSetupSchema = arrayOfModelsToObject(
-    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)
-  );
-  const newKeys = modelsTreeKeys.filter(
-    (key) => !storedSetupSchemaKeys.includes(key)
+  const {
+    oStoredSetupSchema,
+    removedKeys,
+    newKeys,
+    filteredStoredSetupSchemaKeys
+  } = getContentTransferSetupKeysSets(
+    localizableTree,
+    storedSetupSchema,
   );
 
   if (newKeys.length || removedKeys.length) {
     return true;
   }
 
-  const filteredStoredSetupSchemaKeys = storedSetupSchemaKeys.filter(
-    (key) => !removedKeys.includes(key)
-  );
-
+  /**
+   * Check if the values are different (type might have changed; boolean to null or vice versa)
+   */
   // eslint-disable-next-line no-restricted-syntax
   for (const key of filteredStoredSetupSchemaKeys) {
-    const localizableTreeValueToSet = get(storedSetupSchema, key);
+    const localizableTreeValueToSet = get(oStoredSetupSchema, key);
     const allModelsTreeValueToSet = findModelValueByKey(allModelsTree, key);
 
     if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.1.13-rc.4",
+  "version": "0.1.13-rc.6",
   "description": "The official Strapi Plugin by Localazy.",
   "strapi": {
     "name": "localazy",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@david-vaclavek/deep-keys": "^0.5.0",
-    "@localazy/ts-api": "^1.0.12",
+    "@localazy/ts-api": "^1.0.13",
     "i18next": "^22.4.9",
     "isomorphic-fetch": "^3.0.0",
     "js-cookie": "^3.0.1",

package/server/bootstrap.js

@@ -2,6 +2,7 @@
 
 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 }) => {
@@ -34,6 +35,24 @@ 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/config/development/index.js

@@ -12,4 +12,5 @@ module.exports = {
   LOCALAZY_DEFAULT_LOCALE: "en",
   LOCALAZY_API_USER_JWT_COOKIE_NAME: "LOCALAZY-API-USER-JWT",
   LOCALAZY_API_USER_COOKIE_EXPIRATION: 7,
+  LOCALAZY_PUBLIC_API_LIFTED_LIMITS: true,
 };

package/server/config/example/index.js

@@ -11,5 +11,6 @@ module.exports = {
   LOCALAZY_DEFAULT_FILE_EXTENSION: "",
   LOCALAZY_DEFAULT_LOCALE: "",
   LOCALAZY_API_USER_JWT_COOKIE_NAME: "",
-  LOCALAZY_API_USER_COOKIE_EXPIRATION: 7,
+  LOCALAZY_API_USER_COOKIE_EXPIRATION: -1,
+  LOCALAZY_PUBLIC_API_LIFTED_LIMITS: false,
 };

package/server/config/local/index.js

@@ -12,4 +12,5 @@ module.exports = {
   LOCALAZY_DEFAULT_LOCALE: "en",
   LOCALAZY_API_USER_JWT_COOKIE_NAME: "LOCALAZY-API-USER-JWT",
   LOCALAZY_API_USER_COOKIE_EXPIRATION: 7,
+  LOCALAZY_PUBLIC_API_LIFTED_LIMITS: false,
 };

package/server/config/production/index.js

@@ -13,4 +13,5 @@ module.exports = {
   LOCALAZY_DEFAULT_LOCALE: "en",
   LOCALAZY_API_USER_JWT_COOKIE_NAME: "LOCALAZY-API-USER-JWT",
   LOCALAZY_API_USER_COOKIE_EXPIRATION: 7,
+  LOCALAZY_PUBLIC_API_LIFTED_LIMITS: true,
 };

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

@@ -177,11 +177,12 @@ module.exports = {
         locale,
         chunks
       );
+      // Use `deprecate: "file"` if there is one chunk of transferred data only!
+      const hasMoreTransferFilesChunks = importFile.length > 1;
+      const uploadConfig = !hasMoreTransferFilesChunks ? { deprecate: "file" } : {};
       await LocalazyUploadService.upload(
         importFile,
-        // {
-        //   deprecate: "file"
-        // }
+        uploadConfig
       );
 
       ctx.body = {

package/server/services/localazy-upload-service.js

@@ -4,6 +4,7 @@
 
 const getLocalazyApi = require("../utils/get-localazy-api");
 const delay = require("../utils/delay");
+const config = require("../config").default;
 
 module.exports = ({ strapi }) => ({
   /**
@@ -45,15 +46,21 @@ module.exports = ({ strapi }) => ({
     }
   },
 
-  splitToChunks(data, CHUNK_LIMIT = 1000) {
+  /**
+   * Check Directus for the Lifted Limits OAuth Apps IDs
+   */
+  CHUNK_LIMIT: config.LOCALAZY_PUBLIC_API_LIFTED_LIMITS ? 99900 : 9990,
+
+  splitToChunks(data, CHUNK_LIMIT = null) {
     const chunks = [];
     const keys = Object.keys(data);
     const keysCount = keys.length;
-    const chunksCount = Math.ceil(keysCount / CHUNK_LIMIT);
+    const localChunkLimit = CHUNK_LIMIT || this.CHUNK_LIMIT;
+    const chunksCount = Math.ceil(keysCount / localChunkLimit);
     for (let i = 0; i < chunksCount; i += 1) {
       const chunkStrings = {};
-      const from = CHUNK_LIMIT * i;
-      const to = CHUNK_LIMIT * (i + 1);
+      const from = localChunkLimit * i;
+      const to = localChunkLimit * (i + 1);
 
       const currentKeys = keys.slice(from, to);
       currentKeys.forEach((key) => {

package/admin/src/plugins/apolloClient.js

@@ -1,33 +0,0 @@
-import {
-  ApolloClient,
-  HttpLink,
-  ApolloLink,
-  InMemoryCache,
-} from "@apollo/client";
-import Cookies from "js-cookie";
-
-const createClient = () => {
-  const httpLink = new HttpLink({ uri: process.env.STRAPI_ADMIN_GRAPHQL_URL });
-
-  const authLink = new ApolloLink((operation, forward) => {
-    // Retrieve the authorization token from local storage.
-    const token = Cookies.get('LOCALAZY-API-USER-JWT');
-
-    // Use the setContext method to set the HTTP headers.
-    operation.setContext({
-      headers: {
-        'Authorization': token ? `Bearer ${token}` : ''
-      }
-    });
-
-    // Call the next link in the middleware chain.
-    return forward(operation);
-  });
-
-  return new ApolloClient({
-    link: authLink.concat(httpLink),
-    cache: new InMemoryCache()
-  });
-}
-
-export default createClient;