@devtron-labs/devtron-fe-common-lib 0.0.17-beta-10 → 0.0.17-beta-12

package/dist/Common/Common.service.d.ts

@@ -6,8 +6,14 @@ interface UserRole extends ResponseType {
         superAdmin: boolean;
     };
 }
+export declare const SourceTypeMap: {
+    BranchFixed: string;
+    WEBHOOK: string;
+    BranchRegex: string;
+};
 export declare function getUserRole(appName?: string): Promise<UserRole>;
 export declare function setImageTags(request: any, pipelineId: number, artifactId: number): Promise<ResponseType>;
 export declare const getCDMaterials: (cdMaterialId: any, stageType: DeploymentNodeType, abortSignal: AbortSignal, isApprovalNode?: boolean, imageTag?: string) => Promise<any>;
 export declare function extractImage(image: string): string;
+export declare function createGitCommitUrl(url: string, revision: string): string;
 export {};

package/dist/index.js

@@ -22545,6 +22545,11 @@ var stageMap = {
     POSTCD: 'POST',
     APPROVAL: 'APPROVAL',
 };
+var SourceTypeMap = {
+    BranchFixed: 'SOURCE_TYPE_BRANCH_FIXED',
+    WEBHOOK: 'WEBHOOK',
+    BranchRegex: 'SOURCE_TYPE_BRANCH_REGEX',
+};
 function getUserRole(appName) {
     return get("".concat(ROUTES.USER_CHECK_ROLE).concat(appName ? "?appName=".concat(appName) : ''));
 }
@@ -22596,12 +22601,17 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
                     materialInfo: material.material_info
                         ? material.material_info.map(function (mat) {
                             return {
+                                modifiedTime: mat.modifiedTime ? moment(mat.modifiedTime).format("ddd, DD MMM YYYY, hh:mm A") : '',
+                                commitLink: createGitCommitUrl(mat.url, mat.revision),
                                 author: mat.author || '',
                                 message: mat.message || '',
                                 revision: mat.revision || '',
                                 tag: mat.tag || '',
                                 webhookData: mat.webhookData || '',
                                 url: mat.url || '',
+                                branch: (material.ciConfigureSourceType === SourceTypeMap.WEBHOOK
+                                    ? material.ciConfigureSourceValue
+                                    : mat.branch) || '',
                                 type: material.ciConfigureSourceType || '',
                             };
                         })
@@ -22616,6 +22626,30 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
 };
 function extractImage(image) {
     return image ? image.split(':').pop() : '';
+}
+function createGitCommitUrl(url, revision) {
+    if (!url || !revision) {
+        return "NA";
+    }
+    if (url.indexOf("gitlab") > 0 || url.indexOf("github") > 0 || url.indexOf("azure") > 0) {
+        var urlpart = url.split("@");
+        if (urlpart.length > 1) {
+            return "https://" + urlpart[1].split(".git")[0] + "/commit/" + revision;
+        }
+        if (urlpart.length == 1) {
+            return urlpart[0].split(".git")[0] + "/commit/" + revision;
+        }
+    }
+    if (url.indexOf("bitbucket") > 0) {
+        var urlpart = url.split("@");
+        if (urlpart.length > 1) {
+            return "https://" + urlpart[1].split(".git")[0] + "/commits/" + revision;
+        }
+        if (urlpart.length == 1) {
+            return urlpart[0].split(".git")[0] + "/commits/" + revision;
+        }
+    }
+    return "NA";
 }
 
 /*
@@ -23322,6 +23356,7 @@ exports.ScanVulnerabilitiesTable = ScanVulnerabilitiesTable;
 exports.ServerError = ServerError;
 exports.ServerErrors = ServerErrors;
 exports.SingleSelectOption = SingleSelectOption;
+exports.SourceTypeMap = SourceTypeMap;
 exports.StyledRadioGroup = RadioGroup;
 exports.TOAST_ACCESS_DENIED = TOAST_ACCESS_DENIED;
 exports.TOKEN_COOKIE_NAME = TOKEN_COOKIE_NAME;
@@ -23337,6 +23372,7 @@ exports.TriggerTypeMap = TriggerTypeMap;
 exports.URLS = URLS;
 exports.VisibleModal = VisibleModal;
 exports.VisibleModal2 = VisibleModal2;
+exports.createGitCommitUrl = createGitCommitUrl;
 exports.extractImage = extractImage;
 exports.get = get;
 exports.getAlphabetIcon = getAlphabetIcon;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.17-beta-10",
+    "version": "0.0.17-beta-12",
     "description": "Supporting common component library",
     "main": "dist/index.js",
     "scripts": {

package/src/Common/Common.service.ts

@@ -37,6 +37,12 @@ let stageMap = {
     APPROVAL: 'APPROVAL',
 }
 
+export const SourceTypeMap = {
+    BranchFixed: 'SOURCE_TYPE_BRANCH_FIXED',
+    WEBHOOK: 'WEBHOOK',
+    BranchRegex: 'SOURCE_TYPE_BRANCH_REGEX',
+}
+
 export function getUserRole(appName?: string): Promise<UserRole> {
     return get(`${ROUTES.USER_CHECK_ROLE}${appName ? `?appName=${appName}` : ''}`)
 }
@@ -95,12 +101,18 @@ export const getCDMaterials = (
                     materialInfo: material.material_info
                         ? material.material_info.map((mat) => {
                             return {
+                                modifiedTime: mat.modifiedTime ? moment(mat.modifiedTime).format("ddd, DD MMM YYYY, hh:mm A") : '',
+                                commitLink: createGitCommitUrl(mat.url, mat.revision),
                                 author: mat.author || '',
                                 message: mat.message || '',
                                 revision: mat.revision || '',
                                 tag: mat.tag || '',
                                 webhookData: mat.webhookData || '',
                                 url: mat.url || '',
+                                branch:
+                                    (material.ciConfigureSourceType === SourceTypeMap.WEBHOOK
+                                        ? material.ciConfigureSourceValue
+                                        : mat.branch) || '',
                                 type: material.ciConfigureSourceType || '',
                             }
                         })
@@ -116,4 +128,29 @@ export const getCDMaterials = (
 
 export function extractImage(image: string): string {
     return image ? image.split(':').pop() : ''
-}
+}
+
+export function createGitCommitUrl(url: string, revision: string): string {
+    if (!url || !revision) {
+        return "NA"
+    }
+    if (url.indexOf("gitlab") > 0 || url.indexOf("github") > 0 || url.indexOf("azure") > 0) {
+        let urlpart = url.split("@")
+        if (urlpart.length > 1) {
+            return "https://" + urlpart[1].split(".git")[0] + "/commit/" + revision
+        }
+        if (urlpart.length == 1) {
+            return urlpart[0].split(".git")[0] + "/commit/" + revision
+        }
+    }
+    if (url.indexOf("bitbucket") > 0) {
+        let urlpart = url.split("@")
+        if (urlpart.length > 1) {
+            return "https://" + urlpart[1].split(".git")[0] + "/commits/" + revision
+        }
+        if (urlpart.length == 1) {
+            return urlpart[0].split(".git")[0] + "/commits/" + revision
+        }
+    }
+    return "NA"
+}