Merge pull request #654 from yaacov/refactor-details-tab-wrappers

Refactor the hooks used on the details page tabs
kubev2v · Aug 1, 2023 · c6ccf1a · c6ccf1a
2 parents a74c5e8 + 5b09087
commit c6ccf1a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 42 deletions.
diff --git a/...nsole-plugin/src/modules/Providers/views/details/tabs/Credentials/ProviderCredentials.tsx b/...nsole-plugin/src/modules/Providers/views/details/tabs/Credentials/ProviderCredentials.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { useGetDeleteAndEditAccessReview, useProviderInventory } from 'src/modules/Providers/hooks';
 import { ProviderData } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
-import {
-  ProviderInventory,
-  ProviderModel,
-  ProviderModelGroupVersionKind,
-  V1beta1Provider,
-} from '@kubev2v/types';
+import { ProviderModelGroupVersionKind, V1beta1Provider } from '@kubev2v/types';
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { PageSection, Title } from '@patternfly/react-core';
 
@@ -53,10 +47,7 @@ export const ProviderCredentialsWrapper: React.FC<{ name: string; namespace: str
     namespace,
   });
 
-  const { inventory } = useProviderInventory<ProviderInventory>({ provider });
-  const permissions = useGetDeleteAndEditAccessReview({ model: ProviderModel, namespace });
-
-  const data = { provider, inventory, permissions };
+  const data = { provider };
 
   return <ProviderCredentials obj={data} loaded={providerLoaded} loadError={providerLoadError} />;
 };
diff --git a/.../forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/ProviderHosts.tsx b/.../forklift-console-plugin/src/modules/Providers/views/details/tabs/Hosts/ProviderHosts.tsx
@@ -1,15 +1,10 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { useGetDeleteAndEditAccessReview, useProviderInventory } from 'src/modules/Providers/hooks';
+import { useGetDeleteAndEditAccessReview } from 'src/modules/Providers/hooks';
 import { ModalHOC } from 'src/modules/Providers/modals';
 import { ProviderData } from 'src/modules/Providers/utils';
 
-import {
-  ProviderInventory,
-  ProviderModel,
-  ProviderModelGroupVersionKind,
-  V1beta1Provider,
-} from '@kubev2v/types';
+import { ProviderModel, ProviderModelGroupVersionKind, V1beta1Provider } from '@kubev2v/types';
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 
 import { VSphereHostsList } from './VSphereHostsList';
@@ -50,10 +45,9 @@ export const ProviderHostsWrapper: React.FC<{ name: string; namespace: string }>
     namespace,
   });
 
-  const { inventory } = useProviderInventory<ProviderInventory>({ provider });
   const permissions = useGetDeleteAndEditAccessReview({ model: ProviderModel, namespace });
 
-  const data = { provider, inventory, permissions };
+  const data = { provider, permissions };
 
   return <ProviderHosts obj={data} loaded={providerLoaded} loadError={providerLoadError} />;
 };
diff --git a/...ift-console-plugin/src/modules/Providers/views/details/tabs/Networks/ProviderNetworks.tsx b/...ift-console-plugin/src/modules/Providers/views/details/tabs/Networks/ProviderNetworks.tsx
@@ -12,7 +12,6 @@ import { useForkliftTranslation } from 'src/utils/i18n';
 import {
   CnoConfig,
   OpenShiftNetworkAttachmentDefinition,
-  ProviderInventory,
   ProviderModel,
   ProviderModelGroupVersionKind,
   V1beta1Provider,
@@ -128,10 +127,9 @@ export const ProviderNetworksWrapper: React.FC<{ name: string; namespace: string
     namespace,
   });
 
-  const { inventory } = useProviderInventory<ProviderInventory>({ provider });
   const permissions = useGetDeleteAndEditAccessReview({ model: ProviderModel, namespace });
 
-  const data = { provider, inventory, permissions };
+  const data = { provider, permissions };
 
   return <ProviderNetworks obj={data} loaded={providerLoaded} loadError={providerLoadError} />;
 };
diff --git a/...ugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx b/...ugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx
@@ -1,18 +1,13 @@
 import React, { useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import StandardPage from 'src/components/page/StandardPage';
-import {
-  useGetDeleteAndEditAccessReview,
-  useProviderInventory,
-  UseProviderInventoryParams,
-} from 'src/modules/Providers/hooks';
+import { useProviderInventory, UseProviderInventoryParams } from 'src/modules/Providers/hooks';
 import { ProviderData } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
 import { EnumToTuple, loadUserSettings, ResourceFieldFactory } from '@kubev2v/common';
 import {
   ProviderInventory,
-  ProviderModel,
   ProviderModelGroupVersionKind,
   ProviderVirtualMachine,
   V1beta1Provider,
@@ -120,9 +115,8 @@ export const ProviderVirtualMachinesWrapper: React.FC<{ name: string; namespace:
   });
 
   const { inventory } = useProviderInventory<ProviderInventory>({ provider });
-  const permissions = useGetDeleteAndEditAccessReview({ model: ProviderModel, namespace });
 
-  const data = { provider, inventory, permissions };
+  const data = { provider, inventory };
 
   return (
     <ProviderVirtualMachines obj={data} loaded={providerLoaded} loadError={providerLoadError} />

diff --git a/...es/forklift-console-plugin/src/modules/Providers/views/details/tabs/YAML/ProviderYAML.tsx b/...es/forklift-console-plugin/src/modules/Providers/views/details/tabs/YAML/ProviderYAML.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { useGetDeleteAndEditAccessReview, useProviderInventory } from 'src/modules/Providers/hooks';
 import { ProviderData } from 'src/modules/Providers/utils';
 import { useForkliftTranslation } from 'src/utils/i18n';
 
-import {
-  ProviderInventory,
-  ProviderModel,
-  ProviderModelGroupVersionKind,
-  V1beta1Provider,
-} from '@kubev2v/types';
+import { ProviderModelGroupVersionKind, V1beta1Provider } from '@kubev2v/types';
 import { ResourceYAMLEditor, useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { Bullseye } from '@patternfly/react-core';
 
@@ -59,10 +53,7 @@ export const ProviderYAMLPageWrapper: React.FC<{ name: string; namespace: string
     namespace,
   });
 
-  const { inventory } = useProviderInventory<ProviderInventory>({ provider });
-  const permissions = useGetDeleteAndEditAccessReview({ model: ProviderModel, namespace });
-
-  const data = { provider, inventory, permissions };
+  const data = { provider };
 
   return <ProviderYAMLPage obj={data} loaded={providerLoaded} loadError={providerLoadError} />;
 };