@localazy/strapi-plugin 0.1.13-rc.5 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.1.13-rc.5",
+  "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;