From 5817300283440c7dc07bdb3880c886119bce94dd Mon Sep 17 00:00:00 2001
From: Gary Murphy <gary.murphy62@mail.dcu.ie>
Date: Sat, 6 May 2023 19:41:42 +0100
Subject: [PATCH 1/3] dynamic routing for modules

---
 src/PanoptesFrontend/Pages/DynamicChart.razor |  5 +++--
 src/PanoptesFrontend/Pages/DynamicTable.razor |  6 +++---
 src/PanoptesFrontend/Pages/ModDisplay.razor   | 13 +++++++------
 src/PanoptesFrontend/Shared/NavMenu.razor     |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/PanoptesFrontend/Pages/DynamicChart.razor b/src/PanoptesFrontend/Pages/DynamicChart.razor
index fcc2096..f8aa94b 100644
--- a/src/PanoptesFrontend/Pages/DynamicChart.razor
+++ b/src/PanoptesFrontend/Pages/DynamicChart.razor
@@ -39,6 +39,8 @@
     public string SelectedChartType {get; set;}
     [Parameter]
     public int ChartId {get; set;}
+    [Parameter]
+    public string module {get; set;}
 
     protected override void OnAfterRender(bool firstRender)
     {
@@ -53,8 +55,7 @@
 
     private async Task UpdateChartSeries()
     {
-        string module = "localhost:8080";
-        var response = await httpService.GetAsync<GraphComponent>($"http://localhost:10000/{module}/{ChartId}");
+        var response = await httpService.GetAsync<GraphComponent>($"http://localhost:10000/component/{module}/{ChartId}");
         StatsList = response.Stats;
         await chart.UpdateSeriesAsync(true);
         await InvokeAsync(() => StateHasChanged());
diff --git a/src/PanoptesFrontend/Pages/DynamicTable.razor b/src/PanoptesFrontend/Pages/DynamicTable.razor
index f06cffc..84f2e5b 100644
--- a/src/PanoptesFrontend/Pages/DynamicTable.razor
+++ b/src/PanoptesFrontend/Pages/DynamicTable.razor
@@ -25,6 +25,8 @@
     public List<Dictionary<string, object>> data { get; set; }
     [Parameter]
     public int TableId {get; set;}
+    [Parameter]
+    public string module {get; set;}
 
     public IDictionary<string, Type> columns { get; set; }
     public string GetColumnPropertyExpression(string name, Type type)
@@ -63,9 +65,7 @@
 
     private async Task Update()
     {
-        string module = "localhost:8080";
-
-        var response = await httpService.GetAsync<TableComponent>($"http://localhost:10000/{module}/{TableId}");
+        var response = await httpService.GetAsync<TableComponent>($"http://localhost:10000/component/{module}/{TableId}");
         
         if (response.Data != null)
         {
diff --git a/src/PanoptesFrontend/Pages/ModDisplay.razor b/src/PanoptesFrontend/Pages/ModDisplay.razor
index a5e6d0d..7750191 100644
--- a/src/PanoptesFrontend/Pages/ModDisplay.razor
+++ b/src/PanoptesFrontend/Pages/ModDisplay.razor
@@ -1,4 +1,4 @@
-@page "/test"
+@page "/module/{moduleId}"
 
 @using System.Net;
 @using PanoptesFrontend.Data
@@ -17,7 +17,7 @@
             {
                 <div class="card mb-3">
                     <div class="card-body">
-                        <DynamicTable data="@component.Data" TableId="@component.Id"/>
+                        <DynamicTable data="@component.Data" TableId="@component.Id" module="@moduleId"/>
                     </div>
                 </div>
             }
@@ -30,7 +30,8 @@
                             <DynamicChart StatsList="@component.Stats" 
                                           SelectedChartType="@component.Graph" 
                                           ChartTitle="@component.Title"
-                                          ChartId="@component.Id"/>
+                                          ChartId="@component.Id"
+                                          module="@moduleId"/>
                     </div>
                 </div>
             }
@@ -44,12 +45,12 @@
 @code {
     private TableComponent[] tables;
     private GraphComponent[] graphs;
-
-    private string module = "localhost:8080";
+    [Parameter]
+    public string moduleId { get; set; }
 
     protected async override Task OnInitializedAsync()
     {
-        var schema = await httpService.GetAsync<Schema>($"http://localhost:10000/{module}/schema");
+        var schema = await httpService.GetAsync<Schema>("http://localhost:10000/" + @moduleId + "/schema");
         tables = schema.tables;
         graphs = schema.graphs;
     }
diff --git a/src/PanoptesFrontend/Shared/NavMenu.razor b/src/PanoptesFrontend/Shared/NavMenu.razor
index 2a47b6b..75c3875 100644
--- a/src/PanoptesFrontend/Shared/NavMenu.razor
+++ b/src/PanoptesFrontend/Shared/NavMenu.razor
@@ -18,7 +18,7 @@
         {
             @foreach (var module in response){
             <div class="nav-item px-3">
-                <NavLink class="nav-link" href=@module.Name Match="NavLinkMatch.All">
+                <NavLink class="nav-link" href=/module/@module.Name Match="NavLinkMatch.All">
                     <span class="oi oi-home" aria-hidden="true"></span> @module.Name
                 </NavLink>
             </div>

From dcff10e9840aa4730968853bfb593a8ce2e65162 Mon Sep 17 00:00:00 2001
From: Gary Murphy <gary.murphy62@mail.dcu.ie>
Date: Sat, 6 May 2023 19:48:30 +0100
Subject: [PATCH 2/3] fixed nav menu routes

---
 src/PanoptesFrontend/Shared/NavMenu.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PanoptesFrontend/Shared/NavMenu.razor b/src/PanoptesFrontend/Shared/NavMenu.razor
index 75c3875..5ceb200 100644
--- a/src/PanoptesFrontend/Shared/NavMenu.razor
+++ b/src/PanoptesFrontend/Shared/NavMenu.razor
@@ -18,7 +18,7 @@
         {
             @foreach (var module in response){
             <div class="nav-item px-3">
-                <NavLink class="nav-link" href=/module/@module.Name Match="NavLinkMatch.All">
+                <NavLink class="nav-link" href=@($"/module/{module.Name}")  Match="NavLinkMatch.All">
                     <span class="oi oi-home" aria-hidden="true"></span> @module.Name
                 </NavLink>
             </div>

From 8bcb72b2596713611ee7c924701b7207d4345de0 Mon Sep 17 00:00:00 2001
From: Gary Murphy <gary.murphy62@mail.dcu.ie>
Date: Sat, 6 May 2023 20:14:56 +0100
Subject: [PATCH 3/3] updated dynamic component layout

---
 src/PanoptesFrontend/Pages/ModDisplay.razor | 71 ++++++++++++++-------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/src/PanoptesFrontend/Pages/ModDisplay.razor b/src/PanoptesFrontend/Pages/ModDisplay.razor
index 7750191..6f9a93f 100644
--- a/src/PanoptesFrontend/Pages/ModDisplay.razor
+++ b/src/PanoptesFrontend/Pages/ModDisplay.razor
@@ -8,37 +8,64 @@
 @inject IHttpService httpService
 @inject IJSRuntime JSRuntime
 
-@if (tables != null | graphs != null)
+@if (tables != null || graphs != null)
 {
     <div class="container-fluid">
-    <div class="row">
-        <div class="col-md-6">
-            @foreach (var component in tables)
+        <div class="row">
+            @if (graphs != null)
             {
-                <div class="card mb-3">
-                    <div class="card-body">
-                        <DynamicTable data="@component.Data" TableId="@component.Id" module="@moduleId"/>
+                @for (int i = 0; i < graphs.Length; i += 2)
+                {
+                    <div class="col-md-12">
+                        <div class="row">
+                            @if (i < graphs.Length)
+                            {
+                                <div class="col-md-6">
+                                    <div class="card mb-3">
+                                        <div class="card-body">
+                                            <DynamicChart StatsList="@graphs[i].Stats" 
+                                                          SelectedChartType="@graphs[i].Graph" 
+                                                          ChartTitle="@graphs[i].Title"
+                                                          ChartId="@graphs[i].Id"
+                                                          module="@moduleId"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                            @if (i + 1 < graphs.Length)
+                            {
+                                <div class="col-md-6">
+                                    <div class="card mb-3">
+                                        <div class="card-body">
+                                            <DynamicChart StatsList="@graphs[i + 1].Stats" 
+                                                          SelectedChartType="@graphs[i + 1].Graph" 
+                                                          ChartTitle="@graphs[i + 1].Title"
+                                                          ChartId="@graphs[i + 1].Id"
+                                                          module="@moduleId"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                        </div>
                     </div>
-                </div>
+                }
             }
-        </div>
-        <div class="col-md-6">
-            @foreach (var component in graphs)
+
+            @if (tables != null)
             {
-                <div class="card mb-3">
-                    <div class="card-body">
-                            <DynamicChart StatsList="@component.Stats" 
-                                          SelectedChartType="@component.Graph" 
-                                          ChartTitle="@component.Title"
-                                          ChartId="@component.Id"
-                                          module="@moduleId"/>
-                    </div>
+                <div class="col-md-12">
+                    @foreach (var table in tables)
+                    {
+                        <div class="card mb-3">
+                            <div class="card-body">
+                                <DynamicTable data="@table.Data" TableId="@table.Id" module="@moduleId"/>
+                            </div>
+                        </div>
+                    }
                 </div>
             }
         </div>
     </div>
-</div>
-
 }
 
 
@@ -50,7 +77,7 @@
 
     protected async override Task OnInitializedAsync()
     {
-        var schema = await httpService.GetAsync<Schema>("http://localhost:10000/" + @moduleId + "/schema");
+        var schema = await httpService.GetAsync<Schema>("http://localhost:10000/" + moduleId + "/schema");
         tables = schema.tables;
         graphs = schema.graphs;
     }