From 28a4259c43e6180723b15a8c36a9b36871420f8a Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 20 Jul 2021 14:59:58 +0200
Subject: feat(ui): Add table view for topology rooms

---
 .../src/components/topologies/TopologyOverview.js             | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js')

diff --git a/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js b/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
index f773dcd1..761e7f9a 100644
--- a/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
+++ b/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
@@ -33,12 +33,13 @@ import {
     GridItem,
     Skeleton,
 } from '@patternfly/react-core'
+import React from 'react'
 import { useTopology } from '../../data/topology'
 import { parseAndFormatDateTime } from '../../util/date-time'
+import RoomTable from './RoomTable'
 
 function TopologyOverview({ topologyId }) {
     const { data: topology } = useTopology(topologyId)
-
     return (
         <Grid hasGutter>
             <GridItem md={2}>
@@ -66,6 +67,14 @@ function TopologyOverview({ topologyId }) {
                     </CardBody>
                 </Card>
             </GridItem>
+            <GridItem md={5}>
+                <Card>
+                    <CardTitle>Rooms</CardTitle>
+                    <CardBody>
+                        <RoomTable topologyId={topologyId} />
+                    </CardBody>
+                </Card>
+            </GridItem>
         </Grid>
     )
 }
-- 
cgit v1.2.3


From 7f083b47c2e2333819823fd7835332a0f486b626 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 21 Jul 2021 17:31:45 +0200
Subject: feat(ui): Toggle to Floor Plan on room select

---
 .../opendc-web-ui/src/components/topologies/TopologyOverview.js      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js')

diff --git a/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js b/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
index 761e7f9a..213a4868 100644
--- a/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
+++ b/opendc-web/opendc-web-ui/src/components/topologies/TopologyOverview.js
@@ -38,7 +38,7 @@ import { useTopology } from '../../data/topology'
 import { parseAndFormatDateTime } from '../../util/date-time'
 import RoomTable from './RoomTable'
 
-function TopologyOverview({ topologyId }) {
+function TopologyOverview({ topologyId, onSelect }) {
     const { data: topology } = useTopology(topologyId)
     return (
         <Grid hasGutter>
@@ -71,7 +71,7 @@ function TopologyOverview({ topologyId }) {
                 <Card>
                     <CardTitle>Rooms</CardTitle>
                     <CardBody>
-                        <RoomTable topologyId={topologyId} />
+                        <RoomTable topologyId={topologyId} onSelect={(room) => onSelect('room', room)} />
                     </CardBody>
                 </Card>
             </GridItem>
@@ -81,6 +81,7 @@ function TopologyOverview({ topologyId }) {
 
 TopologyOverview.propTypes = {
     topologyId: PropTypes.string,
+    onSelect: PropTypes.func,
 }
 
 export default TopologyOverview
-- 
cgit v1.2.3