[MTV-3311] [UI] mandatory storage incorrectly identified when editing mappings (#1873)

Signed-off-by: Jeff Puzzo <[email protected]>

Author: jpuzz0

src/plans/details/components/PlanPageHeader/hooks/usePlanAlerts.tsx

@@ -15,6 +15,7 @@ import { CATEGORY_TYPES } from '@utils/constants';
 import { getNamespace } from '@utils/crds/common/selectors';
 import { isEmpty } from '@utils/helpers';
 
+import { usePlanMappingData } from '../../../hooks/usePlanMappingData';
 import { getPlanStatus } from '../../PlanStatus/utils/utils';
 
 const usePlanAlerts = (plan: V1beta1Plan) => {
@@ -38,8 +39,17 @@ const usePlanAlerts = (plan: V1beta1Plan) => {
   });
 
   const [sourceProvider] = usePlanProviders(plan, namespace!);
-  const [sourceStorages] = useSourceStorages(sourceProvider);
-  const [sourceNetworks] = useSourceNetworks(sourceProvider);
+  const [providerStorages] = useSourceStorages(sourceProvider);
+  const [providerNetworks] = useSourceNetworks(sourceProvider);
+
+  const { sourceNetworks, sourceStorages } = usePlanMappingData({
+    networkMaps,
+    plan,
+    providerNetworks,
+    providerStorages,
+    sourceProvider,
+    storageMaps,
+  });
 
   const criticalCondition = plan?.status?.conditions?.find(
     (condition) => condition?.category === CATEGORY_TYPES.CRITICAL,

src/plans/details/hooks/usePlanMappingData.ts

@@ -0,0 +1,72 @@
+import { useMemo } from 'react';
+import type { InventoryNetwork } from 'src/modules/Providers/hooks/useNetworks';
+import type { InventoryStorage } from 'src/modules/Providers/hooks/useStorages';
+
+import type {
+  V1beta1NetworkMap,
+  V1beta1Plan,
+  V1beta1Provider,
+  V1beta1StorageMap,
+} from '@kubev2v/types';
+import { getName } from '@utils/crds/common/selectors';
+import { getPlanNetworkMapName, getPlanStorageMapName } from '@utils/crds/plans/selectors';
+import { isEmpty } from '@utils/helpers';
+
+type UsePlanMappingDataOptions = {
+  plan: V1beta1Plan;
+  networkMaps: V1beta1NetworkMap[];
+  storageMaps: V1beta1StorageMap[];
+  providerStorages: InventoryStorage[];
+  providerNetworks: InventoryNetwork[];
+  sourceProvider?: V1beta1Provider;
+};
+
+/**
+ * Returns source storage/network data with fallback to map references
+ * when provider inventory is unavailable.
+ */
+export const usePlanMappingData = ({
+  networkMaps,
+  plan,
+  providerNetworks,
+  providerStorages,
+  sourceProvider,
+  storageMaps,
+}: UsePlanMappingDataOptions) => {
+  const planNetworkMap = useMemo(
+    () => networkMaps.find((map) => getName(map) === getPlanNetworkMapName(plan)),
+    [networkMaps, plan],
+  );
+
+  const planStorageMap = useMemo(
+    () => storageMaps.find((map) => getName(map) === getPlanStorageMapName(plan)),
+    [storageMaps, plan],
+  );
+
+  const sourceStorages = useMemo(() => {
+    if (!isEmpty(providerStorages)) return providerStorages;
+
+    return (planStorageMap?.status?.references ?? []).map((ref) => ({
+      id: ref.id ?? '',
+      name: ref.name ?? '',
+      providerType: sourceProvider?.spec?.type,
+    })) as InventoryStorage[];
+  }, [providerStorages, planStorageMap, sourceProvider]);
+
+  const sourceNetworks = useMemo(() => {
+    if (!isEmpty(providerNetworks)) return providerNetworks;
+
+    return (planNetworkMap?.status?.references ?? []).map((ref) => ({
+      id: ref.id ?? '',
+      name: ref.name ?? '',
+      providerType: sourceProvider?.spec?.type,
+    })) as InventoryNetwork[];
+  }, [providerNetworks, planNetworkMap, sourceProvider]);
+
+  return {
+    planNetworkMap,
+    planStorageMap,
+    sourceNetworks,
+    sourceStorages,
+  };
+};

src/plans/details/tabs/Mappings/hooks/useMappingResources.ts

@@ -25,12 +25,12 @@ import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { getName, getNamespace } from '@utils/crds/common/selectors';
 import {
   getPlanDestinationProviderName,
-  getPlanNetworkMapName,
   getPlanSourceProviderName,
-  getPlanStorageMapName,
 } from '@utils/crds/plans/selectors';
 import { isEmpty } from '@utils/helpers';
 
+import { usePlanMappingData } from '../../../hooks/usePlanMappingData';
+
 type MappingResources = {
   loadingResources: boolean;
   resourcesError: Error | undefined;
@@ -70,16 +70,6 @@ export const useMappingResources = (plan: V1beta1Plan): MappingResources => {
     namespaced: true,
   });
 
-  const planNetworkMaps = useMemo(
-    () => (networkMaps ?? []).find((net) => getName(net) === getPlanNetworkMapName(plan)),
-    [networkMaps, plan],
-  );
-
-  const planStorageMaps = useMemo(
-    () => (storageMaps ?? []).find((storage) => getName(storage) === getPlanStorageMapName(plan)),
-    [storageMaps, plan],
-  );
-
   const sourceProvider = useMemo(
     () =>
       (providers ?? []).find((provider) => getName(provider) === getPlanSourceProviderName(plan)),
@@ -94,15 +84,24 @@ export const useMappingResources = (plan: V1beta1Plan): MappingResources => {
     [providers, plan],
   );
 
-  const [sourceNetworks, sourceNetworksLoading, sourceNetworksError] =
+  const [providerNetworks, sourceNetworksLoading, sourceNetworksError] =
     useSourceNetworks(sourceProvider);
   const [targetNetworks, targetNetworksLoading, targetNetworksError] =
     useOpenShiftNetworks(targetProvider);
-  const [sourceStorages, sourceStoragesLoading, sourceStoragesError] =
+  const [providerStorages, sourceStoragesLoading, sourceStoragesError] =
     useSourceStorages(sourceProvider);
   const [targetStorages, targetStoragesLoading, targetStoragesError] =
     useOpenShiftStorages(targetProvider);
 
+  const { planNetworkMap, planStorageMap, sourceNetworks, sourceStorages } = usePlanMappingData({
+    networkMaps,
+    plan,
+    providerNetworks,
+    providerStorages,
+    sourceProvider,
+    storageMaps,
+  });
+
   const resourcesError = () => {
     if (!isEmpty(providersLoadError as Error)) return providersLoadError as Error;
 
@@ -130,8 +129,8 @@ export const useMappingResources = (plan: V1beta1Plan): MappingResources => {
       targetNetworksLoading ||
       sourceStoragesLoading ||
       targetStoragesLoading,
-    planNetworkMap: planNetworkMaps ?? null,
-    planStorageMap: planStorageMaps ?? null,
+    planNetworkMap: planNetworkMap ?? null,
+    planStorageMap: planStorageMap ?? null,
     resourcesError: resourcesError(),
     sourceNetworks: sourceNetworks ?? [],
     sourceStorages: sourceStorages ?? [],