diff --git a/src/fireedge/src/client/components/Tabs/Backup/index.js b/src/fireedge/src/client/components/Tabs/Backup/index.js index 18550eee61..b7fa9a66f4 100644 --- a/src/fireedge/src/client/components/Tabs/Backup/index.js +++ b/src/fireedge/src/client/components/Tabs/Backup/index.js @@ -43,7 +43,7 @@ const BackupTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Cluster/index.js b/src/fireedge/src/client/components/Tabs/Cluster/index.js index dec93c5923..9920d6d2f8 100644 --- a/src/fireedge/src/client/components/Tabs/Cluster/index.js +++ b/src/fireedge/src/client/components/Tabs/Cluster/index.js @@ -39,7 +39,7 @@ const ClusterTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Datastore/index.js b/src/fireedge/src/client/components/Tabs/Datastore/index.js index ef1459d75f..1dc105524d 100644 --- a/src/fireedge/src/client/components/Tabs/Datastore/index.js +++ b/src/fireedge/src/client/components/Tabs/Datastore/index.js @@ -39,7 +39,7 @@ const DatastoreTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/File/index.js b/src/fireedge/src/client/components/Tabs/File/index.js index 3e0cbf75d7..8c964c6b61 100644 --- a/src/fireedge/src/client/components/Tabs/File/index.js +++ b/src/fireedge/src/client/components/Tabs/File/index.js @@ -39,7 +39,7 @@ const FileTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Group/index.js b/src/fireedge/src/client/components/Tabs/Group/index.js index ff6fa57a10..2f6ba4f569 100644 --- a/src/fireedge/src/client/components/Tabs/Group/index.js +++ b/src/fireedge/src/client/components/Tabs/Group/index.js @@ -39,7 +39,7 @@ const GroupTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Host/index.js b/src/fireedge/src/client/components/Tabs/Host/index.js index 0e26892cf2..291b609ad2 100644 --- a/src/fireedge/src/client/components/Tabs/Host/index.js +++ b/src/fireedge/src/client/components/Tabs/Host/index.js @@ -50,7 +50,7 @@ const HostTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Image/index.js b/src/fireedge/src/client/components/Tabs/Image/index.js index 72f1b887b3..fd20cdfbfc 100644 --- a/src/fireedge/src/client/components/Tabs/Image/index.js +++ b/src/fireedge/src/client/components/Tabs/Image/index.js @@ -43,7 +43,7 @@ const ImageTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Marketplace/index.js b/src/fireedge/src/client/components/Tabs/Marketplace/index.js index 77df769489..e2c2bb4852 100644 --- a/src/fireedge/src/client/components/Tabs/Marketplace/index.js +++ b/src/fireedge/src/client/components/Tabs/Marketplace/index.js @@ -39,7 +39,7 @@ const MarketplaceTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/MarketplaceApp/index.js b/src/fireedge/src/client/components/Tabs/MarketplaceApp/index.js index 56ba9cd8d2..f4424a1dea 100644 --- a/src/fireedge/src/client/components/Tabs/MarketplaceApp/index.js +++ b/src/fireedge/src/client/components/Tabs/MarketplaceApp/index.js @@ -44,7 +44,7 @@ const MarketplaceAppTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/SecurityGroup/index.js b/src/fireedge/src/client/components/Tabs/SecurityGroup/index.js index edbecacaf4..ec4df71684 100644 --- a/src/fireedge/src/client/components/Tabs/SecurityGroup/index.js +++ b/src/fireedge/src/client/components/Tabs/SecurityGroup/index.js @@ -40,7 +40,7 @@ const SecurityGroupTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/Service/index.js b/src/fireedge/src/client/components/Tabs/Service/index.js index 9dac9c7d66..270ef9a6fb 100644 --- a/src/fireedge/src/client/components/Tabs/Service/index.js +++ b/src/fireedge/src/client/components/Tabs/Service/index.js @@ -45,7 +45,7 @@ const ServiceTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/ServiceTemplate/index.js b/src/fireedge/src/client/components/Tabs/ServiceTemplate/index.js index 14103be63c..1eaf445fc5 100644 --- a/src/fireedge/src/client/components/Tabs/ServiceTemplate/index.js +++ b/src/fireedge/src/client/components/Tabs/ServiceTemplate/index.js @@ -45,7 +45,7 @@ const ServiceTemplateTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/User/index.js b/src/fireedge/src/client/components/Tabs/User/index.js index 41be23afca..e99ad943f8 100644 --- a/src/fireedge/src/client/components/Tabs/User/index.js +++ b/src/fireedge/src/client/components/Tabs/User/index.js @@ -39,7 +39,7 @@ const UserTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/VNetwork/index.js b/src/fireedge/src/client/components/Tabs/VNetwork/index.js index b1b137762c..657d3e62fe 100644 --- a/src/fireedge/src/client/components/Tabs/VNetwork/index.js +++ b/src/fireedge/src/client/components/Tabs/VNetwork/index.js @@ -42,14 +42,16 @@ const getTabComponent = (tabName) => const VNetworkTabs = memo(({ id }) => { const { view, getResourceView } = useViews() - const { isLoading, isError, error, status } = useGetVNetworkQuery({ id }) + const { isLoading, isError, error, status } = useGetVNetworkQuery({ + id, + }) const tabsAvailable = useMemo(() => { const resource = RESOURCE_NAMES.VNET const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( @@ -62,6 +64,7 @@ const VNetworkTabs = memo(({ id }) => { if (isLoading || status === 'pending') { return } + if (status === 'fulfilled') { return } diff --git a/src/fireedge/src/client/components/Tabs/VNetworkTemplate/index.js b/src/fireedge/src/client/components/Tabs/VNetworkTemplate/index.js index e247ec34c5..5e1513b95b 100644 --- a/src/fireedge/src/client/components/Tabs/VNetworkTemplate/index.js +++ b/src/fireedge/src/client/components/Tabs/VNetworkTemplate/index.js @@ -39,7 +39,7 @@ const VNetTemplateTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return ( diff --git a/src/fireedge/src/client/components/Tabs/VmTemplate/index.js b/src/fireedge/src/client/components/Tabs/VmTemplate/index.js index e42cb2c2db..50f18d821d 100644 --- a/src/fireedge/src/client/components/Tabs/VmTemplate/index.js +++ b/src/fireedge/src/client/components/Tabs/VmTemplate/index.js @@ -41,7 +41,7 @@ const VmTemplateTabs = memo(({ id }) => { const infoTabs = getResourceView(resource)?.['info-tabs'] ?? {} return getAvailableInfoTabs(infoTabs, getTabComponent, id) - }, [view]) + }, [view, id]) if (isError) { return (