@devtron-labs/devtron-fe-common-lib 0.0.32-beta1 → 0.0.33-beta-1

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

@@ -24,7 +24,6 @@ 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, isSuperAdmin }: ImageTaggingContainerType) => JSX.Element;
+export declare const ImageTagsContainer: ({ ciPipelineId, artifactId, imageComment, imageReleaseTags, updateCurrentAppMaterial, appReleaseTagNames, setAppReleaseTagNames, tagsEditable, setTagsEditable, toggleCardMode, hideHardDelete, forceReInit, }: 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

@@ -1,6 +1,6 @@
 import React, { ReactNode, CSSProperties } from 'react';
 import { Placement } from 'tippy.js';
-import { ImageComment, ReleaseTag } from "./ImageTags.Types";
+import { ImageComment, ReleaseTag } from './ImageTags.Types';
 export interface ResponseType {
     code: number;
     status: string;
@@ -193,8 +193,8 @@ export interface UserApprovalMetadataType {
     requestedUserData: ApprovalUserDataType;
 }
 export declare enum FilterStates {
-    BLOCKED = 0,
-    ALLOWED = 1,
+    ALLOWED = 0,
+    BLOCKED = 1,
     ERROR = 2
 }
 export interface CDMaterialType {
@@ -315,6 +315,20 @@ export interface MaterialInfo {
     url?: string;
     type?: string;
 }
+export declare enum FilterConditionType {
+    PASS = 1,
+    FAIL = 0
+}
+export interface FilterConditionsInfo {
+    conditionType: FilterConditionType;
+    expression: string;
+}
+export interface FilterConditionsListType {
+    id: number;
+    name: string;
+    description: string;
+    conditions: FilterConditionsInfo[];
+}
 export interface CDMaterialResponseType {
     approvalUsers: string[];
     materials: any[];
@@ -323,6 +337,7 @@ export interface CDMaterialResponseType {
     tagsEditable: boolean;
     appReleaseTagNames: string[];
     hideImageTaggingHardDelete: boolean;
+    resourceFilters?: FilterConditionsListType[];
 }
 export interface InputDetailType {
     label: string;

package/dist/index.js

@@ -426,8 +426,8 @@ exports.DeploymentNodeType = void 0;
 })(exports.DeploymentNodeType || (exports.DeploymentNodeType = {}));
 exports.FilterStates = void 0;
 (function (FilterStates) {
-    FilterStates[FilterStates["BLOCKED"] = 0] = "BLOCKED";
-    FilterStates[FilterStates["ALLOWED"] = 1] = "ALLOWED";
+    FilterStates[FilterStates["ALLOWED"] = 0] = "ALLOWED";
+    FilterStates[FilterStates["BLOCKED"] = 1] = "BLOCKED";
     FilterStates[FilterStates["ERROR"] = 2] = "ERROR";
 })(exports.FilterStates || (exports.FilterStates = {}));
 exports.DeploymentAppTypes = void 0;
@@ -436,7 +436,12 @@ exports.DeploymentAppTypes = void 0;
     DeploymentAppTypes["GITOPS"] = "argo_cd";
     DeploymentAppTypes["MANIFEST_DOWNLOAD"] = "manifest_download";
     DeploymentAppTypes["MANIFEST_PUSH"] = "manifest_push";
-})(exports.DeploymentAppTypes || (exports.DeploymentAppTypes = {}));
+})(exports.DeploymentAppTypes || (exports.DeploymentAppTypes = {}));
+exports.FilterConditionType = void 0;
+(function (FilterConditionType) {
+    FilterConditionType[FilterConditionType["PASS"] = 1] = "PASS";
+    FilterConditionType[FilterConditionType["FAIL"] = 0] = "FAIL";
+})(exports.FilterConditionType || (exports.FilterConditionType = {}));
 
 var responseMessages = {
     100: 'Continue',
@@ -10071,7 +10076,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] }), 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] }))); })] })));
 }
 function handleUTCTime(ts, isRelativeTime) {
     if (isRelativeTime === void 0) { isRelativeTime = false; }
@@ -22683,7 +22688,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
+// FIXME: This is only returning materials to cater the case of search in approval but it should be a common function service coming from dashboard.
 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, {
@@ -23120,7 +23125,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, isSuperAdmin = _a.isSuperAdmin;
+    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 _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];
@@ -23132,14 +23137,41 @@ 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(''), 2), descriptionValidationMessage = _o[0], setDescriptionValidationMessage = _o[1];
-    var _p = __read(React.useState(''), 2), textInput = _p[0], setTextInput = _p[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();
+    }, []);
     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.32-beta1",
+    "version": "0.0.33-beta-1",
     "description": "Supporting common component library",
     "main": "dist/index.js",
     "scripts": {

package/src/Common/Common.service.ts

@@ -51,7 +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
+// FIXME: This is only returning materials to cater the case of search in approval but it should be a common function service coming from dashboard.
 export const getCDMaterials = (
     cdMaterialId,
     stageType: DeploymentNodeType,

package/src/Common/Helper.tsx

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

package/src/Common/ImageTags.Types.ts

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

package/src/Common/ImageTags.tsx

@@ -32,7 +32,6 @@ export const ImageTagsContainer = ({
     toggleCardMode,
     hideHardDelete,
     forceReInit,
-    isSuperAdmin
 }: ImageTaggingContainerType) => {
     const [initialTags, setInitialTags] = useState<ReleaseTag[]>(imageReleaseTags ? imageReleaseTags : [])
     const [initialDescription, setInitialDescription] = useState(imageComment ? imageComment.comment : '')
@@ -45,9 +44,13 @@ 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()
@@ -57,6 +60,16 @@ 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

@@ -1,6 +1,6 @@
 import React, { ReactNode, CSSProperties } from 'react'
 import { Placement } from 'tippy.js'
-import { ImageComment, ReleaseTag } from "./ImageTags.Types";
+import { ImageComment, ReleaseTag } from './ImageTags.Types'
 export interface ResponseType {
     code: number
     status: string
@@ -216,9 +216,9 @@ export interface UserApprovalMetadataType {
 }
 
 export enum FilterStates {
-    BLOCKED = 0,
-    ALLOWED = 1,
-    ERROR = 2
+    ALLOWED = 0,
+    BLOCKED = 1,
+    ERROR = 2,
 }
 
 export interface CDMaterialType {
@@ -246,7 +246,7 @@ export interface CDMaterialType {
     imageComment?: ImageComment
     imageReleaseTags?: ReleaseTag[]
     artifactStatus?: string
-    filterState: FilterStates;
+    filterState: FilterStates
 }
 
 export interface CommonNodeAttr {
@@ -304,7 +304,7 @@ export interface CommonNodeAttr {
     deploymentAppType?: DeploymentAppTypes
     isCITriggerBlocked?: boolean
     ciBlockState?: {
-        action: any,
+        action: any
         metadataField: string
     }
     appReleaseTagNames?: string[]
@@ -315,7 +315,7 @@ export enum DeploymentAppTypes {
     HELM = 'helm',
     GITOPS = 'argo_cd',
     MANIFEST_DOWNLOAD = 'manifest_download',
-    MANIFEST_PUSH='manifest_push'
+    MANIFEST_PUSH = 'manifest_push',
 }
 
 export interface VulnerabilityType {
@@ -345,6 +345,23 @@ export interface MaterialInfo {
     type?: string
 }
 
+export enum FilterConditionType {
+    PASS = 1,
+    FAIL = 0,
+}
+
+export interface FilterConditionsInfo {
+    conditionType: FilterConditionType
+    expression: string
+}
+
+export interface FilterConditionsListType {
+    id: number
+    name: string
+    description: string
+    conditions: FilterConditionsInfo[]
+}
+
 export interface CDMaterialResponseType {
     approvalUsers: string[]
     materials: any[]
@@ -353,9 +370,9 @@ export interface CDMaterialResponseType {
     tagsEditable: boolean
     appReleaseTagNames: string[]
     hideImageTaggingHardDelete: boolean
+    resourceFilters?: FilterConditionsListType[]
 }
 
-
 export interface InputDetailType {
     label: string
     defaultValue: string
@@ -404,7 +421,6 @@ export interface AsyncState<T> {
     dependencies: any[]
 }
 
-
 export interface AsyncOptions {
     resetOnChange: boolean
 }