@crowdin/app-project-module 0.29.4 → 0.30.0

package/out/storage/index.d.ts

@@ -1,4 +1,4 @@
-import { Config, CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings, Provider } from '../models';
+import { Config, CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncedFiles, IntegrationSyncSettings, Provider } from '../models';
 export interface Storage {
     migrate(): Promise<void>;
     saveCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
@@ -25,6 +25,9 @@ export interface Storage {
     saveFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: Provider): Promise<void>;
     updateFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: Provider): Promise<void>;
     getFilesSnapshot(integrationId: string, crowdinId: string, provider: Provider): Promise<IntegrationFilesSnapshot | undefined>;
+    saveSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    updateSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    getSyncedFiles(integrationId: string, crowdinId: string): Promise<IntegrationSyncedFiles | undefined>;
 }
 export declare function initialize(config: Config): Promise<void>;
 export declare function getStorage(): Storage;

package/out/storage/mysql.d.ts

@@ -1,5 +1,5 @@
 import { Storage } from '.';
-import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings } from '../models';
+import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncedFiles, IntegrationSyncSettings } from '../models';
 export interface MySQLStorageConfig {
     uri?: string;
     host?: string;
@@ -42,4 +42,7 @@ export declare class MySQLStorage implements Storage {
     saveFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     updateFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     getFilesSnapshot(integrationId: string, crowdinId: string, provider: string): Promise<IntegrationFilesSnapshot | undefined>;
+    saveSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    updateSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    getSyncedFiles(integrationId: string, crowdinId: string): Promise<IntegrationSyncedFiles | undefined>;
 }

package/out/storage/mysql.js

@@ -114,6 +114,15 @@ class MySQLStorage {
                 provider       varchar(255) not null
             )
             `);
+            yield connection.execute(`
+            create table if not exists synced_files
+            (
+                id             int auto_increment primary key,
+                integration_id varchar(255) not null,
+                crowdin_id     varchar(255) not null,
+                file_ids       text
+            )
+            `);
         });
     }
     saveCrowdinCredentials(credentials) {
@@ -297,7 +306,7 @@ class MySQLStorage {
     saveSyncSettings(files, integrationId, crowdinId, type, provider) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.dbPromise;
-            yield this.executeQuery((connection) => connection.execute('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES (?, , ?, ?, ?)', [files, integrationId, crowdinId, type, provider]));
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES (?, ?, ?, ?, ?)', [files, integrationId, crowdinId, type, provider]));
         });
     }
     updateSyncSettings(files, integrationId, crowdinId, type, provider) {
@@ -336,5 +345,34 @@ class MySQLStorage {
             }));
         });
     }
+    saveSyncedFiles(fileIds, integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((connection) => connection.execute('INSERT INTO synced_files(file_ids, integration_id, crowdin_id) VALUES (?, ?, ?)', [
+                fileIds,
+                integrationId,
+                crowdinId,
+            ]));
+        });
+    }
+    updateSyncedFiles(fileIds, integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((connection) => connection.execute('UPDATE synced_files SET file_ids = ? WHERE integration_id = ? AND crowdin_id = ?', [
+                fileIds,
+                integrationId,
+                crowdinId,
+            ]));
+        });
+    }
+    getSyncedFiles(integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            return this.executeQuery((connection) => __awaiter(this, void 0, void 0, function* () {
+                const [rows] = yield connection.execute('SELECT id, file_ids as "fileIds", integration_id as "integrationId", crowdin_id as "crowdinId" FROM synced_files WHERE integration_id = ? AND crowdin_id = ?', [integrationId, crowdinId]);
+                return (rows || [])[0];
+            }));
+        });
+    }
 }
 exports.MySQLStorage = MySQLStorage;

package/out/storage/postgre.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'pg';
 import { Storage } from '.';
-import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings } from '../models';
+import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncedFiles, IntegrationSyncSettings } from '../models';
 export interface PostgreStorageConfig {
     host?: string;
     connectionString?: string;
@@ -21,6 +21,7 @@ export declare class PostgreStorage implements Storage {
     constructor(config: PostgreStorageConfig);
     executeQuery<T>(command: (client: Client) => Promise<T>): Promise<T>;
     migrate(): Promise<void>;
+    addColumns(client: Client): Promise<void>;
     addTables(client: Client): Promise<void>;
     saveCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
     updateCrowdinCredentials(credentials: CrowdinCredentials): Promise<void>;
@@ -46,4 +47,7 @@ export declare class PostgreStorage implements Storage {
     saveFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     updateFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     getFilesSnapshot(integrationId: string, crowdinId: string, provider: string): Promise<IntegrationFilesSnapshot | undefined>;
+    saveSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    updateSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    getSyncedFiles(integrationId: string, crowdinId: string): Promise<IntegrationSyncedFiles | undefined>;
 }

package/out/storage/postgre.js

@@ -48,6 +48,8 @@ class PostgreStorage {
             try {
                 yield this.executeQuery(this.addTables);
                 this._res && this._res();
+                // TODO: temporary code
+                yield this.executeQuery(this.addColumns);
             }
             catch (e) {
                 console.error(e);
@@ -55,6 +57,22 @@ class PostgreStorage {
             }
         });
     }
+    addColumns(client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tableName = 'app_metadata';
+            const newColumns = ['crowdin_id'];
+            const tableInfo = yield client.query('SELECT column_name FROM information_schema.columns WHERE table_name = $1', [tableName]);
+            tableInfo.rows.map((columnInfo) => __awaiter(this, void 0, void 0, function* () {
+                const index = newColumns.indexOf(columnInfo.column_name);
+                if (~index) {
+                    newColumns.splice(index, 1);
+                }
+            }));
+            for (const column of newColumns) {
+                yield client.query(`ALTER TABLE ${tableName} ADD COLUMN ${column} varchar NULL;`);
+            }
+        });
+    }
     addTables(client) {
         return __awaiter(this, void 0, void 0, function* () {
             yield client.query(`
@@ -97,7 +115,7 @@ class PostgreStorage {
             (
                 id             varchar primary key,
                 data           varchar,
-                crowdin_id     varchar,
+                crowdin_id     varchar
             )
             `);
             yield client.query(`
@@ -110,6 +128,15 @@ class PostgreStorage {
                 provider       varchar not null
             )
             `);
+            yield client.query(`
+            create table if not exists synced_files
+            (
+                id             serial primary key,
+                integration_id varchar not null,
+                crowdin_id     varchar not null,
+                file_ids       varchar
+            )
+            `);
         });
     }
     saveCrowdinCredentials(credentials) {
@@ -332,5 +359,34 @@ class PostgreStorage {
             }));
         });
     }
+    saveSyncedFiles(fileIds, integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((client) => client.query('INSERT INTO synced_files(file_ids, integration_id, crowdin_id) VALUES ($1, $2, $3)', [
+                fileIds,
+                integrationId,
+                crowdinId,
+            ]));
+        });
+    }
+    updateSyncedFiles(fileIds, integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            yield this.executeQuery((client) => client.query('UPDATE synced_files SET file_ids = $1 WHERE integration_id = $2 AND crowdin_id = $3', [
+                fileIds,
+                integrationId,
+                crowdinId,
+            ]));
+        });
+    }
+    getSyncedFiles(integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.dbPromise;
+            return this.executeQuery((client) => __awaiter(this, void 0, void 0, function* () {
+                const res = yield client.query('SELECT id, file_ids as "fileIds", integration_id as "integrationId", crowdin_id as "crowdinId" FROM synced_files WHERE integration_id = $1 AND crowdin_id = $2', [integrationId, crowdinId]);
+                return res === null || res === void 0 ? void 0 : res.rows[0];
+            }));
+        });
+    }
 }
 exports.PostgreStorage = PostgreStorage;

package/out/storage/sqlite.d.ts

@@ -1,5 +1,5 @@
 import { Storage } from '.';
-import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncSettings } from '../models';
+import { CrowdinCredentials, IntegrationCredentials, IntegrationFilesSnapshot, IntegrationSyncedFiles, IntegrationSyncSettings } from '../models';
 export interface SQLiteStorageConfig {
     dbFolder: string;
 }
@@ -41,4 +41,7 @@ export declare class SQLiteStorage implements Storage {
     saveFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     updateFilesSnapshot(files: any, integrationId: string, crowdinId: string, provider: string): Promise<void>;
     getFilesSnapshot(integrationId: string, crowdinId: string, provider: string): Promise<IntegrationFilesSnapshot | undefined>;
+    saveSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    updateSyncedFiles(fileIds: any, integrationId: string, crowdinId: string): Promise<void>;
+    getSyncedFiles(integrationId: string, crowdinId: string): Promise<IntegrationSyncedFiles | undefined>;
 }

package/out/storage/sqlite.js

@@ -185,6 +185,15 @@ class SQLiteStorage {
                 files          varchar     null,
                 provider       varchar not null
             );
+            `, []);
+                yield this._run(`
+            create table if not exists synced_files
+            (
+                id             integer not null primary key autoincrement,
+                integration_id varchar not null,
+                crowdin_id     varchar not null,
+                file_ids       varchar     null
+            );
             `, []);
                 this._res && this._res();
                 // TODO: temporary code
@@ -351,5 +360,27 @@ class SQLiteStorage {
             }
         });
     }
+    saveSyncedFiles(fileIds, integrationId, crowdinId) {
+        return this.run('INSERT INTO synced_files(file_ids, integration_id, crowdin_id) VALUES (?, ?, ?)', [
+            fileIds,
+            integrationId,
+            crowdinId,
+        ]);
+    }
+    updateSyncedFiles(fileIds, integrationId, crowdinId) {
+        return this.run('UPDATE synced_files SET file_ids = ? WHERE integration_id = ? AND crowdin_id = ?', [
+            fileIds,
+            integrationId,
+            crowdinId,
+        ]);
+    }
+    getSyncedFiles(integrationId, crowdinId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const row = yield this.get('SELECT id, file_ids as fileIds, integration_id as integrationId, crowdin_id as crowdinId FROM synced_files WHERE integration_id = ? AND crowdin_id = ?', [integrationId, crowdinId]);
+            if (row) {
+                return row;
+            }
+        });
+    }
 }
 exports.SQLiteStorage = SQLiteStorage;

package/out/util/synced-files.d.ts

@@ -0,0 +1,2 @@
+import { CreateOrUpdateSyncedFilesArgs } from '../models';
+export declare function createOrUpdateSyncedFiles(args: CreateOrUpdateSyncedFilesArgs): Promise<void>;

package/out/util/synced-files.js

@@ -0,0 +1,31 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOrUpdateSyncedFiles = void 0;
+const storage_1 = require("../storage");
+const index_1 = require("./index");
+function createOrUpdateSyncedFiles(args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { config, req } = args;
+        let fileIds = args.fileIds;
+        const existingFiles = yield (0, storage_1.getStorage)().getSyncedFiles(req.crowdinContext.clientId, req.crowdinContext.crowdinId);
+        if (existingFiles) {
+            fileIds = [...new Set([...JSON.parse(existingFiles.fileIds), ...fileIds])];
+            (0, index_1.log)(`Updating synced files ${JSON.stringify(fileIds, null, 2)}`, config.logger);
+            yield (0, storage_1.getStorage)().updateSyncedFiles(JSON.stringify(fileIds), req.crowdinContext.clientId, req.crowdinContext.crowdinId);
+        }
+        else {
+            (0, index_1.log)(`Saving synced files ${JSON.stringify(fileIds, null, 2)}`, config.logger);
+            yield (0, storage_1.getStorage)().saveSyncedFiles(JSON.stringify(fileIds), req.crowdinContext.clientId, req.crowdinContext.crowdinId);
+        }
+    });
+}
+exports.createOrUpdateSyncedFiles = createOrUpdateSyncedFiles;

package/out/util/terminus-express.d.ts

@@ -0,0 +1,7 @@
+import express from 'express';
+declare module 'express-serve-static-core' {
+    interface Application {
+        baseListen: any;
+    }
+}
+export default express;

package/out/util/terminus-express.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const terminus_1 = require("@godaddy/terminus");
+express_1.default.application.baseListen = express_1.default.application.listen;
+express_1.default.application.listen = function (...args) {
+    const [port, callback] = args;
+    const server = this.baseListen.call(this, port);
+    if (callback) {
+        callback();
+    }
+    (0, terminus_1.createTerminus)(server, {
+        timeout: Infinity,
+        useExit0: true,
+    });
+    return server;
+};
+exports.default = express_1.default;

package/out/views/main.handlebars

@@ -6,21 +6,36 @@
     <div class="i_w">
         <div class="top">
             {{#if checkSubscription}}
-                <crowdin-alert id="subscription-info" no-icon="true" type="warning" style="display: none;">
+                <crowdin-alert id="subscription-info" no-icon="true" type="warning" style="display: none; margin-bottom: 12px;">
                     <div class="box-center">
                         <p class="m-0"></p>
                         <crowdin-button class="ml-1" primary onclick="window.open(subscriptionLink,'_blank')">Subscribe</crowdin-button>
                     </div>
                 </crowdin-alert>
             {{/if}}
-            {{#if infoModal}}
-            <crowdin-button icon-before="info" onclick="infoModal.open();">{{infoModal.title}}</crowdin-button>
-            {{/if}}
-            {{#if configurationFields}}
-            <crowdin-button icon-before="settings" onclick="settingsModal.open();fillSettingsForm();">Settings</crowdin-button>
-            {{/if}}
-            <crowdin-button icon-before="account_circle" onclick="integrationLogout()">Log out</crowdin-button>
-            {{#if uploadTranslations}}
+            <div class="top-button">
+                {{#if filtering}}
+                    <div class="integration-filter">
+                        <crowdin-integration-filter
+                            {{#if filtering.syncStatus}}
+                            enable-sync-status-filter
+                            {{/if}}
+                            integration-logo="logo.png"
+                        ></crowdin-integration-filter>
+                    </div>
+                {{/if}}
+
+                <div>
+                    {{#if infoModal}}
+                        <crowdin-button icon-before="info" onclick="infoModal.open();">{{infoModal.title}}</crowdin-button>
+                    {{/if}}
+                    {{#if configurationFields}}
+                        <crowdin-button icon-before="settings" onclick="settingsModal.open();fillSettingsForm();">Settings</crowdin-button>
+                    {{/if}}
+                    <crowdin-button icon-before="account_circle" onclick="integrationLogout()">Log out</crowdin-button>
+                </div>
+            </div>
+                {{#if uploadTranslations}}
                 <crowdin-alert id="translation-info" no-icon="true" style="display: none;">
                     <div class="box-center">
                         <p class="info-text">
@@ -31,7 +46,7 @@
                     </div>
                     <crowdin-button onclick="closeAlert(this)" class="dismiss-alert" icon>close</crowdin-button>
                 </crowdin-alert>
-            {{/if}}
+                {{/if}}
         </div>
         <crowdin-simple-integration
                 {{#if syncNewElements.crowdin}}
@@ -248,6 +263,11 @@
     const appComponent = document.querySelector('crowdin-simple-integration');
     const subscriptionModal = document.getElementById('subscription-modal');
 
+    {{#if filtering}}
+    let syncedFiles = [];
+    const filterIntegration = document.querySelector('crowdin-integration-filter');
+    {{/if}}
+
     const folderType = '0';
     const fileType = '1';
     const branchType = '2';
@@ -297,10 +317,16 @@
             .then((res) => {
                 project = res;
                 appComponent.setCrowdinLanguagesData(project.targetLanguages)
+                {{#if filtering}}
+                    filterIntegration.setLanguages(project.targetLanguages)
+                {{/if}}
             })
             {{#or withCronSync webhooks}}
                 .then(() => getSyncSettings('crowdin'))
             {{/or}}
+            {{#if filtering}}
+                .then(() => getSyncedFiles())
+            {{/if}}
             .catch(e => catchRejection(e, 'Can\'t fetch Crowdin data'))
             .finally(() => (appComponent.setAttribute('is-crowdin-loading', false)));
     }
@@ -761,6 +787,34 @@
         }
         checkAlert(translationInfo);
     {{/if}}
+
+    {{#if filtering}}
+    document.body.addEventListener("integrationFilterChange", filterFiles);
+
+    function filterFiles(event) {
+        const filter = event.detail;
+
+        if (filter.languages) {
+            const languageIds = filter.languages === 'all' ? [] : [filter.languages];
+            appComponent.filterCrowdinFilesByLanguages(languageIds);
+        }
+        if (filter.sync) {
+            const fileId = filter.sync === 'all' ? [] : syncedFiles;
+            appComponent.filterIntegrationFilesByIds(fileId, filter.sync !== 'not_synced');
+        }
+    }
+
+    function getSyncedFiles() {
+        checkOrigin()
+            .then(restParams => fetch('/api/synced-files' + restParams))
+            .then(checkResponse)
+            .then((res) => {
+                syncedFiles = res;
+            })
+            .catch(e => catchRejection(e, 'Can\'t fetch file progress'));
+    }
+
+    {{/if}}
 </script>
 
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.29.4",
+  "version": "0.30.0",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -15,11 +15,12 @@
   },
   "dependencies": {
     "@crowdin/crowdin-apps-functions": "0.5.1",
+    "@godaddy/terminus": "^4.12.1",
     "@types/pg": "^8.6.6",
     "amqplib": "^0.10.3",
     "crypto-js": "^4.0.0",
     "express": "4.18.2",
-    "express-handlebars": "^5.3.4",
+    "express-handlebars": "^5.3.5",
     "mysql2": "^2.3.3",
     "node-cron": "^3.0.2",
     "pg": "^8.10.0",
@@ -30,7 +31,7 @@
   },
   "devDependencies": {
     "@babel/preset-react": "^7.22.3",
-    "@emotion/react": "^11.10.6",
+    "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.10.6",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.11.12",
@@ -45,7 +46,7 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.0",
     "@types/amqplib": "^0.10.1",
-    "@types/crypto-js": "^4.0.0",
+    "@types/crypto-js": "^4.1.1",
     "@types/express": "4.17.17",
     "@types/express-handlebars": "^5.3.1",
     "@types/jest": "^29.5.2",
@@ -63,7 +64,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "^3.20.2",
-    "ts-jest": "^29.1.0",
+    "ts-jest": "^29.1.1",
     "typescript": "^4.9.5"
   },
   "repository": {