From 02b98071e99d3e945ced58d12fdeea2a7bc37fc0 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 20 May 2025 14:55:33 +0530
Subject: [PATCH 1/2] feat: Checkbox - add error prop to Checkbox

---
 src/Common/Checkbox.tsx | 2 +-
 src/Common/Types.ts     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Common/Checkbox.tsx b/src/Common/Checkbox.tsx
index ee6b18d41..d8e8b1cfe 100644
--- a/src/Common/Checkbox.tsx
+++ b/src/Common/Checkbox.tsx
@@ -35,7 +35,7 @@ export class Checkbox extends Component<CheckboxProps> {
                 <input
                     {...(this.props.name ? { name: this.props.name } : {})}
                     type="checkbox"
-                    className="form__checkbox"
+                    className={`form__checkbox ${this.props.error ? 'error': ''}`}
                     disabled={this.props.disabled}
                     value={this.props.value}
                     onChange={this.props.onChange}
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index 4dc7b9bbd..f82b80877 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -117,6 +117,7 @@ export interface CheckboxProps {
     onClick?: (event) => void
     id?: string
     dataTestId?: string
+    error?: boolean
 }
 
 export interface TippyCustomizedProps extends Pick<TippyProps, 'appendTo'> {

From 6050c823b4c314a2cc5adbef8da2b3f5c54c9de8 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@devtron.ai>
Date: Tue, 20 May 2025 14:55:54 +0530
Subject: [PATCH 2/2] chore: add ic-filter icons

---
 src/Assets/IconV2/ic-filter-applied.svg | 4 ++++
 src/Assets/IconV2/ic-filter.svg         | 3 +++
 src/Shared/Components/Icon/Icon.tsx     | 4 ++++
 3 files changed, 11 insertions(+)
 create mode 100644 src/Assets/IconV2/ic-filter-applied.svg
 create mode 100644 src/Assets/IconV2/ic-filter.svg

diff --git a/src/Assets/IconV2/ic-filter-applied.svg b/src/Assets/IconV2/ic-filter-applied.svg
new file mode 100644
index 000000000..86f00f5a1
--- /dev/null
+++ b/src/Assets/IconV2/ic-filter-applied.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path data-style-override="false" fill="var(--R500)" d="M23 7a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12h10M2 7.5h12m-4.25 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-filter.svg b/src/Assets/IconV2/ic-filter.svg
new file mode 100644
index 000000000..aeda5ba8f
--- /dev/null
+++ b/src/Assets/IconV2/ic-filter.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12h12M2 7.5h19.5m-11.75 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index 548cf761b..2929b0940 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -49,6 +49,8 @@ import { ReactComponent as ICError } from '@IconsV2/ic-error.svg'
 import { ReactComponent as ICFailure } from '@IconsV2/ic-failure.svg'
 import { ReactComponent as ICFastForward } from '@IconsV2/ic-fast-forward.svg'
 import { ReactComponent as ICFileKey } from '@IconsV2/ic-file-key.svg'
+import { ReactComponent as ICFilter } from '@IconsV2/ic-filter.svg'
+import { ReactComponent as ICFilterApplied } from '@IconsV2/ic-filter-applied.svg'
 import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
 import { ReactComponent as ICFolderUser } from '@IconsV2/ic-folder-user.svg'
 import { ReactComponent as ICGear } from '@IconsV2/ic-gear.svg'
@@ -181,6 +183,8 @@ export const iconMap = {
     'ic-failure': ICFailure,
     'ic-fast-forward': ICFastForward,
     'ic-file-key': ICFileKey,
+    'ic-filter-applied': ICFilterApplied,
+    'ic-filter': ICFilter,
     'ic-flask': ICFlask,
     'ic-folder-user': ICFolderUser,
     'ic-gear': ICGear,