From 9c242d42264a1738ccd7fd2191d4b0e9e674f792 Mon Sep 17 00:00:00 2001 From: Peter Makowski Date: Thu, 16 May 2024 16:35:15 +0200 Subject: [PATCH] refactor: fix selector memoization warning Signed-off-by: Peter Makowski --- .../MachineDetails/MachineConfiguration/TagForm/TagForm.tsx | 2 +- src/app/store/subnet/selectors.ts | 6 +++--- src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx b/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx index 1b8a20fd50..c705a000d8 100644 --- a/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx +++ b/src/app/machines/views/MachineDetails/MachineConfiguration/TagForm/TagForm.tsx @@ -21,7 +21,7 @@ const TagForm = ({ systemId }: Props): JSX.Element | null => { machineSelectors.getById(state, systemId) ); const tags = useSelector((state: RootState) => - tagSelectors.getByIDs(state, machine?.tags || []) + tagSelectors.getByIDs(state, machine?.tags || null) ); const tagsLoading = useSelector(tagSelectors.loading); const taggingMachines = useSelector(machineSelectors.updatingTags); diff --git a/src/app/store/subnet/selectors.ts b/src/app/store/subnet/selectors.ts index 569711ce6c..d197af547d 100644 --- a/src/app/store/subnet/selectors.ts +++ b/src/app/store/subnet/selectors.ts @@ -60,10 +60,10 @@ const active = createSelector( const getByIds = createSelector( [ defaultSelectors.all, - (_state: RootState, ids: Subnet[SubnetMeta.PK][]) => ids, + (_state: RootState, ids: Subnet[SubnetMeta.PK][] | null) => ids, ], - (subnets, ids) => { - return subnets.filter(({ id }) => ids.includes(id)); + (subnets, ids = []) => { + return subnets.filter(({ id }) => ids?.includes(id)); } ); diff --git a/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx b/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx index 22424200a7..6bc96cff76 100644 --- a/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx +++ b/src/app/subnets/views/VLANDetails/DHCPStatus/DHCPStatus.tsx @@ -64,7 +64,7 @@ const DHCPStatus = ({ id }: Props): JSX.Element | null => { vlanSelectors.getById(state, id) ); const vlanSubnets = useSelector((state: RootState) => - subnetSelectors.getByIds(state, vlan?.subnet_ids || []) + subnetSelectors.getByIds(state, vlan?.subnet_ids || null) ); const subnetsLoading = useSelector(subnetSelectors.loading);