Better querying

linode · Feb 7, 2024 · 9196b13 · 9196b13
1 parent ed91597
commit 9196b13
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.tsx b/packages/manager/src/features/PlacementGroups/PlacementGroupsAssignLinodesDrawer.tsx
@@ -35,7 +35,16 @@ export const PlacementGroupsAssignLinodesDrawer = (
   props: PlacementGroupsAssignLinodesDrawerProps
 ) => {
   const { onClose, open, selectedPlacementGroup } = props;
-  const { data: linodes, error: linodesError } = useAllLinodesQuery();
+  const { data: linodes, error: linodesError } = useAllLinodesQuery(
+    {},
+    {
+      '+or': [
+        {
+          region: selectedPlacementGroup?.region,
+        },
+      ],
+    }
+  );
   const { data: regions, error: regionsError } = useRegionsQuery();
   const {
     data: allPlacementGroups,
@@ -86,15 +95,14 @@ export const PlacementGroupsAssignLinodesDrawer = (
   const getLinodeSelectOptions = (): Linode[] => {
     return (
       linodes.filter((linode) => {
-        const isInRegion = linode.region === selectedPlacementGroup.region;
         const isNotAlreadyAssigned = !linodesFromAllPlacementGroups.includes(
           linode.id as number
         );
         const isNotAssignedInDrawer = !localLinodesSelection.find(
           (l) => l.id === linode.id
         );
 
-        return isInRegion && isNotAlreadyAssigned && isNotAssignedInDrawer;
+        return isNotAlreadyAssigned && isNotAssignedInDrawer;
       }) ?? []
     );
   };

diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
@@ -735,9 +735,14 @@ export const handlers = [
 
       if (orFilters) {
         const filteredLinodes = linodes.filter((linode) => {
-          return orFilters.some(
+          const filteredById = orFilters.some(
             (filter: { id: number }) => filter.id === linode.id
           );
+          const filteredByRegion = orFilters.some(
+            (filter: { region: string }) => filter.region === linode.region
+          );
+
+          return (filteredById || filteredByRegion) ?? linodes;
         });
 
         return res(ctx.json(makeResourcePage(filteredLinodes)));