@devtron-labs/devtron-fe-common-lib 0.0.10-beta-19 → 0.0.10-beta-21

package/package.json

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

package/src/Common/Common.service.ts

@@ -1,7 +1,7 @@
-import {get, post} from './Api';
+import { get } from './Api';
 import { ROUTES } from './Constants'
 import { sortCallback } from './Helper';
-import { TeamList ,ResponseType } from './Types';
+import { TeamList } from './Types';
 
 export const getTeamListMin = (): Promise<TeamList> => {
   // ignore active field
@@ -20,19 +20,4 @@ export const getTeamListMin = (): Promise<TeamList> => {
           result: list,
       };
   });
-};
-
-interface UserRole extends ResponseType {
-    result?: {
-        roles: string[]
-        superAdmin: boolean
-    }
-}
-
-export function getUserRole(appName?: string): Promise<UserRole> {
-    return get(`${ROUTES.USER_CHECK_ROLE}${appName ? `?appName=${appName}` : ''}`)
-}
-
-export function setImageTags(request, pipelineId: number, artifactId: number){
-    return post(`${ROUTES.IMAGE_TAGGING}/${pipelineId}/${artifactId}`,request )
-}
+};

package/src/Common/Constants.ts

@@ -20,8 +20,6 @@ export const URLS = {
 
 export const ROUTES = {
     PROJECT_LIST_MIN: 'team/autocomplete',
-    USER_CHECK_ROLE: 'user/check/roles',
-    IMAGE_TAGGING:'app/image-tagging',
 }
 
 export enum KEY_VALUE {

package/src/Common/RadioGroup.tsx

@@ -9,12 +9,12 @@ export class RadioGroupItem extends Component<RadioGroupItemProps> {
                 {(context) => {
                     return (
                         <>
-                            <label className={context.disabled ? 'form__radio-item disabled' : 'form__radio-item'}>
+                            <label className={(this.props.disabled || context.disabled) ? 'form__radio-item disabled' : 'form__radio-item'}>
                                 <input
                                     type="radio"
                                     className="form__checkbox"
                                     name={context.name}
-                                    disabled={context.disabled}
+                                    disabled={context.disabled || this.props.disabled}
                                     onChange={context.onChange}
                                     value={this.props.value}
                                     checked={context.value === this.props.value}

package/src/Common/Types.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode, CSSProperties } from 'react'
+import { ReactNode, CSSProperties } from 'react'
 import { Placement } from 'tippy.js'
 export interface ResponseType {
     code: number
@@ -119,6 +119,7 @@ export interface ReloadType {
 export interface RadioGroupItemProps {
     value: string
     dataTestId?: string
+    disabled?: boolean
 }
 
 export interface RadioGroupProps {
@@ -211,34 +212,6 @@ export interface UserApprovalMetadataType {
     requestedUserData: ApprovalUserDataType
 }
 
-
-export interface CDMaterialType {
-    index: number
-    id: string
-    materialInfo: MaterialInfo[]
-    tab: CDModalTabType
-    scanEnabled: boolean
-    scanned: boolean
-    vulnerabilitiesLoading: boolean
-    lastExecution: string //timestamp
-    vulnerabilities: VulnerabilityType[]
-    vulnerable: boolean
-    deployedTime: string
-    deployedBy?: string
-    wfrId?: number
-    buildTime: string
-    image: string
-    isSelected: boolean
-    showSourceInfo: boolean
-    latest: boolean
-    runningOnParentCd?: boolean
-    userApprovalMetadata?: UserApprovalMetadataType
-    triggeredBy?: number
-    imageComment?: ImageComment
-    imageReleaseTags?: ReleaseTag[]
-    artifactStatus?: string
-}
-
 export interface CommonNodeAttr {
     connectingCiPipelineId?: number
     parents: string | number[] | string[]
@@ -295,8 +268,6 @@ export interface CommonNodeAttr {
         action: any,
         metadataField: string
     }
-    appReleaseTagNames?: string[]
-    tagsEditable?: boolean
 }
 
 export interface VulnerabilityType {
@@ -326,57 +297,33 @@ export interface MaterialInfo {
     type?: string
 }
 
+export interface CDMaterialType {
+    index: number
+    id: string
+    materialInfo: MaterialInfo[]
+    tab: CDModalTabType
+    scanEnabled: boolean
+    scanned: boolean
+    vulnerabilitiesLoading: boolean
+    lastExecution: string //timestamp
+    vulnerabilities: VulnerabilityType[]
+    vulnerable: boolean
+    deployedTime: string
+    deployedBy?: string
+    wfrId?: number
+    buildTime: string
+    image: string
+    isSelected: boolean
+    showSourceInfo: boolean
+    latest: boolean
+    runningOnParentCd?: boolean
+    userApprovalMetadata?: UserApprovalMetadataType
+    triggeredBy?: number
+}
+
 export interface CDMaterialResponseType {
     approvalUsers: string[]
     materials: any[]
     userApprovalConfig: UserApprovalConfigType
     requestedUserId: number
-    tagsEditable: boolean
-    appReleaseTagNames: string[]
-}
-
-export interface ReleaseTag {
-    id: number
-    tagName: string
-    appId: number
-    deleted: boolean
-    artifactId: number
-    duplicateTag: boolean
-}
-
-export interface ImageComment {
-    id: number
-    comment: string
-    artifactId: number
-}
-
-
-export interface ImageTaggingContainerType {
-    ciPipelineId?: number
-    artifactId?: number
-    imageComment?: ImageComment
-    imageReleaseTags?: ReleaseTag[]
-    updateCurrentAppMaterial? : (matId:number, releaseTags?:ReleaseTag[], imageComment?:ImageComment) => void
-    appReleaseTagNames?: string[]
-    tagsEditable?: boolean
-    forceReInit?: boolean
-    setAppReleaseTagNames?: (appReleaseTags: string[]) => void
-    setTagsEditable?: (tagsEditable: boolean) => void
-    toggleCardMode?: (id: number) => void
-    hideHardDelete?: boolean
-}
-
-export interface ImageButtonType {
-    text: string
-    isSoftDeleted: boolean
-    isEditing: boolean
-    onSoftDeleteClick?: any
-    onHardDeleteClick?: any
-    tagId: number
-    softDeleteTags: any
-    isSuperAdmin: any
-    duplicateTag?: boolean
-    hideHardDelete?: boolean
-}
-
-
+}

package/src/Common/index.ts

@@ -32,4 +32,3 @@ export { default as StyledRadioGroup } from './RadioGroup/RadioGroup'
 export * from './CIPipeline.Types'
 export * from './Policy.Types'
 export { default as DeleteComponent } from './DeleteComponentModal/DeleteComponent'
-export * from './ImageTags'

package/dist/Common/ImageTags.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import { ImageButtonType, ImageTaggingContainerType } from './Types';
-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/src/Assets/Icon/ic-arrow-counter-clockwise.svg

@@ -1,5 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M3.74216 4.67419H1.49216V2.42419" fill="#767D84"/>
-    <path d="M3.74216 4.67419H1.49216V2.42419" stroke="#596168" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M3.08318 8.91682C3.66007 9.49371 4.39507 9.88658 5.19525 10.0457C5.99542 10.2049 6.82482 10.1232 7.57856 9.811C8.33231 9.49879 8.97654 8.97008 9.42981 8.29173C9.88307 7.61338 10.125 6.81585 10.125 6C10.125 5.18415 9.88307 4.38663 9.42981 3.70827C8.97654 3.02992 8.33231 2.50121 7.57856 2.189C6.82482 1.87679 5.99542 1.7951 5.19525 1.95426C4.39507 2.11343 3.66007 2.50629 3.08318 3.08319L1.49219 4.67418" stroke="#596168" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

package/src/Assets/Icon/ic-enter.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 4C12.4899 4 12.3203 4.07024 12.1953 4.19526C12.0703 4.32029 12.0001 4.48986 12.0001 4.66667V7.33333C12.0001 7.51014 11.9298 7.67971 11.8048 7.80474C11.6798 7.92976 11.5102 8 11.3334 8H4.94005L5.80672 7.14C5.93226 7.01446 6.00278 6.8442 6.00278 6.66667C6.00278 6.48913 5.93226 6.31887 5.80672 6.19333C5.68118 6.0678 5.51092 5.99727 5.33339 5.99727C5.15585 5.99727 4.98559 6.0678 4.86005 6.19333L2.86005 8.19333C2.79936 8.25674 2.75178 8.3315 2.72005 8.41333C2.65337 8.57564 2.65337 8.75769 2.72005 8.92C2.75178 9.00183 2.79936 9.0766 2.86005 9.14L4.86005 11.14C4.92203 11.2025 4.99576 11.2521 5.077 11.2859C5.15824 11.3198 5.24538 11.3372 5.33339 11.3372C5.42139 11.3372 5.50853 11.3198 5.58977 11.2859C5.67101 11.2521 5.74474 11.2025 5.80672 11.14C5.86921 11.078 5.9188 11.0043 5.95265 10.9231C5.98649 10.8418 6.00392 10.7547 6.00392 10.6667C6.00392 10.5787 5.98649 10.4915 5.95265 10.4103C5.9188 10.329 5.86921 10.2553 5.80672 10.1933L4.94005 9.33333H11.3334C11.8638 9.33333 12.3725 9.12262 12.7476 8.74755C13.1227 8.37247 13.3334 7.86377 13.3334 7.33333V4.66667C13.3334 4.48986 13.2631 4.32029 13.1381 4.19526C13.0131 4.07024 12.8435 4 12.6667 4Z" fill="#3B444C"/>
-</svg>

package/src/Assets/Icon/ic-error-exclamation.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#FFF" d="M5 5H15V15H5z"/>
-        <path fill="#F33E3E" d="M10 18.333c-4.6 0-8.333-3.733-8.333-8.333S5.4 1.667 10 1.667 18.333 5.4 18.333 10 14.6 18.333 10 18.333zm0-12.5c-.46 0-.833.373-.833.834V10c0 .46.373.833.833.833.46 0 .833-.373.833-.833V6.667c0-.46-.373-.834-.833-.834zm0 6.667c-.46 0-.833.373-.833.833 0 .46.373.834.833.834.46 0 .833-.373.833-.834 0-.46-.373-.833-.833-.833z"/>
-    </g>
-</svg>

package/src/Assets/Icon/ic-minus.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
-    <path fill="#959BA1" class="fill-color" fill-rule="evenodd" d="M10.5 7.583h-7c-.322 0-.583-.26-.583-.583 0-.322.26-.583.583-.583h7c.322 0 .583.26.583.583 0 .322-.26.583-.583.583z"/>
-</svg>

package/src/Assets/Icon/ic-pencil.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.625 4.99991L15 9.37491M7.5 16.8749H3.75C3.58424 16.8749 3.42527 16.8091 3.30806 16.6918C3.19085 16.5746 3.125 16.4157 3.125 16.2499V12.7588C3.125 12.6767 3.14117 12.5954 3.17258 12.5196C3.20398 12.4438 3.25002 12.3749 3.30806 12.3168L12.6831 2.94185C12.8003 2.82464 12.9592 2.75879 13.125 2.75879C13.2908 2.75879 13.4497 2.82464 13.5669 2.94185L17.0581 6.43296C17.1753 6.55017 17.2411 6.70915 17.2411 6.87491C17.2411 7.04067 17.1753 7.19964 17.0581 7.31685L7.5 16.8749Z" stroke="#596168" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>