Merge branch 'feat/plugin-policy' into feat/ci-pipeline-mandatory-plugins

Author: AbhishekA1509

src/Common/Policy.Types.ts

@@ -112,10 +112,18 @@ export enum ConsequenceAction {
     ALLOW_FOREVER = 'ALLOW_FOREVER',
 }
 
-export interface ConsequenceType {
-    action: ConsequenceAction
-    metadataField: string
-}
+export type ConsequenceType =
+    | {
+          action: Exclude<ConsequenceAction, ConsequenceAction.ALLOW_UNTIL_TIME>
+          metadataField?: never | null
+      }
+    | {
+          action: ConsequenceAction.ALLOW_UNTIL_TIME
+          /**
+           * Denotes the time till which the policy enforcement is relaxed
+           */
+          metadataField: string
+      }
 
 export interface BlockedStateData {
     isOffendingMandatoryPlugin: boolean

src/Common/Types.ts

@@ -18,8 +18,15 @@ import React, { ReactNode, CSSProperties, ReactElement } from 'react'
 import { Placement } from 'tippy.js'
 import { UserGroupDTO } from '@Pages/GlobalConfigurations'
 import { ImageComment, ReleaseTag } from './ImageTags.Types'
-import { ACTION_STATE, DEPLOYMENT_WINDOW_TYPE, DockerConfigOverrideType, SortingOrder, TaskErrorObj } from '.'
 import { MandatoryPluginBaseStateType, RegistryType, RuntimeParamsListItemType, Severity } from '../Shared'
+import {
+    ACTION_STATE,
+    ConsequenceType,
+    DEPLOYMENT_WINDOW_TYPE,
+    DockerConfigOverrideType,
+    SortingOrder,
+    TaskErrorObj,
+} from '.'
 
 /**
  * Generic response type object with support for overriding the result type
@@ -450,12 +457,12 @@ export interface ArtifactReleaseMappingType {
 }
 
 export interface CDMaterialListModalServiceUtilProps {
-    artifacts: any[],
-    offset: number,
-    artifactId?: number,
-    artifactStatus?: string,
-    disableDefaultSelection?: boolean,
-    userApprovalConfig?: UserApprovalConfigType,
+    artifacts: any[]
+    offset: number
+    artifactId?: number
+    artifactStatus?: string
+    disableDefaultSelection?: boolean
+    userApprovalConfig?: UserApprovalConfigType
 }
 
 export interface CDMaterialType {

src/Shared/Components/FilterChips/FilterChips.component.tsx

@@ -45,7 +45,7 @@ const FilterChip = ({
                         <span className="dc__divider h-24" />
                     </>
                 )}
-                <Tooltip content={valueToDisplay} showOnTruncate>
+                <Tooltip content={valueToDisplay}>
                     <span className="dc__ellipsis-right dc__word-break dc__mxw-150">{valueToDisplay}</span>
                 </Tooltip>
                 {showRemoveIcon && (

src/Shared/Components/SelectPicker/common.tsx

@@ -170,9 +170,8 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
                         />
                     )}
                     <div className={`flex left ${showDescription ? 'top' : ''} dc__gap-8`}>
-                        {/* startIcon is not to be shown in option in case of multi select */}
-                        {!isMulti && startIcon && (
-                            <div className="dc__no-shrink icon-dim-20 flex dc__fill-available-space">{startIcon}</div>
+                        {startIcon && (
+                            <div className="dc__no-shrink icon-dim-16 flex dc__fill-available-space">{startIcon}</div>
                         )}
                         <div className="flex-grow-1">
                             <h4 className={`m-0 fs-13 ${isCreatableOption ? 'cb-5' : 'cn-9'} fw-4 lh-20 dc__truncate`}>
@@ -191,7 +190,7 @@ export const SelectPickerOption = <OptionValue, IsMulti extends boolean>({
                                 ))}
                         </div>
                         {endIcon && (
-                            <div className="dc__no-shrink icon-dim-20 flex dc__fill-available-space">{endIcon}</div>
+                            <div className="dc__no-shrink icon-dim-16 flex dc__fill-available-space">{endIcon}</div>
                         )}
                     </div>
                 </div>