@crowdin/app-project-module 0.41.0 → 0.41.2

package/out/handlers/integration/crowdin-update.js

@@ -8,12 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
 const job_1 = require("../../models/job");
 const util_1 = require("../../util");
 const defaults_1 = require("../../util/defaults");
 const logger_1 = require("../../util/logger");
 const job_2 = require("../../util/job");
+const files_1 = require("../../util/files");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
@@ -36,6 +41,11 @@ function handle(config, integration) {
             payload: req.body,
             res,
             jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
+                var _c;
+                if (req.body && ((_c = req.body) === null || _c === void 0 ? void 0 : _c.length)) {
+                    req.body = yield (0, files_1.expandFilesTree)(req.body, req, integration, job);
+                    req.body = (0, lodash_uniqby_1.default)(req.body, 'id');
+                }
                 const result = yield integration.updateCrowdin({
                     projectId,
                     client: req.crowdinApiClient,

package/out/handlers/integration/sync-settings-save.js

@@ -8,20 +8,51 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
 const util_1 = require("../../util");
 const cron_1 = require("../../util/cron");
 const file_snapshot_1 = require("../../util/file-snapshot");
+const files_1 = require("../../util/files");
+const job_1 = require("../../util/job");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const { files, provider } = req.body;
-        yield (0, cron_1.createOrUpdateSyncSettings)(config, req, files, provider);
-        const appSettings = req.integrationSettings || {};
-        if (((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]) {
-            yield (0, file_snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider);
-        }
-        res.status(204).end();
+        const { files, provider, expandIntegrationFolders } = req.body;
+        yield (0, job_1.runAsJob)({
+            integrationId: req.crowdinContext.clientId,
+            crowdinId: req.crowdinContext.crowdinId,
+            type: `${provider}SyncSettingsSave`,
+            title: 'Save sync settings',
+            payload: req.body,
+            res,
+            jobCallback: () => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (Array.isArray(expandIntegrationFolders) && expandIntegrationFolders.length) {
+                    const allFiles = (yield (0, files_1.expandFilesTree)(expandIntegrationFolders, req, integration)).map((node) => ({
+                        id: node.id,
+                        name: node.name,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        node_type: node.nodeType,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        parent_id: node.parentId,
+                        schedule: true,
+                        sync: false,
+                        type: node.type,
+                    }));
+                    yield (0, cron_1.createOrUpdateSyncSettings)(config, req, (0, lodash_uniqby_1.default)([...files, ...allFiles], 'id'), provider);
+                }
+                else {
+                    yield (0, cron_1.createOrUpdateSyncSettings)(config, req, files, provider);
+                }
+                const appSettings = req.integrationSettings || {};
+                if (((_a = integration.syncNewElements) === null || _a === void 0 ? void 0 : _a[provider]) && appSettings[`new-${provider}-files`]) {
+                    yield (0, file_snapshot_1.createOrUpdateFileSnapshot)(config, integration, req, provider);
+                }
+            }),
+        });
     }));
 }
 exports.default = handle;

package/out/models/index.d.ts

@@ -199,7 +199,8 @@ export declare enum Scope {
     WEBHOOKS = "project.webhook",
     TRANSLATIONS = "project.translation",
     SCREENSHOTS = "project.screenshot",
-    SECURITY_LOGS = "security-log"
+    SECURITY_LOGS = "security-log",
+    VENDORS = "vendor"
 }
 export interface IntegrationLogic {
     /**
@@ -589,6 +590,7 @@ export interface IntegrationFile {
     name: string;
     type: SourceFilesModel.FileType;
     parentId: string;
+    nodeType?: IntegrationTreeElementType;
 }
 export interface UpdateIntegrationRequest {
     [fileId: string]: string[];

package/out/models/index.js

@@ -25,6 +25,7 @@ var Scope;
     Scope["TRANSLATIONS"] = "project.translation";
     Scope["SCREENSHOTS"] = "project.screenshot";
     Scope["SECURITY_LOGS"] = "security-log";
+    Scope["VENDORS"] = "vendor";
 })(Scope = exports.Scope || (exports.Scope = {}));
 var AccountType;
 (function (AccountType) {

package/out/models/job.d.ts

@@ -1,6 +1,8 @@
 export declare enum JobType {
     UPDATE_TO_CROWDIN = "updateCrowdin",
-    UPDATE_TO_INTEGRATION = "updateIntegration"
+    UPDATE_TO_INTEGRATION = "updateIntegration",
+    CROWDIN_SYNC_SETTINGS_SAVE = "crowdinSyncSettingsSave",
+    INTEGRATION_SYNC_SETTINGS_SAVE = "integrationSyncSettingsSave"
 }
 export declare enum JobStatus {
     CREATED = "created",

package/out/models/job.js

@@ -5,6 +5,8 @@ var JobType;
 (function (JobType) {
     JobType["UPDATE_TO_CROWDIN"] = "updateCrowdin";
     JobType["UPDATE_TO_INTEGRATION"] = "updateIntegration";
+    JobType["CROWDIN_SYNC_SETTINGS_SAVE"] = "crowdinSyncSettingsSave";
+    JobType["INTEGRATION_SYNC_SETTINGS_SAVE"] = "integrationSyncSettingsSave";
 })(JobType = exports.JobType || (exports.JobType = {}));
 var JobStatus;
 (function (JobStatus) {

package/out/util/files.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" />
-import { ProcessFileString, SkipIntegrationNodes, TreeItem } from '../models';
+import { IntegrationFile, IntegrationLogic, IntegrationRequest, ProcessFileString, SkipIntegrationNodes, TreeItem } from '../models';
+import { JobClient } from '../models/job';
 export declare const MAX_BODY_SIZE: number;
 export declare function storeFile(fileContent: Buffer, folder: string): Promise<string>;
 export declare function getFileContent(url: string): Promise<Buffer>;
 export declare function getFileStrings(url: string): Promise<ProcessFileString[]>;
 export declare function skipFilesByRegex(files: TreeItem[] | undefined, skipIntegrationNodes?: SkipIntegrationNodes): TreeItem[];
+export declare function expandFilesTree(nodes: IntegrationFile[], req: IntegrationRequest, integration: IntegrationLogic, job?: JobClient): Promise<IntegrationFile[]>;

package/out/util/files.js

@@ -12,10 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipFilesByRegex = exports.getFileStrings = exports.getFileContent = exports.storeFile = exports.MAX_BODY_SIZE = void 0;
+exports.expandFilesTree = exports.skipFilesByRegex = exports.getFileStrings = exports.getFileContent = exports.storeFile = exports.MAX_BODY_SIZE = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const index_1 = require("./index");
+const job_1 = require("../models/job");
 exports.MAX_BODY_SIZE = 4.9 * 1024 * 1024; //4.9mb
 function storeFile(fileContent, folder) {
     const fileName = `file${Date.now()}`;
@@ -63,3 +65,24 @@ function skipFilesByRegex(files, skipIntegrationNodes) {
     return files;
 }
 exports.skipFilesByRegex = skipFilesByRegex;
+function expandFilesTree(nodes, req, integration, job) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (job && job_1.JobStatus.CANCELED === ((_a = (yield job.get())) === null || _a === void 0 ? void 0 : _a.status)) {
+            throw new Error('Job canceled');
+        }
+        const files = nodes.filter((file) => file.nodeType === undefined || file.nodeType === '1');
+        const folders = nodes.filter((folder) => folder.nodeType === '0' && !nodes.find((node) => node.parentId === folder.id));
+        for (const { id } of folders) {
+            const integrationData = yield integration.getIntegrationFiles(req.integrationCredentials, req.integrationSettings, id);
+            const integrationTreeItems = (0, index_1.isExtendedResultType)(integrationData)
+                ? integrationData.data
+                : integrationData;
+            const checkNodes = integrationTreeItems.map((item) => (Object.assign(Object.assign({}, item), { nodeType: item.nodeType || ('type' in item ? '1' : '0') })));
+            const expandedResult = yield expandFilesTree(checkNodes, req, integration, job);
+            files.push(...expandedResult);
+        }
+        return files;
+    });
+}
+exports.expandFilesTree = expandFilesTree;

package/out/util/job.js

@@ -16,6 +16,8 @@ const logger_1 = require("./logger");
 const blockingJobs = {
     [job_1.JobType.UPDATE_TO_CROWDIN]: [job_1.JobType.UPDATE_TO_CROWDIN, job_1.JobType.UPDATE_TO_INTEGRATION],
     [job_1.JobType.UPDATE_TO_INTEGRATION]: [job_1.JobType.UPDATE_TO_CROWDIN, job_1.JobType.UPDATE_TO_INTEGRATION],
+    [job_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE]: [job_1.JobType.CROWDIN_SYNC_SETTINGS_SAVE],
+    [job_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE]: [job_1.JobType.INTEGRATION_SYNC_SETTINGS_SAVE],
 };
 function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobCallback, onError, }) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -25,7 +27,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, jobCall
             const existingJob = activeJobs.find((job) => blockingJobs[type].includes(job.type));
             if (existingJob === null || existingJob === void 0 ? void 0 : existingJob.id) {
                 if (res) {
-                    res.status(202).send({ jobId: existingJob.id, message: 'Job is already running' });
+                    res.status(202).send({ jobId: existingJob.id, message: 'Another sync is running' });
                 }
                 return;
             }

package/out/util/logger.js

@@ -137,20 +137,20 @@ function logError(e, context) {
 }
 exports.logError = logError;
 function errorOutputByType(error) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const message = error.message || error;
     if (isAxiosError(error)) {
-        const request = error.config || error.data.config
+        const request = (error === null || error === void 0 ? void 0 : error.config) || ((_a = error.data) === null || _a === void 0 ? void 0 : _a.config)
             ? {
-                url: ((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) || ((_b = error.data) === null || _b === void 0 ? void 0 : _b.config.url),
-                method: ((_c = error.config) === null || _c === void 0 ? void 0 : _c.method) || ((_d = error.data) === null || _d === void 0 ? void 0 : _d.config.method),
-                data: ((_e = error.config) === null || _e === void 0 ? void 0 : _e.data) || ((_f = error.data) === null || _f === void 0 ? void 0 : _f.config.data),
+                url: ((_b = error.config) === null || _b === void 0 ? void 0 : _b.url) || ((_c = error.data) === null || _c === void 0 ? void 0 : _c.config.url),
+                method: ((_d = error.config) === null || _d === void 0 ? void 0 : _d.method) || ((_e = error.data) === null || _e === void 0 ? void 0 : _e.config.method),
+                data: ((_f = error.config) === null || _f === void 0 ? void 0 : _f.data) || ((_g = error.data) === null || _g === void 0 ? void 0 : _g.config.data),
             }
             : {};
-        const response = error.response || error.data.response
+        const response = (error === null || error === void 0 ? void 0 : error.response) || ((_h = error.data) === null || _h === void 0 ? void 0 : _h.response)
             ? {
-                data: ((_g = error.response) === null || _g === void 0 ? void 0 : _g.data) || ((_h = error.data) === null || _h === void 0 ? void 0 : _h.response.data),
-                status: ((_j = error.response) === null || _j === void 0 ? void 0 : _j.status) || ((_k = error.data) === null || _k === void 0 ? void 0 : _k.response.status),
+                data: ((_j = error.response) === null || _j === void 0 ? void 0 : _j.data) || ((_k = error.data) === null || _k === void 0 ? void 0 : _k.response.data),
+                status: ((_l = error.response) === null || _l === void 0 ? void 0 : _l.status) || ((_m = error.data) === null || _m === void 0 ? void 0 : _m.response.status),
             }
             : {};
         console.error(message, { attributes: JSON.stringify({ request, response }) }, { backtrace: error.stack });

package/out/views/main.handlebars

@@ -318,6 +318,8 @@
     const JOB_TYPE = {
         updateCrowdin: 'updateCrowdin',
         updateIntegration: 'updateIntegration',
+        integrationSyncSettingsSave: 'integrationSyncSettingsSave',
+        crowdinSyncSettingsSave: 'crowdinSyncSettingsSave',
     };
 
     const JOB_STATUS = {
@@ -328,6 +330,11 @@
         finished: 'finished',
     };
 
+    const silentJobs = [
+        JOB_TYPE.integrationSyncSettingsSave,
+        JOB_TYPE.crowdinSyncSettingsSave,
+    ];
+
     const asyncJobs = {};
 
     let project = {};
@@ -410,16 +417,31 @@
                     }
                     return item;
                 });
+
+                const appIntegrationFiles = appComponent.querySelector('#integration-files');
                 if (hardReload) {
                     appComponent.setIntegrationFilesData(tree);
-                } else {
-                    appComponent.pushIntegrationFilesData(tree);
+                } else if (tree.length) {
+                    appComponent.pushIntegrationFilesData(tree).then(() => {
+                        appIntegrationFiles.getSelected().then(selection => {
+                            selection = selection?.filter((node) => node);
+                            if (!selection?.length) {
+                                return;
+                            }
+
+                            const selectedIds = selection.map(({id}) => id);
+                            tree.forEach((node) => {
+                                selectedIds.includes(node.parent_id) && selectedIds.push(node.id);
+                            });
+                            appIntegrationFiles.setSelected(selectedIds);
+                        });
+                    });
                 }
                 {{#if integrationPagination}}
                     if (stopPagination) {
-                        appComponent.querySelector('#integration-files').setAttribute('load-more-disabled', true);
+                        appIntegrationFiles.setAttribute('load-more-disabled', true);
                     } else {
-                        appComponent.querySelector('#integration-files').setAttribute('load-more-disabled', false);
+                        appIntegrationFiles.setAttribute('load-more-disabled', false);
                     }
                 {{/if}}
                 if (search) {
@@ -530,6 +552,12 @@
                         case JOB_TYPE.updateIntegration:
                             appComponent.setAttribute('is-to-integration-process', true);
                             break;
+                        case JOB_TYPE.crowdinSyncSettingsSave:
+                            appComponent.setAttribute(`is-crowdin-sync-settings-in-progress`, true)
+                            break;
+                        case JOB_TYPE.integrationSyncSettingsSave:
+                            appComponent.setAttribute(`is-integration-sync-settings-in-progress`, true)
+                            break;
                         default:
                     }
 
@@ -575,6 +603,16 @@
                     onFinally = (() => appComponent.setAttribute('is-to-integration-process', false));
                 }
                 break;
+            case JOB_TYPE.crowdinSyncSettingsSave:
+                if (!onFinally) {
+                    onFinally = (() => appComponent.setAttribute(`is-crowdin-sync-settings-in-progress`, false));
+                }
+                break;
+            case JOB_TYPE.integrationSyncSettingsSave:
+                if (!onFinally) {
+                    onFinally = (() => appComponent.setAttribute(`is-integration-sync-settings-in-progress`, false));
+                }
+                break;
             default:
         }
 
@@ -586,7 +624,7 @@
                 const progress = isFailed || JOB_STATUS.finished === job.status ? 100 : job.progress;
                 const info = JOB_STATUS.canceled === job.status ? `Cancelled\n${job.info || ''}` : job.info;
 
-                pushJobs([ {
+                !silentJobs.find((type) => type === jobType) && pushJobs([ {
                     id: job.id,
                     title: job.title,
                     progress,
@@ -610,7 +648,7 @@
             .catch((e) => {
                 onFinally && onFinally();
 
-                pushJobs([ {
+                !silentJobs.find((type) => type === jobType) && pushJobs([ {
                     id: jobId,
                     isFailed: true,
                 } ]);
@@ -783,6 +821,18 @@
         document.body.addEventListener('crowdinDisableSync', disableCrowdinSync);
         document.body.addEventListener('integrationDisableSync', disableIntegrationSync);
 
+        function getIntegrationFoldersToExpand(allData, syncedFiles) {
+            return Array.isArray(allData)
+                ? allData.filter(
+                        node => (node.node_type === folderType && !syncedFiles.find((syncedFile) => syncedFile.parent_id === node.id))
+                    ).map(node => ({
+                        ...node,
+                        nodeType: node.node_type,
+                        parentId: node.parent_id,
+                    }))
+                : [];
+        }
+
         async function saveScheduleSync() {
             const newFile = scheduleModal.querySelector('#new-files').checked || false;
             const selectedFiles = scheduleModal.querySelector('#selected-files').checked || false;
@@ -792,13 +842,22 @@
             if (type === 'crowdin') {
                 appComponent.setCrowdinScheduleSync(syncData, newFile, selectedFiles);
                 const syncedFiles = await appComponent.getCrowdinScheduleSync(true);
-                appComponent.setAttribute('is-crowdin-loading', true);
+                appComponent.setAttribute('is-crowdin-sync-settings-in-progress', true);
                 updateSyncSettings(syncedFiles, 'schedule', 'crowdin');
             } else if (type === 'integration') {
                 appComponent.setIntegrationScheduleSync(syncData, newFile, selectedFiles);
                 const syncedFiles = await appComponent.getIntegrationScheduleSync(true);
-                appComponent.setAttribute('is-integration-loading', true);
-                updateSyncSettings(syncedFiles, 'schedule', 'integration');
+                appComponent.setAttribute('is-integration-sync-settings-in-progress', true);
+                {{#if integrationOneLevelFetching}}
+                    updateSyncSettings(
+                        syncedFiles,
+                        'schedule',
+                        'integration',
+                        selectedFiles ? getIntegrationFoldersToExpand(syncData, syncedFiles) : [],
+                    );
+                {{else}}
+                    updateSyncSettings(syncedFiles, 'schedule', 'integration');
+                {{/if}}
             }
 
             scheduleModal.close();
@@ -861,8 +920,13 @@
             {{else}}
                 const syncedFiles = await appComponent.getIntegrationScheduleSync();
             {{/if}}
-            appComponent.setAttribute('is-integration-loading', true);
-            updateSyncSettings(syncedFiles, 'schedule', 'integration');
+
+            appComponent.setAttribute('is-integration-sync-settings-in-progress', true);
+            {{#if integrationOneLevelFetching}}
+                updateSyncSettings(syncedFiles, 'schedule', 'integration', getIntegrationFoldersToExpand(e.detail, syncedFiles));
+            {{else}}
+                updateSyncSettings(syncedFiles, 'schedule', 'integration');
+            {{/if}}
         }
 
         async function setCrowdinScheduleSync(e) {
@@ -884,7 +948,7 @@
             {{else}}
                 const syncedFiles = await appComponent.getCrowdinScheduleSync();
             {{/if}}
-            appComponent.setAttribute('is-crowdin-loading', true);
+            appComponent.setAttribute('is-crowdin-sync-settings-in-progress', true);
             updateSyncSettings(syncedFiles, 'schedule', 'crowdin');
         }
 
@@ -893,7 +957,7 @@
                 showToast('Select templates which will be pushed to Crowdin');
                 return;
             }
-            appComponent.setAttribute('is-integration-loading', true);
+            appComponent.setAttribute('is-integration-sync-settings-in-progress', true);
             {{#if syncNewElements.integration}}
                 const syncedFiles = await appComponent.getIntegrationScheduleSync(true);
             {{else}}
@@ -908,7 +972,7 @@
                 showToast('Select templates which will be pushed to Crowdin');
                 return;
             }
-            appComponent.setAttribute('is-crowdin-loading', true);
+            appComponent.setAttribute('is-crowdin-sync-settings-in-progress', true);
             {{#if syncNewElements.crowdin}}
                 const syncedFiles = await appComponent.getCrowdinScheduleSync(true);
             {{else}}
@@ -918,16 +982,21 @@
             updateSyncSettings(syncedFiles, 'schedule', 'crowdin');
         }
 
-        function updateSyncSettings(files, type, provider) {
+        function updateSyncSettings(files, type, provider, expandIntegrationFolders = []) {
             checkOrigin()
                 .then(restParams => fetch('api/sync-settings' + restParams, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ files, type,  provider })
+                    body: JSON.stringify({ files, type,  provider, expandIntegrationFolders })
                 }))
                 .then(checkResponse)
-                .catch(e => catchRejection(e, 'Can\'t save schedule sync settings'))
-                .finally(() => (appComponent.setAttribute(`is-${provider}-loading`, false)));
+                .then((res) => {
+                    checkJob({
+                        jobId: res?.jobId,
+                        jobType: JOB_TYPE[`${provider}SyncSettingsSave`],
+                    })
+                })
+                .catch(e => catchRejection(e, 'Can\'t save schedule sync settings'));
         }
     {{/or}}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.41.0",
+  "version": "0.41.2",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -17,12 +17,13 @@
     "@aws-sdk/client-s3": "^3.423.0",
     "@aws-sdk/s3-request-presigner": "^3.484.0",
     "@crowdin/crowdin-apps-functions": "0.6.0",
-    "@crowdin/logs-formatter": "^2.1.2",
+    "@crowdin/logs-formatter": "^2.1.3",
     "@godaddy/terminus": "^4.12.1",
     "amqplib": "^0.10.3",
     "crypto-js": "^4.2.0",
     "express": "4.18.2",
     "express-handlebars": "^5.3.5",
+    "lodash.uniqby": "^4.7.0",
     "mysql2": "^2.3.3",
     "node-cron": "^3.0.2",
     "pg": "^8.11.3",
@@ -52,6 +53,7 @@
     "@types/express": "4.17.21",
     "@types/express-handlebars": "^5.3.1",
     "@types/jest": "^29.5.5",
+    "@types/lodash.uniqby": "^4.7.9",
     "@types/node": "^16.18.69",
     "@types/node-cron": "^3.0.9",
     "@types/pg": "^8.10.3",