@crowdin/app-project-module 0.40.0 → 0.41.1

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.40.0",
+  "version": "0.41.1",
   "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.1",
+    "@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",
@@ -35,27 +36,28 @@
     "@babel/preset-react": "^7.23.3",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.2",
-    "@mui/material": "^5.15.2",
-    "@rjsf/core": "^5.15.1",
-    "@rjsf/mui": "^5.15.1",
+    "@mui/icons-material": "^5.15.7",
+    "@mui/material": "^5.15.7",
+    "@rjsf/core": "^5.16.1",
+    "@rjsf/mui": "^5.16.1",
     "@rjsf/utils": "^5.15.1",
-    "@rjsf/validator-ajv8": "^5.15.1",
+    "@rjsf/validator-ajv8": "^5.16.1",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^24.1.0",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.3",
     "@types/amqplib": "^0.10.4",
     "@types/crypto-js": "^4.1.3",
-    "@types/express": "4.17.18",
+    "@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",
-    "@types/swagger-jsdoc": "^6.0.1",
+    "@types/swagger-jsdoc": "^6.0.4",
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^2.3.1",
     "@typescript-eslint/parser": "^2.3.1",