Dev

.deployments/k8-argo-run-ris.yaml

@@ -0,0 +1,145 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ri-subscriptions
+  namespace: subscriptions-ri
+  labels:
+    app: ri-subscriptions
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ri-subscriptions
+  template:
+    metadata:
+      labels:
+        app: ri-subscriptions
+    spec:
+      containers:
+      - name: fhir-candle
+        image: ghcr.io/fhir/fhir-candle:latest
+        command: ["dotnet"]
+        args: ["fhir-candle.dll", "--reference-implementation", "subscriptions", "--load-package", "hl7.fhir.uv.subscriptions-backport#1.1.0", "--load-examples", "false", "--protect-source", "true", "-m", "200"]
+        envFrom:
+        - configMapRef:
+            name: special-config
+        env:
+        - name: Listen_Port
+          value: "5826"
+        - name: Public_Url
+          value: "https://subscriptions.argo.run"
+        - name: Zulip_Email
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: Zulip_Email
+        - name: Zulip_Key
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: Zulip_Key
+        - name: Zulip_Url
+          value: "https://chat.fhir.org"
+        - name: SMTP_Host
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: SMTP_Host
+        - name: SMTP_Password
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: SMTP_Password
+        - name: SMTP_Port
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: SMTP_Port
+        - name: SMTP_User
+          valueFrom:
+            secretKeyRef:
+              name: argonaut-secrets
+              key: SMTP_User
+        ports:
+        - containerPort: 5826
+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: subscriptions-ri
+  name: ri-subscriptions
+spec:
+  selector:
+    app: ri-subscriptions
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: 5826
+---
+kind: Ingress
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: subscriptions-ingress
+  namespace: subscriptions-ri
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+spec:
+  tls:
+  - hosts:
+    - subscriptions.argo.run
+    - cdex.ri.argo.run
+    - ecr.ri.argo.run
+    - vitals-server.ri.argo.run
+    - feature-cs-server.ri.argo.run
+    secretName: tls-secret
+  rules:
+  - host: subscriptions.argo.run
+    http:
+      paths:
+      - backend:
+          service:
+            name: ri-subscriptions
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  - host: cdex.ri.argo.run
+    http:
+      paths:
+      - backend:
+          service:
+            name: ri-cdex
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  - host: ecr.ri.argo.run
+    http:
+      paths:
+      - backend:
+          service:
+            name: ri-ecr
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  - host: vitals-server.ri.argo.run
+    http:
+      paths:
+      - backend:
+          service:
+            name: ri-vitals-server
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  - host: feature-cs-server.ri.argo.run
+    http:
+      paths:
+      - backend:
+          service:
+            name: ri-feature-cs-server
+            port:
+              number: 80
+        path: /
+        pathType: Prefix

fhir-candle.sln

@@ -21,14 +21,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		.github\workflows\argo-subscriptions.yml = .github\workflows\argo-subscriptions.yml
-		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
 		CONTRIBUTING.MD = CONTRIBUTING.MD
 		Dockerfile = Dockerfile
 		fhir-candle.props = fhir-candle.props
-		.github\workflows\ghcr-docker.yml = .github\workflows\ghcr-docker.yml
 		LICENSE = LICENSE
-		.github\workflows\nuget-tool.yml = .github\workflows\nuget-tool.yml
 		README.md = README.md
 		THIRDPARTYNOTICES.md = THIRDPARTYNOTICES.md
 	EndProjectSection
@@ -41,6 +37,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FhirCandle.Ui.R5", "src\Fhi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FhirCandle.Ui.Common", "src\FhirCandle.Ui.Common\FhirCandle.Ui.Common.csproj", "{2276D057-68A6-4639-A821-0C028D8449D0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".deployments", ".deployments", "{C08AFD85-C98F-4DEA-8915-AEE3CF5A7C15}"
+	ProjectSection(SolutionItems) = preProject
+		.deployments\k8-argo-run-ris.yaml = .deployments\k8-argo-run-ris.yaml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1AAC7962-65B4-42CD-AD5F-3EE8BD3149D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{22C11CB9-2408-4056-B41E-87DD07AECF94}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\argo-subscriptions.yml = .github\workflows\argo-subscriptions.yml
+		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
+		.github\workflows\ghcr-docker.yml = .github\workflows\ghcr-docker.yml
+		.github\workflows\nuget-tool.yml = .github\workflows\nuget-tool.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,6 +102,11 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C08AFD85-C98F-4DEA-8915-AEE3CF5A7C15} = {8B6BFF93-0260-40D3-BF26-175BC295D77B}
+		{1AAC7962-65B4-42CD-AD5F-3EE8BD3149D0} = {8B6BFF93-0260-40D3-BF26-175BC295D77B}
+		{22C11CB9-2408-4056-B41E-87DD07AECF94} = {1AAC7962-65B4-42CD-AD5F-3EE8BD3149D0}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2F9896CC-1A33-4A99-95F9-8D13DF291779}
 	EndGlobalSection

src/FhirCandle.Ui.Common/Components/FhirEditor.razor

@@ -11,6 +11,8 @@
     OnDidInit="EditorOnDidInit"/>
 
 @code {
+#pragma warning disable BL0007
+
     private string _language = "json";
 
     /// <summary>Gets or sets the language.</summary>
@@ -48,7 +50,6 @@
         }
     }
 
-
     private string _editorContent = "";
 
     /// <summary>Gets or sets the editor content.</summary>
@@ -71,6 +72,9 @@
     /// <summary>The editor.</summary>
     private StandaloneCodeEditor? _editor = null;
 
+#pragma warning restore BL0007
+
+
     /// <summary>Resource construction options.</summary>
     /// <param name="editor">The editor.</param>
     /// <returns>The StandaloneEditorConstructionOptions.</returns>
@@ -147,3 +151,4 @@
     {
     }
 }
+

src/FhirCandle.Ui.Common/FhirCandle.Ui.Common.csproj

@@ -8,11 +8,11 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
 		<PackageReference Include="BlazorMonaco" Version="3.2.0" IncludeAssets="all" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FhirStore.Common\FhirCandle.Common.csproj" />

src/FhirStore.Common/Models/IPackagePage.cs → src/FhirCandle.Ui.Common/Models/IPackagePage.cs

@@ -1,8 +1,14 @@
-// <copyright file="IRiPage.cs" company="Microsoft Corporation">
+// <copyright file="IPackagePage.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. All rights reserved.
 //     Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // </copyright>
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace FhirCandle.Models;
 
 /// <summary>Information about the package page.</summary>
@@ -14,11 +20,11 @@ namespace FhirCandle.Models;
 /// <param name="FhirVersionNumeric">The FHIR version numeric.</param>
 /// <param name="OnlyShowOnEndpoint">The only show on endpoint.</param>
 public record struct PackagePageInfo(
-    string ContentFor, 
-    string PageName, 
-    string Description, 
-    string RoutePath, 
-    string FhirVersionLiteral, 
+    string ContentFor,
+    string PageName,
+    string Description,
+    string RoutePath,
+    string FhirVersionLiteral,
     string FhirVersionNumeric,
     string OnlyShowOnEndpoint);
 

src/FhirCandle.Ui.R4/FhirCandle.Ui.R4.csproj

@@ -15,10 +15,10 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FhirCandle.Ui.Common\FhirCandle.Ui.Common.csproj" />

src/FhirCandle.Ui.R4B/FhirCandle.Ui.R4B.csproj

@@ -15,10 +15,10 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FhirCandle.Ui.Common\FhirCandle.Ui.Common.csproj" />

src/FhirCandle.Ui.R5/FhirCandle.Ui.R5.csproj

@@ -15,10 +15,10 @@
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
 		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.7" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FhirCandle.Ui.Common\FhirCandle.Ui.Common.csproj" />

src/FhirStore.Common/Client/CandleClientSettings.cs

@@ -4,7 +4,6 @@
 // </copyright>
 
 
-using static System.Runtime.InteropServices.JavaScript.JSType;
 using System.Net;
 using FhirCandle.Extensions;