Merge remote-tracking branch 'origin/feat/lock-deployment-configuration' into feat/lock-profiles

Author: Elessar1802

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

@@ -24,6 +24,7 @@ const FilterChip = ({
     handleRemoveFilter,
     getFormattedLabel = noop,
     getFormattedValue = noop,
+    showRemoveIcon,
 }: FilterChipProps) => {
     const removeFilter = () => {
         handleRemoveFilter(label, value)
@@ -40,14 +41,16 @@ const FilterChip = ({
                 <span className="fw-6 dc__capitalize">{labelToDisplay}</span>
                 <span className="dc__divider h-24" />
                 <span className="dc__ellipsis-right">{valueToDisplay}</span>
-                <button
-                    type="button"
-                    className="flex p-0 dc__transparent"
-                    onClick={removeFilter}
-                    aria-label="Remove filter"
-                >
-                    <CloseIcon className="icon-dim-12 icon-use-fill-n6" />
-                </button>
+                {showRemoveIcon && (
+                    <button
+                        type="button"
+                        className="flex p-0 dc__transparent dc__hover-n50 br-4"
+                        onClick={removeFilter}
+                        aria-label="Remove filter"
+                    >
+                        <CloseIcon className="icon-dim-12 icon-use-fill-n6" />
+                    </button>
+                )}
             </div>
         )
     )
@@ -64,6 +67,7 @@ const FilterChips = <T = Record<string, unknown>,>({
     getFormattedValue,
     className = '',
     clearButtonClassName = '',
+    showClearAndRemove = true,
 }: FilterChipsProps<T>) => {
     const handleRemoveFilter = (filterKey, valueToRemove) => {
         const updatedFilterConfig = JSON.parse(JSON.stringify(filterConfig))
@@ -95,6 +99,7 @@ const FilterChips = <T = Record<string, unknown>,>({
                                 handleRemoveFilter={handleRemoveFilter}
                                 getFormattedLabel={getFormattedLabel}
                                 getFormattedValue={getFormattedValue}
+                                showRemoveIcon={showClearAndRemove}
                             />
                         ))
                     ) : (
@@ -105,18 +110,21 @@ const FilterChips = <T = Record<string, unknown>,>({
                             handleRemoveFilter={handleRemoveFilter}
                             getFormattedLabel={getFormattedLabel}
                             getFormattedValue={getFormattedValue}
+                            showRemoveIcon={showClearAndRemove}
                         />
                     ),
                 )}
-                <div className="flex">
-                    <button
-                        type="button"
-                        className={`cta text fs-13-imp lh-20-imp h-20 p-0-imp ${clearButtonClassName}`}
-                        onClick={clearFilters}
-                    >
-                        Clear All Filters
-                    </button>
-                </div>
+                {showClearAndRemove && (
+                    <div className="flex">
+                        <button
+                            type="button"
+                            className={`cta text fs-13-imp lh-20-imp h-20 p-0-imp ${clearButtonClassName}`}
+                            onClick={clearFilters}
+                        >
+                            Clear All Filters
+                        </button>
+                    </div>
+                )}
             </div>
         )
     )

src/Shared/Components/FilterChips/types.ts

@@ -37,28 +37,45 @@ export interface FilterChipProps {
      * If passed, the label will be formatted accordingly
      */
     getFormattedValue?: (filterKey: string, filterValue: unknown) => ReactNode
+    showRemoveIcon: boolean
 }
 
-export interface FilterChipsProps<T = Record<string, unknown>>
-    extends Pick<FilterChipProps, 'getFormattedLabel' | 'getFormattedValue'> {
+export type FilterChipsProps<T = Record<string, unknown>> = Pick<
+    FilterChipProps,
+    'getFormattedLabel' | 'getFormattedValue'
+> & {
     /**
      * Current filter configuration
      */
     filterConfig: T
-    /**
-     * Callback handler for removing the filters
-     */
-    clearFilters: () => void
-    /**
-     * Handler for removing a applied filter
-     */
-    onRemoveFilter: (filterConfig: T) => void
     /**
      * Class name for the container
      */
     className?: string
-    /**
-     * Class name for the clear filter button
-     */
-    clearButtonClassName?: string
-}
+} & (
+        | {
+              /**
+               * If false, anything related to removing filters is not shown
+               * @default 'true'
+               */
+              showClearAndRemove: false
+              clearFilters?: never
+              onRemoveFilter?: never
+              clearButtonClassName?: never
+          }
+        | {
+              showClearAndRemove?: true
+              /**
+               * Callback handler for removing the filters
+               */
+              clearFilters: () => void
+              /**
+               * Handler for removing a applied filter
+               */
+              onRemoveFilter: (filterConfig: T) => void
+              /**
+               * Class name for the clear filter button
+               */
+              clearButtonClassName?: string
+          }
+    )

src/Shared/Services/types.ts

@@ -15,7 +15,7 @@
  */
 
 import { getUrlWithSearchParams } from '../../Common'
-import { PolicySubKindType, ResourceKindType, ResourceVersionType } from '../types'
+import { PolicyKindType, ResourceKindType, ResourceVersionType } from '../types'
 
 export interface ClusterType {
     id: number
@@ -31,7 +31,7 @@ export interface ClusterType {
  * K => Type of kind
  * P => Type of version
  */
-interface BaseGetApiUrlProps<T, K extends ResourceKindType | PolicySubKindType, P extends ResourceVersionType> {
+interface BaseGetApiUrlProps<T, K extends ResourceKindType | PolicyKindType, P extends ResourceVersionType> {
     baseUrl: string
     kind: K
     version: P
@@ -41,4 +41,4 @@ interface BaseGetApiUrlProps<T, K extends ResourceKindType | PolicySubKindType,
 export interface GetResourceApiUrlProps<T> extends BaseGetApiUrlProps<T, ResourceKindType, ResourceVersionType> {}
 
 export interface GetPolicyApiUrlProps<T>
-    extends Omit<BaseGetApiUrlProps<T, PolicySubKindType, ResourceVersionType>, 'baseUrl'> {}
+    extends Omit<BaseGetApiUrlProps<T, PolicyKindType, ResourceVersionType>, 'baseUrl'> {}

src/Shared/types.ts

@@ -427,8 +427,8 @@ export enum ResourceVersionType {
     alpha1 = 'alpha1',
 }
 
-export enum PolicySubKindType {
-    lockConfiguration = 'config-protection',
+export enum PolicyKindType {
+    lockConfiguration = 'lock-configuration',
 }
 
 export interface LastExecutionResultType {