From 3198fc91cdf4f383c9cf3ebef2416295afdec561 Mon Sep 17 00:00:00 2001 From: Thorhildur Thorleiksdottir Date: Fri, 17 Jan 2025 16:19:49 +0000 Subject: [PATCH 1/3] fix(j-s): select all when only invalid files are in list --- .../web/src/components/SelectableList/SelectableList.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx index 31b2e242a094..f77f93d769c7 100644 --- a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx +++ b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx @@ -103,6 +103,7 @@ const SelectableList: FC = (props) => { setIsHandlingCTA(false) } + const validSelectableItems = selectableItems.filter((item) => !item.invalid) return ( <> = (props) => { name="select-all" label={formatMessage(strings.selectAllLabel)} checked={ - selectableItems.length > 0 && - // check if all valid selectable items are checked - selectableItems + validSelectableItems.length > 0 && + validSelectableItems .filter((item) => !item.invalid) .every((item) => item.checked) } @@ -132,7 +132,7 @@ const SelectableList: FC = (props) => { })), ) } - disabled={isHandlingCTA || selectableItems.length === 0} + disabled={isHandlingCTA || validSelectableItems.length === 0} strong /> From 836130137c4a7151bc54c2a4477660174b337aae Mon Sep 17 00:00:00 2001 From: Thorhildur Thorleiksdottir Date: Mon, 20 Jan 2025 09:25:51 +0000 Subject: [PATCH 2/3] fix(j-s): remove reduntant filter --- .../web/src/components/SelectableList/SelectableList.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx index f77f93d769c7..36a6db6d8a77 100644 --- a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx +++ b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx @@ -121,7 +121,6 @@ const SelectableList: FC = (props) => { checked={ validSelectableItems.length > 0 && validSelectableItems - .filter((item) => !item.invalid) .every((item) => item.checked) } onChange={(evt) => From cf658bd7131def9250744d2227b208d7d9e98449 Mon Sep 17 00:00:00 2001 From: andes-it Date: Mon, 20 Jan 2025 09:31:07 +0000 Subject: [PATCH 3/3] chore: nx format:write update dirty files --- .../web/src/components/SelectableList/SelectableList.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx index 36a6db6d8a77..a94116365fea 100644 --- a/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx +++ b/apps/judicial-system/web/src/components/SelectableList/SelectableList.tsx @@ -120,8 +120,7 @@ const SelectableList: FC = (props) => { label={formatMessage(strings.selectAllLabel)} checked={ validSelectableItems.length > 0 && - validSelectableItems - .every((item) => item.checked) + validSelectableItems.every((item) => item.checked) } onChange={(evt) => setSelectableItems((selectableItems) =>