Merge branch 'refs/heads/develop' into chore/openid-connect

# Conflicts: # backend/LexBoxApi/appsettings.Development.json # backend/LexData/Migrations/LexBoxDbContextModelSnapshot.cs
sillsdev · May 28, 2024 · 040eac8 · 040eac8
2 parents dd593df + 1ce357a
commit 040eac8
Show file tree

Hide file tree

Showing 134 changed files with 6,543 additions and 763 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,7 @@
 # force LF line endings on all shell scripts, even on Windows
 *.sh text eol=lf
+
+# Verify settings
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.xml text eol=lf working-tree-encoding=UTF-8
+*.verified.json text eol=lf working-tree-encoding=UTF-8
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -53,6 +53,8 @@ jobs:
     runs-on: ${{ inputs.runs-on }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: testspace-com/[email protected]
         with:
           domain: ${{ github.repository_owner }}

diff --git a/.github/workflows/lexbox-api.yaml b/.github/workflows/lexbox-api.yaml
@@ -45,13 +45,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.x'
       - name: Dotnet build
         run: dotnet build
       - name: Unit tests
-        run: dotnet test --logger xunit --results-directory ./test-results --filter "Category!=Integration" --blame-hang-timeout 10m
+        run: dotnet test --logger:"xunit;LogFileName={assembly}.results.xml" --results-directory ./test-results --filter "Category!=Integration" --blame-hang-timeout 10m
       - name: Publish unit test results
         uses: EnricoMi/publish-unit-test-result-action@8885e273a4343cd7b48eaa72428dea0c3067ea98 # v2.14.0
         if: always()

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+ [submodule "backend/harmony"]
+	path = backend/harmony
+	url = https://github.com/hahn-kev/harmony.git
+	branch = add-crdt
diff --git a/LexBox.sln b/LexBox.sln
@@ -27,6 +27,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LfClassicData", "backend\Lf
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniLcm", "backend\MiniLcm\MiniLcm.csproj", "{6D4062DC-1B1A-4A24-9C61-0F6A18A39882}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocalWebApp", "backend\LocalWebApp\LocalWebApp.csproj", "{2CDF7126-733B-46E8-9B93-7DC31DE39682}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LcmCrdt", "backend\LcmCrdt\LcmCrdt.csproj", "{6B857F83-72E3-43E6-91C3-A946F3F988D8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LcmCrdt.Tests", "backend\LcmCrdt.Tests\LcmCrdt.Tests.csproj", "{7D874D9B-1CA9-49E9-8B03-91B5C324E938}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt", "backend\harmony\src\Crdt\Crdt.csproj", "{740C8FF5-8006-4047-8C52-53873C2DD7C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Core", "backend\harmony\src\Crdt.Core\Crdt.Core.csproj", "{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,9 +75,34 @@ Global
 		{6D4062DC-1B1A-4A24-9C61-0F6A18A39882}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D4062DC-1B1A-4A24-9C61-0F6A18A39882}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D4062DC-1B1A-4A24-9C61-0F6A18A39882}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B857F83-72E3-43E6-91C3-A946F3F988D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B857F83-72E3-43E6-91C3-A946F3F988D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B857F83-72E3-43E6-91C3-A946F3F988D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B857F83-72E3-43E6-91C3-A946F3F988D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D874D9B-1CA9-49E9-8B03-91B5C324E938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D874D9B-1CA9-49E9-8B03-91B5C324E938}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D874D9B-1CA9-49E9-8B03-91B5C324E938}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D874D9B-1CA9-49E9-8B03-91B5C324E938}.Release|Any CPU.Build.0 = Release|Any CPU
+		{740C8FF5-8006-4047-8C52-53873C2DD7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{740C8FF5-8006-4047-8C52-53873C2DD7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{740C8FF5-8006-4047-8C52-53873C2DD7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{740C8FF5-8006-4047-8C52-53873C2DD7C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{E8BB768B-C3DC-4BE6-9B9F-82319E05AF86} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
 		{6D4062DC-1B1A-4A24-9C61-0F6A18A39882} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{2CDF7126-733B-46E8-9B93-7DC31DE39682} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{6B857F83-72E3-43E6-91C3-A946F3F988D8} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{7D874D9B-1CA9-49E9-8B03-91B5C324E938} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{740C8FF5-8006-4047-8C52-53873C2DD7C4} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{8B54FFB5-0BDF-403E-83CC-A3B3861EC507} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
 	EndGlobalSection
 EndGlobal
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -84,4 +84,5 @@ tasks:
     deps: [ infra-up, api:only, k8s:infra-forward ]
     interactive: true
 
-
+  local-web-app:
+    deps: [ ui:viewer-dev, api:local-web-app ]
diff --git a/backend/.editorconfig b/backend/.editorconfig
@@ -135,4 +135,15 @@ dotnet_diagnostic.VSTHRD200.severity = none
 dotnet_diagnostic.IDE0058.severity = suggestion
 
 [{*Kernel}.cs]
-dotnet_diagnostic.IDE0058.severity = none
+dotnet_diagnostic.IDE0058.severity = none
+
+
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
diff --git a/backend/LcmCrdt.Tests/LcmCrdt.Tests.csproj b/backend/LcmCrdt.Tests/LcmCrdt.Tests.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.12.0"/>
+        <PackageReference Include="xunit" Version="2.5.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
+        <PackageReference Include="XunitXml.TestLogger" Version="3.1.20" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="Xunit"/>
+        <Using Include="FluentAssertions"/>
+        <Using Include="Crdt"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\LcmCrdt\LcmCrdt.csproj" />
+    </ItemGroup>
+
+</Project>