@crowdin/app-project-module 0.98.0-cf-3 → 0.99.0

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

@@ -14,7 +14,6 @@ const logger_1 = require("../../../util/logger");
 const subscription_1 = require("../../../util/subscription");
 const defaults_1 = require("../util/defaults");
 const users_1 = require("./users");
-const views_1 = require("../../../views");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
@@ -78,9 +77,11 @@ function handle(config, integration) {
             : {};
         options.integrationOneLevelFetching = integration.integrationOneLevelFetching;
         options.integrationSearchListener = integration.integrationSearchListener;
+        options.progressiveCrowdinFilesLoading = integration.progressiveCrowdinFilesLoading;
         options.checkSubscription = !(0, subscription_1.isAppFree)(config);
         options.uploadTranslations = integration.uploadTranslations;
         options.forcePushTranslations = integration.forcePushTranslations;
+        options.forcePushSources = integration.forcePushSources;
         options.excludedTargetLanguages = integration.excludedTargetLanguages;
         options.sentryData = process.env.SENTRY_DSN
             ? {
@@ -93,18 +94,7 @@ function handle(config, integration) {
             checkInterval: ((_d = integration.asyncProgress) === null || _d === void 0 ? void 0 : _d.checkInterval) || 1000,
         };
         logger(`Routing user to ${view} view`);
-        let html;
-        if (view === 'install') {
-            html = (0, util_1.renderJSX)(views_1.InstallPage, options);
-        }
-        else if (view === 'login') {
-            html = (0, util_1.renderJSX)(views_1.LoginPage, options);
-        }
-        else {
-            html = (0, util_1.renderJSX)(views_1.MainPage, options);
-        }
-        res.setHeader('Content-Type', 'text/html; charset=utf-8');
-        return res.send(html);
+        return res.render(view, options);
     }));
 }
 exports.default = handle;

package/out/modules/integration/handlers/oauth-login.d.ts

@@ -2,4 +2,4 @@
 import { Request, Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../../types").CrowdinClientRequest | Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/oauth-login.js

@@ -18,7 +18,6 @@ const defaults_1 = require("../util/defaults");
 const logger_1 = require("../../../util/logger");
 const storage_1 = require("../../../storage");
 const crowdin_apps_functions_1 = require("@crowdin/crowdin-apps-functions");
-const views_1 = require("../../../views");
 function handle(config, integration) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
@@ -66,19 +65,12 @@ function handle(config, integration) {
                 yield (0, storage_1.getStorage)().deleteMetadata((0, defaults_1.getOAuthPollingId)(clientId));
                 yield (0, storage_1.getStorage)().saveMetadata((0, defaults_1.getOAuthPollingId)(clientId), oauthCredentials, organization);
             }
-            const html = (0, util_1.renderJSX)(views_1.OAuthPage, {
-                message: JSON.stringify(message),
-                oauthMode: (_p = integration.oauthLogin) === null || _p === void 0 ? void 0 : _p.mode,
-            });
-            res.setHeader('Content-Type', 'text/html; charset=utf-8');
-            return res.send(html);
+            return res.render('oauth', { message: JSON.stringify(message), oauthMode: (_p = integration.oauthLogin) === null || _p === void 0 ? void 0 : _p.mode });
         }
         catch (e) {
             (0, logger_1.logError)(e);
             message.data = { error: (0, logger_1.getErrorMessage)(e) };
-            const html = (0, util_1.renderJSX)(views_1.OAuthPage, { message: JSON.stringify(message) });
-            res.setHeader('Content-Type', 'text/html; charset=utf-8');
-            return res.send(html);
+            return res.render('oauth', { message: JSON.stringify(message) });
         }
     }));
 }

package/out/modules/integration/handlers/oauth-polling.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { CrowdinClientRequest } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(integration: IntegrationLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/oauth-url.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config, CrowdinClientRequest } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/settings-save.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/settings.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/sync-settings-save.d.ts

@@ -2,4 +2,4 @@
 import { Response } from 'express';
 import { Config } from '../../../types';
 import { IntegrationLogic } from '../types';
-export default function handle(config: Config, integration: IntegrationLogic): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(config: Config, integration: IntegrationLogic): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/sync-settings.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/user-errors.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;

package/out/modules/integration/handlers/users.d.ts

@@ -2,7 +2,7 @@
 import Crowdin, { UsersModel } from '@crowdin/crowdin-api-client';
 import { Response } from 'express';
 export type ProjectMember = UsersModel.ProjectMember | UsersModel.EnterpriseProjectMember;
-export default function handle(): (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | import("../../../types").CrowdinClientRequest, res: Response<any, Record<string, any>>, next: Function) => void;
+export default function handle(): (req: import("../../../types").CrowdinClientRequest | import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: Function) => void;
 export declare function isManager({ client, projectId, memberId, }: {
     client: Crowdin;
     projectId: number;

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

@@ -3,6 +3,4 @@ import { Config } from '../../types';
 export declare function register({ config, app }: {
     config: Config;
     app: Express;
-}): {
-    cronExecutions: {};
-};
+}): void;

package/out/modules/integration/index.js

@@ -36,11 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const cron = __importStar(require("node-cron"));
 const crowdin_client_1 = __importDefault(require("../../middlewares/crowdin-client"));
 const integration_credentials_1 = __importDefault(require("../../middlewares/integration-credentials"));
 const json_response_1 = __importDefault(require("../../middlewares/json-response"));
 const util_1 = require("../../util");
-const static_files_1 = require("../../util/static-files");
 const defaults_1 = require("./util/defaults");
 const webhooks_1 = require("./util/webhooks");
 const crowdin_file_progress_1 = __importDefault(require("./handlers/crowdin-file-progress"));
@@ -54,7 +54,9 @@ const integration_logout_1 = __importDefault(require("./handlers/integration-log
 const integration_update_1 = __importDefault(require("./handlers/integration-update"));
 const integration_webhook_1 = __importDefault(require("./handlers/integration-webhook"));
 const job_cancel_1 = __importDefault(require("./handlers/job-cancel"));
+const job_info_deprecated_1 = __importDefault(require("./handlers/job-info-deprecated"));
 const job_info_1 = __importDefault(require("./handlers/job-info"));
+const job_list_1 = __importDefault(require("./handlers/job-list"));
 const main_1 = __importDefault(require("./handlers/main"));
 const oauth_login_1 = __importDefault(require("./handlers/oauth-login"));
 const oauth_url_1 = __importDefault(require("./handlers/oauth-url"));
@@ -70,13 +72,12 @@ const cron_1 = require("./util/cron");
 const storage_1 = require("../../storage");
 function register({ config, app }) {
     var _a, _b, _c;
-    let cronExecutions = {};
     const integrationLogic = config.projectIntegration;
     if (!integrationLogic) {
-        return { cronExecutions };
+        return;
     }
     (0, defaults_1.applyIntegrationModuleDefaults)(config, integrationLogic);
-    app.get((0, util_1.getLogoUrl)(integrationLogic, '/integration'), (0, static_files_1.serveFile)(config, integrationLogic.imagePath || config.imagePath));
+    app.get((0, util_1.getLogoUrl)(integrationLogic, '/integration'), (req, res) => res.sendFile(integrationLogic.imagePath || config.imagePath));
     app.get('/', (0, crowdin_client_1.default)({
         config,
         optional: true,
@@ -89,12 +90,24 @@ function register({ config, app }) {
         checkSubscriptionExpiration: true,
         moduleKey: integrationLogic.key,
     }), (0, subscription_info_1.default)(config));
+    app.get('/api/all-jobs', json_response_1.default, (0, crowdin_client_1.default)({
+        config,
+        optional: false,
+        checkSubscriptionExpiration: true,
+        moduleKey: integrationLogic.key,
+    }), (0, job_list_1.default)());
+    app.get('/api/job-info', json_response_1.default, (0, crowdin_client_1.default)({
+        config,
+        optional: false,
+        checkSubscriptionExpiration: true,
+        moduleKey: integrationLogic.key,
+    }), (0, job_info_1.default)());
     app.get('/api/jobs', json_response_1.default, (0, crowdin_client_1.default)({
         config,
         optional: false,
         checkSubscriptionExpiration: true,
         moduleKey: integrationLogic.key,
-    }), (0, job_info_1.default)(config));
+    }), (0, job_info_deprecated_1.default)(config));
     app.delete('/api/jobs', json_response_1.default, (0, crowdin_client_1.default)({
         config,
         optional: false,
@@ -184,39 +197,25 @@ function register({ config, app }) {
             }), (0, oauth_polling_1.default)(integrationLogic));
         }
     }
-    Promise.resolve().then(() => __importStar(require('node-cron'))).then((nodeCron) => {
-        const cron = nodeCron.default || nodeCron;
-        if (integrationLogic.cronJobs) {
-            integrationLogic.cronJobs.forEach((job) => {
-                cron.schedule(job.expression, () => (0, cron_1.runJob)({ config, integration: integrationLogic, job }).catch(console.error));
-            });
-        }
-        if (integrationLogic.withCronSync) {
-            cron.schedule('0 * * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '1' }).catch(console.error));
-            cron.schedule('0 */3 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '3' }).catch(console.error));
-            cron.schedule('0 */6 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '6' }).catch(console.error));
-            cron.schedule('0 */12 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '12' }).catch(console.error));
-            cron.schedule('0 0 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '24' }).catch(console.error));
+    if (integrationLogic.cronJobs) {
+        integrationLogic.cronJobs.forEach((job) => {
+            cron.schedule(job.expression, () => (0, cron_1.runJob)({ config, integration: integrationLogic, job }).catch(console.error));
+        });
+    }
+    if (integrationLogic.withCronSync) {
+        cron.schedule('0 * * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '1' }).catch(console.error));
+        cron.schedule('0 */3 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '3' }).catch(console.error));
+        cron.schedule('0 */6 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '6' }).catch(console.error));
+        cron.schedule('0 */12 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '12' }).catch(console.error));
+        cron.schedule('0 0 * * *', () => (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '24' }).catch(console.error));
+    }
+    // remove user errors
+    cron.schedule('0 0 * * *', () => __awaiter(this, void 0, void 0, function* () {
+        if (integrationLogic.userErrorLifetimeDays) {
+            const date = (0, util_1.getPreviousDate)(integrationLogic.userErrorLifetimeDays);
+            yield (0, storage_1.getStorage)().deleteAllUsersErrorsOlderThan(`${date.getTime()}`);
         }
-        // remove user errors
-        cron.schedule('0 0 * * *', () => __awaiter(this, void 0, void 0, function* () {
-            if (integrationLogic.userErrorLifetimeDays) {
-                const date = (0, util_1.getPreviousDate)(integrationLogic.userErrorLifetimeDays);
-                yield (0, storage_1.getStorage)().deleteAllUsersErrorsOlderThan(`${date.getTime()}`);
-            }
-        }));
-        cron.schedule('0 0 1 * *', () => (0, cron_1.removeFinishedJobs)());
-    })
-        .catch(() => {
-        // node-cron not available (e.g., Cloudflare Workers), delegating to external cron handler
-        cronExecutions = {
-            '0 * * * *': (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '1' }).catch(console.error),
-            '0 */3 * * *': (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '3' }).catch(console.error),
-            '0 */6 * * *': (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '6' }).catch(console.error),
-            '0 */12 * * *': (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '12' }).catch(console.error),
-            '0 0 * * *': (0, cron_1.filesCron)({ config, integration: integrationLogic, period: '24' }).catch(console.error),
-        };
-    });
+    }));
     if (integrationLogic.webhooks) {
         app.post(`${integrationLogic.webhooks.crowdinWebhookUrl
             ? integrationLogic.webhooks.crowdinWebhookUrl
@@ -253,6 +252,6 @@ function register({ config, app }) {
         checkSubscriptionExpiration: true,
         moduleKey: integrationLogic.key,
     }), (0, integration_credentials_1.default)(config, integrationLogic), (0, invite_users_1.default)());
-    return { cronExecutions };
+    cron.schedule('0 0 1 * *', () => (0, cron_1.removeFinishedJobs)());
 }
 exports.register = register;

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

@@ -36,7 +36,7 @@ export interface IntegrationLogic extends ModuleKey {
     /**
      * function to get crowdin files that are related with this integration
      */
-    getCrowdinFiles?: (projectId: number, client: Crowdin, appRootFolder?: SourceFilesModel.Directory, config?: any) => Promise<TreeItem[]>;
+    getCrowdinFiles?: (projectId: number, client: Crowdin, appRootFolder?: SourceFilesModel.Directory, config?: any, mode?: CrowdinFilesLoadMode) => Promise<TreeItem[]>;
     /**
      * function to get data from integration
      */
@@ -160,6 +160,10 @@ export interface IntegrationLogic extends ModuleKey {
      * Enable integration next page event
      */
     integrationPagination?: boolean;
+    /**
+     * Enable progressive loading for Crowdin files (directories first, then files).
+     */
+    progressiveCrowdinFilesLoading?: boolean;
     /**
      * Enable the option to upload translations to crowdin that are already present in the integration.
      */
@@ -168,6 +172,10 @@ export interface IntegrationLogic extends ModuleKey {
      * Force sync translations from Crowdin to integration regardless of etag.
      */
     forcePushTranslations?: boolean;
+    /**
+     * Force sync sources from integration to Crowdin.
+     */
+    forcePushSources?: boolean;
     /**
      * Enable the option to upload file for translation into selected languages.
      */
@@ -352,6 +360,7 @@ export interface OAuthLogin {
      */
     performRefreshTokenRequest?: (currentCredentials: any, loginForm?: any) => Promise<any>;
 }
+export type CrowdinFilesLoadMode = 'directories' | 'files';
 export interface BaseTreeItem {
     id: string;
     name: string;
@@ -363,6 +372,7 @@ export interface BaseTreeItem {
     tooltip?: string;
     path?: string;
     type?: string;
+    syncedAt?: string;
 }
 export interface File extends BaseTreeItem {
     type: SourceFilesModel.FileType;

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

@@ -60,7 +60,7 @@ exports.getOauthRoute = getOauthRoute;
 function applyIntegrationModuleDefaults(config, integration) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if (!integration.getCrowdinFiles) {
-        integration.getCrowdinFiles = (projectId, client, rootFolder) => __awaiter(this, void 0, void 0, function* () {
+        integration.getCrowdinFiles = (projectId, client, rootFolder, config, mode) => __awaiter(this, void 0, void 0, function* () {
             const allBranches = (yield client.sourceFilesApi.withFetchAll().listProjectBranches(projectId)).data.map((d) => d.data);
             let options = {};
             if (rootFolder) {
@@ -69,57 +69,63 @@ function applyIntegrationModuleDefaults(config, integration) {
                     recursion: 'true',
                 };
             }
-            const allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)).data.map((d) => d.data);
-            const directoryIds = allDirectories.map((d) => d.id);
-            let files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options)).data.map((d) => d.data);
-            files = files.filter((f) => (rootFolder && f.directoryId === rootFolder.id) ||
-                directoryIds.includes(f.directoryId) ||
-                (!rootFolder && !f.directoryId));
             const res = [];
-            allDirectories.forEach((e) => {
-                let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
-                if (!parentId && e.branchId) {
-                    const branch = allBranches.find((branch) => branch.id === e.branchId);
-                    if (branch) {
-                        parentId = branch.id;
-                        if (!res.find((node) => node.id === branch.id.toString())) {
-                            res.push({
-                                id: branch.id.toString(),
-                                name: branch.name,
-                                nodeType: '2',
-                            });
+            if (!mode || mode === 'directories') {
+                const allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)).data.map((d) => d.data);
+                allDirectories.forEach((e) => {
+                    let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                    if (!parentId && e.branchId) {
+                        const branch = allBranches.find((branch) => branch.id === e.branchId);
+                        if (branch) {
+                            parentId = branch.id;
+                            if (!res.find((node) => node.id === branch.id.toString())) {
+                                res.push({
+                                    id: branch.id.toString(),
+                                    name: branch.name,
+                                    nodeType: '2',
+                                });
+                            }
                         }
                     }
-                }
-                res.push({
-                    id: e.id.toString(),
-                    parentId: parentId ? parentId.toString() : undefined,
-                    name: e.name,
+                    res.push({
+                        id: e.id.toString(),
+                        parentId: parentId ? parentId.toString() : undefined,
+                        name: e.name,
+                    });
                 });
-            });
-            files.forEach((e) => {
-                let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
-                if (!parentId && e.branchId) {
-                    const branch = allBranches.find((branch) => branch.id === e.branchId);
-                    if (branch) {
-                        parentId = branch.id;
-                        if (!res.find((node) => node.id === branch.id.toString())) {
-                            res.push({
-                                id: branch.id.toString(),
-                                name: branch.name,
-                                nodeType: '2',
-                            });
+            }
+            if (!mode || mode === 'files') {
+                const directoryIds = mode === 'files'
+                    ? (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, options)).data.map((d) => d.data.id)
+                    : res.filter((item) => !item.type && item.nodeType !== '2').map((d) => parseInt(d.id));
+                let files = (yield client.sourceFilesApi.withFetchAll().listProjectFiles(projectId, options)).data.map((d) => d.data);
+                files = files.filter((f) => (rootFolder && f.directoryId === rootFolder.id) ||
+                    directoryIds.includes(f.directoryId) ||
+                    (!rootFolder && !f.directoryId));
+                files.forEach((e) => {
+                    let parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                    if (!parentId && e.branchId) {
+                        const branch = allBranches.find((branch) => branch.id === e.branchId);
+                        if (branch) {
+                            parentId = branch.id;
+                            if (!res.find((node) => node.id === branch.id.toString())) {
+                                res.push({
+                                    id: branch.id.toString(),
+                                    name: branch.name,
+                                    nodeType: '2',
+                                });
+                            }
                         }
                     }
-                }
-                res.push({
-                    id: e.id.toString(),
-                    parentId: parentId ? parentId.toString() : undefined,
-                    name: e.title || e.name,
-                    type: e.type,
-                    excludedTargetLanguages: e.excludedTargetLanguages,
+                    res.push({
+                        id: e.id.toString(),
+                        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

@@ -23,3 +23,4 @@ export declare function getParentFiles(allFiles: TreeItem[], fileCollection: Tre
 export declare function filterFilesByPatterns(files: TreeItem[], patterns: string[]): TreeItem[];
 export declare function filterFilesByPath(files: TreeItem[], includePatterns?: string[], excludePatterns?: string[]): TreeItem[];
 export declare function updateSyncedData(clientId: string, crowdinId: string, payload: any[], provider?: Provider): Promise<void>;
+export declare function filterSyncedData(payload: any[]): Promise<any[]>;

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

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSyncedData = exports.filterFilesByPath = exports.filterFilesByPatterns = exports.getParentFiles = exports.getParentPaths = exports.buildPath = exports.filterLanguages = exports.getExcludedTargetLanguages = exports.markUnsyncedFiles = exports.isExtendedResultType = exports.expandFilesTree = exports.skipFilesByRegex = void 0;
+exports.filterSyncedData = exports.updateSyncedData = exports.filterFilesByPath = exports.filterFilesByPatterns = exports.getParentFiles = exports.getParentPaths = exports.buildPath = exports.filterLanguages = exports.getExcludedTargetLanguages = exports.markUnsyncedFiles = exports.isExtendedResultType = exports.expandFilesTree = exports.skipFilesByRegex = void 0;
 const types_1 = require("../types");
 const types_2 = require("./types");
 const storage_1 = require("../../../storage");
@@ -38,7 +38,7 @@ function skipFilesByRegex(files, skipIntegrationNodes) {
 }
 exports.skipFilesByRegex = skipFilesByRegex;
 function expandFilesTree(nodes, req, integration, job) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         if (job && types_2.JobStatus.CANCELED === ((_a = (yield job.get())) === null || _a === void 0 ? void 0 : _a.status)) {
             throw new Error('Job canceled');
@@ -69,6 +69,46 @@ function expandFilesTree(nodes, req, integration, job) {
             const expandedResult = yield expandFilesTree(checkNodes, req, integration, job);
             files.push(...expandedResult);
         }
+        const needsFileStatus = ((_c = (_b = integration.filtering) === null || _b === void 0 ? void 0 : _b.integrationFileStatus) === null || _c === void 0 ? void 0 : _c.isNew) ||
+            ((_e = (_d = integration.filtering) === null || _d === void 0 ? void 0 : _d.integrationFileStatus) === null || _e === void 0 ? void 0 : _e.isUpdated) ||
+            ((_g = (_f = integration.filtering) === null || _f === void 0 ? void 0 : _f.integrationFileStatus) === null || _g === void 0 ? void 0 : _g.notSynced) ||
+            integration.forcePushSources === true;
+        if (needsFileStatus) {
+            const { crowdinId, clientId } = req.crowdinContext;
+            const syncedData = yield (0, storage_1.getStorage)().getSyncedData(clientId, crowdinId, types_1.Provider.INTEGRATION);
+            const syncedFiles = (syncedData === null || syncedData === void 0 ? void 0 : syncedData.files) ? JSON.parse(syncedData.files) : [];
+            const lastSyncTimestamp = (syncedData === null || syncedData === void 0 ? void 0 : syncedData.updatedAt) ? Number(syncedData.updatedAt) : null;
+            return files.map((file) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (!file.type) {
+                    return file;
+                }
+                const syncedFile = syncedFiles.find((syncedItem) => syncedItem.id === file.id);
+                const notSynced = ((_b = (_a = integration.filtering) === null || _a === void 0 ? void 0 : _a.integrationFileStatus) === null || _b === void 0 ? void 0 : _b.notSynced) === true ? !syncedFile : false;
+                const fileSyncTimestamp = (syncedFile === null || syncedFile === void 0 ? void 0 : syncedFile.syncedAt) ? Number(syncedFile.syncedAt) : lastSyncTimestamp;
+                const isNew = ((_d = (_c = integration.filtering) === null || _c === void 0 ? void 0 : _c.integrationFileStatus) === null || _d === void 0 ? void 0 : _d.isNew) === true
+                    ? !syncedFile &&
+                        fileSyncTimestamp &&
+                        file.createdAt &&
+                        (typeof file.createdAt === 'string' ? new Date(file.createdAt).getTime() : file.createdAt) >
+                            fileSyncTimestamp
+                    : false;
+                const shouldCalculateIsUpdated = ((_f = (_e = integration.filtering) === null || _e === void 0 ? void 0 : _e.integrationFileStatus) === null || _f === void 0 ? void 0 : _f.isUpdated) === true ||
+                    integration.forcePushSources === true;
+                const isUpdated = file.isUpdated !== undefined
+                    ? file.isUpdated
+                    : shouldCalculateIsUpdated
+                        ? syncedFile &&
+                            fileSyncTimestamp &&
+                            file.updatedAt &&
+                            (typeof file.updatedAt === 'string' ? new Date(file.updatedAt).getTime() : file.updatedAt) >
+                                fileSyncTimestamp
+                        : false;
+                return Object.assign(Object.assign({}, file), { isNew,
+                    notSynced,
+                    isUpdated });
+            });
+        }
         return files;
     });
 }
@@ -201,14 +241,22 @@ exports.filterFilesByPath = filterFilesByPath;
 function updateSyncedData(clientId, crowdinId, payload, provider = types_1.Provider.INTEGRATION) {
     return __awaiter(this, void 0, void 0, function* () {
         const existingSyncedData = yield (0, storage_1.getStorage)().getSyncedData(clientId, crowdinId, provider);
+        const currentTimestamp = Date.now().toString();
+        const filesWithTimestamp = (payload === null || payload === void 0 ? void 0 : payload.map((file) => (Object.assign(Object.assign({}, file), { syncedAt: currentTimestamp })))) || [];
         if (existingSyncedData) {
             const existingFiles = JSON.parse(existingSyncedData.files);
-            const mergedFiles = (0, lodash_uniqby_1.default)([...existingFiles, ...payload], 'id');
+            const mergedFiles = (0, lodash_uniqby_1.default)([...filesWithTimestamp, ...existingFiles], 'id');
             yield (0, storage_1.getStorage)().updateSyncedData(JSON.stringify(mergedFiles), clientId, crowdinId, provider);
         }
         else {
-            yield (0, storage_1.getStorage)().saveSyncedData(JSON.stringify(payload), clientId, crowdinId, provider);
+            yield (0, storage_1.getStorage)().saveSyncedData(JSON.stringify(filesWithTimestamp), clientId, crowdinId, provider);
         }
     });
 }
 exports.updateSyncedData = updateSyncedData;
+function filterSyncedData(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return payload === null || payload === void 0 ? void 0 : payload.filter((file) => file.isUpdated !== false);
+    });
+}
+exports.filterSyncedData = filterSyncedData;

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

@@ -14,7 +14,7 @@ export declare function runAsJob({ integrationId, crowdinId, type, title, payloa
     jobType: JobClientType;
     jobStoreType: JobStoreType;
     jobCallback: (arg1: JobClient) => Promise<any>;
-    onError?: (e: any) => Promise<void>;
+    onError?: (e: any, job: JobClient) => Promise<void>;
     reRunJobId?: string;
     forcePushTranslations?: boolean;
 }): Promise<void>;

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, errors, }) {
+            update: function updateProgress({ progress, status, info, data, attempt, errors, processedEntities, }) {
                 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) {
@@ -99,6 +99,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                         data: JSON.stringify(data),
                         attempt,
                         errors,
+                        processedEntities: JSON.stringify(processedEntities),
                     });
                     return { isCanceled: false };
                 });
@@ -222,7 +223,7 @@ function runAsJob({ integrationId, crowdinId, type, title, payload, res, project
                 info: (0, logger_1.getErrorMessage)(e),
             });
             if (onError) {
-                yield onError(e);
+                yield onError(e, job);
             }
             else {
                 throw e;

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

@@ -41,6 +41,7 @@ export interface Job {
     info?: string;
     attempt?: number;
     errors?: string;
+    processedEntities?: string;
 }
 export type GetJobParams = Pick<Job, 'id'>;
 export type GetActiveJobsParams = Pick<Job, 'integrationId' | 'crowdinId'>;
@@ -53,6 +54,7 @@ export type UpdateJobParams = {
     data?: string;
     attempt?: number;
     errors?: string[];
+    processedEntities?: string;
 };
 export type JobClient = {
     get: () => Promise<Job | undefined>;
@@ -124,3 +126,9 @@ export interface IntegrationSyncedData {
     updatedAt: string;
     files?: any;
 }
+export type GetAllJobsParams = {
+    integrationId: string;
+    crowdinId: string;
+    limit: number;
+    offset: number;
+};

package/out/modules/modal/index.js

@@ -16,14 +16,14 @@ function register({ config, app }) {
     if (Array.isArray(config.modal)) {
         config.modal.forEach((modal) => {
             if ((modal === null || modal === void 0 ? void 0 : modal.uiPath) || (modal === null || modal === void 0 ? void 0 : modal.formSchema)) {
-                app.use(`/modal-${modal.key}`, (0, ui_module_1.default)({ config, allowUnauthorized, moduleType: modal.key }), (0, render_ui_module_1.default)(modal, config));
+                app.use(`/modal-${modal.key}`, (0, ui_module_1.default)({ config, allowUnauthorized, moduleType: modal.key }), (0, render_ui_module_1.default)(modal));
             }
         });
     }
     else {
         // backward compatibility will be removed after migration
         if (((_a = config.modal) === null || _a === void 0 ? void 0 : _a.uiPath) || ((_b = config.modal) === null || _b === void 0 ? void 0 : _b.formSchema)) {
-            app.use('/modal', (0, ui_module_1.default)({ config, allowUnauthorized, moduleType: config.modal.key }), (0, render_ui_module_1.default)(config.modal, config));
+            app.use('/modal', (0, ui_module_1.default)({ config, allowUnauthorized, moduleType: config.modal.key }), (0, render_ui_module_1.default)(config.modal));
         }
     }
 }