From 04da0dddf3b377f44a7a6f82ffb9639e6d06d0a0 Mon Sep 17 00:00:00 2001
From: TUAILLON <leo.tuaillon@cgi.com>
Date: Mon, 4 Dec 2023 09:29:07 +0100
Subject: [PATCH] fix #2675 - Make module version ediatable on edge template
 screen

---
 .../EdgeModels/EdgeModule/ModuleDialog.razor  |  9 ++++++++
 .../EdgeModels/CreateEdgeModelsPage.razor     | 23 +++++++++++--------
 .../IoTHub.Portal.Server.csproj               |  2 +-
 src/IoTHub.Portal.sln                         |  1 +
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/IoTHub.Portal.Client/Dialogs/EdgeModels/EdgeModule/ModuleDialog.razor b/src/IoTHub.Portal.Client/Dialogs/EdgeModels/EdgeModule/ModuleDialog.razor
index 5340919f3..90cae45b8 100644
--- a/src/IoTHub.Portal.Client/Dialogs/EdgeModels/EdgeModule/ModuleDialog.razor
+++ b/src/IoTHub.Portal.Client/Dialogs/EdgeModels/EdgeModule/ModuleDialog.razor
@@ -25,6 +25,14 @@
                                   For="@(() => Module.ImageURI)"
                                   Required="true"/>
                 </MudItem>
+                <MudItem xs="12" md="6">
+                    <MudTextField @bind-Value="@currentNumVersion"
+                                  id=@nameof(IoTEdgeModule.Version)
+                                  Label="Version"
+                                  Variant="Variant.Outlined"
+                                  For="@(() => Module.Version)"
+                                  Required="true"/>
+                </MudItem>
 
                 @if (Portal.CloudProvider.Equals(CloudProviders.Azure))
                 {
@@ -120,6 +128,7 @@
         Module.ModuleName = currentModuleName;
         Module.ImageURI = currentImageUri;
         Module.ContainerCreateOptions = currentContainerCreateOptions;
+        Module.Version = currentNumVersion;
 
         if (Portal.CloudProvider.Equals(CloudProviders.Azure)) { Module.Version = " "; }
         else { Module.Version = currentNumVersion; }
diff --git a/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor b/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
index 9eac4b5d8..68640c79a 100644
--- a/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
+++ b/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
@@ -114,16 +114,16 @@
                                             <MudItem xs="12">
                                                 <MudTable Items="@edgeModules" Dense=true Hover=true Bordered=true Striped=true Elevation=0>
                                                     <ColGroup>
-                                                        <col style="width: 30%;" />
-                                                        <col style="width: 40%;" />
-                                                        <col style="width: 10%;" />
-                                                        <col style="width: 5%;" />
+                                                        <col style="width: 25%;" />
+                                                        <col style="width: 35%;" />
+                                                        <col style="width: 20%;" />
+                                                        <col style="width: 20%;" />
                                                     </ColGroup>
                                                     <HeaderContent>
                                                         <MudTh Style="text-align: center">Module name</MudTh>
                                                         <MudTh Style="text-align: center">Image URI</MudTh>
-                                                        <MudTh Style="text-align: center">See detail</MudTh>
-                                                        <MudTh Style="text-align: center">Delete</MudTh>
+                                                        <MudTh Style="text-align: center">Version</MudTh>
+                                                        <MudTh Style="text-align: center" colspan="2">Actions</MudTh>
                                                     </HeaderContent>
                                                     <RowTemplate Context="moduleContext">
                                                         <MudTd DataLabel="module Name" Style="word-break: break-all;">
@@ -132,11 +132,14 @@
                                                         <MudTd DataLabel="module Image URI" Style="word-break: break-all;">
                                                             <MudTextField id="@(nameof(IoTEdgeModule.ImageURI))" @bind-Value="@moduleContext.ImageURI" Margin="Margin.Dense" Label="Image URI" For="@(() => moduleContext.ImageURI )" Variant="Variant.Outlined" Required="true" />
                                                         </MudTd>
-                                                        <MudTd DataLabel="See detail" Style="text-align: center;">
-                                                            <MudButton Variant="Variant.Filled" id="editButton" OnClick="@(async () => await ShowAddEdgeModuleDialog(moduleContext))">Detail</MudButton>
+                                                        <MudTd DataLabel="Module Version" Style="word-break: break-all;">
+                                                            <MudTextField id="@(nameof(IoTEdgeModule.Version))" @bind-Value="@moduleContext.Version" Margin="Margin.Dense" Label="Version" For="@(() => moduleContext.Version)" Variant="Variant.Outlined" Required="true"></MudTextField>
                                                         </MudTd>
-                                                        <MudTd DataLabel="Delete" Style="text-align: center">
-                                                            <MudIconButton Class="deleteModuleButton" Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(() => DeleteModule(moduleContext))"></MudIconButton>
+                                                        <MudTd DataLabel="Actions" Style="text-align: center" colspan="2">
+                                                            <div>
+                                                                <MudButton Variant="Variant.Filled" id="editButton" OnClick="@(async () => await ShowAddEdgeModuleDialog(moduleContext))">Detail</MudButton>
+                                                                <MudIconButton Class="deleteModuleButton" Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(() => DeleteModule(moduleContext))"></MudIconButton>
+                                                            </div>
                                                         </MudTd>
                                                     </RowTemplate>
                                                     <FooterContent>
diff --git a/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj b/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj
index 999b95613..550bd6aad 100644
--- a/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj
+++ b/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ProjectExtensions>
-    <VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="https://cdn.jsdelivr.net/gh/roadrunner-server/roadrunner@latest/schemas/config/2.0.schema.json" properties_4launchsettings_1json__JsonSchema="" /></VisualStudio>
+    <VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio>
   </ProjectExtensions>
 
   <ItemGroup>
diff --git a/src/IoTHub.Portal.sln b/src/IoTHub.Portal.sln
index fd250ee6d..70472ee3d 100644
--- a/src/IoTHub.Portal.sln
+++ b/src/IoTHub.Portal.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.31911.260