Added usages of currentOs and desiredOs for backward compatibility (#236)

riyaz-ghati · web-flow · commit f88fe0e60a4b · 2025-08-04T19:20:21.000+05:30
diff --git a/apps/admin/VERSION b/apps/admin/VERSION
@@ -1 +1 @@
-2.0.21-dev
+2.0.21
diff --git a/apps/admin/deploy/Chart.yaml b/apps/admin/deploy/Chart.yaml
@@ -4,11 +4,11 @@ apiVersion: v2
 name: orch-ui-admin
 description: Deploy Edge-Native Software Platform UI Admin pods on Kubernetes
 type: application
-version: 2.0.21-dev
+version: 2.0.21
 # 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.21-dev"
+appVersion: "2.0.21"
 annotations:
   api_observability_monitor: 0.0.5
 dependencies: []
diff --git a/apps/app-orch/VERSION b/apps/app-orch/VERSION
@@ -1 +1 @@
-2.0.23-dev
+2.0.23
diff --git a/apps/app-orch/deploy/Chart.yaml b/apps/app-orch/deploy/Chart.yaml
@@ -4,10 +4,10 @@ apiVersion: v2
 name: orch-ui-app-orch
 description: Deploy the Edge Orchestrator app-orch pod
 type: application
-version: 2.0.23-dev
+version: 2.0.23
 # 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.23-dev"
+appVersion: "2.0.23"
 annotations: {}
 dependencies: []
diff --git a/apps/cluster-orch/VERSION b/apps/cluster-orch/VERSION
@@ -1 +1 @@
-2.0.24-dev
+2.0.24
diff --git a/apps/cluster-orch/deploy/Chart.yaml b/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.24-dev
+version: 2.0.24
 # 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.24-dev"
+appVersion: "2.0.24"
 annotations: {}
 dependencies: []
diff --git a/apps/cluster-orch/src/components/pages/AddToClusterDrawer/AddToClusterDrawer.pom.ts b/apps/cluster-orch/src/components/pages/AddToClusterDrawer/AddToClusterDrawer.pom.ts
@@ -47,6 +47,8 @@ export const hostOne: infra.HostResourceRead = {
       repoUrl: "repoUrl",
       sha256:
         "09f6e5d55cd9741a026c0388d4905b7492749feedbffc741e65aab35fc38430d",
+      kernelCommand: "kernelCommand",
+      updateSources: ["updateResources"],
     },
     workloadMembers: [
       {
diff --git a/apps/infra/VERSION b/apps/infra/VERSION
@@ -1 +1 @@
-1.0.22-dev
+1.0.22
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: 1.0.22-dev
+version: 1.0.22
 # Default appVersion will be overwritten by a the build to use the version from package.json.
 
-appVersion: "1.0.22-dev"
+appVersion: "1.0.22"
 dependencies: []
 annotations: {}
diff --git a/apps/infra/src/components/atom/HostsTableRowExpansionDetail/HostsTableRowExpansionDetail.tsx b/apps/infra/src/components/atom/HostsTableRowExpansionDetail/HostsTableRowExpansionDetail.tsx
@@ -46,6 +46,8 @@ const HostsTableRowExpansionDetail = ({
           <div className={`${className}__content`} data-cy="osUpdate">
             {host.instance?.osUpdateAvailable ? (
               host.instance?.osUpdateAvailable
+            ) : host.instance?.desiredOs?.name ? (
+              host.instance?.desiredOs?.name
             ) : (
               <em>(No Update)</em>
             )}
diff --git a/apps/infra/src/components/atom/OsConfig/OsConfig.cy.tsx b/apps/infra/src/components/atom/OsConfig/OsConfig.cy.tsx
@@ -49,7 +49,9 @@ describe("<OsConfig/>", () => {
       <OsConfig
         instance={{
           ...instanceOne,
-          os: os,
+          osUpdateAvailable: "",
+          currentOs: os,
+          desiredOs: os,
         }}
       />,
     );
diff --git a/apps/infra/src/components/atom/OsConfig/OsConfig.tsx b/apps/infra/src/components/atom/OsConfig/OsConfig.tsx
@@ -4,6 +4,7 @@
  */
 
 import { infra } from "@orch-ui/apis";
+import { isOSUpdateAvailable } from "@orch-ui/utils";
 import { Icon } from "@spark-design/react";
 import "./OsConfig.scss";
 const dataCy = "osConfig";
@@ -14,7 +15,9 @@ export interface OsConfigProps {
 
 export const OsConfig = ({ instance, iconOnly = false }: OsConfigProps) => {
   const cy = { "data-cy": dataCy };
-  const showUpdateAvailable = instance?.osUpdateAvailable;
+  // isOSUpdateAvailable is called for backward compatibility
+  const showUpdateAvailable =
+    instance?.osUpdateAvailable || isOSUpdateAvailable(instance);
   return (
     <div {...cy} className="os-config">
       {showUpdateAvailable && iconOnly && (
@@ -25,7 +28,7 @@ export const OsConfig = ({ instance, iconOnly = false }: OsConfigProps) => {
           title="OS update available"
         />
       )}
-      {instance?.os?.name ?? <em>(Not set)</em>}
+      {(instance?.os?.name || instance?.currentOs?.name) ?? <em>(Not set)</em>}
       {showUpdateAvailable && iconOnly === false && (
         <label
           className="os-update"
diff --git a/apps/infra/src/components/organism/OSProfileDetails/OSProfileDetails.cy.tsx b/apps/infra/src/components/organism/OSProfileDetails/OSProfileDetails.cy.tsx
@@ -15,11 +15,12 @@ describe("<OSProfileDetails/>", () => {
       cy.mount(
         <OSProfileDetails
           os={osUbuntu}
-          updatePolicy={{
-            name: "Ubuntu",
-            kernelCommand: "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
-            updateSources: ["deb https://files.edgeorch.net orchui release"],
-          }}
+          /* TODO: uncomment this data post 3.1 */
+          // updatePolicy={{
+          //   name: "Ubuntu",
+          //   kernelCommand: "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
+          //   updateSources: ["deb https://files.edgeorch.net orchui release"],
+          // }}
         />,
       );
     });
diff --git a/apps/infra/src/components/organism/OSProfileDetails/OSProfileDetails.tsx b/apps/infra/src/components/organism/OSProfileDetails/OSProfileDetails.tsx
@@ -139,6 +139,17 @@ const OSProfileDetails = ({ os, updatePolicy }: OSProfileDetailsProps) => {
     ? JSON.parse(os.existingCves)
     : null;
 
+  const getUpdateSources = () => {
+    if (updatePolicy?.updateSources) {
+      return updatePolicy?.updateSources?.join();
+    }
+    // for backward compatibility
+    if (os.updateSources) {
+      return os.updateSources.join();
+    }
+    return "-";
+  };
+
   return (
     <div className="os-profile-detail-content" {...cy}>
       <div className="os-details-header">Details</div>
@@ -150,19 +161,12 @@ const OSProfileDetails = ({ os, updatePolicy }: OSProfileDetailsProps) => {
       />
       <OsProfileDetailField label="Architecture" value={os.architecture} />
       <div className="os-details-advanced-settings">Advanced Settings</div>
-      <OsProfileDetailField
-        label="Update Sources"
-        value={
-          updatePolicy?.updateSources
-            ? updatePolicy?.updateSources?.join()
-            : "-"
-        }
-      />
+      <OsProfileDetailField label="Update Sources" value={getUpdateSources()} />
       <OsProfileDetailField label="Repository URL" value={os.repoUrl} />
       <OsProfileDetailField label="sha256" value={os.sha256} />
       <OsProfileDetailField
         label="Kernel Command"
-        value={updatePolicy?.kernelCommand}
+        value={updatePolicy?.kernelCommand || os.kernelCommand}
       />
 
       <div className="os-details-installed-packages">System Overview</div>
diff --git a/apps/infra/src/components/organism/hosts/HostDetailsTab/HostDetailsTab.tsx b/apps/infra/src/components/organism/hosts/HostDetailsTab/HostDetailsTab.tsx
@@ -40,7 +40,7 @@ const ClusterSummaryRemote = RuntimeConfig.isEnabled("CLUSTER_ORCH")
 
 const HostDetailsTab: React.FC<HostDetailsTabProps> = (props) => {
   const { host, onShowCategoryDetails } = props;
-  const currentOs = host.instance?.os;
+  const currentOs = host.instance?.os || host.instance?.currentOs; // currentOs is used for backward compatibility
   const updatePolicy = host.instance?.updatePolicy;
   const storageDisplayValue = humanFileSize(
     host.hostStorages?.reduce((total: number, s) => {
diff --git a/apps/infra/src/components/pages/HostDetails/HostDetails.cy.tsx b/apps/infra/src/components/pages/HostDetails/HostDetails.cy.tsx
@@ -52,7 +52,10 @@ describe("HostDetails", () => {
       );
       pom.el.guid.should("have.text", mockHost.uuid);
       pom.el.serial.should("have.text", mockHost.serialNumber);
-      pom.el.osProfiles.should("have.text", mockHost.instance?.os?.name);
+      pom.el.osProfiles.should(
+        "have.text",
+        mockHost.instance?.os?.name || mockHost.instance?.currentOs?.name,
+      );
       pom.el.site.should("have.text", "Restaurant 02");
       pom.el.trustedCompute.should("contain.text", "Not compatible");
       pom.el.provider.should("have.text", mockHost.provider?.name);
diff --git a/apps/infra/src/components/pages/HostDetails/HostDetails.pom.ts b/apps/infra/src/components/pages/HostDetails/HostDetails.pom.ts
@@ -125,6 +125,21 @@ const getApiEndpoints = (hostId: string): CyApiDetails<ApiAliases> => {
           os: {
             name: "Ubuntu",
             sha256: "OSSHA256",
+            updateSources: ["OSUpdateSourceName"],
+          },
+          // data for backward compatibility
+          currentOs: {
+            resourceId: "os-current",
+            name: "CurrentOS",
+            sha256: "CurrentOSSHA256",
+            updateSources: ["CurrentOSUpdateSourceName"],
+            osType: "OS_TYPE_IMMUTABLE",
+          },
+          desiredOs: {
+            resourceId: "os-desired",
+            name: "DesiredOS",
+            sha256: "DesiredOSSHA256",
+            updateSources: ["DesiredOSUpdateSourceName"],
           },
         },
       },
diff --git a/apps/infra/src/components/pages/HostDetails/HostDetails.tsx b/apps/infra/src/components/pages/HostDetails/HostDetails.tsx
@@ -22,6 +22,7 @@ import {
   getTrustedComputeCompatibility,
   HostGenericStatuses,
   hostToStatuses,
+  isOSUpdateAvailable,
   parseError,
   Role,
   SharedStorage,
@@ -437,7 +438,8 @@ const HostDetails: React.FC = () => {
               idle: () => getCustomStatusOnIdleAggregation(host),
             }}
           />
-          {host?.instance?.osUpdateAvailable && (
+          {(isOSUpdateAvailable(host?.instance) ||
+            host?.instance?.osUpdateAvailable) && (
             <label className="update-available" data-cy="osUpdateAvailable">
               <Icon icon={"alert-triangle"} className={"warning-icon"} /> OS
               update available
@@ -495,12 +497,18 @@ const HostDetails: React.FC = () => {
             </tr>
             <tr>
               <td>OS</td>
-              <td data-cy="osProfiles">{host?.instance?.os?.name ?? "-"}</td>
+              <td data-cy="osProfiles">
+                {host?.instance?.os?.name ??
+                  host?.instance?.currentOs?.name ??
+                  "-"}
+              </td>
             </tr>
             <tr>
               <td>Updates</td>
               <td data-cy="desiredOsProfiles">
-                {host?.instance?.osUpdateAvailable ?? "-"}
+                {host?.instance?.osUpdateAvailable ??
+                  host?.instance?.desiredOs?.name ??
+                  "-"}{" "}
               </td>
             </tr>
             {host.site && (
diff --git a/apps/infra/src/utils/HostTableColumns.tsx b/apps/infra/src/utils/HostTableColumns.tsx
@@ -133,7 +133,8 @@ const status: TableColumn<infra.HostResourceRead> = {
 
 const os: TableColumn<infra.HostResourceRead> = {
   Header: "Operating System",
-  accessor: (host) => host.instance?.os?.name ?? "-",
+  accessor: (host) =>
+    host.instance?.os?.name ?? host.instance?.currentOs?.name ?? "-",
   Cell: (table: { row: { original: infra.HostResourceRead } }) => {
     return <OsConfig instance={table.row.original.instance} iconOnly />;
   },
diff --git a/apps/root/VERSION b/apps/root/VERSION
@@ -1 +1 @@
-2.0.21-dev
+2.0.21
diff --git a/apps/root/deploy/Chart.yaml b/apps/root/deploy/Chart.yaml
@@ -4,10 +4,10 @@ apiVersion: v2
 name: orch-ui-root
 description: Deploy Edge Orchestrator UI pods on Kubernetes
 type: application
-version: 2.0.21-dev
+version: 2.0.21
 # 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.21-dev"
+appVersion: "2.0.21"
 annotations: {}
 dependencies: []
diff --git a/library/utils/global/eim/global.ts b/library/utils/global/eim/global.ts
@@ -228,6 +228,17 @@ export const statusIndicatorToIconStatus = (
   }
 };
 
+export const isOSUpdateAvailable = (
+  instance: infra.InstanceResourceRead | undefined,
+) => {
+  const desiredOsId = instance?.desiredOs?.resourceId;
+  const currentOs = instance?.currentOs;
+  return (
+    currentOs?.osType === "OS_TYPE_IMMUTABLE" &&
+    currentOs?.resourceId !== desiredOsId
+  );
+};
+
 const getHostProvisionTitles = (
   hostName: string,
   provisioningStatusIndicator?: infra.HostResourceRead["hostStatusIndicator"],
diff --git a/library/utils/mocks/infra/store/instances.ts b/library/utils/mocks/infra/store/instances.ts
@@ -56,6 +56,7 @@ export const instanceOne: enhancedInfraSlice.InstanceReadModified = {
   kind: "INSTANCE_KIND_METAL",
   currentState: "INSTANCE_STATE_RUNNING",
   os: osUbuntu,
+  currentOs: osUbuntu,
   securityFeature: "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   workloadMembers: [
     {
@@ -399,6 +400,8 @@ export class InstanceStore extends BaseStore<
       provisioningStatusTimestamp: currentTime,
       host: host ?? (body.host as infra.HostResourceRead),
       os: os ?? (body.currentOs as infra.OperatingSystemResourceRead),
+      currentOs: os ?? (body.currentOs as infra.OperatingSystemResourceRead),
+      desiredOs: os ?? (body.desiredOs as infra.OperatingSystemResourceRead),
       updatePolicy: {
         targetOs: os ?? (body.desiredOs as infra.OperatingSystemResourceRead),
         name: "",
diff --git a/library/utils/mocks/infra/store/osresources.ts b/library/utils/mocks/infra/store/osresources.ts
@@ -12,6 +12,8 @@ export const createOsResource = (
   name: string,
   architecture: string,
   repoUrl: string,
+  kernelCommand: string,
+  updateResources: string[],
   profileName: string,
   securityFeature: infra.InstanceResourceRead["securityFeature"],
   osType: infra.OperatingSystemResourceRead["osType"],
@@ -21,6 +23,8 @@ export const createOsResource = (
     architecture,
     name,
     repoUrl: repoUrl,
+    kernelCommand: kernelCommand,
+    updateSources: updateResources,
     sha256: "09f6e5d55cd9741a026c0388d4905b7492749feedbffc741e65aab35fc38430d",
     profileName: profileName,
     securityFeature: securityFeature,
@@ -37,6 +41,8 @@ export const osTb = createOsResource(
   "Tb Os",
   "x86_64",
   "http://open-edge-platform/tbos",
+  "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
+  ["deb https://files.edgeorch.net orchui release"],
   "TbOS",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
@@ -47,6 +53,8 @@ export const osTbUpdate = createOsResource(
   "Tb new Os",
   "x86_64",
   "http://open-edge-platform/tbos",
+  "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
+  ["deb https://files.edgeorch.net orchui release"],
   "TbOS",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
@@ -57,6 +65,8 @@ export const osUbuntu = createOsResource(
   "Ubuntu",
   "x86_64",
   "http://archive.ubuntu.com/ubuntu",
+  "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
+  ["deb https://files.edgeorch.net orchui release"],
   "Ubuntu-x86_profile",
   "SECURITY_FEATURE_SECURE_BOOT_AND_FULL_DISK_ENCRYPTION",
   "OS_TYPE_IMMUTABLE",
@@ -67,6 +77,8 @@ export const osRedHat = createOsResource(
   "Red Hat",
   "x86_64",
   "http://redhat.com/redhat",
+  "kvmgt vfio-iommu-type1 vfio-mdev i915.enable_gvt=1",
+  ["deb https://files.edgeorch.net orchui release"],
   "Redhat-x86_profile",
   "SECURITY_FEATURE_NONE",
   "OS_TYPE_IMMUTABLE",

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ export const hostOne: infra.HostResourceRead = {`
`47`	`47`	`repoUrl: "repoUrl",`
`48`	`48`	`sha256:`
`49`	`49`	`"09f6e5d55cd9741a026c0388d4905b7492749feedbffc741e65aab35fc38430d",`
	`50`	`+ kernelCommand: "kernelCommand",`
	`51`	`+ updateSources: ["updateResources"],`
`50`	`52`	`},`
`51`	`53`	`workloadMembers: [`
`52`	`54`	`{`