@devtron-labs/devtron-fe-common-lib 0.0.28-beta-1 → 0.0.28-beta-2

package/dist/Common/Types.d.ts

@@ -192,11 +192,6 @@ export interface UserApprovalMetadataType {
     approvedUsersData: ApprovalUserDataType[];
     requestedUserData: ApprovalUserDataType;
 }
-export declare enum FilterStates {
-    BLOCKED = 0,
-    ALLOWED = 1,
-    ERROR = 2
-}
 export interface CDMaterialType {
     index: number;
     id: string;
@@ -222,7 +217,6 @@ export interface CDMaterialType {
     imageComment?: ImageComment;
     imageReleaseTags?: ReleaseTag[];
     artifactStatus?: string;
-    filterState: FilterStates;
 }
 export interface CommonNodeAttr {
     connectingCiPipelineId?: number;
@@ -248,6 +242,7 @@ export interface CommonNodeAttr {
     colorCode?: string;
     isExternalCI?: boolean;
     isLinkedCI?: boolean;
+    isJobCI?: boolean;
     environmentName?: string;
     environmentId?: number;
     inputMaterialList?: any[];

package/dist/index.js

@@ -424,12 +424,6 @@ exports.DeploymentNodeType = void 0;
     DeploymentNodeType["POSTCD"] = "POSTCD";
     DeploymentNodeType["APPROVAL"] = "APPROVAL";
 })(exports.DeploymentNodeType || (exports.DeploymentNodeType = {}));
-exports.FilterStates = void 0;
-(function (FilterStates) {
-    FilterStates[FilterStates["BLOCKED"] = 0] = "BLOCKED";
-    FilterStates[FilterStates["ALLOWED"] = 1] = "ALLOWED";
-    FilterStates[FilterStates["ERROR"] = 2] = "ERROR";
-})(exports.FilterStates || (exports.FilterStates = {}));
 exports.DeploymentAppTypes = void 0;
 (function (DeploymentAppTypes) {
     DeploymentAppTypes["HELM"] = "helm";
@@ -22573,7 +22567,6 @@ function getUserRole(appName) {
 function setImageTags(request, pipelineId, artifactId) {
     return post("".concat(ROUTES.IMAGE_TAGGING, "/").concat(pipelineId, "/").concat(artifactId), request);
 }
-// TODO: Add enum for filterState as well
 var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalNode, imageTag) {
     var URL = (!imageTag) ? "app/cd-pipeline/".concat(cdMaterialId, "/material?stage=").concat(stageMap[stageType]) : "app/cd-pipeline/".concat(cdMaterialId, "/material?stage=").concat(stageMap[stageType], "&search=").concat(imageTag);
     return get(URL, {
@@ -22588,9 +22581,7 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
         }
         else {
             var materials = artifacts.map(function (material, index) {
-                var _a;
                 var artifactStatusValue = '';
-                var filterState = (_a = material.filterState) !== null && _a !== void 0 ? _a : exports.FilterStates.ALLOWED;
                 return {
                     index: index,
                     id: material.id,
@@ -22610,7 +22601,7 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
                     vulnerabilitiesLoading: true,
                     scanned: material.scanned,
                     scanEnabled: material.scanEnabled,
-                    isSelected: !material.vulnerable && filterState === exports.FilterStates.ALLOWED && index === 0,
+                    isSelected: !material.vulnerable && index === 0,
                     vulnerable: material.vulnerable,
                     runningOnParentCd: material.runningOnParentCd,
                     artifactStatus: artifactStatusValue,
@@ -22637,7 +22628,6 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
                             };
                         })
                         : [],
-                    filterState: filterState,
                 };
             });
             return {

package/package.json

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

package/src/Common/Common.service.ts

@@ -2,7 +2,7 @@ import moment from 'moment';
 import {get, post} from './Api';
 import { ROUTES } from './Constants'
 import { sortCallback } from './Helper';
-import { TeamList ,ResponseType, DeploymentNodeType, CDModalTab, FilterStates } from './Types';
+import { TeamList ,ResponseType, DeploymentNodeType, CDModalTab } from './Types';
 
 export const getTeamListMin = (): Promise<TeamList> => {
   // ignore active field
@@ -51,7 +51,6 @@ export function setImageTags(request, pipelineId: number, artifactId: number){
     return post(`${ROUTES.IMAGE_TAGGING}/${pipelineId}/${artifactId}`,request )
 }
 
-// TODO: Add enum for filterState as well
 export const getCDMaterials = (
     cdMaterialId,
     stageType: DeploymentNodeType,
@@ -72,8 +71,6 @@ export const getCDMaterials = (
         else {
             const materials = artifacts.map((material, index) => {
                 let artifactStatusValue = ''
-                const filterState = material.filterState ?? FilterStates.ALLOWED
-
                 return {
                     index,
                     id: material.id,
@@ -93,7 +90,7 @@ export const getCDMaterials = (
                     vulnerabilitiesLoading: true,
                     scanned: material.scanned,
                     scanEnabled: material.scanEnabled,
-                    isSelected: !material.vulnerable && filterState === FilterStates.ALLOWED && index === 0,
+                    isSelected: !material.vulnerable && index === 0,
                     vulnerable: material.vulnerable,
                     runningOnParentCd: material.runningOnParentCd,
                     artifactStatus: artifactStatusValue,
@@ -121,7 +118,6 @@ export const getCDMaterials = (
                             }
                         })
                         : [],
-                    filterState,
                 }
             })
             return {

package/src/Common/Types.ts

@@ -215,11 +215,6 @@ export interface UserApprovalMetadataType {
     requestedUserData: ApprovalUserDataType
 }
 
-export enum FilterStates {
-    BLOCKED = 0,
-    ALLOWED = 1,
-    ERROR = 2
-}
 
 export interface CDMaterialType {
     index: number
@@ -246,7 +241,6 @@ export interface CDMaterialType {
     imageComment?: ImageComment
     imageReleaseTags?: ReleaseTag[]
     artifactStatus?: string
-    filterState: FilterStates;
 }
 
 export interface CommonNodeAttr {
@@ -273,6 +267,7 @@ export interface CommonNodeAttr {
     colorCode?: string
     isExternalCI?: boolean
     isLinkedCI?: boolean
+    isJobCI?: boolean // used for Job type CI in Devtron Apps
     environmentName?: string //used for CDs
     environmentId?: number
     inputMaterialList?: any[]