@crowdin/app-project-module 0.82.0 → 0.82.1

package/out/index.js

@@ -220,28 +220,26 @@ function addCrowdinEndpoints(app, clientConfig) {
 }
 exports.addCrowdinEndpoints = addCrowdinEndpoints;
 function addFormSchema({ app, config }) {
-    let moduleConfigWithForm = null;
     for (const moduleKey of Object.keys(config)) {
         const moduleConfig = config[moduleKey];
         if ((0, form_schema_1.hasFormSchema)(moduleConfig)) {
-            moduleConfigWithForm = (0, form_schema_1.getLowCodeUiConfigFromModuleConfig)(moduleConfig);
-            break;
+            const moduleConfigWithForm = (0, form_schema_1.getLowCodeUiConfigFromModuleConfig)(moduleConfig);
+            if (moduleConfigWithForm) {
+                app.get(`/api/${moduleConfigWithForm.key}/form-data`, json_response_1.default, (0, crowdin_client_1.default)({
+                    config,
+                    optional: false,
+                    checkSubscriptionExpiration: true,
+                    moduleKey: moduleConfigWithForm.key,
+                }), (0, credentials_masker_1.getRequestCredentialsMasker)({ moduleConfig: moduleConfigWithForm }), (0, form_data_display_1.default)(config));
+                app.post(`/api/${moduleConfigWithForm.key}/form-data`, (0, crowdin_client_1.default)({
+                    config,
+                    optional: false,
+                    checkSubscriptionExpiration: true,
+                    moduleKey: moduleConfigWithForm.key,
+                }), (0, credentials_masker_1.postRequestCredentialsMasker)(moduleConfigWithForm), (0, form_data_save_1.default)(config));
+            }
         }
     }
-    if (moduleConfigWithForm) {
-        app.get('/api/form-data', json_response_1.default, (0, crowdin_client_1.default)({
-            config,
-            optional: false,
-            checkSubscriptionExpiration: true,
-            moduleKey: moduleConfigWithForm.key,
-        }), (0, credentials_masker_1.getRequestCredentialsMasker)({ moduleConfig: moduleConfigWithForm }), (0, form_data_display_1.default)(config));
-        app.post('/api/form-data', (0, crowdin_client_1.default)({
-            config,
-            optional: false,
-            checkSubscriptionExpiration: true,
-            moduleKey: moduleConfigWithForm.key,
-        }), (0, credentials_masker_1.postRequestCredentialsMasker)(moduleConfigWithForm), (0, form_data_save_1.default)(config));
-    }
 }
 function convertClientConfig(clientConfig) {
     const baseUrl = clientConfig.baseUrl || process.env.URL;

package/out/middlewares/render-ui-module.js

@@ -18,8 +18,12 @@ function handle(moduleConfig) {
     return (0, util_1.runAsyncWrapper)((req, res, next) => __awaiter(this, void 0, void 0, function* () {
         if (moduleConfig.formSchema) {
             return res.render('form', {
-                formGetDataUrl: moduleConfig.formGetDataUrl ? moduleConfig.formGetDataUrl : '/api/form-data',
-                formPostDataUrl: moduleConfig.formPostDataUrl ? moduleConfig.formPostDataUrl : '/api/form-data',
+                formGetDataUrl: moduleConfig.formGetDataUrl
+                    ? moduleConfig.formGetDataUrl
+                    : `/api/${moduleConfig.key}/form-data`,
+                formPostDataUrl: moduleConfig.formPostDataUrl
+                    ? moduleConfig.formPostDataUrl
+                    : `/api/${moduleConfig.key}/form-data`,
                 formSchema: JSON.stringify(moduleConfig.formSchema),
                 formUiSchema: moduleConfig.formUiSchema ? JSON.stringify(moduleConfig.formUiSchema) : '{}',
             });

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

@@ -130,7 +130,7 @@ exports.runUpdateProviderJob = runUpdateProviderJob;
 function filesCron({ config, integration, period, }) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, logger_1.log)(`Starting files cron job with period [${period}]`);
-        const syncSettingsList = yield (0, storage_1.getStorage)().getAllSyncSettingsByType('schedule');
+        const syncSettingsList = yield (0, storage_1.getStorage)().getSyncSettingsBySchedule('schedule', period);
         const crowdinSyncSettings = syncSettingsList.filter((syncSettings) => syncSettings.provider === types_1.Provider.CROWDIN);
         const integrationSyncSettings = syncSettingsList.filter((syncSettings) => syncSettings.provider === types_1.Provider.INTEGRATION);
         yield Promise.all(crowdinSyncSettings.map((syncSettings) => processSyncSettings({ config, integration, period, syncSettings })));

package/out/storage/index.d.ts

@@ -36,7 +36,7 @@ export interface Storage {
     getAllMetadata(): Promise<any[] | undefined>;
     deleteMetadata(id: string): Promise<void>;
     getSyncSettingsByProvider(integrationId: string, provider: Provider): Promise<IntegrationSyncSettings | undefined>;
-    getAllSyncSettingsByType(type: string): Promise<IntegrationSyncSettings[]>;
+    getSyncSettingsBySchedule(type: string, schedule: string): Promise<IntegrationSyncSettings[]>;
     saveSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: Provider): Promise<void>;
     updateSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: Provider): Promise<void>;
     getSyncSettings(integrationId: string, crowdinId: string, type: string, provider: Provider): Promise<IntegrationSyncSettings | undefined>;

package/out/storage/mysql.d.ts

@@ -52,7 +52,7 @@ export declare class MySQLStorage implements Storage {
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;
     getSyncSettingsByProvider(integrationId: string, provider: string): Promise<IntegrationSyncSettings | undefined>;
-    getAllSyncSettingsByType(type: string): Promise<IntegrationSyncSettings[]>;
+    getSyncSettingsBySchedule(type: string, schedule: string): Promise<IntegrationSyncSettings[]>;
     saveSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     updateSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     getSyncSettings(integrationId: string, crowdinId: string, type: string, provider: string): Promise<IntegrationSyncSettings | undefined>;

package/out/storage/mysql.js

@@ -356,11 +356,20 @@ class MySQLStorage {
             }));
         });
     }
-    getAllSyncSettingsByType(type) {
+    getSyncSettingsBySchedule(type, schedule) {
         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, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE type = ?', [type]);
+                const [rows] = yield connection.execute(`
+                    SELECT s.id, s.files, s.integration_id as "integrationId", s.crowdin_id as "crowdinId", s.type, s.provider 
+                    FROM sync_settings s
+                    INNER JOIN integration_settings i ON s.integration_id = i.integration_id
+                    WHERE s.type = ?
+                        AND CASE 
+                            WHEN i.config IS NULL THEN false
+                            ELSE JSON_EXTRACT(i.config, '$.schedule') = ?
+                        END
+                `, [type, schedule]);
                 return rows || [];
             }));
         });

package/out/storage/postgre.d.ts

@@ -66,7 +66,7 @@ export declare class PostgreStorage implements Storage {
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;
     getSyncSettingsByProvider(integrationId: string, provider: string): Promise<IntegrationSyncSettings | undefined>;
-    getAllSyncSettingsByType(type: string): Promise<IntegrationSyncSettings[]>;
+    getSyncSettingsBySchedule(type: string, schedule: string): Promise<IntegrationSyncSettings[]>;
     saveSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     updateSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     getSyncSettings(integrationId: string, crowdinId: string, type: string, provider: string): Promise<IntegrationSyncSettings | undefined>;

package/out/storage/postgre.js

@@ -439,11 +439,20 @@ class PostgreStorage {
             }));
         });
     }
-    getAllSyncSettingsByType(type) {
+    getSyncSettingsBySchedule(type, schedule) {
         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, files, integration_id as "integrationId", crowdin_id as "crowdinId", type, provider FROM sync_settings WHERE type = $1', [type]);
+                const res = yield client.query(`
+                    SELECT s.id, s.files, s.integration_id as "integrationId", s.crowdin_id as "crowdinId", s.type, s.provider 
+                    FROM sync_settings s
+                    INNER JOIN integration_settings i ON s.integration_id = i.integration_id
+                    WHERE s.type = $1
+                        AND CASE 
+                            WHEN i.config IS NULL THEN false
+                            ELSE (i.config::json->>'schedule') = $2
+                        END
+                `, [type, schedule]);
                 return (res === null || res === void 0 ? void 0 : res.rows) || [];
             }));
         });

package/out/storage/sqlite.d.ts

@@ -55,7 +55,7 @@ export declare class SQLiteStorage implements Storage {
     getAllMetadata(): Promise<any[]>;
     deleteMetadata(id: string): Promise<void>;
     getSyncSettingsByProvider(integrationId: string, provider: string): Promise<IntegrationSyncSettings | undefined>;
-    getAllSyncSettingsByType(type: string): Promise<IntegrationSyncSettings[]>;
+    getSyncSettingsBySchedule(type: string, schedule: string): Promise<IntegrationSyncSettings[]>;
     saveSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     updateSyncSettings(files: any, integrationId: string, crowdinId: string, type: string, provider: string): Promise<void>;
     getSyncSettings(integrationId: string, crowdinId: string, type: string, provider: string): Promise<IntegrationSyncSettings | undefined>;

package/out/storage/sqlite.js

@@ -432,8 +432,17 @@ class SQLiteStorage {
             }
         });
     }
-    getAllSyncSettingsByType(type) {
-        return this.each('SELECT id, files, integration_id as integrationId, crowdin_id as crowdinId, type, provider FROM sync_settings WHERE type = ?', [type]);
+    getSyncSettingsBySchedule(type, schedule) {
+        return this.each(`
+                SELECT s.id, s.files, s.integration_id as integrationId, s.crowdin_id as crowdinId, s.type, s.provider 
+                FROM sync_settings s
+                INNER JOIN integration_settings i ON s.integration_id = i.integration_id
+                WHERE s.type = ?
+                    AND CASE 
+                        WHEN i.config IS NULL THEN 0
+                        ELSE json_extract(i.config, '$.schedule') = ?
+                    END
+            `, [type, schedule]);
     }
     saveSyncSettings(files, integrationId, crowdinId, type, provider) {
         return this.run('INSERT INTO sync_settings(files, integration_id, crowdin_id, type, provider) VALUES (?, ?, ?, ?, ?)', [files, integrationId, crowdinId, type, provider]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.82.0",
+  "version": "0.82.1",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",