Add "Activate vPro" button to host actions (#304)

Author: vigneshintel

apps/cluster-orch/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

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: 3.2.1
+version: 3.2.2
 # 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: "3.2.1"
+appVersion: "3.2.2"
 annotations: {}
 dependencies: []

apps/cluster-orch/src/components/organism/DeauthorizeNodeConfirmationDialog/DeauthorizeNodeConfirmationDialog.cy.tsx

@@ -33,10 +33,12 @@ describe("<DeauthorizeNodeConfirmationDialog/>", () => {
         "host-dh38bjw9",
       );
 
-      pom.interceptApis([pom.api.putClusterNode]);
+      pom.interceptApis([pom.api.patchHost, pom.api.putClusterNode]);
       pom.el.reason.type("sample-deauthorize-reason");
       cy.get(".spark-modal-footer").contains("Deauthorize").click();
 
+      cy.wait(`@${pom.api.patchHost}`);
+
       cy.get(`@${pom.api.putClusterNode}`)
         .its("request.url")
         .then((url) => {
@@ -70,6 +72,8 @@ describe("<DeauthorizeNodeConfirmationDialog/>", () => {
         />,
       );
 
+      pom.interceptApis([pom.api.patchHost, pom.api.putClusterNode]);
+
       pom.el.reason.type("sample-deauthorize-reason");
 
       cyGet("confirmBtn").click();

apps/cluster-orch/src/components/organism/DeauthorizeNodeConfirmationDialog/DeauthorizeNodeConfirmationDialog.pom.ts

@@ -9,7 +9,7 @@ import { CyApiDetails, CyPom } from "@orch-ui/tests";
 const dataCySelectors = ["reason"] as const;
 type Selectors = (typeof dataCySelectors)[number];
 
-type ApiAliases = "putClusterNode";
+type ApiAliases = "putClusterNode" | "patchHost";
 
 const endpoints: CyApiDetails<
   ApiAliases,
@@ -21,6 +21,12 @@ const endpoints: CyApiDetails<
     statusCode: 200,
     response: undefined,
   },
+  patchHost: {
+    route: "**/hosts/*",
+    method: "PATCH",
+    statusCode: 200,
+    response: undefined,
+  },
 };
 
 class DeauthorizeNodeConfirmationDialogPom extends CyPom<

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { cm } from "@orch-ui/apis";
+import { cm, infra } from "@orch-ui/apis";
 import { ConfirmationDialog } from "@orch-ui/components";
 import {
   hostsRoute,
@@ -59,6 +59,7 @@ const DeauthorizeNodeConfirmationDialog = ({
 
   const [removeHostNodeFromCluster] =
     cm.usePutV2ProjectsByProjectNameClustersAndNameNodesMutation();
+  const [patchHost] = infra.useHostServicePatchHostMutation();
 
   const [deauthorizeReason, setDeauthorizeReason] = useState<string>();
 
@@ -68,6 +69,16 @@ const DeauthorizeNodeConfirmationDialog = ({
 
   const removeNodeFn = async () => {
     try {
+      await patchHost({
+        projectName: SharedStorage.project?.name ?? "",
+        resourceId: hostId,
+        hostResource: {
+          name: hostName || hostId,
+          desiredAmtState: "AMT_STATE_UNPROVISIONED",
+          desiredPowerState: "POWER_STATE_OFF",
+        },
+      }).unwrap();
+
       const deauthorizeFnList: (() => Promise<any>)[] = [];
 
       if (name && hostUuid) {

apps/infra/VERSION

@@ -1 +1 @@
-3.2.4-dev
+3.2.4

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

apps/infra/src/components/molecules/ProvisionedHostPopup/ProvisionedHostPopup.cy.tsx

@@ -117,4 +117,46 @@ describe("<ProvisionedHostPopup />", () => {
       cy.get("@onDeauthorizeWithoutWorkloadStub").should("be.called");
     });
   });
+
+  describe("Provisioned host with vPro capabilities", () => {
+    it("should show the Activate vPro option when AMT state is not provisioned", () => {
+      const props: ProvisionedHostPopupProps = {
+        host: {
+          ...provisionedHostOne,
+          instance: {
+            ...hostOne.instance,
+            workloadMembers: undefined,
+          },
+          amtSku: "AMT_SKU_AMT",
+          currentAmtState: "AMT_STATE_UNSPECIFIED",
+        },
+      };
+      cy.mount(<ProvisionedHostPopup {...props} />);
+      pom.root.click();
+
+      pom.hostPopupPom
+        .getActionPopupBySearchText("Activate vPro")
+        .should("exist");
+    });
+
+    it("should show the De-Activate vPro option when AMT state is provisioned", () => {
+      const props: ProvisionedHostPopupProps = {
+        host: {
+          ...provisionedHostOne,
+          instance: {
+            ...hostOne.instance,
+            workloadMembers: undefined,
+          },
+          amtSku: "AMT_SKU_AMT",
+          currentAmtState: "AMT_STATE_PROVISIONED",
+        },
+      };
+      cy.mount(<ProvisionedHostPopup {...props} />);
+      pom.root.click();
+
+      pom.hostPopupPom
+        .getActionPopupBySearchText("De-Activate vPro")
+        .should("exist");
+    });
+  });
 });

apps/infra/src/components/molecules/ProvisionedHostPopup/ProvisionedHostPopup.tsx

@@ -35,13 +35,18 @@ export type ProvisionedHostPopupProps = Omit<
   host: infra.HostResourceRead;
   onDeauthorizeHostWithoutWorkload?: (hostId: string) => void;
   onScheduleMaintenance?: (targetEntity: infra.HostResourceRead) => void;
+  onToggleVpro?: (boolean) => void;
 };
 
 /** This will show all available host actions within popup menu (active/configured, i.e, assigned/unassigned host only) */
 const ProvisionedHostPopup = (props: ProvisionedHostPopupProps) => {
   const cy = { "data-cy": dataCy };
-  const { host, onDeauthorizeHostWithoutWorkload, onScheduleMaintenance } =
-    props;
+  const {
+    host,
+    onDeauthorizeHostWithoutWorkload,
+    onScheduleMaintenance,
+    onToggleVpro,
+  } = props;
 
   const navigate = useInfraNavigate();
 
@@ -95,6 +100,24 @@ const ProvisionedHostPopup = (props: ProvisionedHostPopupProps) => {
       disable: !checkAuthAndRole([Role.INFRA_MANAGER_WRITE]),
       onSelect: () => onScheduleMaintenance && onScheduleMaintenance(host),
     },
+    ...((host.amtSku === "AMT_SKU_AMT" || host.amtSku === "AMT_SKU_ISM") &&
+    host.currentAmtState !== "AMT_STATE_PROVISIONED"
+      ? [
+          {
+            displayText: "Activate vPro",
+            onSelect: () => onToggleVpro && onToggleVpro(true),
+          },
+        ]
+      : []),
+    ...((host.amtSku === "AMT_SKU_AMT" || host.amtSku === "AMT_SKU_ISM") &&
+    host.currentAmtState === "AMT_STATE_PROVISIONED"
+      ? [
+          {
+            displayText: "De-Activate vPro",
+            onSelect: () => onToggleVpro && onToggleVpro(false),
+          },
+        ]
+      : []),
   ];
 
   // Graphana: add Dashboard access

apps/infra/src/components/organism/ConfigureAllHosts/ConfigureAllHosts.tsx

@@ -24,7 +24,6 @@ import {
   setCommonPublicSshKey,
   setCommonSecurityFeature,
   setCommonSite,
-  setCommonVPro,
   setShowAdvancedOptions,
   setValidationError,
 } from "../../../store/provisionHost";
@@ -151,7 +150,7 @@ const ConfigureAllHosts = () => {
       >
         <Section title="Security options">
           <Flex cols={[6]} gap="2" align="start">
-            <div>
+            {/* <div>
               <Heading semanticLevel={6}>vPro</Heading>
               <p>Enable vPro</p>
               <ToggleSwitch
@@ -162,7 +161,7 @@ const ConfigureAllHosts = () => {
               >
                 {commonHostData.vPro ? "Enabled" : "Disabled"}
               </ToggleSwitch>
-            </div>
+            </div> */}
             <div>
               <Heading semanticLevel={6}>
                 Secure Boot and Full Disk Encryption