@crowdin/app-project-module 0.73.0 → 0.73.2

package/out/modules/integration/handlers/job-info.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="qs" />
 import { Response } from 'express';
-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;
+import { Config } from '../../../types';
+export default function handle(config: Config): (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/job-info.js

@@ -12,6 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../util/types");
 const util_1 = require("../../../util");
 const storage_1 = require("../../../storage");
+const cron_1 = require("../util/cron");
+const defaults_1 = require("../util/defaults");
+const connection_1 = require("../../../util/connection");
+const MINUTES = 60;
 function getHumanETA(ms) {
     const seconds = Math.floor(ms / 1000);
     let minutes = Math.floor(seconds / 60);
@@ -29,7 +33,7 @@ function getHumanETA(ms) {
     }
     return `About ${timeParts.join(' and ')} remaining`;
 }
-function handle() {
+function handle(config) {
     return (0, util_1.runAsyncWrapper)((req, res) => __awaiter(this, void 0, void 0, function* () {
         const id = req.query.job_id || req.body.job_id;
         if (!id) {
@@ -47,6 +51,37 @@ function handle() {
             job.eta = ((Date.now() - job.createdAt) / job.progress) * (100 - job.progress);
             job.info = getHumanETA(job.eta) + (job.info ? `\n${job.info}` : '');
         }
+        if (job && (job === null || job === void 0 ? void 0 : job.updatedAt) && Date.now() - job.updatedAt >= MINUTES * 60 * 1000) {
+            const context = req.crowdinContext;
+            const projectId = context.jwtPayload.context.project_id;
+            const integration = config.projectIntegration;
+            const crowdinId = req.crowdinContext.crowdinId;
+            const integrationId = req.crowdinContext.clientId;
+            const integrationCredentials = yield (0, storage_1.getStorage)().getIntegrationCredentials(integrationId);
+            const credentials = yield (0, connection_1.prepareIntegrationCredentials)(config, integration, integrationCredentials);
+            const integrationConfig = yield (0, storage_1.getStorage)().getIntegrationConfig(integrationId);
+            const intConfig = (integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.config)
+                ? JSON.parse(integrationConfig.config)
+                : { schedule: '0', condition: '0' };
+            const rootFolder = yield (0, defaults_1.getRootFolder)(config, integration, req.crowdinApiClient, projectId);
+            req.logInfo(`Restarting the job after no updates for more than ${MINUTES} minutes.`);
+            return (0, cron_1.runUpdateProviderJob)({
+                integrationId,
+                crowdinId,
+                type: job.type,
+                title: job.title,
+                payload: JSON.parse(job.payload),
+                jobType: types_1.JobClientType.RERUN,
+                projectId,
+                client: req.crowdinApiClient,
+                integration,
+                context,
+                credentials,
+                rootFolder,
+                appSettings: intConfig,
+                reRunJobId: id,
+            });
+        }
         req.logInfo(`Returning job info ${JSON.stringify(job, null, 2)}`);
         res.send(job);
     }));

package/out/modules/integration/index.js

@@ -93,7 +93,7 @@ function register({ config, app }) {
         optional: false,
         checkSubscriptionExpiration: true,
         moduleKey: integrationLogic.key,
-    }), (0, job_info_1.default)());
+    }), (0, job_info_1.default)(config));
     app.delete('/api/jobs', json_response_1.default, (0, crowdin_client_1.default)({
         config,
         optional: false,

package/out/static/css/styles.css

@@ -323,16 +323,20 @@ th {
 }
 
 .badge-will-be-granted {
-    background-color: var(--crowdin-warning-bg);
-    color: var(--crowdin-warning);
+    background-color: var(--crowdin-info);
+    color: var(--crowdin-white);
 }
 
 .badge-not-available {
-    background-color: var(--crowdin-danger);
-    color: var(--crowdin-white);
+    background-color: var(--crowdin-warning-bg);
+    color: var(--crowdin-warning);
 }
 
 .status {
     position: relative;
     text-align: right;
 }
+
+.text-warning {
+    color: var(--crowdin-warning) !important;
+}

package/out/views/main.handlebars

@@ -36,7 +36,7 @@
             <div id="buttons">
                 <crowdin-button id="show-integration-btn" class="hidden" icon-before="arrow_back" onclick="showIntegration();">Integration</crowdin-button>
                 <crowdin-button id="show-error-logs-btn" icon-before="list" onclick="showErrorLogs();">Error logs</crowdin-button>
-                <crowdin-button icon-before="manage_accounts" onclick="showPermissionsDialog()">Permissions</crowdin-button>
+                <crowdin-button icon-before="link" onclick="showPermissionsDialog()">Share</crowdin-button>
                 {{#if infoModal}}
                     <crowdin-button icon-before="info" onclick="openModal(infoModal);">{{infoModal.title}}</crowdin-button>
                 {{/if}}
@@ -120,7 +120,7 @@
     <crowdin-modal
         style="display: none;"
         id="permissions-modal"
-        modal-title="Permissions"
+        modal-title="Share"
         close-button-title="Close"
         close-button
         body-overflow-unset
@@ -148,9 +148,9 @@
                     <table>
                         <thead>
                             <tr>
-                                <th style="width: 40%;">Permission Type (Upcoming changes)</th>
+                                <th style="width: 40%;">Access</th>
                                 <th style="width: 35%;">Users</th>
-                                <th class="status" style="width: 20%;">Status</th>
+                                <th class="status" style="width: 20%;">Upcoming changes</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -172,8 +172,8 @@
                             </tr>
                             <tr class="application-settings-invite">
                                 <td>
-                                    <crowdin-p>Application Access</crowdin-p>
-                                    <div class="permission-description">{{name}} installation settings will be updated.</div>
+                                    <crowdin-p>Application Visibility Access</crowdin-p>
+                                    <div class="permission-description"></div>
                                 </td>
                                 <td class="affected-users"></td>
                                 <td class="status"></td>
@@ -181,7 +181,7 @@
                             <tr class="application-credentials-invite">
                                 <td>
                                     <crowdin-p>Access to the Integration</crowdin-p>
-                                    <div class="permission-description">{{name}} settings will be updated.</div>
+                                    <div class="permission-description">This provides access to sync files and modify the current integration settings.</div>
                                 </td>
                                 <td class="affected-users"></td>
                                 <td class="status"></td>
@@ -194,7 +194,7 @@
                         <crowdin-input
                             with-fixed-height
                             label="Zen Mode link"
-                            help-text="This focused view allows you to concentrate solely on the Integrations section, eliminating distractions and providing a streamlined experience for managing your project integrations."
+                            help-text="This focused view allows you to concentrate solely on the Integrations section, eliminating other distractions."
                             value="{{zenModeUrl}}"
                             name="zenModeLink"
                             with-copy-button
@@ -953,7 +953,6 @@
                 .then(restParams => fetch('api/users' + restParams))
                 .then(checkResponse)
                 .then((res) => {
-                console.log(res)
                     let userOptions = res.data.users.map(user => `<option value="${user.id}">${user.name}</option>`).join('');
                     select.innerHTML = userOptions;
                     select.value = JSON.stringify(res.data.managers);
@@ -1008,13 +1007,13 @@
             const projectInvite = document.querySelector('.project-invite');
             const applicationCredentialsInvite = document.querySelector('.application-credentials-invite');
 
-            const grantedElement = '<span class="badge badge-granted">Available</span>';
+            const grantedElement = '<crowdin-p>&horbar;</crowdin-p>';
             const willGrantedElement = '<span class="badge badge-will-be-granted">Will Be Granted</span>';
-            const notAvailableElement = '<span class="badge badge-not-available">Manual Action Required</span>';
+            const notAvailableElement = '<span class="badge badge-not-available">Action Required</span>';
 
             // only in enterprise
             if (organizationInvite) {
-                const organizationWillGrantElement = '<span class="badge badge-will-be-granted">Will be registered</span>';
+                 const organizationWillGrantElement = `<span class="badge badge-will-be-granted">Will Be Registered</span>`;
 
                 processUsersWhoWillBeInvited(organizationInvite, usersData.usersWhoWillBeInvitedToOrganization, organizationWillGrantElement, grantedElement);
             }
@@ -1040,7 +1039,7 @@
                 userList.innerHTML = affectedUsers;
             } else {
                 tooltip.innerHTML = alreadyGrantedMessage;
-                userList.innerHTML = '<crowdin-p>&horbar;</crowdin-p>';
+                userList.innerHTML = alreadyGrantedMessage;
             }
         }
 
@@ -1048,23 +1047,30 @@
             const applicationSettingsInvite = document.querySelector('.application-settings-invite');
 
             const tooltip = applicationSettingsInvite.querySelector('.status');
+            const description = applicationSettingsInvite.querySelector('.permission-description');
             const userList = applicationSettingsInvite.querySelector('.affected-users');
 
+            let descriptionMessage = 'This can be configured in organization settings (Apps section).';
+            description.classList.remove('text-warning');
+            description.innerText = descriptionMessage;
+
             let affectedUsers = '<ul>';
 
             if (!usersData.editApplicationAvailable) {
-                tooltip.innerHTML = `<crowdin-tooltip
-                    position="left"
-                    tooltip=">The application doesn't have permission to update this setting.">
-                        ${notAvailableElement}
-                    </crowdin-tooltip>`;
+                descriptionMessage += ' The application doesn\'t have permission to update this setting.';
+                descriptionMessage += usersData.isAdmin ? ' Please reinstall the app.' : ' Please ask the organization admin to reinstall the app.';
+
+                description.classList.add('text-warning');
+                description.innerText = descriptionMessage;
+
+                tooltip.innerHTML = notAvailableElement;
                 for (const user of usersData.usersWhoNotIssetInApplicationInstallation) {
                     affectedUsers += `<li><crowdin-p>${user.name}</crowdin-p></li>`;
                 }
                 userList.innerHTML = affectedUsers + '</ul>';
             } else if (!usersData.usersWhoNotIssetInApplicationInstallation.length) {
                 tooltip.innerHTML = grantedElement;
-                userList.innerHTML = '<crowdin-p>&horbar;</crowdin-p>';
+                userList.innerHTML = grantedElement;
             } else {
                 if (usersData.isAdmin) {
                     tooltip.innerHTML = willGrantedElement;
@@ -1073,11 +1079,12 @@
                     }
                     userList.innerHTML = affectedUsers + '</ul>';
                 } else {
-                    tooltip.innerHTML = `<crowdin-tooltip
-                        position="left"
-                        tooltip="Only organization admins have permission to update this setting.">
-                            ${notAvailableElement}
-                        </crowdin-tooltip>`;
+                    descriptionMessage += ' Only organization admins have permission to update this setting.';
+
+                    description.classList.add('text-warning');
+                    description.innerText = descriptionMessage;
+
+                    tooltip.innerHTML = notAvailableElement;
                     for (const user of usersData.usersWhoNotIssetInApplicationInstallation) {
                         affectedUsers += `<li><crowdin-p>${user.name}</crowdin-p></li>`;
                     }

package/package.json

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