Merge pull request #5743 from yaacov/remove-ga-selectors

Remove guest agent selectors

frontend/packages/kubevirt-plugin/src/components/vms/vm-details.tsx

@@ -21,8 +21,7 @@ import { VMResourceSummary, VMDetailsList, VMSchedulingList } from './vm-resourc
 import { VMUsersList } from './vm-users';
 import { VMTabProps } from './types';
 import { useGuestAgentInfo } from '../../hooks/use-guest-agent-info';
-import { getGuestAgentInfoOS } from '../../selectors/vmi-guest-agent-info/guest-agent-info';
-import { getGuestOSID } from '../../selectors/vmi-guest-agent-info/guest-os-info';
+import { GuestAgentInfoWrapper } from '../../k8s/wrapper/vm/guest-agent-info/guest-agent-info-wrapper';
 import { getVMStatus } from '../../statuses/vm/vm-status';
 import { VMStatusBundle } from '../../statuses/vm/types';
 import { isWindows } from '../../selectors/vm/combined';
@@ -83,13 +82,13 @@ export const VMDetails: React.FC<VMDetailsProps> = (props) => {
   const vmiLike = kindObj === VirtualMachineModel ? vm : vmi;
   const vmServicesData = getServicesForVmi(getLoadedData(props.services, []), vmi);
   const canUpdate = useAccessReview(asAccessReview(kindObj, vmiLike || {}, 'patch')) && !!vmiLike;
-  const [guestAgentInfo] = useGuestAgentInfo({ vmi });
-  const guestAgentInfoOS = getGuestAgentInfoOS(guestAgentInfo);
+
+  const [guestAgentInfoRaw] = useGuestAgentInfo({ vmi });
+  const guestAgentInfo = new GuestAgentInfoWrapper(guestAgentInfoRaw);
+  const operatingSystemID = guestAgentInfo.getOSInfo().getId();
 
   const OSMismatchExists =
-    vmi &&
-    guestAgentInfo &&
-    isWindows(vmiLike) !== (getGuestOSID(guestAgentInfoOS) === 'mswindows');
+    vmi && guestAgentInfoRaw && isWindows(vmiLike) !== (operatingSystemID === 'mswindows');
   const OSMismatchAlert = OSMismatchExists && (
     <Alert className="co-alert" variant="warning" title="Operating system mismatch" isInline>
       The operating system defined for this virtual machine does not match what is being reported by

frontend/packages/kubevirt-plugin/src/components/vms/vm-resource.tsx

@@ -42,12 +42,7 @@ import {
   AFFINITY_MODAL_TITLE,
 } from '../modals/scheduling-modals/shared/consts';
 import { useGuestAgentInfo } from '../../hooks/use-guest-agent-info';
-import {
-  getGuestAgentInfoOS,
-  getGuestAgentInfoHostname,
-  getGuestAgentInfoTimezoneName,
-} from '../../selectors/vmi-guest-agent-info/guest-agent-info';
-import { getGuestOSPrettyName } from '../../selectors/vmi-guest-agent-info/guest-os-info';
+import { GuestAgentInfoWrapper } from '../../k8s/wrapper/vm/guest-agent-info/guest-agent-info-wrapper';
 import { VMStatusBundle } from '../../statuses/vm/types';
 
 import './vm-resource.scss';
@@ -89,8 +84,9 @@ export const VMResourceSummary: React.FC<VMResourceSummaryProps> = ({
   const description = getDescription(vmiLike);
   const os = getOperatingSystemName(vmiLike) || getOperatingSystem(vmiLike);
 
-  const [guestAgentInfo] = useGuestAgentInfo({ vmi });
-  const guestAgentInfoOS = getGuestAgentInfoOS(guestAgentInfo);
+  const [guestAgentInfoRaw] = useGuestAgentInfo({ vmi });
+  const guestAgentInfo = new GuestAgentInfoWrapper(guestAgentInfoRaw);
+  const operatingSystem = guestAgentInfo.getOSInfo().getPrettyName();
 
   return (
     <ResourceSummary resource={vmiLike}>
@@ -111,9 +107,9 @@ export const VMResourceSummary: React.FC<VMResourceSummaryProps> = ({
       <VMDetailsItem
         title="Operating System"
         idValue={prefixedID(id, 'os')}
-        isNotAvail={!(getGuestOSPrettyName(guestAgentInfoOS) || os)}
+        isNotAvail={!(operatingSystem || os)}
       >
-        {getGuestOSPrettyName(guestAgentInfoOS) || os}
+        {operatingSystem || os}
       </VMDetailsItem>
 
       {isVM && (
@@ -135,7 +131,11 @@ export const VMDetailsList: React.FC<VMResourceListProps> = ({
   canUpdateVM,
   kindObj,
 }) => {
-  const [guestAgentInfo] = useGuestAgentInfo({ vmi });
+  const [guestAgentInfoRaw] = useGuestAgentInfo({ vmi });
+  const guestAgentInfo = new GuestAgentInfoWrapper(guestAgentInfoRaw);
+  const hostname = guestAgentInfo.getHostname();
+  const timeZone = guestAgentInfo.getTimezoneName();
+
   const [isBootOrderModalOpen, setBootOrderModalOpen] = React.useState<boolean>(false);
   const isVM = kindObj === VirtualMachineModel;
   const vmiLike = isVM ? vm : vmi;
@@ -214,20 +214,12 @@ export const VMDetailsList: React.FC<VMResourceListProps> = ({
         {launcherPod && ipAddrs}
       </VMDetailsItem>
 
-      <VMDetailsItem
-        title="Hostname"
-        idValue={prefixedID(id, 'hostname')}
-        isNotAvail={!getGuestAgentInfoHostname(guestAgentInfo)}
-      >
-        {getGuestAgentInfoHostname(guestAgentInfo)}
+      <VMDetailsItem title="Hostname" idValue={prefixedID(id, 'hostname')} isNotAvail={!hostname}>
+        {hostname}
       </VMDetailsItem>
 
-      <VMDetailsItem
-        title="Time Zone"
-        idValue={prefixedID(id, 'timezone')}
-        isNotAvail={!getGuestAgentInfoTimezoneName(guestAgentInfo)}
-      >
-        {getGuestAgentInfoTimezoneName(guestAgentInfo)}
+      <VMDetailsItem title="Time Zone" idValue={prefixedID(id, 'timezone')} isNotAvail={!timeZone}>
+        {timeZone}
       </VMDetailsItem>
 
       <VMDetailsItem

frontend/packages/kubevirt-plugin/src/components/vms/vm-users.tsx

@@ -13,12 +13,7 @@ import {
 import { VMStatus } from '../../constants/vm/vm-status';
 import { isGuestAgentInstalled } from '../dashboards-page/vm-dashboard/vm-alerts';
 import { useGuestAgentInfo } from '../../hooks/use-guest-agent-info';
-import { getGuestAgentInfoUserList } from '../../selectors/vmi-guest-agent-info/guest-agent-info';
-import {
-  getGuestOSUserUserName,
-  getGuestOSUserLoginTimeSec,
-  getGuestOSUserDomain,
-} from '../../selectors/vmi-guest-agent-info/guest-os-user-list';
+import { GuestAgentInfoWrapper } from '../../k8s/wrapper/vm/guest-agent-info/guest-agent-info-wrapper';
 import { VMStatusBundle } from '../../statuses/vm/types';
 import { VMIKind } from '../../types';
 
@@ -73,7 +68,9 @@ const UsersTableRow = ({ obj: user, index, key, style }) => {
 };
 
 export const VMUsersList: React.FC<VMUsersListProps> = ({ vmi, vmStatusBundle, delay }) => {
-  const [response, error, loading] = useGuestAgentInfo({ vmi, delay });
+  const [guestAgentInfoRaw, error, loading] = useGuestAgentInfo({ vmi, delay });
+  const guestAgentInfo = new GuestAgentInfoWrapper(guestAgentInfoRaw);
+  const userList = guestAgentInfo.getUserList();
 
   if (vmStatusBundle.status !== VMStatus.RUNNING) {
     return <div className="text-center">{VIRTUAL_MACHINE_IS_NOT_RUNNING}</div>;
@@ -84,14 +81,14 @@ export const VMUsersList: React.FC<VMUsersListProps> = ({ vmi, vmStatusBundle, d
   }
 
   const data =
-    response &&
-    getGuestAgentInfoUserList(response) &&
-    getGuestAgentInfoUserList(response).map((user, uid) => ({
+    guestAgentInfoRaw &&
+    userList &&
+    userList.map((user, uid) => ({
       metadata: {
         uid,
-        userName: getGuestOSUserUserName(user),
-        domain: getGuestOSUserDomain(user),
-        loginTime: getGuestOSUserLoginTimeSec(user),
+        userName: user.getUserName(),
+        domain: user.getDomain(),
+        loginTime: user.getLoginTimeInMilliSec(),
       },
     }));