fix for create instance in network type fields condition show or not …

…show (omnistrate-oss#494) fix for create instance in network type fileds
FalkorDB · Jan 10, 2025 · b5d7b24 · b5d7b24
1 parent b10c1e4
commit b5d7b24
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pages/access/service/[serviceId].js b/pages/access/service/[serviceId].js
@@ -279,6 +279,13 @@ function MarketplaceService() {
     (instance) => instance.kubernetesDashboardEndpoint
   );
 
+  const isMultiTenancy = useMemo(
+    () =>
+      service?.productTierType === productTierTypes.OMNISTRATE_MULTI_TENANCY,
+
+    [service]
+  );
+
   const handleViewAccountConfigInstructions = (row) => {
     setViewInstructionsItem(row);
     const result_params = row.result_params;
@@ -938,7 +945,11 @@ function MarketplaceService() {
             }
           }
 
-          if (!isCloudProvider || isCustomNetworkEnabled) {
+          if (
+            !isCloudProvider ||
+            isMultiTenancy ||
+            !service?.supportsPublicNetwork
+          ) {
             delete data["network_type"];
           }
 
@@ -2024,6 +2035,7 @@ function MarketplaceService() {
                       gcp: service?.gcpRegions || [],
                     }}
                     isCustomNetworkEnabled={isCustomNetworkEnabled}
+                    isMultiTenancy={isMultiTenancy}
                   />
                 }
               />

diff --git a/src/components/Forms/CreateResourceInstanceForm.jsx b/src/components/Forms/CreateResourceInstanceForm.jsx
@@ -65,6 +65,7 @@ function CreateResourceInstanceForm(props) {
     service,
     subscriptionId,
     isCustomNetworkEnabled = false,
+    isMultiTenancy,
   } = props;
 
   const [isSchemaLoading, setIsSchemaLoading] = useState(true);
@@ -234,7 +235,7 @@ function CreateResourceInstanceForm(props) {
 
   const networkTypeFieldExists =
     cloudProviderFieldExists &&
-    !isCustomNetworkEnabled &&
+    !isMultiTenancy &&
     service?.supportsPublicNetwork;
 
   if (isSchemaLoading)