feat: display operating system as new card in instance detail view

Co-authored-by: Julian Geywitz <[email protected]>
sipgate · Aug 5, 2022 · 0141f3f · 0141f3f
1 parent 8c72aee
commit 0141f3f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 2 deletions.
diff --git a/api/model/model.go b/api/model/model.go
@@ -27,6 +27,7 @@ type GntInstance struct {
 	Disks          []GntDisk `json:"disks"`
 	Nics           []GntNic  `json:"nics"`
 	Tags           []string  `json:"tags"`
+	OS             string    `json:"OS"`
 }
 
 type GntCluster struct {

diff --git a/api/repository/instance.go b/api/repository/instance.go
@@ -54,6 +54,7 @@ func (repo *InstanceRepository) Get(clusterName string, instanceName string) (mo
 			Disks:          extractDisks(parsedInstance),
 			Nics:           extractNics(parsedInstance),
 			Tags:           parsedInstance.Tags,
+			OS:             parsedInstance.OS,
 		},
 	}, nil
 }

diff --git a/api/repository/instance_test.go b/api/repository/instance_test.go
@@ -106,6 +106,7 @@ func TestInstanceRepoGetFuncReturnsSuccessfulResult_OnValidResponse(t *testing.T
 		Nics:           []model.GntNic{},
 		Disks:          []model.GntDisk{},
 		Tags:           []string{"tag1"},
+		OS:             "noop",
 	}, result.Instance)
 }
 

diff --git a/api/repository/instance_types.go b/api/repository/instance_types.go
@@ -138,7 +138,7 @@ type rapiInstanceResponse struct {
 	NicUuids         []string      `json:"nic.uuids"`
 	OperRAM          interface{}   `json:"oper_ram"`
 	OperVcpus        interface{}   `json:"oper_vcpus"`
-	Os               string        `json:"os"`
+	OS               string        `json:"os"`
 	SerialNo         int           `json:"serial_no"`
 	Tags             []string      `json:"tags"`
 	UUID             string        `json:"uuid"`

diff --git a/web/package.json b/web/package.json
@@ -67,4 +67,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/web/src/api/models.ts b/web/src/api/models.ts
@@ -25,6 +25,7 @@ export type GntInstance = {
   disks: GntDisk[];
   nics: GntNic[];
   tags: string[];
+  OS: string;
 };
 
 export type GntNode = {

diff --git a/web/src/components/InstanceActions/InstanceActions.test.tsx b/web/src/components/InstanceActions/InstanceActions.test.tsx
@@ -58,6 +58,7 @@ function createMockInstance(overrideParams: Partial<GntInstance>): GntInstance {
     primaryNode: "",
     secondaryNodes: [],
     tags: [],
+    OS: "noop",
     ...overrideParams,
   };
 }

diff --git a/web/src/views/InstanceDetail/InstanceDetail.tsx b/web/src/views/InstanceDetail/InstanceDetail.tsx
@@ -1,4 +1,5 @@
 import {
+  faComputer,
   faHdd,
   faMemory,
   faMicrochip,
@@ -80,6 +81,10 @@ type InstanceResponse = {
   instance: GntInstance;
 };
 
+function OSCard({ os }: { os: string }): ReactElement {
+  return <Card icon={faComputer} title={os} />;
+}
+
 const InstanceDetail = (): ReactElement => {
   const { instanceName } = useParams<{ instanceName: string }>();
   const clusterName = useClusterName();
@@ -161,6 +166,9 @@ const InstanceDetail = (): ReactElement => {
                     <TagCard key={tag} tag={tag} />
                   ))}
                 </CardGrid.Section>
+                <CardGrid.Section headline="Operating System">
+                  <OSCard os={instance.OS} />
+                </CardGrid.Section>
               </CardGrid>
             </>
           );
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,4 +67,4 @@ @@
           "last 1 safari version"
         ]
       }
-    }
+    }