@crowdin/app-project-module 0.35.1 → 0.36.0

package/out/util/webhooks.js

@@ -35,20 +35,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listenQueueMessage = exports.updateCrowdinFromWebhookRequest = exports.prepareWebhookData = exports.filterSyncFiles = exports.unregisterAllCrowdinWebhooks = exports.unregisterCrowdinWebhooks = exports.updateCrowdinWebhooks = exports.registerCrowdinWebhook = exports.getAllCrowdinProjectWebhooks = exports.getCrowdinProjectWebhook = exports.unregisterWebhooks = exports.registerWebhooks = exports.makeCrowdinWebhookUrl = exports.decodedUrlParam = exports.encodedUrlParam = void 0;
+exports.listenQueueMessage = exports.updateCrowdinFromWebhookRequest = exports.prepareWebhookData = exports.unregisterAllCrowdinWebhooks = exports.unregisterCrowdinWebhooks = exports.updateCrowdinWebhooks = exports.registerCrowdinWebhook = exports.getAllCrowdinProjectWebhooks = exports.getCrowdinProjectWebhook = exports.unregisterWebhooks = exports.registerWebhooks = exports.makeCrowdinWebhookUrl = exports.decodedUrlParam = exports.encodedUrlParam = exports.HookEvents = void 0;
 const crowdinAppFunctions = __importStar(require("@crowdin/crowdin-apps-functions"));
 const amqplib_1 = __importDefault(require("amqplib"));
 const models_1 = require("../models");
 const storage_1 = require("../storage");
 const connection_1 = require("./connection");
 const defaults_1 = require("./defaults");
-const file_snapshot_1 = require("./file-snapshot");
 const index_1 = require("./index");
 const logger_1 = require("./logger");
-const HookEvents = {
-    ALL: ['file.translated', 'file.approved'],
-    TRANSLATED: ['file.translated'],
-    APPROVED: ['file.approved'],
+exports.HookEvents = {
+    fileAdded: 'file.added',
+    fileDeleted: 'file.deleted',
+    fileApproved: 'file.approved',
+    fileTranslated: 'file.translated',
+    translationUpdated: 'translation.updated',
+};
+const HookConditionEvents = {
+    ALL: [exports.HookEvents.translationUpdated, exports.HookEvents.fileDeleted],
+    TRANSLATED: [exports.HookEvents.fileTranslated, exports.HookEvents.fileDeleted],
+    APPROVED: [exports.HookEvents.fileApproved, exports.HookEvents.fileDeleted],
 };
 function encodedUrlParam(config, integration, crowdinContext) {
     var _a;
@@ -75,7 +81,7 @@ exports.makeCrowdinWebhookUrl = makeCrowdinWebhookUrl;
 function registerWebhooks(config, integration, client, crowdinContext, apiCredentials, appSettings) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        const isWebhookSync = +appSettings.syncType === models_1.SyncType.WEBHOOKS;
+        const isWebhookSync = Number(appSettings.schedule) !== models_1.SyncSchedule.DISABLED;
         const projectId = crowdinContext.jwtPayload.context.project_id;
         const urlParam = encodedUrlParam(config, integration, crowdinContext);
         if ((_a = integration.webhooks) === null || _a === void 0 ? void 0 : _a.crowdinWebhooks) {
@@ -84,9 +90,12 @@ function registerWebhooks(config, integration, client, crowdinContext, apiCreden
         else {
             const webhookName = `${config.name} application hook ${crowdinContext.jwtPayload.sub}`;
             const webhookUrl = makeCrowdinWebhookUrl(config, integration, crowdinContext);
-            const syncCondition = models_1.SyncCondition[+appSettings.condition];
-            const events = HookEvents[syncCondition];
+            const syncCondition = models_1.SyncCondition[Number(appSettings.condition)];
+            const events = HookConditionEvents[syncCondition];
             const webhook = yield getCrowdinProjectWebhook(config, client, projectId, webhookName);
+            if (appSettings['new-crowdin-files']) {
+                events.push(exports.HookEvents.fileAdded);
+            }
             if (isWebhookSync && webhook) {
                 yield updateCrowdinWebhooks(config, client, projectId, webhook, events, webhookUrl);
             }
@@ -210,30 +219,11 @@ function unregisterAllCrowdinWebhooks(config, integration, crowdinId) {
     });
 }
 exports.unregisterAllCrowdinWebhooks = unregisterAllCrowdinWebhooks;
-function filterSyncFiles(events, syncFileSettings) {
-    const files = {};
-    events.forEach((event) => {
-        const fileId = event.fileId;
-        const language = event.language;
-        if (syncFileSettings[fileId] && syncFileSettings[fileId].includes(language)) {
-            if (files[fileId]) {
-                files[fileId] = [...files[fileId], event.language];
-            }
-            else {
-                files[fileId] = [event.language];
-            }
-        }
-    });
-    return files;
-}
-exports.filterSyncFiles = filterSyncFiles;
 function prepareWebhookData(config, integration, webhookUrlParam, provider) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         let rootFolder = undefined;
-        let appSettings = null;
         let syncSettings = null;
-        let newFiles = [];
+        let appSettings = {};
         const { projectId, crowdinId, clientId } = decodedUrlParam(config, webhookUrlParam);
         const crowdinCredentials = yield (0, storage_1.getStorage)().getCrowdinCredentials(crowdinId);
         const crowdinClient = yield (0, connection_1.prepareCrowdinClient)({ config, credentials: crowdinCredentials });
@@ -241,23 +231,10 @@ function prepareWebhookData(config, integration, webhookUrlParam, provider) {
         const preparedIntegrationCredentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
         if (integrationCredentials === null || integrationCredentials === void 0 ? void 0 : integrationCredentials.config) {
             appSettings = JSON.parse(integrationCredentials.config);
-            const isWebhookSync = +appSettings.syncType === models_1.SyncType.WEBHOOKS;
+            const isWebhookSync = Number(appSettings.schedule) !== models_1.SyncSchedule.DISABLED;
             if (isWebhookSync) {
                 syncSettings = (yield (0, storage_1.getStorage)().getSyncSettings(clientId, crowdinId, 'schedule', provider));
                 rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, crowdinClient.client, projectId);
-                if (((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]) {
-                    newFiles = yield (0, file_snapshot_1.getAllNewFiles)({
-                        config,
-                        integration,
-                        crowdinApiClient: crowdinClient.client,
-                        crowdinId,
-                        integrationCredentials: preparedIntegrationCredentials,
-                        integrationId: clientId,
-                        projectId,
-                        integrationSettings: appSettings,
-                        syncSettings,
-                    });
-                }
             }
         }
         return {
@@ -267,7 +244,6 @@ function prepareWebhookData(config, integration, webhookUrlParam, provider) {
             rootFolder,
             appSettings,
             syncSettings,
-            newFiles,
         };
     });
 }
@@ -277,24 +253,29 @@ function updateCrowdinFromWebhookRequest(args) {
     return __awaiter(this, void 0, void 0, function* () {
         const { integration, webhookData, req } = args;
         let filesToSync = [];
-        const { projectId, crowdinClient, preparedIntegrationCredentials, rootFolder, appSettings, syncSettings, newFiles, } = webhookData;
+        const { projectId, crowdinClient, preparedIntegrationCredentials, rootFolder, appSettings, syncSettings } = webhookData;
         const syncFiles = (syncSettings === null || syncSettings === void 0 ? void 0 : syncSettings.files) ? JSON.parse(syncSettings.files) : [];
         if ((_a = integration.webhooks) === null || _a === void 0 ? void 0 : _a.integrationWebhookInterceptor) {
             filesToSync = yield ((_b = integration.webhooks) === null || _b === void 0 ? void 0 : _b.integrationWebhookInterceptor(projectId, crowdinClient.client, preparedIntegrationCredentials, rootFolder, appSettings, syncSettings, req));
         }
-        const allIntFiles = [...filesToSync, ...newFiles].map((file) => (Object.assign({ id: file.id, name: file.name, parentId: file.parent_id || file.parentId, 
-            // eslint-disable-next-line @typescript-eslint/camelcase
-            parent_id: file.parent_id || file.parentId, nodeType: file.nodeType || file.node_type || '1', 
-            // eslint-disable-next-line @typescript-eslint/camelcase
-            node_type: file.nodeType || file.node_type || '1' }, (file.type ? { type: file.type } : {}))));
-        const intFiles = allIntFiles.filter((file) => file.nodeType === '1');
-        const newSyncSettingsFiels = [...syncFiles, ...newFiles].map((file) => (Object.assign(Object.assign({}, file), { schedule: true, sync: false })));
-        if (Object.keys(newFiles).length) {
-            yield (0, storage_1.getStorage)().updateSyncSettings(JSON.stringify(newSyncSettingsFiels), syncSettings.integrationId, syncSettings.crowdinId, 'schedule', syncSettings.provider);
-            const currentFileSnapshot = yield (0, file_snapshot_1.getIntegrationSnapshot)(integration, preparedIntegrationCredentials, appSettings);
-            yield (0, storage_1.getStorage)().updateFilesSnapshot(JSON.stringify(currentFileSnapshot), syncSettings.integrationId, syncSettings.crowdinId, syncSettings.provider);
+        for (const file of filesToSync) {
+            const fileNodeType = file.nodeType || file.node_type || '1';
+            if (fileNodeType !== '1') {
+                continue;
+            }
+            const initFile = Object.assign({ id: file.id, name: file.name, sync: false, schedule: true, 
+                // eslint-disable-next-line @typescript-eslint/camelcase
+                parent_id: file.parent_id || file.parentId, 
+                // eslint-disable-next-line @typescript-eslint/camelcase
+                node_type: file.nodeType || file.node_type || '1' }, (file.type ? { type: file.type } : {}));
+            if (!syncFiles.find((obj) => obj.id === initFile.id)) {
+                yield (0, storage_1.getStorage)().updateSyncSettings(JSON.stringify([...syncFiles, initFile]), syncSettings.integrationId, syncSettings.crowdinId, 'schedule', syncSettings.provider);
+            }
+            const webhook = yield (0, storage_1.getStorage)().getWebhooks(initFile.id, syncSettings.integrationId, syncSettings.crowdinId, syncSettings.provider);
+            if (!webhook) {
+                yield (0, storage_1.getStorage)().saveWebhooks(initFile.id, syncSettings.integrationId, syncSettings.crowdinId, syncSettings.provider);
+            }
         }
-        return yield integration.updateCrowdin(projectId, crowdinClient.client, preparedIntegrationCredentials, intFiles, rootFolder, appSettings);
     });
 }
 exports.updateCrowdinFromWebhookRequest = updateCrowdinFromWebhookRequest;

package/out/views/main.handlebars

@@ -334,7 +334,8 @@
             .then(checkResponse)
             .then((res) => {
                 project = res;
-                appComponent.setCrowdinLanguagesData(project.targetLanguages)
+                const languagesSorted = project.targetLanguages.sort((a, b) => a.name.localeCompare(b.name));
+                appComponent.setCrowdinLanguagesData(languagesSorted)
             })
             {{#or withCronSync webhooks}}
                 .then(() => getSyncSettings('crowdin'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -21,7 +21,7 @@
     "@godaddy/terminus": "^4.12.1",
     "@types/pg": "^8.10.3",
     "amqplib": "^0.10.3",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "express": "4.18.2",
     "express-handlebars": "^5.3.5",
     "mysql2": "^2.3.3",
@@ -36,24 +36,24 @@
     "@babel/preset-react": "^7.22.15",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.12",
-    "@mui/material": "^5.14.12",
-    "@rjsf/core": "^5.13.0",
-    "@rjsf/mui": "^5.13.0",
-    "@rjsf/utils": "^5.13.0",
-    "@rjsf/validator-ajv8": "^5.13.0",
-    "@rollup/plugin-babel": "^6.0.3",
+    "@mui/icons-material": "^5.14.16",
+    "@mui/material": "^5.14.16",
+    "@rjsf/core": "^5.13.3",
+    "@rjsf/mui": "^5.13.3",
+    "@rjsf/utils": "^5.13.3",
+    "@rjsf/validator-ajv8": "^5.13.3",
+    "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.3",
     "@types/amqplib": "^0.10.2",
-    "@types/crypto-js": "^4.1.2",
+    "@types/crypto-js": "^4.1.3",
     "@types/express": "4.17.18",
     "@types/express-handlebars": "^5.3.1",
     "@types/jest": "^29.5.5",
-    "@types/node": "^16.18.57",
+    "@types/node": "^16.18.60",
     "@types/node-cron": "^3.0.9",
     "@types/swagger-jsdoc": "^6.0.1",
     "@typescript-eslint/eslint-plugin": "^2.3.1",