Merge branch 'main' into feature/Anil/Fix-linter-issues

adimoft · web-flow · commit e44038ceedff · 2025-10-27T10:51:00.000+02:00
diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml
@@ -22,7 +22,7 @@ jobs:
           persist-credentials: false
 
       - name: Cache npm dependencies
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444  # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903  # v6.0.0
         with:
           node-version: 18.17.1
           cache: "npm"
diff --git a/.github/workflows/post-merge-admin.yml b/.github/workflows/post-merge-admin.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/post-merge-app-orch.yml b/.github/workflows/post-merge-app-orch.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/post-merge-cluster-orch.yml b/.github/workflows/post-merge-cluster-orch.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/post-merge-infra.yml b/.github/workflows/post-merge-infra.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/post-merge-root.yml b/.github/workflows/post-merge-root.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/post-merge-tests.yml b/.github/workflows/post-merge-tests.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/post-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_version_check: true
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -25,15 +25,15 @@ jobs:
         run: git config --global --add safe.directory $GITHUB_WORKSPACE
 
       - name: Discover changed files at root level
-        uses: open-edge-platform/orch-ci/discover-changed-files@0.1.52
+        uses: open-edge-platform/orch-ci/discover-changed-files@0.1.54
         id: root-file-changes
 
       - name: Discover changed folders at root level
-        uses: open-edge-platform/orch-ci/discover-changed-subfolders@0.1.52
+        uses: open-edge-platform/orch-ci/discover-changed-subfolders@0.1.54
         id: discover-changes
 
       - name: Discover changed apps
-        uses: open-edge-platform/orch-ci/discover-changed-subfolders@0.1.52
+        uses: open-edge-platform/orch-ci/discover-changed-subfolders@0.1.54
         id: discover-changes-apps
         with:
           project_folder: "apps"
@@ -104,7 +104,7 @@ jobs:
       fail-fast: false
       matrix:
         project_folder: ${{ (needs.setup-conditions.outputs.common_condition == 'true' && fromJson('["admin", "app-orch", "cluster-orch", "infra", "root"]')) || fromJson(needs.detect-changed-folders.outputs.changed_apps) }}
-    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@0.1.52
+    uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@0.1.54
     with:
       bootstrap_tools: "base,helm,yq,jq"
       run_security_scans: true
diff --git a/apps/app-orch/src/components/organisms/setup-deployments/OverrideProfileValues/OverrideProfileTable.tsx b/apps/app-orch/src/components/organisms/setup-deployments/OverrideProfileValues/OverrideProfileTable.tsx
@@ -101,7 +101,7 @@ const OverrideProfileTable = ({
         .catch(setParsedErr)
         .finally(() => setIsloading(false));
     }
-  }, [selectedPackage, selectedProfile, overrideValues]);
+  }, [selectedPackage, selectedProfile]);
 
   const columns: TableColumn<catalog.Application>[] = [
     {
diff --git a/apps/infra/VERSION b/apps/infra/VERSION
@@ -1 +1 @@
-3.2.7
+3.2.9-dev
diff --git a/apps/infra/deploy/Chart.yaml b/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.7
+version: 3.2.9-dev
 # Default appVersion will be overwritten by a the build to use the version from package.json.
 
-appVersion: "3.2.7"
+appVersion: "3.2.9-dev"
 dependencies: []
 annotations: {}
diff --git a/apps/infra/src/components/organism/locations/SiteView/SiteView.cy.tsx b/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");
diff --git a/apps/infra/src/components/organism/locations/SiteView/SiteView.pom.ts b/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);
   }
 }
diff --git a/apps/infra/src/components/organism/locations/SiteView/SiteView.tsx b/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 />;
   }
diff --git a/apps/infra/src/components/pages/region/RegionForm.tsx b/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);
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ const OverrideProfileTable = ({`
`101`	`101`	`.catch(setParsedErr)`
`102`	`102`	`.finally(() => setIsloading(false));`
`103`	`103`	`}`
`104`		`- }, [selectedPackage, selectedProfile, overrideValues]);`
	`104`	`+ }, [selectedPackage, selectedProfile]);`
`105`	`105`
`106`	`106`	`const columns: TableColumn<catalog.Application>[] = [`
`107`	`107`	`{`