Cherry Pick from main into 3.1-release for October Patch Release (#322)

Author: vigneshintel

apps/cluster-orch/VERSION

@@ -1 +1 @@
-2.0.29-dev
+2.0.31

apps/cluster-orch/deploy/Chart.yaml

@@ -4,10 +4,10 @@ apiVersion: v2
 name: orch-ui-cluster-orch
 description: Deploy the Edge Orchestrator cluster-orch pod
 type: application
-version: 2.0.29-dev
+version: 2.0.31
 # Default appVersion will be overwritten by a the build to use the version from package.json.
 
 # This value is supplied only to enable local unbuilt deployment of released content.
-appVersion: "2.0.29-dev"
+appVersion: "2.0.31"
 annotations: {}
 dependencies: []

apps/cluster-orch/src/components/organism/ClusterTemplatesList/ClusterTemplatesList.tsx

@@ -140,6 +140,7 @@ const ClusterTemplatesList = ({
 
       {doTemplatesExist && (
         <Table
+          key={templates?.templateInfoList?.length}
           columns={columns}
           data={templates?.templateInfoList}
           canSearch

apps/infra/VERSION

@@ -1 +1 @@
-1.0.32-dev
+1.0.32

apps/infra/deploy/Chart.yaml

@@ -4,9 +4,9 @@ apiVersion: v2
 name: orch-ui-infra
 description: Deploy the Edge-Native Software Platform Infrastructure pod
 type: application
-version: 1.0.32-dev
+version: 1.0.32
 # Default appVersion will be overwritten by a the build to use the version from package.json.
 
-appVersion: "1.0.32-dev"
+appVersion: "1.0.32"
 dependencies: []
 annotations: {}

apps/infra/src/components/pages/region/RegionForm.tsx

@@ -354,6 +354,12 @@ const RegionForm: React.FC = () => {
       delete data.parentId;
       delete data.parentRegion;
     }
+
+    if (!parentRegion) {
+      delete data.parentId;
+      delete data.parentRegion;
+    }
+
     if (parentRegionId) {
       data.parentId =
         regions?.find((r) => r.resourceId === parentRegion)?.resourceId ||