@crowdin/app-project-module 0.24.1 → 0.24.3

package/out/models/index.d.ts

@@ -370,19 +370,25 @@ export interface MessageResult<T> {
     message?: string;
 }
 export declare type TreeItem = File | Folder;
+/**
+ * 0 - folder
+ * 1 - file
+ * 2 - branch
+ */
+declare type IntegrationTreeElementType = '0' | '1' | '2';
 export interface File {
     id: string;
     name: string;
     type: SourceFilesModel.FileType;
     parentId?: string;
-    nodeType?: string;
+    nodeType?: IntegrationTreeElementType;
     customContent?: string;
 }
 export interface Folder {
     id: string;
     name: string;
     parentId?: string;
-    nodeType?: string;
+    nodeType?: IntegrationTreeElementType;
     customContent?: string;
 }
 export interface IntegrationRequest extends CrowdinClientRequest {

package/out/util/connection.js

@@ -66,7 +66,7 @@ function prepareCrowdinClient(config, credentials) {
             expire: (new Date().getTime() / 1000 + newCredentials.expiresIn).toString(),
             type: credentials.type,
         });
-        const token = (0, _1.decryptData)(config, credentials.accessToken);
+        const token = (0, _1.decryptData)(config, newCredentials.accessToken);
         return {
             client: new crowdin_api_client_1.default({ token, organization, baseUrl: (_b = config.crowdinUrls) === null || _b === void 0 ? void 0 : _b.apiUrl }),
             token,

package/out/util/defaults.js

@@ -50,6 +50,7 @@ exports.getOauthRoute = getOauthRoute;
 function applyDefaults(config, integration) {
     if (!integration.getCrowdinFiles) {
         integration.getCrowdinFiles = (projectId, client, rootFolder) => __awaiter(this, void 0, void 0, function* () {
+            const allBranches = (yield client.sourceFilesApi.withFetchAll().listProjectBranches(projectId)).data.map((d) => d.data);
             let allDirectories;
             if (rootFolder) {
                 allDirectories = (yield client.sourceFilesApi.withFetchAll().listProjectDirectories(projectId, {
@@ -67,7 +68,20 @@ function applyDefaults(config, integration) {
                 (!rootFolder && !f.directoryId));
             const res = [];
             allDirectories.forEach((e) => {
-                const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                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,
@@ -75,7 +89,20 @@ function applyDefaults(config, integration) {
                 });
             });
             files.forEach((e) => {
-                const parentId = rootFolder && e.directoryId === rootFolder.id ? undefined : e.directoryId;
+                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,

package/out/views/main.handlebars

@@ -175,6 +175,7 @@
 
     const folderType = '0';
     const fileType = '1';
+    const branchType = '2';
 
     let project = {};
     let crowdinData = [];
@@ -409,10 +410,14 @@
                 {{/if}}
             });
     }
+    {{else}}
+         const settingsModal = undefined;
     {{/if}}
 
     {{#if infoModal}}
          const infoModal = document.getElementById('info-modal');
+    {{else}}
+         const infoModal = undefined;
     {{/if}}
 
     document.addEventListener('keydown', (event) => {

package/package.json

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