@crowdin/app-project-module 0.95.2 → 0.96.0

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

@@ -74,6 +74,17 @@ function handle(config, integration) {
                     job,
                     excludedTargetLanguages: req.query.languages ? excludedTargetLanguages : undefined,
                 });
+                const currentJob = yield job.get();
+                if (currentJob && (currentJob === null || currentJob === void 0 ? void 0 : currentJob.errors)) {
+                    const errors = JSON.parse(currentJob.errors);
+                    yield (0, logger_1.handleUserError)({
+                        action: 'Sync files to Crowdin',
+                        error: errors,
+                        crowdinId: req.crowdinContext.crowdinId,
+                        clientId: req.crowdinContext.clientId,
+                    });
+                    throw errors.toString();
+                }
                 try {
                     yield (0, files_1.updateSyncedData)(req.crowdinContext.clientId, req.crowdinContext.crowdinId, payload, types_2.Provider.INTEGRATION);
                 }

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

@@ -362,6 +362,7 @@ export interface BaseTreeItem {
     disabled?: boolean;
     tooltip?: string;
     path?: string;
+    type?: string;
 }
 export interface File extends BaseTreeItem {
     type: SourceFilesModel.FileType;

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

@@ -46,11 +46,26 @@ function expandFilesTree(nodes, req, integration, job) {
         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);
+            let integrationData = [];
+            try {
+                integrationData = yield integration.getIntegrationFiles(req.integrationCredentials, req.integrationSettings, id);
+            }
+            catch (e) {
+                if (job) {
+                    const currentJob = yield job.get();
+                    const errorMessage = e instanceof Error ? e.message : String(e);
+                    const currentErrors = (currentJob === null || currentJob === void 0 ? void 0 : currentJob.errors) ? JSON.parse(currentJob.errors) : [];
+                    const newErrors = [...currentErrors, errorMessage];
+                    yield job.update({ errors: newErrors });
+                }
+                continue;
+            }
             const integrationTreeItems = isExtendedResultType(integrationData)
                 ? integrationData.data
                 : integrationData;
-            const checkNodes = integrationTreeItems.map((item) => (Object.assign(Object.assign({}, item), { nodeType: item.nodeType || ('type' in item ? '1' : '0') })));
+            const checkNodes = integrationTreeItems
+                .filter((item) => item.id !== id)
+                .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);
         }

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

@@ -85,7 +85,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                     return yield storage.getJob({ id: jobId });
                 });
             },
-            update: function updateProgress({ progress, status, info, data, attempt }) {
+            update: function updateProgress({ progress, status, info, data, attempt, errors, }) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const prevData = yield this.get();
                     if ((prevData === null || prevData === void 0 ? void 0 : prevData.status) === types_1.JobStatus.CANCELED) {
@@ -98,6 +98,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                         info,
                         data: JSON.stringify(data),
                         attempt,
+                        errors,
                     });
                     return { isCanceled: false };
                 });

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

@@ -38,7 +38,7 @@ function getTreeItems(integrationData) {
 function getOneLevelFetchingFiles(integration, integrationCredentials, integrationSettings, parentFiles) {
     return __awaiter(this, void 0, void 0, function* () {
         for (const file of parentFiles) {
-            if (!('type' in file)) {
+            if (!file.type) {
                 let childs = yield integration.getIntegrationFiles(integrationCredentials, integrationSettings, file.id, '', 0);
                 childs = getTreeItems(childs);
                 if (childs.length > 0) {

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

@@ -40,6 +40,7 @@ export interface Job {
     eta?: number;
     info?: string;
     attempt?: number;
+    errors?: string;
 }
 export type GetJobParams = Pick<Job, 'id'>;
 export type GetActiveJobsParams = Pick<Job, 'integrationId' | 'crowdinId'>;
@@ -51,6 +52,7 @@ export type UpdateJobParams = {
     info?: string;
     data?: string;
     attempt?: number;
+    errors?: string[];
 };
 export type JobClient = {
     get: () => Promise<Job | undefined>;
@@ -61,7 +63,7 @@ export type JobClient = {
     markFilesAsUnsynced: MarkUnsyncedFiles;
     unmarkFilesAsUnsynced: UnmarkUnsyncedFiles;
 };
-export type UpdateJobProgress = ({ progress, status, info, data, attempt, }: Omit<UpdateJobParams, 'id'>) => Promise<{
+export type UpdateJobProgress = ({ progress, status, info, data, attempt, errors, }: Omit<UpdateJobParams, 'id'>) => Promise<{
     isCanceled: boolean;
 }>;
 export interface GetAllNewFilesArgs {

package/out/modules/manifest.js

@@ -378,12 +378,11 @@ function handle(config) {
     if (!(0, subscription_1.isAppFree)(config)) {
         events['subscription_paid'] = '/subscription-paid';
     }
-    const defaultScopes = config.projectIntegration ? [types_1.Scope.USERS, types_1.Scope.PROJECTS] : [types_1.Scope.PROJECTS];
     return (_req, res) => {
         const manifest = Object.assign(Object.assign(Object.assign(Object.assign({ identifier: config.identifier, name: config.name, logo: (0, util_1.getLogoUrl)(), baseUrl: config.baseUrl, authentication: {
                 type: config.authenticationType || types_1.AuthenticationType.APP,
                 clientId: config.clientId,
-            }, restrictAiToSameApp: config.restrictAiToSameApp }, (config.agent && { agent: config.agent })), { events, scopes: config.scopes ? config.scopes : defaultScopes }), (config.defaultPermissions && { default_permissions: config.defaultPermissions })), { modules });
+            }, restrictAiToSameApp: config.restrictAiToSameApp }, (config.agent && { agent: config.agent })), { events, scopes: config.scopes ? config.scopes : [types_1.Scope.PROJECTS] }), (config.defaultPermissions && { default_permissions: config.defaultPermissions })), { modules });
         res.send(manifest);
     };
 }