From b2f6850b8127379e13898574b9bc2624ced80662 Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Fri, 11 Apr 2025 00:25:53 +0530 Subject: [PATCH 1/3] Feat: Filters UI --- src/Components/FilterHeader/index.jsx | 2 +- src/Utils/Theme/globalTheme.js | 2 ++ src/locales/gb.json | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx index 4bb27646f..284170a8c 100644 --- a/src/Components/FilterHeader/index.jsx +++ b/src/Components/FilterHeader/index.jsx @@ -42,7 +42,7 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) => return header; } - return selected + return header + " | " + selected .map((value) => options.find((option) => option.value === value)?.label) .filter(Boolean) .join(", "); diff --git a/src/Utils/Theme/globalTheme.js b/src/Utils/Theme/globalTheme.js index 306ed3466..a6e747555 100644 --- a/src/Utils/Theme/globalTheme.js +++ b/src/Utils/Theme/globalTheme.js @@ -477,6 +477,7 @@ const baseTheme = (palette) => ({ root: ({ theme }) => ({ "& .MuiOutlinedInput-input": { color: theme.palette.primary.contrastText, + paddingLeft: theme.spacing(14), }, "& .MuiOutlinedInput-notchedOutline": { borderColor: theme.palette.primary.lowContrast, @@ -484,6 +485,7 @@ const baseTheme = (palette) => ({ }, "& .MuiSelect-icon": { color: theme.palette.primary.contrastTextSecondary, // Dropdown + color + left: theme.spacing(4), }, "&:hover": { backgroundColor: theme.palette.primary.main, // Background on hover diff --git a/src/locales/gb.json b/src/locales/gb.json index 5dfe9b4ca..21299f2e8 100644 --- a/src/locales/gb.json +++ b/src/locales/gb.json @@ -186,6 +186,8 @@ }, "testLocale": "testLocale", "add": "Add", + "state": "State", + "reset": "Reset", "monitors": "monitors", "distributedUptimeStatusCreateStatusPage": "status page", "distributedUptimeStatusCreateStatusPageAccess": "Access", From 4c2de647e6c0739b7a9909f8fce060e4ff053f3a Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Fri, 11 Apr 2025 12:26:59 +0530 Subject: [PATCH 2/3] Feat: Filters UI --- src/Components/FilterHeader/index.jsx | 8 ++++++++ src/Utils/Theme/globalTheme.js | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx index 284170a8c..9cbdd4137 100644 --- a/src/Components/FilterHeader/index.jsx +++ b/src/Components/FilterHeader/index.jsx @@ -57,6 +57,14 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) => horizontal: "left", }, }} + sx={{ + "& .MuiOutlinedInput-input": { + paddingLeft: theme.spacing(14), + }, + "& .MuiSelect-icon": { + left: theme.spacing(4), + }, + }} > {options.map((option) => ( ({ root: ({ theme }) => ({ "& .MuiOutlinedInput-input": { color: theme.palette.primary.contrastText, - paddingLeft: theme.spacing(14), }, "& .MuiOutlinedInput-notchedOutline": { borderColor: theme.palette.primary.lowContrast, @@ -485,7 +484,6 @@ const baseTheme = (palette) => ({ }, "& .MuiSelect-icon": { color: theme.palette.primary.contrastTextSecondary, // Dropdown + color - left: theme.spacing(4), }, "&:hover": { backgroundColor: theme.palette.primary.main, // Background on hover From 0783eb5bcbff5146f52838b54cc97c2bb1beab15 Mon Sep 17 00:00:00 2001 From: Aryaman Kumar Sharma Date: Sun, 13 Apr 2025 19:25:46 +0530 Subject: [PATCH 3/3] Feat: Filters UI --- src/Components/FilterHeader/index.jsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Components/FilterHeader/index.jsx b/src/Components/FilterHeader/index.jsx index 9cbdd4137..284170a8c 100644 --- a/src/Components/FilterHeader/index.jsx +++ b/src/Components/FilterHeader/index.jsx @@ -57,14 +57,6 @@ const FilterHeader = ({ header, options, value, onChange, multiple = true }) => horizontal: "left", }, }} - sx={{ - "& .MuiOutlinedInput-input": { - paddingLeft: theme.spacing(14), - }, - "& .MuiSelect-icon": { - left: theme.spacing(4), - }, - }} > {options.map((option) => (