upcoming: [M3-7423] - Show regions instead of clusterIds in Create Dr…

…awer
linode · Dec 7, 2023 · be7305b · be7305b
1 parent d6a9890
commit be7305b
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/packages/manager/src/features/ObjectStorage/BucketLanding/ClusterSelect.tsx b/packages/manager/src/features/ObjectStorage/BucketLanding/ClusterSelect.tsx
@@ -1,8 +1,6 @@
-import { Region } from '@linode/api-v4/lib/regions';
 import * as React from 'react';
 
 import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
-import { useObjectStorageClusters } from 'src/queries/objectStorage';
 import { useRegionsQuery } from 'src/queries/regions';
 
 interface Props {
@@ -24,23 +22,10 @@ export const ClusterSelect: React.FC<Props> = (props) => {
     selectedCluster,
   } = props;
 
-  const { data: clusters, error: clustersError } = useObjectStorageClusters();
-  const { data: regions } = useRegionsQuery();
-
-  const regionOptions = clusters?.reduce<Region[]>((acc, cluster) => {
-    const region = regions?.find((r) => r.id === cluster.region);
-    if (region) {
-      acc.push({ ...region, id: cluster.id });
-    }
-    return acc;
-  }, []);
+  const { data: regions, error: regionsError } = useRegionsQuery();
 
   // Error could be: 1. General Clusters error, 2. Field error, 3. Nothing
-  const errorText = clustersError
-    ? 'Error loading regions'
-    : error
-    ? error
-    : undefined;
+  const errorText = error || regionsError?.[0]?.reason;
 
   return (
     <RegionSelect
@@ -53,7 +38,7 @@ export const ClusterSelect: React.FC<Props> = (props) => {
       label="Region"
       onBlur={onBlur}
       placeholder="Select a Region"
-      regions={regionOptions ?? []}
+      regions={regions ?? []}
       required={required}
       selectedId={selectedCluster}
     />