Cherry pick locations fix (#346)

Author: vigneshintel

apps/infra/VERSION

@@ -1 +1 @@
-3.2.8-dev
+3.2.8

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: 3.2.8-dev
+version: 3.2.8
 # Default appVersion will be overwritten by a the build to use the version from package.json.
 
-appVersion: "3.2.8-dev"
+appVersion: "3.2.8"
 dependencies: []
 annotations: {}

apps/infra/src/components/organism/locations/SiteView/SiteView.cy.tsx

@@ -11,6 +11,7 @@ import { SiteViewPom } from "./SiteView.pom";
 const pom = new SiteViewPom();
 describe("<SiteView/>", () => {
   it("should render component", () => {
+    pom.interceptApis([pom.api.getSite]);
     cy.mount(<SiteView />, {
       reduxStore: setupStore({
         locations: {
@@ -21,10 +22,12 @@ describe("<SiteView/>", () => {
       }),
     });
 
+    pom.waitForApis();
     pom.root.should("exist");
   });
 
   it("should render all info correctly when the site is valid", () => {
+    pom.interceptApis([pom.api.getSite]);
     pom.metrics.interceptApis([pom.metrics.api.getRegionTelemetryMetrics]);
     pom.logs.interceptApis([pom.logs.api.getRegionTelemetryLogs]);
 
@@ -38,6 +41,7 @@ describe("<SiteView/>", () => {
       }),
     });
 
+    pom.waitForApis();
     pom.metrics.waitForApis();
     pom.logs.waitForApis();
 
@@ -50,6 +54,7 @@ describe("<SiteView/>", () => {
   });
 
   it("should render actions button by default when hideActions prop is not passed", () => {
+    pom.interceptApis([pom.api.getSite]);
     pom.metrics.interceptApis([pom.metrics.api.getRegionTelemetryMetrics]);
     pom.logs.interceptApis([pom.logs.api.getRegionTelemetryLogs]);
 
@@ -63,12 +68,14 @@ describe("<SiteView/>", () => {
       }),
     });
 
+    pom.waitForApis();
     pom.metrics.waitForApis();
     pom.logs.waitForApis();
     pom.siteActionsPopup.el.siteActionsBtn.should("exist");
   });
 
   it("should not render actions button when hideActions prop is passed as true", () => {
+    pom.interceptApis([pom.api.getSite]);
     pom.metrics.interceptApis([pom.metrics.api.getRegionTelemetryMetrics]);
     pom.logs.interceptApis([pom.logs.api.getRegionTelemetryLogs]);
 
@@ -82,6 +89,7 @@ describe("<SiteView/>", () => {
       }),
     });
 
+    pom.waitForApis();
     pom.metrics.waitForApis();
     pom.logs.waitForApis();
     pom.siteActionsPopup.el.siteActionsBtn.should("not.exist");

apps/infra/src/components/organism/locations/SiteView/SiteView.pom.ts

@@ -3,20 +3,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CyPom } from "@orch-ui/tests";
+import { infra } from "@orch-ui/apis";
+import { CyApiDetails, CyPom, defaultActiveProject } from "@orch-ui/tests";
+import { siteRestaurantTwo } from "@orch-ui/utils";
 import { SiteActionsPopupPom } from "../../../../components/atom/locations/SiteActionsPopup/SiteActionsPopup.pom";
 import { TelemetryProfileLogsPom } from "../../../../components/molecules/locations/TelemetryProfileLogs/TelemetryProfileLogs.pom";
 import { TelemetryProfileMetricsPom } from "../../../../components/molecules/locations/TelemetryProfileMetrics/TelemetryProfileMetrics.pom";
 
 const dataCySelectors = ["siteName", "siteRegion"] as const;
 type Selectors = (typeof dataCySelectors)[number];
 
-export class SiteViewPom extends CyPom<Selectors> {
+type ApiAliases = "getSite";
+
+const route = `**/v1/projects/${defaultActiveProject.name}/regions/${siteRestaurantTwo.region?.resourceId}/sites/${siteRestaurantTwo.resourceId}`;
+
+const endpoints: CyApiDetails<ApiAliases, infra.SiteServiceGetSiteApiResponse> =
+  {
+    getSite: {
+      route: route,
+      statusCode: 200,
+      response: siteRestaurantTwo,
+    },
+  };
+
+export class SiteViewPom extends CyPom<Selectors, ApiAliases> {
   public metrics = new TelemetryProfileMetricsPom();
   public logs = new TelemetryProfileLogsPom();
   public siteActionsPopup = new SiteActionsPopupPom();
 
   constructor(public rootCy: string = "siteView") {
-    super(rootCy, [...dataCySelectors]);
+    super(rootCy, [...dataCySelectors], endpoints);
   }
 }

apps/infra/src/components/organism/locations/SiteView/SiteView.tsx

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { infra } from "@orch-ui/apis";
 import { Flex, SquareSpinner } from "@orch-ui/components";
+import { SharedStorage } from "@orch-ui/utils";
 import { Heading } from "@spark-design/react";
 import { DeploymentMetadata } from "../../../../components/atom/locations/DeploymentMetadata/DeploymentMetadata";
 import { SiteActionsPopup } from "../../../../components/atom/locations/SiteActionsPopup/SiteActionsPopup";
@@ -22,9 +24,24 @@ interface SiteViewProps {
 
 export const SiteView = ({ basePath, hideActions = false }: SiteViewProps) => {
   const cy = { "data-cy": dataCy };
-  const site = useAppSelector(selectSite);
+  const siteFromRedux = useAppSelector(selectSite);
   const className = "site-view";
 
+  const { data: site } = infra.useSiteServiceGetSiteQuery(
+    {
+      projectName: SharedStorage.project?.name ?? "",
+      resourceId: siteFromRedux?.resourceId ?? "",
+      regionResourceId: siteFromRedux?.region?.resourceId ?? "",
+    },
+    {
+      skip:
+        !siteFromRedux?.resourceId ||
+        !siteFromRedux?.region?.resourceId ||
+        !SharedStorage.project?.name,
+      refetchOnMountOrArgChange: true,
+    },
+  );
+
   if (!site) {
     return <SquareSpinner />;
   }

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

@@ -487,6 +487,11 @@ const RegionForm: React.FC = () => {
 
       await Promise.all(allPromises);
 
+      // Force tree refresh to show updated region data
+      if (regionId !== "new") {
+        localStorage.setItem("clearTree", "true");
+      }
+
       redirectToLocationsPage();
     } catch (error) {
       setErrorInfo(error);