Make deauthorization reason mandatory and disable confirmBtn (#237)

Author: vigneshintel

apps/admin/VERSION

@@ -1 +1 @@
-2.0.20-dev
+2.0.20

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.20-dev
+version: 2.0.20
 # 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.20-dev"
+appVersion: "2.0.20"
 annotations:
   api_observability_monitor: 0.0.5
 dependencies: []

apps/app-orch/VERSION

@@ -1 +1 @@
-2.0.22-dev
+2.0.22

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.22-dev
+version: 2.0.22
 # 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.22-dev"
+appVersion: "2.0.22"
 annotations: {}
 dependencies: []

apps/cluster-orch/VERSION

@@ -1 +1 @@
-2.0.23-dev
+2.0.23

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.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: []

apps/infra/VERSION

@@ -1 +1 @@
-1.0.21-dev
+1.0.21

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

apps/infra/src/components/organism/hosts/DeauthorizeHostStandalone/DeauthorizeHostStandalone.tsx

@@ -45,7 +45,7 @@ const DeauthorizeHostStandalone = ({
   setDeauthorizeConfirmationOpen,
 }: DeauthorizeHostStandaloneProps) => {
   const cy = { "data-cy": dataCy };
-  const [deauthorizeReason, setDeauthorizeReason] = useState<string>();
+  const [deauthorizeReason, setDeauthorizeReason] = useState<string>("");
   const { control: controlDeauthBasicInfo } = useForm<DeauthInputs>({
     mode: "all",
   });
@@ -71,10 +71,12 @@ const DeauthorizeHostStandalone = ({
         render={({ field }) => (
           <TextField
             {...field}
-            label="Deauthorize reason (Optional)"
+            label="Reason for deauthorization"
             data-cy="reason"
             onInput={(e) => {
-              setDeauthorizeReason(e.currentTarget.value);
+              const value = e.currentTarget.value;
+              setDeauthorizeReason(value);
+              field.onChange(value);
             }}
             size={InputSize.Large}
             className="text-field-align"
@@ -109,6 +111,9 @@ const DeauthorizeHostStandalone = ({
       content={deauthDialogContent}
       isOpen={isDeauthConfirmationOpen}
       confirmBtnVariant={ButtonVariant.Alert}
+      confirmBtnDisabled={
+        !deauthorizeReason || deauthorizeReason.trim().length === 0
+      }
       confirmCb={() => deauthorizeHostFn(deauthorizeReason ?? "")}
       confirmBtnText="Deauthorize"
       cancelCb={() => setDeauthorizeConfirmationOpen(false)}

apps/infra/src/components/organism/hosts/HostDetailsTab/HostDetailsTab.tsx

@@ -21,7 +21,7 @@ import {
 import { Item, MessageBanner, Tabs } from "@spark-design/react";
 import React, { Suspense } from "react";
 import OSProfileDetails from "../../../organism/OSProfileDetails/OSProfileDetails";
-import VproDetails from "../../../organism/VproDetails/VproDetails";
+import VproDetails from "../../VproDetails/VproDetails";
 import { ResourceType, ResourceTypeTitle } from "../ResourceDetails";
 import { HostResourcesCpuRead } from "../resourcedetails/Cpu";
 import ResourceIndicator from "../ResourceIndicator";
@@ -81,10 +81,14 @@ const HostDetailsTab: React.FC<HostDetailsTabProps> = (props) => {
       id: 7,
       title: "Host Labels",
     },
-    {
-      id: 8,
-      title: "vPro Details",
-    },
+    ...(host.amtSku !== "Unknown"
+      ? [
+          {
+            id: 8,
+            title: "vPro Details",
+          },
+        ]
+      : []),
   ];
 
   const itemList = [
@@ -233,11 +237,16 @@ const HostDetailsTab: React.FC<HostDetailsTabProps> = (props) => {
         <OSProfileDetails os={currentOs} updatePolicy={updatePolicy} />
       )}
     </Item>,
-    <Item title={tabItems[7].title}>
-      <VproDetails host={host} />
-    </Item>,
   ];
 
+  if (host.amtSku !== "Unknown") {
+    itemList.push(
+      <Item title="vPro Details">
+        <VproDetails host={host} />
+      </Item>,
+    );
+  }
+
   if (
     host.site &&
     host.instance?.workloadMembers?.find(