bug fix (style is still bugged i should add it), resolves #2675

CGI-FR · Dec 1, 2023 · c1b32f0 · c1b32f0
1 parent be7b2f9
commit c1b32f0
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 1 deletion.
diff --git a/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor b/src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
@@ -135,6 +135,16 @@
                                                         <MudTd DataLabel="See detail" Style="text-align: center;">
                                                             <MudButton Variant="Variant.Filled" id="editButton" OnClick="@(async () => await ShowAddEdgeModuleDialog(moduleContext))">Detail</MudButton>
                                                         </MudTd>
+                                                        <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>

diff --git 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.Server/appsettings.Developpement.json b/src/IoTHub.Portal.Server/appsettings.Developpement.json
@@ -0,0 +1,60 @@
+{
+  "PortalName": "IoT Portal - DEV",
+  "CloudProvider": "Azure",
+  "PostgreSQL": {
+    "ConnectionString": "Server=database;Database=cgigeiotdemo;Port=5432;User Id=postgres;Password=postgrePassword;Pooling=true;Connection Lifetime=0;Command Timeout=0;"
+  },
+  "MySQL": {
+    "ConnectionString": "server=localhost;database=cgigeiotdemo;user=root;password=pass;Pooling=true;Connection Lifetime=0;Command Timeout=0;"
+  },
+  "OIDC": {
+    "ValidateAudience": "False",
+    "Scope": "iot_access",
+    "MetadataUrl": "https://cgigeiotdemoauth.azurewebsites.net/auth/realms/iot-portal/.well-known/openid-configuration",
+    "ClientId": "iot-portal",
+    "Authority": "https://cgigeiotdemoauth.azurewebsites.net/auth/realms/iot-portal",
+    "ApiClientId": "iot-portal-api"
+  },
+  "LoRaFeature:Enabled": "True",
+  "JobStore": {
+    "ConnectionString": "Server=database;Database=jobstore;Port=5432;User Id=postgres;Password=postgrePassword;Pooling=true;Connection Lifetime=0;Command Timeout=0;"
+  },
+  "Ideas": {
+    "Url": "https://cgi-iot-portal-apim.azure-api.net",
+    "Ideas:Enabled": "True",
+    "Ideas:Authentication:Token": "3a3d50188c7041af87c77040cf48fd58",
+    "Ideas:Authentication:Header": "Ocp-Apim-Subscription-Key"
+  },
+  "Azure": {
+    "StorageAccount": {
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=cgigeiotdemostorage;AccountKey=5iB5S21JzCZvXEmcTMZGXi4j2WAn9ALCM5CYoI0S1OJp0mmw/8Yb+DXVrrYXQ+XYvzno3kUv3GSRjG/eLjJOwg==;EndpointSuffix=core.windows.net",
+      "BlobContainerName": "img-container"
+    },
+    "LoRaKeyManagement": {
+      "LoRaKeyManagement:Url": "https://cgigeiotdemofunction.azurewebsites.net/",
+      "LoRaKeyManagement:Code": "blaT7XYCQwvRJxK45NhFaJrBmb1jubBuJMAqnCamzwajknnD9dVLYA=="
+    },
+    "IoTHub": {
+      "ConnectionString": "HostName=cgigeiotdemohub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=InUirQhB/8f5cQ/b/Scqca+2m33sqAHYvsgN+S9/W9U=",
+      "EventHub": {
+        "ConsumerGroup": "iothub-portal-dev-kbe",
+        "Endpoint": "Endpoint=sb://iothub-ns-cgigeiotde-17093778-f712547cb5.servicebus.windows.net/;SharedAccessKeyName=service;SharedAccessKey=W6F1ZwFYXo/QacdyTsjXlR/Sf9vfghge4I4e+bim1TE=;EntityPath=cgigeiotdemohub"
+      }
+    },
+    "IoTDPS": {
+      "ServiceEndpoint": "cgigeiotplatformdemodps.azure-devices-provisioning.net",
+      "IDScope": "0ne004B1AEF",
+      "ConnectionString": "HostName=cgigeiotdemodps.azure-devices-provisioning.net;SharedAccessKeyName=provisioningserviceowner;SharedAccessKey=L7bWrSfLb+LXUYmWm/alEibApQ3C7nFgabRLuN9lCLk="
+    }
+  },
+  "AWS": {
+    "Region": "eu-west-1",
+    "GreengrassRequiredRoles:1": "aurademoiot-GreengrassV2IoTThingPolicy",
+    "GreengrassRequiredRoles:0": "aurademoiot-GreengrassCoreTokenExchangeRoleAliasPolicy",
+    "GreengrassCoreTokenExchangeRoleAliasName": "aurademoiot-GreengrassCoreTokenExchangeRoleAlias",
+    "BucketName": "aurademoiot-bucket",
+    "AccountId": "578920151383",
+    "AccessSecret": "bZccsvIgqob4ShgjbsgP9uyFPeMZhZWEUWRzJJjZ",
+    "Access": "AKIAYNSSUPFLRJYTZPHY"
+  }
+}
diff --git 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
@@ -83,6 +84,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure", "azure", "{EB8B706B
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IoTHub Portal", "IoTHub Portal", "{2CEFBA09-E7DB-409B-97F5-BBA272E6CFC3}"
+	ProjectSection(SolutionItems) = preProject
+		appsettings.developpement.json = appsettings.developpement.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{42453683-0D1E-45B0-8B9B-2B4F5BE2D211}"
 EndProject

diff --git a/src/XMLSchema1.xsd b/src/XMLSchema1.xsd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://tempuri.org/XMLSchema.xsd"
+    elementFormDefault="qualified"
+    xmlns="http://tempuri.org/XMLSchema.xsd"
+    xmlns:mstns="http://tempuri.org/XMLSchema.xsd"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+</xs:schema>
diff --git a/src/appsettings.developpement.json b/src/appsettings.developpement.json