@devtron-labs/devtron-fe-common-lib 0.0.29 → 0.0.30-beta1

package/dist/Common/ImageTags.Types.d.ts

@@ -24,6 +24,7 @@ export interface ImageTaggingContainerType {
     setTagsEditable?: (tagsEditable: boolean) => void;
     toggleCardMode?: (id: number) => void;
     hideHardDelete?: boolean;
+    isSuperAdmin?: boolean;
 }
 export interface ImageButtonType {
     text: string;

package/dist/Common/ImageTags.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ImageButtonType, ImageTaggingContainerType } from './ImageTags.Types';
-export declare const ImageTagsContainer: ({ ciPipelineId, artifactId, imageComment, imageReleaseTags, updateCurrentAppMaterial, appReleaseTagNames, setAppReleaseTagNames, tagsEditable, setTagsEditable, toggleCardMode, hideHardDelete, forceReInit, }: ImageTaggingContainerType) => JSX.Element;
+export declare const ImageTagsContainer: ({ ciPipelineId, artifactId, imageComment, imageReleaseTags, updateCurrentAppMaterial, appReleaseTagNames, setAppReleaseTagNames, tagsEditable, setTagsEditable, toggleCardMode, hideHardDelete, forceReInit, isSuperAdmin }: ImageTaggingContainerType) => JSX.Element;
 export declare const ImageTagButton: ({ text, isSoftDeleted, isEditing, onSoftDeleteClick, onHardDeleteClick, tagId, softDeleteTags, isSuperAdmin, duplicateTag, hideHardDelete, }: ImageButtonType) => JSX.Element;

package/dist/Common/Types.d.ts

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

package/dist/index.js

@@ -424,6 +424,12 @@ 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";
@@ -10065,7 +10071,7 @@ function CustomInput(_a) {
     return (jsxRuntime.jsxs("div", __assign({ className: "flex column left top" }, { children: [jsxRuntime.jsx("label", __assign({ className: "form__label ".concat(labelClassName) }, { children: label })), jsxRuntime.jsx("input", { "data-testid": dataTestid, type: type, name: name, autoComplete: "off", className: "form__input", onChange: function (e) {
                     e.persist();
                     onChange(e);
-                }, onBlur: onBlur, onFocus: onFocus, placeholder: placeholder, value: value, disabled: disabled, tabIndex: tabIndex }), handleError(error).map(function (err) { return (jsxRuntime.jsxs("div", __assign({ className: "form__error" }, { children: [jsxRuntime.jsx(SvgIcWarning, { className: "form__icon form__icon--error" }), err] }))); })] })));
+                }, onBlur: onBlur, onFocus: onFocus, placeholder: placeholder, value: value, disabled: disabled, tabIndex: tabIndex }), handleError(error).map(function (err) { return (jsxRuntime.jsxs("div", __assign({ className: "form__error" }, { children: [jsxRuntime.jsx(SvgIcWarning, { className: "form__icon form__icon--error" }), err] }), err)); })] })));
 }
 function handleUTCTime(ts, isRelativeTime) {
     if (isRelativeTime === void 0) { isRelativeTime = false; }
@@ -22567,6 +22573,7 @@ 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, {
@@ -22581,7 +22588,9 @@ 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,
@@ -22601,7 +22610,7 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
                     vulnerabilitiesLoading: true,
                     scanned: material.scanned,
                     scanEnabled: material.scanEnabled,
-                    isSelected: !material.vulnerable && index === 0,
+                    isSelected: !material.vulnerable && filterState === exports.FilterStates.ALLOWED && index === 0,
                     vulnerable: material.vulnerable,
                     runningOnParentCd: material.runningOnParentCd,
                     artifactStatus: artifactStatusValue,
@@ -22628,6 +22637,7 @@ var getCDMaterials = function (cdMaterialId, stageType, abortSignal, isApprovalN
                             };
                         })
                         : [],
+                    filterState: filterState,
                 };
             });
             return {
@@ -23000,7 +23010,7 @@ var SvgIcEnter = function SvgIcEnter(props) {
 };
 
 var ImageTagsContainer = function (_a) {
-    var ciPipelineId = _a.ciPipelineId, artifactId = _a.artifactId, imageComment = _a.imageComment, imageReleaseTags = _a.imageReleaseTags, updateCurrentAppMaterial = _a.updateCurrentAppMaterial, appReleaseTagNames = _a.appReleaseTagNames, setAppReleaseTagNames = _a.setAppReleaseTagNames, tagsEditable = _a.tagsEditable, setTagsEditable = _a.setTagsEditable, toggleCardMode = _a.toggleCardMode, hideHardDelete = _a.hideHardDelete, forceReInit = _a.forceReInit;
+    var ciPipelineId = _a.ciPipelineId, artifactId = _a.artifactId, imageComment = _a.imageComment, imageReleaseTags = _a.imageReleaseTags, updateCurrentAppMaterial = _a.updateCurrentAppMaterial, appReleaseTagNames = _a.appReleaseTagNames, setAppReleaseTagNames = _a.setAppReleaseTagNames, tagsEditable = _a.tagsEditable, setTagsEditable = _a.setTagsEditable, toggleCardMode = _a.toggleCardMode, hideHardDelete = _a.hideHardDelete, forceReInit = _a.forceReInit, isSuperAdmin = _a.isSuperAdmin;
     var _b = __read(React.useState(imageReleaseTags ? imageReleaseTags : []), 2), initialTags = _b[0], setInitialTags = _b[1];
     var _c = __read(React.useState(imageComment ? imageComment.comment : ''), 2), initialDescription = _c[0], setInitialDescription = _c[1];
     var _d = __read(React.useState(appReleaseTagNames ? appReleaseTagNames : []), 2), existingTags = _d[0], setExistingTags = _d[1];
@@ -23012,41 +23022,14 @@ var ImageTagsContainer = function (_a) {
     var _k = __read(React.useState([]), 2), createTags = _k[0], setCreateTags = _k[1];
     var _l = __read(React.useState([]), 2), softDeleteTags = _l[0], setSoftDeleteTags = _l[1];
     var _m = __read(React.useState([]), 2), hardDeleteTags = _m[0], setHardDeleteTags = _m[1];
-    var _o = __read(React.useState(false), 2), isSuperAdmin = _o[0], setSuperAdmin = _o[1];
-    var _p = __read(React.useState(''), 2), descriptionValidationMessage = _p[0], setDescriptionValidationMessage = _p[1];
-    var _q = __read(React.useState(''), 2), textInput = _q[0], setTextInput = _q[1];
-    React.useEffect(function () {
-        initialise();
-    }, []);
+    var _o = __read(React.useState(''), 2), descriptionValidationMessage = _o[0], setDescriptionValidationMessage = _o[1];
+    var _p = __read(React.useState(''), 2), textInput = _p[0], setTextInput = _p[1];
     React.useEffect(function () {
         reInitState();
     }, [imageReleaseTags, imageComment, tagsEditable]);
     React.useEffect(function () {
         setExistingTags(appReleaseTagNames ? appReleaseTagNames : []);
     }, [appReleaseTagNames]);
-    function initialise() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var userRole, superAdmin, err_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, getUserRole()];
-                    case 1:
-                        userRole = _c.sent();
-                        superAdmin = (_b = (_a = userRole === null || userRole === void 0 ? void 0 : userRole.result) === null || _a === void 0 ? void 0 : _a.roles) === null || _b === void 0 ? void 0 : _b.includes('role:super-admin___');
-                        setSuperAdmin(superAdmin);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_1 = _c.sent();
-                        showError(err_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    }
     var reInitState = function () {
         if (forceReInit || !isEditing) {
             setInitialTags(imageReleaseTags ? imageReleaseTags : []);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.29",
+    "version": "0.0.30-beta1",
     "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 } from './Types';
+import { TeamList ,ResponseType, DeploymentNodeType, CDModalTab, FilterStates } from './Types';
 
 export const getTeamListMin = (): Promise<TeamList> => {
   // ignore active field
@@ -51,6 +51,7 @@ 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,
@@ -71,6 +72,8 @@ export const getCDMaterials = (
         else {
             const materials = artifacts.map((material, index) => {
                 let artifactStatusValue = ''
+                const filterState = material.filterState ?? FilterStates.ALLOWED
+
                 return {
                     index,
                     id: material.id,
@@ -90,7 +93,7 @@ export const getCDMaterials = (
                     vulnerabilitiesLoading: true,
                     scanned: material.scanned,
                     scanEnabled: material.scanEnabled,
-                    isSelected: !material.vulnerable && index === 0,
+                    isSelected: !material.vulnerable && filterState === FilterStates.ALLOWED && index === 0,
                     vulnerable: material.vulnerable,
                     runningOnParentCd: material.runningOnParentCd,
                     artifactStatus: artifactStatusValue,
@@ -118,6 +121,7 @@ export const getCDMaterials = (
                             }
                         })
                         : [],
+                    filterState,
                 }
             })
             return {

package/src/Common/Helper.tsx

@@ -326,7 +326,7 @@ export function CustomInput({
                 tabIndex={tabIndex}
             />
             {handleError(error).map((err) => (
-                <div className="form__error">
+                <div className="form__error" key={err}>
                     <FormError className="form__icon form__icon--error" />
                     {err}
                 </div>

package/src/Common/ImageTags.Types.ts

@@ -27,6 +27,7 @@ export interface ImageTaggingContainerType {
     setTagsEditable?: (tagsEditable: boolean) => void
     toggleCardMode?: (id: number) => void
     hideHardDelete?: boolean
+    isSuperAdmin?: boolean
 }
 
 export interface ImageButtonType {

package/src/Common/ImageTags.tsx

@@ -32,6 +32,7 @@ export const ImageTagsContainer = ({
     toggleCardMode,
     hideHardDelete,
     forceReInit,
+    isSuperAdmin
 }: ImageTaggingContainerType) => {
     const [initialTags, setInitialTags] = useState<ReleaseTag[]>(imageReleaseTags ? imageReleaseTags : [])
     const [initialDescription, setInitialDescription] = useState(imageComment ? imageComment.comment : '')
@@ -44,13 +45,9 @@ export const ImageTagsContainer = ({
     const [createTags, setCreateTags] = useState<ReleaseTag[]>([])
     const [softDeleteTags, setSoftDeleteTags] = useState<ReleaseTag[]>([])
     const [hardDeleteTags, setHardDeleteTags] = useState<ReleaseTag[]>([])
-    const [isSuperAdmin, setSuperAdmin] = useState<boolean>(false)
     const [descriptionValidationMessage, setDescriptionValidationMessage] = useState<string>('')
     const [textInput, setTextInput] = useState<string>('')
 
-    useEffect(() => {
-        initialise()
-    }, [])
 
     useEffect(() => {
         reInitState()
@@ -60,16 +57,6 @@ export const ImageTagsContainer = ({
         setExistingTags(appReleaseTagNames ? appReleaseTagNames : [])
     }, [appReleaseTagNames])
 
-    async function initialise() {
-        try {
-            const userRole = await getUserRole()
-
-            const superAdmin = userRole?.result?.roles?.includes('role:super-admin___')
-            setSuperAdmin(superAdmin)
-        } catch (err) {
-            showError(err)
-        }
-    }
 
     const reInitState = () => {
         if (forceReInit || !isEditing) {

package/src/Common/Types.ts

@@ -215,6 +215,11 @@ export interface UserApprovalMetadataType {
     requestedUserData: ApprovalUserDataType
 }
 
+export enum FilterStates {
+    BLOCKED = 0,
+    ALLOWED = 1,
+    ERROR = 2
+}
 
 export interface CDMaterialType {
     index: number
@@ -241,6 +246,7 @@ export interface CDMaterialType {
     imageComment?: ImageComment
     imageReleaseTags?: ReleaseTag[]
     artifactStatus?: string
+    filterState: FilterStates;
 }
 
 export interface CommonNodeAttr {