@crowdin/app-project-module 0.77.0 → 0.78.0

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

@@ -21,7 +21,7 @@ const job_1 = 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;
+        var _a, _b, _c;
         const projectId = req.crowdinContext.jwtPayload.context.project_id || (req === null || req === void 0 ? void 0 : req.body.projectId);
         const uploadTranslations = req.query.uploadTranslations === 'true' || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.uploadTranslations);
         req.logInfo(`Updating crowdin project ${projectId}`);
@@ -33,6 +33,11 @@ function handle(config, integration) {
         if (((_b = config.api) === null || _b === void 0 ? void 0 : _b.default) && req.body.files) {
             req.body = req.body.files;
         }
+        const excludedTargetLanguages = yield (0, files_1.getExcludedTargetLanguages)({
+            client: req.crowdinApiClient,
+            projectId,
+            languages: ((_c = req.query.languages) === null || _c === void 0 ? void 0 : _c.split(',')) || [],
+        });
         yield (0, job_1.runAsJob)({
             integrationId: req.crowdinContext.clientId,
             crowdinId: req.crowdinContext.crowdinId,
@@ -40,13 +45,13 @@ function handle(config, integration) {
             title: 'Sync files to Crowdin',
             payload: req.body,
             res,
-            projectId: projectId,
+            projectId,
             client: req.crowdinApiClient,
             jobType: types_1.JobClientType.MANUAL,
             jobStoreType: integration.jobStoreType,
             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)) {
+                var _d;
+                if (req.body && ((_d = req.body) === null || _d === void 0 ? void 0 : _d.length)) {
                     req.body = yield (0, files_1.expandFilesTree)(req.body, req, integration, job);
                     req.body = (0, lodash_uniqby_1.default)(req.body, 'id');
                 }
@@ -59,6 +64,7 @@ function handle(config, integration) {
                     appSettings: req.integrationSettings,
                     uploadTranslations,
                     job,
+                    excludedTargetLanguages: req.query.languages ? excludedTargetLanguages : undefined,
                 });
                 let message;
                 if ((0, files_1.isExtendedResultType)(result)) {

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

@@ -19,7 +19,9 @@ function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         req.logInfo('Updating integration data');
-        const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, req.crowdinContext.jwtPayload.context.project_id);
+        const client = req.crowdinApiClient;
+        const projectId = req.crowdinContext.jwtPayload.context.project_id;
+        const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
         if (rootFolder) {
             req.logInfo(`Updating integration data for crowding root folder ${rootFolder.id}`);
         }
@@ -27,23 +29,35 @@ function handle(config, integration) {
         if (((_a = config.api) === null || _a === void 0 ? void 0 : _a.default) && req.body.files) {
             req.body = req.body.files;
         }
+        let payload = req.body;
+        if (integration.excludedTargetLanguages) {
+            let options = {};
+            if (rootFolder) {
+                options = {
+                    directoryId: rootFolder.id,
+                    recursion: 'true',
+                };
+            }
+            const files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options)).data.map((d) => d.data);
+            payload = (0, files_1.filterLanguages)(payload, files);
+        }
         yield (0, job_1.runAsJob)({
             integrationId: req.crowdinContext.clientId,
             crowdinId: req.crowdinContext.crowdinId,
             type: types_1.JobType.UPDATE_TO_INTEGRATION,
             title: 'Sync files to ' + config.name,
-            payload: req.body,
+            payload,
             res,
-            projectId: req.crowdinContext.jwtPayload.context.project_id,
-            client: req.crowdinApiClient,
+            projectId,
+            client,
             jobType: types_1.JobClientType.MANUAL,
             jobStoreType: integration.jobStoreType,
             jobCallback: (job) => __awaiter(this, void 0, void 0, function* () {
                 const result = yield integration.updateIntegration({
-                    projectId: req.crowdinContext.jwtPayload.context.project_id,
-                    client: req.crowdinApiClient,
+                    projectId,
+                    client,
                     credentials: req.integrationCredentials,
-                    request: req.body,
+                    request: payload,
                     rootFolder,
                     appSettings: req.integrationSettings,
                     job,

package/out/modules/integration/handlers/main.js

@@ -94,6 +94,7 @@ function handle(config, integration) {
         options.integrationSearchListener = integration.integrationSearchListener;
         options.checkSubscription = !(0, subscription_1.isAppFree)(config);
         options.uploadTranslations = integration.uploadTranslations;
+        options.excludedTargetLanguages = integration.excludedTargetLanguages;
         options.sentryData = process.env.SENTRY_DSN
             ? {
                 dsn: process.env.SENTRY_DSN,

package/out/modules/integration/types.d.ts

@@ -34,7 +34,7 @@ export interface IntegrationLogic extends ModuleKey {
     /**
      * function to update crowdin files (e.g. pull integration data to crowdin source files)
      */
-    updateCrowdin: ({ projectId, client, credentials, request, rootFolder, appSettings, uploadTranslations, job, }: {
+    updateCrowdin: ({ projectId, client, credentials, request, rootFolder, appSettings, uploadTranslations, job, excludedTargetLanguages, }: {
         projectId: number;
         client: Crowdin;
         credentials: any;
@@ -43,6 +43,7 @@ export interface IntegrationLogic extends ModuleKey {
         appSettings?: any;
         uploadTranslations?: boolean;
         job: JobClient;
+        excludedTargetLanguages?: string[];
     }) => Promise<void | ExtendedResult<void>>;
     /**
      * function to update integration content (e.g. load crowdin translations and push them to integration service)
@@ -125,6 +126,10 @@ export interface IntegrationLogic extends ModuleKey {
      * Enable the option to upload translations to crowdin that are already present in the integration.
      */
     uploadTranslations?: boolean;
+    /**
+     * Enable the option to upload file for translation into selected languages.
+     */
+    excludedTargetLanguages?: boolean;
     /**
      * function to get crowdin file translation progress
      */
@@ -299,6 +304,7 @@ export interface File {
     customContent?: string;
     labels?: LabelTreeElement[];
     failed?: boolean;
+    excludedTargetLanguages?: string[];
 }
 export interface Folder {
     id: string;

package/out/modules/integration/util/defaults.js

@@ -116,6 +116,7 @@ function applyIntegrationModuleDefaults(config, integration) {
                     parentId: parentId ? parentId.toString() : undefined,
                     name: e.title || e.name,
                     type: e.type,
+                    excludedTargetLanguages: e.excludedTargetLanguages,
                 });
             });
             return res;

package/out/modules/integration/util/files.d.ts

@@ -1,6 +1,7 @@
-import { ExtendedResult, IntegrationFile, IntegrationLogic, IntegrationRequest, SkipIntegrationNodes, TreeItem } from '../types';
+import { ExtendedResult, IntegrationFile, IntegrationLogic, IntegrationRequest, SkipIntegrationNodes, TreeItem, UpdateIntegrationRequest } from '../types';
 import { JobClient } from './types';
 import Crowdin from '@crowdin/crowdin-api-client';
+import { SourceFilesModel } from '@crowdin/crowdin-api-client';
 export declare function skipFilesByRegex(files: TreeItem[] | undefined, skipIntegrationNodes?: SkipIntegrationNodes): TreeItem[];
 export declare function expandFilesTree(nodes: IntegrationFile[], req: IntegrationRequest, integration: IntegrationLogic, job?: JobClient): Promise<IntegrationFile[]>;
 export declare function isExtendedResultType<T>(data?: T | ExtendedResult<T>): data is ExtendedResult<T>;
@@ -10,3 +11,9 @@ export declare function markUnsyncedFiles({ integrationId, crowdinId, client, fi
     client: Crowdin;
     files?: TreeItem[];
 }): Promise<TreeItem[]>;
+export declare function getExcludedTargetLanguages({ client, projectId, languages, }: {
+    client: Crowdin;
+    projectId: number;
+    languages: string[];
+}): Promise<string[]>;
+export declare function filterLanguages(request: UpdateIntegrationRequest, files: SourceFilesModel.File[]): UpdateIntegrationRequest;

package/out/modules/integration/util/files.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.markUnsyncedFiles = exports.isExtendedResultType = exports.expandFilesTree = exports.skipFilesByRegex = void 0;
+exports.filterLanguages = exports.getExcludedTargetLanguages = exports.markUnsyncedFiles = exports.isExtendedResultType = exports.expandFilesTree = exports.skipFilesByRegex = void 0;
 const types_1 = require("./types");
 const storage_1 = require("../../../storage");
 const util_1 = require("../../../util");
@@ -98,3 +98,26 @@ function markUnsyncedFiles({ integrationId, crowdinId, client, files, }) {
     });
 }
 exports.markUnsyncedFiles = markUnsyncedFiles;
+function getExcludedTargetLanguages({ client, projectId, languages, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectData = yield client.projectsGroupsApi.getProject(projectId);
+        const targetLanguages = projectData.data.targetLanguageIds;
+        return targetLanguages.filter((language) => !languages.includes(language));
+    });
+}
+exports.getExcludedTargetLanguages = getExcludedTargetLanguages;
+function filterLanguages(request, files) {
+    const result = {};
+    for (const fileId in request) {
+        const file = files.find((f) => f.id === parseInt(fileId, 10));
+        if (file) {
+            const excludedLanguages = new Set((file === null || file === void 0 ? void 0 : file.excludedTargetLanguages) || []);
+            result[fileId] = request[fileId].filter((lang) => !excludedLanguages.has(lang));
+        }
+        else {
+            result[fileId] = request[fileId];
+        }
+    }
+    return result;
+}
+exports.filterLanguages = filterLanguages;

package/out/views/main.handlebars

@@ -79,7 +79,15 @@
                 integration-name="{{name}}"
                 integration-logo="logo.png"
                 {{#if uploadTranslations}}
-                    integration-button-menu-items='[{"label":"Sync translations", "title":"Sync translations to Crowdin", "action":"uploadTranslations"}]'
+                  {{#if excludedTargetLanguages}}
+                      integration-button-menu-items='[{"label":"Sync translations", "title":"Sync translations to Crowdin", "action":"uploadTranslations"}, {"label":"Select target languages", "title":"Upload file for translation into selected languages", "action":"excludedTargetLanguages"}]'
+                  {{else}}
+                      integration-button-menu-items='[{"label":"Sync translations", "title":"Sync translations to Crowdin", "action":"uploadTranslations"}]'
+                  {{/if}}
+                {{else}}
+                  {{#if excludedTargetLanguages}}
+                      integration-button-menu-items='[{"label":"Select target languages", "title":"Upload file for translation into selected languages", "action":"excludedTargetLanguages"}]'
+                  {{/if}}
                 {{/if}}
                 {{#if filtering.crowdinLanguages}}
                 crowdin-filter
@@ -209,6 +217,15 @@
         </div>
     </crowdin-modal>
 
+    {{#if excludedTargetLanguages}}
+      <crowdin-modal
+        modal-width="50"
+        modal-title="Select Target Languages for Translation"
+        id="excluded-languages"
+      >
+      </crowdin-modal>
+    {{/if}}
+
     {{#if infoModal}}
         <crowdin-modal
             style="display: none;"
@@ -479,6 +496,7 @@
 
     let project = {};
     let crowdinData = [];
+    let fileToSync = [];
 
     getCrowdinData();
     getIntegrationData();
@@ -511,6 +529,7 @@
                         item.type = e.type;
                         item.node_type = fileType;
                         item.failed = e.failed;
+                        item.excludedTargetLanguages = e.excludedTargetLanguages;
                     } else {
                         item.node_type = e.nodeType || folderType;
                     }
@@ -534,6 +553,8 @@
                     languagesSorted.push({...project.inContextPseudoLanguage, inContext: true});
                 }
 
+                setLanguagesForTranslation(languagesSorted);
+
                 appComponent.setCrowdinLanguagesData(languagesSorted)
             })
             {{#or withCronSync webhooks}}
@@ -636,17 +657,21 @@
             .catch(e => catchRejection(e, 'Can\'t fetch file progress'));
     }
 
-    function uploadFilesToCrowdin(event) {
+    function uploadFilesToCrowdin(event, languages = []) {
         let files = [];
         let uploadTranslations = false;
-        if (event.detail.action === 'uploadTranslations') {
+        if (event.detail?.action === 'uploadTranslations') {
             files = event.detail.files;
             uploadTranslations = true;
+        } else if (event.detail?.action === 'excludedTargetLanguages') {
+          fileToSync = event.detail.files;
+          openLanguageModal();
+          return;
         } else {
             files = event.detail;
         }
 
-        if (event.detail.length === 0) {
+        if (event.detail?.length === 0 || !event.detail) {
             showToast('Select templates which will be pushed to Crowdin');
             return;
         }
@@ -669,7 +694,7 @@
             }));
         {{/if}}
         checkOrigin()
-            .then(restParams => fetch(`api/crowdin/update${restParams}&uploadTranslations=${uploadTranslations}`, {
+            .then(restParams => fetch(`api/crowdin/update${restParams}&uploadTranslations=${uploadTranslations}&languages=${languages}`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(req)
@@ -844,6 +869,56 @@
             .catch(e => catchRejection(e, 'Can\'t upload files to {{name}}'))
     }
 
+    function openLanguageModal() {
+      openModal(languageModal);
+    }
+
+    async function uploadFilesToCrowdinWithExcludedLanguages() {
+      const languageSelect = document.querySelector('#language-select');
+      const selectedLanguages = await languageSelect.getValue();
+      closeModal(languageModal);
+      uploadFilesToCrowdin({ detail: fileToSync }, selectedLanguages);
+    }
+
+    async function setLanguagesForTranslation(languages) {
+      const languageIds = languages.map(language => language.id);
+      if (languageModal) {
+        let modalContent = `
+      <div>
+        <crowdin-select
+          is-multi
+          is-searchable
+          is-position-fixed
+          close-on-select="false"
+          name="languages"
+          id="language-select"
+          label="Languages"
+        >`;
+
+        for (const language of languages) {
+          modalContent += `<option value="${language.id}">${language.name}</option>`;
+        }
+
+        modalContent += `
+        </crowdin-select>
+        </div>
+        <div slot="footer">
+            <crowdin-button id="upload-exclude-languages" outlined onclick="uploadFilesToCrowdinWithExcludedLanguages()">
+                <div class="integration-icon-button">
+                  <span>Sync to</span>
+                  <crowdin-logo is-icon/>
+                </div>
+            </crowdin-button>
+        </div>
+    `;
+
+        languageModal.innerHTML = modalContent;
+
+        const select = document.querySelector('#language-select')
+        await select.setValue(languageIds);
+      }
+    }
+
     {{#if configurationFields}}
         const settingsModal = document.getElementById('settings-modal');
         const settingsSaveBtn = document.getElementById('settings-save-btn');
@@ -1109,6 +1184,12 @@
 
     const permissions = document.getElementById('permissions-modal');
 
+    {{#if excludedTargetLanguages}}
+         const languageModal = document.getElementById('excluded-languages');
+    {{else}}
+         const languageModal = undefined;
+    {{/if}}
+
     {{#if infoModal}}
          const infoModal = document.getElementById('info-modal');
     {{else}}
@@ -1126,6 +1207,9 @@
             if (settingsModal) {
                 closeModal(settingsModal);
             }
+            if (languageModal) {
+              closeModal(languageModal);
+            }
         }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.77.0",
+  "version": "0.78.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 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.744.0",
     "@aws-sdk/s3-request-presigner": "^3.744.0",
-    "@crowdin/crowdin-apps-functions": "^0.10.0",
+    "@crowdin/crowdin-apps-functions": "^0.11.0",
     "@crowdin/logs-formatter": "^2.1.7",
     "@godaddy/terminus": "^4.12.1",
     "@monaco-editor/react": "^4.6.0",