From 3a7455b6a19541937b4ac51845b96c9f57c70ed7 Mon Sep 17 00:00:00 2001
From: "marco.mruz" <marcomruz1@gmail.com>
Date: Wed, 15 May 2024 14:30:01 +0200
Subject: [PATCH 1/2] add new model/version column to devices table

---
 .../src/__generated__/graphql.ts              | 54 ++++++++++++++++++-
 .../src/pages/device-list/device-list.tsx     |  3 ++
 .../src/pages/device-list/device-table.tsx    | 21 +++++++-
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/packages/frinx-inventory-client/src/__generated__/graphql.ts b/packages/frinx-inventory-client/src/__generated__/graphql.ts
index 5403baba4..5c25e0cae 100644
--- a/packages/frinx-inventory-client/src/__generated__/graphql.ts
+++ b/packages/frinx-inventory-client/src/__generated__/graphql.ts
@@ -649,6 +649,7 @@ export type Device = Node & {
   name: Scalars['String']['output'];
   port: Maybe<Scalars['Int']['output']>;
   serviceState: DeviceServiceState;
+  software: Maybe<Scalars['String']['output']>;
   source: DeviceSource;
   updatedAt: Scalars['String']['output'];
   vendor: Maybe<Scalars['String']['output']>;
@@ -677,6 +678,11 @@ export type DeviceEdge = {
   node: Device;
 };
 
+export type DeviceListUsage = {
+  __typename?: 'DeviceListUsage';
+  devicesUsage: Array<Maybe<DevicesUsage>>;
+};
+
 export type DeviceOrderByInput = {
   direction: SortDirection;
   sortKey: SortDeviceBy;
@@ -697,6 +703,19 @@ export type DeviceSource =
   | 'IMPORTED'
   | 'MANUAL';
 
+export type DeviceUsage = {
+  __typename?: 'DeviceUsage';
+  cpuLoad: Scalars['Float']['output'];
+  memoryLoad: Scalars['Float']['output'];
+};
+
+export type DevicesUsage = {
+  __typename?: 'DevicesUsage';
+  cpuLoad: Scalars['Float']['output'];
+  deviceName: Scalars['String']['output'];
+  memoryLoad: Scalars['Float']['output'];
+};
+
 export type DiffData = {
   __typename?: 'DiffData';
   data: Scalars['String']['output'];
@@ -1045,6 +1064,12 @@ export type NetTopology = {
   nodes: Array<NetNode>;
 };
 
+export type NetTopologyVersionData = {
+  __typename?: 'NetTopologyVersionData';
+  edges: Array<GraphVersionEdge>;
+  nodes: Array<NetNode>;
+};
+
 export type Node = {
   id: Scalars['ID']['output'];
 };
@@ -2292,6 +2317,7 @@ export type ConductorMutation = {
   deleteWorkflowDefinition: DeleteWorkflowDefinitionPayload;
   editEventHandler: EditEventHandlerPayload;
   executeWorkflowByName: Maybe<Scalars['String']['output']>;
+  exportWorkflowDefinition: Maybe<Scalars['JSON']['output']>;
   /** Lists workflows for the given correlation id list */
   getWorkflows: Maybe<Scalars['JSON']['output']>;
   /** Log Task Execution Details */
@@ -2417,6 +2443,12 @@ export type ConductorMutationExecuteWorkflowByNameArgs = {
 };
 
 
+export type ConductorMutationExportWorkflowDefinitionArgs = {
+  name: Scalars['String']['input'];
+  version?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type ConductorMutationGetWorkflowsArgs = {
   includeClosed?: InputMaybe<Scalars['Boolean']['input']>;
   includeTasks?: InputMaybe<Scalars['Boolean']['input']>;
@@ -3145,6 +3177,7 @@ export type DeviceInventoryQuery = {
   labels: LabelConnection;
   locations: LocationConnection;
   netTopology: Maybe<NetTopology>;
+  netTopologyVersionData: NetTopologyVersionData;
   node: Maybe<Node>;
   phyTopologyVersionData: PhyTopologyVersionData;
   ptpDiffSynce: PtpDiffSynce;
@@ -3220,6 +3253,11 @@ export type DeviceInventoryQueryLocationsArgs = {
 };
 
 
+export type DeviceInventoryQueryNetTopologyVersionDataArgs = {
+  version: Scalars['String']['input'];
+};
+
+
 export type DeviceInventoryQueryNodeArgs = {
   id: Scalars['ID']['input'];
 };
@@ -3286,10 +3324,24 @@ export type DeviceInventoryQueryZonesArgs = {
 
 export type DeviceInventorySubscription = {
   __typename?: 'deviceInventorySubscription';
+  deviceUsage: Maybe<DeviceUsage>;
+  devicesUsage: Maybe<DeviceListUsage>;
   uniconfigShell: Maybe<Scalars['String']['output']>;
 };
 
 
+export type DeviceInventorySubscriptionDeviceUsageArgs = {
+  deviceName: Scalars['String']['input'];
+  refreshEverySec?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
+export type DeviceInventorySubscriptionDevicesUsageArgs = {
+  deviceNames: Array<Scalars['String']['input']>;
+  refreshEverySec?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type DeviceInventorySubscriptionUniconfigShellArgs = {
   input?: InputMaybe<Scalars['String']['input']>;
   sessionId: Scalars['String']['input'];
@@ -3913,7 +3965,7 @@ export type DevicesQueryVariables = Exact<{
 }>;
 
 
-export type DevicesQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', devices: { __typename?: 'DeviceConnection', edges: Array<{ __typename?: 'DeviceEdge', node: { __typename?: 'Device', id: string, name: string, createdAt: string, isInstalled: boolean, serviceState: DeviceServiceState, zone: { __typename?: 'Zone', id: string, name: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string | null, endCursor: string | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
+export type DevicesQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', devices: { __typename?: 'DeviceConnection', edges: Array<{ __typename?: 'DeviceEdge', node: { __typename?: 'Device', id: string, name: string, createdAt: string, isInstalled: boolean, serviceState: DeviceServiceState, version: string | null, model: string | null, software: string | null, zone: { __typename?: 'Zone', id: string, name: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string | null, endCursor: string | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
 
 export type InstallDeviceMutationVariables = Exact<{
   id: Scalars['String']['input'];
diff --git a/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx b/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
index 03585d189..67dcc63cf 100644
--- a/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
+++ b/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
@@ -79,6 +79,9 @@ const DEVICES_QUERY = gql`
             createdAt
             isInstalled
             serviceState
+            version
+            model
+            software
             zone {
               id
               name
diff --git a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
index a63bb051a..c469d59f4 100644
--- a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
+++ b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
@@ -71,6 +71,9 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
               )}
             </Flex>
           </Th>
+          <Th>
+            <Text>Model/Version</Text>
+          </Th>
           <Th>
             <Flex
               alignItems="center"
@@ -122,8 +125,22 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
                 />
               </Td>
               <Td>
-                <Text data-cy={`device-name-${device.name}`} as="span" fontWeight={600}>
-                  {device.name}
+                <HStack>
+                  <Text data-cy={`device-name-${device.name}`} as="span" fontWeight={600}>
+                    {device.name}
+                  </Text>
+                  {device.model == null && device.software == null && device.software == null && (
+                    <Tooltip label="This device is currently unknown to the network, since we do not have any information on its model and software version">
+                      <Text data-cy={`device-id-${device.name}`} as="span" fontSize="sm" color="blackAlpha.700">
+                        <Icon size={12} as={FeatherIcon} icon="info" />
+                      </Text>
+                    </Tooltip>
+                  )}
+                </HStack>
+              </Td>
+              <Td>
+                <Text data-cy="device-name-software" as="span">
+                  {device.model ?? device.software ?? '?'} / {device.version ?? '?'}
                 </Text>
               </Td>
               <Td>

From 9c27377a51d26e3fa49dcd2ea426b3cc9ef94759 Mon Sep 17 00:00:00 2001
From: "marco.mruz" <marcomruz1@gmail.com>
Date: Wed, 15 May 2024 14:54:17 +0200
Subject: [PATCH 2/2] grayish unknown device names

---
 .../src/pages/device-list/device-table.tsx             | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
index c469d59f4..75fd64be5 100644
--- a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
+++ b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
@@ -114,6 +114,7 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
           const { isInstalled } = device;
           const localDate = getLocalDateFromUTC(device.createdAt);
           const isLoading = installLoadingMap[device.id] ?? false;
+          const isUnknown = device.model == null && device.software == null && device.version == null;
 
           return (
             <Tr key={device.id}>
@@ -126,10 +127,15 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
               </Td>
               <Td>
                 <HStack>
-                  <Text data-cy={`device-name-${device.name}`} as="span" fontWeight={600}>
+                  <Text
+                    data-cy={`device-name-${device.name}`}
+                    as="span"
+                    fontWeight={600}
+                    textColor={isUnknown ? 'gray.400' : 'black'}
+                  >
                     {device.name}
                   </Text>
-                  {device.model == null && device.software == null && device.software == null && (
+                  {isUnknown && (
                     <Tooltip label="This device is currently unknown to the network, since we do not have any information on its model and software version">
                       <Text data-cy={`device-id-${device.name}`} as="span" fontSize="sm" color="blackAlpha.700">
                         <Icon size={12} as={FeatherIcon} icon="info" />