@devtron-labs/devtron-fe-common-lib 0.0.33-beta-4 → 0.0.33-beta-6

package/dist/Common/Types.d.ts

@@ -224,6 +224,8 @@ export interface CDMaterialType {
     artifactStatus?: string;
     filterState: FilterStates;
     scanToolId?: number;
+    appliedFiltersTimestamp?: string;
+    appliedFilters?: FilterConditionsListType[];
 }
 export declare enum CDMaterialServiceEnum {
     ROLLBACK = "rollback",
@@ -358,6 +360,7 @@ export interface CDMaterialsMetaInfo {
     appReleaseTagNames: string[];
     hideImageTaggingHardDelete: boolean;
     resourceFilters?: FilterConditionsListType[];
+    totalCount: number;
 }
 export interface CDMaterialResponseType extends CDMaterialsMetaInfo, CDMaterialsApprovalInfo {
     materials: CDMaterialType[];

package/dist/index.js

@@ -22686,6 +22686,12 @@ var getTeamListMin = function () {
         };
     });
 };
+var stageMap = {
+    PRECD: 'PRE',
+    CD: 'DEPLOY',
+    POSTCD: 'POST',
+    APPROVAL: 'APPROVAL',
+};
 var SourceTypeMap = {
     BranchFixed: 'SOURCE_TYPE_BRANCH_FIXED',
     WEBHOOK: 'WEBHOOK',
@@ -22717,11 +22723,11 @@ var processURL = function (url, params) {
 var cdMaterialListModal = function (artifacts, offset, artifactId, artifactStatus) {
     if (!artifacts || !artifacts.length)
         return [];
-    var markFirstSelected = offset === 1;
-    var startIndex = offset - 1;
+    var markFirstSelected = offset === 0;
+    var startIndex = offset;
     var isImageMarked = false;
     var materials = artifacts.map(function (material, index) {
-        var _a;
+        var _a, _b, _c;
         var artifactStatusValue = '';
         var filterState = (_a = material.filterState) !== null && _a !== void 0 ? _a : exports.FilterStates.ALLOWED;
         if (artifactId && artifactStatus && material.id === artifactId) {
@@ -22782,6 +22788,8 @@ var cdMaterialListModal = function (artifacts, offset, artifactId, artifactStatu
                 })
                 : [],
             filterState: filterState,
+            appliedFiltersTimestamp: (_b = material.appliedFiltersTimestamp) !== null && _b !== void 0 ? _b : '',
+            appliedFilters: (_c = material.appliedFilters) !== null && _c !== void 0 ? _c : []
         };
     });
     return materials;
@@ -22801,13 +22809,14 @@ var processCDMaterialsApprovalInfo = function (enableApproval, cdMaterialsResult
     };
 };
 var processCDMaterialsMetaInfo = function (cdMaterialsResult) {
-    var _a;
+    var _a, _b;
     if (!cdMaterialsResult) {
         return {
             tagsEditable: false,
             appReleaseTagNames: [],
             hideImageTaggingHardDelete: false,
             resourceFilters: [],
+            totalCount: 0,
         };
     }
     return {
@@ -22815,13 +22824,14 @@ var processCDMaterialsMetaInfo = function (cdMaterialsResult) {
         tagsEditable: cdMaterialsResult.tagsEditable,
         hideImageTaggingHardDelete: cdMaterialsResult.hideImageTaggingHardDelete,
         resourceFilters: (_a = cdMaterialsResult.resourceFilters) !== null && _a !== void 0 ? _a : [],
+        totalCount: (_b = cdMaterialsResult.totalCount) !== null && _b !== void 0 ? _b : 0,
     };
 };
 var processCDMaterialServiceResponse = function (cdMaterialsResult, stage, offset, filter) {
     if (!cdMaterialsResult) {
         return __assign(__assign({ materials: [] }, processCDMaterialsMetaInfo(cdMaterialsResult)), processCDMaterialsApprovalInfo(false, cdMaterialsResult));
     }
-    var materials = cdMaterialListModal(cdMaterialsResult.ci_artifacts, offset !== null && offset !== void 0 ? offset : 1, cdMaterialsResult.latest_wf_artifact_id, cdMaterialsResult.latest_wf_artifact_status);
+    var materials = cdMaterialListModal(cdMaterialsResult.ci_artifacts, offset !== null && offset !== void 0 ? offset : 0, cdMaterialsResult.latest_wf_artifact_id, cdMaterialsResult.latest_wf_artifact_status);
     var approvalInfo = processCDMaterialsApprovalInfo(stage === exports.DeploymentNodeType.CD || stage === exports.DeploymentNodeType.APPROVAL, cdMaterialsResult);
     var metaInfo = processCDMaterialsMetaInfo(cdMaterialsResult);
     // TODO: On update of service would remove from here
@@ -22847,11 +22857,11 @@ var genericCDMaterialsService = function (serviceType, cdMaterialID, stage, sign
             break;
         // Meant for handling getCDMaterialList
         default:
-            URL = processURL("".concat(ROUTES.CD_MATERIAL_GET, "/").concat(cdMaterialID, "/material"), __assign(__assign({}, manipulatedParams), { stage: stage }));
+            URL = processURL("".concat(ROUTES.CD_MATERIAL_GET, "/").concat(cdMaterialID, "/material"), __assign(__assign({}, manipulatedParams), { stage: stageMap[stage] }));
             break;
     }
     return get(URL, { signal: signal }).then(function (response) {
-        return processCDMaterialServiceResponse(response.result, stage, manipulatedParams.offset, manipulatedParams.filter);
+        return processCDMaterialServiceResponse(response.result, stage, queryParams.offset, queryParams.filter);
     });
 };
 function extractImage(image) {

package/package.json

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

package/src/Common/Common.service.ts

@@ -43,7 +43,7 @@ interface UserRole extends ResponseType {
     }
 }
 
-let stageMap = {
+const stageMap = {
     PRECD: 'PRE',
     CD: 'DEPLOY',
     POSTCD: 'POST',
@@ -88,11 +88,11 @@ const processURL = (url: string, params: object) => {
 const cdMaterialListModal = (artifacts: any[], offset: number, artifactId?: number, artifactStatus?: string) => {
     if (!artifacts || !artifacts.length) return []
 
-    const markFirstSelected = offset === 1
-    const startIndex = offset - 1
+    const markFirstSelected = offset === 0
+    const startIndex = offset
     let isImageMarked = false
 
-    const materials: CDMaterialType[] = artifacts.map((material, index) => {
+    const materials = artifacts.map((material, index) => {
         let artifactStatusValue = ''
         const filterState = material.filterState ?? FilterStates.ALLOWED
 
@@ -158,6 +158,8 @@ const cdMaterialListModal = (artifacts: any[], offset: number, artifactId?: numb
                   })
                 : [],
             filterState,
+            appliedFiltersTimestamp: material.appliedFiltersTimestamp ?? '',
+            appliedFilters: material.appliedFilters ?? []
         }
     })
     return materials
@@ -186,6 +188,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
             appReleaseTagNames: [],
             hideImageTaggingHardDelete: false,
             resourceFilters: [],
+            totalCount: 0,
         }
     }
 
@@ -194,6 +197,7 @@ const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
         tagsEditable: cdMaterialsResult.tagsEditable,
         hideImageTaggingHardDelete: cdMaterialsResult.hideImageTaggingHardDelete,
         resourceFilters: cdMaterialsResult.resourceFilters ?? [],
+        totalCount: cdMaterialsResult.totalCount ?? 0,
     }
 }
 
@@ -213,7 +217,7 @@ const processCDMaterialServiceResponse = (
 
     const materials = cdMaterialListModal(
         cdMaterialsResult.ci_artifacts,
-        offset ?? 1,
+        offset ?? 0,
         cdMaterialsResult.latest_wf_artifact_id,
         cdMaterialsResult.latest_wf_artifact_status,
     )
@@ -261,12 +265,12 @@ export const genericCDMaterialsService = (
 
         // Meant for handling getCDMaterialList
         default:
-            URL = processURL(`${ROUTES.CD_MATERIAL_GET}/${cdMaterialID}/material`, { ...manipulatedParams, stage })
+            URL = processURL(`${ROUTES.CD_MATERIAL_GET}/${cdMaterialID}/material`, { ...manipulatedParams, stage: stageMap[stage] })
             break
     }
 
     return get(URL, { signal }).then((response) => {
-        return processCDMaterialServiceResponse(response.result, stage, manipulatedParams.offset, manipulatedParams.filter)
+        return processCDMaterialServiceResponse(response.result, stage, queryParams.offset, queryParams.filter)
     })
 }
 

package/src/Common/Types.ts

@@ -249,6 +249,8 @@ export interface CDMaterialType {
     filterState: FilterStates
     // Not even coming from API but required in CDMaterials for Security which makes its own api call but stores data in CDMaterials
     scanToolId?: number
+    appliedFiltersTimestamp?: string
+    appliedFilters?: FilterConditionsListType[]
 }
 
 export enum CDMaterialServiceEnum {
@@ -397,6 +399,7 @@ export interface CDMaterialsMetaInfo {
     appReleaseTagNames: string[]
     hideImageTaggingHardDelete: boolean
     resourceFilters?: FilterConditionsListType[]
+    totalCount: number
 }
 
 export interface CDMaterialResponseType extends CDMaterialsMetaInfo, CDMaterialsApprovalInfo {