Merge remote-tracking branch 'origin/develop'

sillsdev · May 17, 2024 · 272760c · 272760c
2 parents ebb8e5e + 4b5cca5
commit 272760c
Show file tree

Hide file tree

Showing 32 changed files with 1,643 additions and 1,800 deletions.
diff --git a/.env b/.env
@@ -6,6 +6,7 @@ HASURA_GRAPHQL_ADMIN_SECRET=c67eeb626bee405d883b482046934860
 # Get test key at https://ui.honeycomb.io/sil-language-forge/environments/test/api_keys
 HONEYCOMB_API_KEY=__REPLACE__
 OTEL_RESOURCE_ATTRIBUTES=service.version=0.0.1,deployment.environment=dev
+OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_DISABLE_URL_QUERY_REDACTION=true
 
 SMTP_USER=maildev
 SMTP_PASSWORD=maildev
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ local.env
 cookies.txt
 dump.sql
 test-results/
+**/*.sqlite
+**/*.sqlite-*
diff --git a/backend/LexBoxApi/GraphQL/CustomTypes/IsLanguageForgeProjectDataLoader.cs b/backend/LexBoxApi/GraphQL/CustomTypes/IsLanguageForgeProjectDataLoader.cs
@@ -0,0 +1,30 @@
+using LexCore.ServiceInterfaces;
+using LfClassicData;
+using MongoDB.Driver;
+using MongoDB.Driver.Linq;
+
+namespace LexBoxApi.GraphQL.CustomTypes;
+
+public class IsLanguageForgeProjectDataLoader : BatchDataLoader<string, bool>, IIsLanguageForgeProjectDataLoader
+{
+    private readonly SystemDbContext _systemDbContext;
+
+    public IsLanguageForgeProjectDataLoader(
+        SystemDbContext systemDbContext,
+        IBatchScheduler batchScheduler,
+        DataLoaderOptions? options = null)
+        : base(batchScheduler, options)
+    {
+        _systemDbContext = systemDbContext;
+    }
+
+    protected override async Task<IReadOnlyDictionary<string, bool>> LoadBatchAsync(
+        IReadOnlyList<string> projectCodes,
+        CancellationToken cancellationToken)
+    {
+        return await MongoExtensions.ToAsyncEnumerable(_systemDbContext.Projects.AsQueryable()
+            .Select(p => p.ProjectCode)
+            .Where(projectCode => projectCodes.Contains(projectCode)))
+            .ToDictionaryAsync(projectCode => projectCode, _ => true, cancellationToken);
+    }
+}
diff --git a/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs b/backend/LexBoxApi/GraphQL/GraphQlSetupKernel.cs
@@ -20,6 +20,7 @@ public static void AddLexGraphQL(this IServiceCollection services, IHostEnvironm
             .InitializeOnStartup()
             .RegisterDbContext<LexBoxDbContext>()
             .RegisterService<IHgService>()
+            .RegisterService<IIsLanguageForgeProjectDataLoader>()
             .RegisterService<LoggedInContext>()
             .RegisterService<EmailService>()
             .RegisterService<LexAuthService>()

diff --git a/backend/LexBoxApi/GraphQL/ProjectMutations.cs b/backend/LexBoxApi/GraphQL/ProjectMutations.cs
@@ -339,6 +339,25 @@ await dbContext.ProjectUsers.Where(pu => pu.ProjectId == input.ProjectId && pu.U
         return dbContext.Projects.Where(p => p.Id == input.ProjectId);
     }
 
+    [Error<NotFoundException>]
+    [Error<DbError>]
+    [AdminRequired]
+    [UseMutationConvention]
+    [UseProjection]
+    public async Task<DraftProject> DeleteDraftProject(
+        Guid draftProjectId,
+        LexBoxDbContext dbContext)
+    {
+        var deletedDraft = await dbContext.DraftProjects.FindAsync(draftProjectId);
+        if (deletedDraft == null)
+        {
+            throw NotFoundException.ForType<DraftProject>();
+        }
+        // Draft projects are deleted immediately, not soft-deleted
+        dbContext.DraftProjects.Remove(deletedDraft);
+        await dbContext.SaveChangesAsync();
+        return deletedDraft;
+    }
 
     [Error<NotFoundException>]
     [Error<DbError>]
@@ -356,18 +375,7 @@ public async Task<IQueryable<Project>> SoftDeleteProject(
         var project = await dbContext.Projects.Include(p => p.Users).FirstOrDefaultAsync(p => p.Id == projectId);
         if (project is null)
         {
-            // Draft projects, if any, are deleted immediately, not soft-deleted
-            var deletedDraftCount = await dbContext.DraftProjects.Where(dp => dp.Id == projectId).ExecuteDeleteAsync();
-            if (deletedDraftCount == 0)
-            {
-                // No draft project either, so return standard project not found error
-                throw NotFoundException.ForType<Project>();
-            }
-            else
-            {
-                // Return an empty project list to indicate success
-                return dbContext.Projects.Where(p => p.Id == projectId);
-            }
+            throw NotFoundException.ForType<Project>();
         }
         if (project.DeletedDate is not null) throw new InvalidOperationException("Project already deleted");
 

diff --git a/backend/LexBoxApi/LexBoxApi.csproj b/backend/LexBoxApi/LexBoxApi.csproj
@@ -33,16 +33,16 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
-        <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.1" />
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+        <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.3" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.3" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-beta.1" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
         <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
         <PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/backend/LexBoxApi/LexBoxKernel.cs b/backend/LexBoxApi/LexBoxKernel.cs
@@ -1,6 +1,7 @@
 using LexBoxApi.Auth;
 using LexBoxApi.Config;
 using LexBoxApi.GraphQL;
+using LexBoxApi.GraphQL.CustomTypes;
 using LexBoxApi.Services;
 using LexCore.Config;
 using LexCore.ServiceInterfaces;
@@ -52,6 +53,7 @@ public static void AddLexBoxApi(this IServiceCollection services,
         services.AddScoped<TusService>();
         services.AddScoped<TurnstileService>();
         services.AddScoped<IHgService, HgService>();
+        services.AddScoped<IIsLanguageForgeProjectDataLoader, IsLanguageForgeProjectDataLoader>();
         services.AddScoped<ILexProxyService, LexProxyService>();
         services.AddSingleton<ISendReceiveService, SendReceiveService>();
         services.AddSingleton<LexboxLinkGenerator>();

diff --git a/backend/LexBoxApi/appsettings.json b/backend/LexBoxApi/appsettings.json
@@ -12,7 +12,7 @@
       "Microsoft.AspNetCore": "Information",
       "Microsoft.AspNetCore.HttpOverrides.ForwardedHeadersMiddleware": "Debug",
       "Microsoft.EntityFrameworkCore": "Information",
-      "MongoDB.Command": "Debug",
+      "MongoDB.Command": "Debug"
     }
   },
   "ForwardedHeadersOptions": {
@@ -66,6 +66,6 @@
     "Endpoint": "http://localhost:4317"
   },
   "Email": {
-    "CreateProjectEmailDestination": "admin@languagedepot.org"
+    "CreateProjectEmailDestination": "lexbox_support@groups.sil.org"
   }
 }
diff --git a/backend/LexCore/Entities/Project.cs b/backend/LexCore/Entities/Project.cs
@@ -50,6 +50,15 @@ public bool GetHasAbandonedTransactions(IHgService hgService)
     {
         return hgService.HasAbandonedTransactions(Code);
     }
+
+    public Task<bool> GetIsLanguageForgeProject(IIsLanguageForgeProjectDataLoader loader)
+    {
+        if (Type is ProjectType.Unknown or ProjectType.FLEx)
+        {
+            return loader.LoadAsync(Code);
+        }
+        return Task.FromResult(false);
+    }
 }
 
 public enum ProjectMigrationStatus

diff --git a/backend/LexCore/ServiceInterfaces/IIsLanguageForgeProjectDataLoader.cs b/backend/LexCore/ServiceInterfaces/IIsLanguageForgeProjectDataLoader.cs
@@ -0,0 +1,6 @@
+namespace LexCore.ServiceInterfaces;
+
+public interface IIsLanguageForgeProjectDataLoader
+{
+    public Task<bool> LoadAsync(string projectCode, CancellationToken cancellationToken = default);
+}
diff --git a/backend/LexData/LexData.csproj b/backend/LexData/LexData.csproj
@@ -19,8 +19,8 @@
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
       <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
       <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
-      <PackageReference Include="Npgsql" Version="8.0.2" />
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
+      <PackageReference Include="Npgsql" Version="8.0.3" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
 </ItemGroup>
 
     <ItemGroup>

diff --git a/backend/SyncReverseProxy/SyncReverseProxy.csproj b/backend/SyncReverseProxy/SyncReverseProxy.csproj
@@ -16,11 +16,11 @@
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
         <PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
 
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
         <PackageReference Include="Yarp.Telemetry.Consumption" Version="2.1.0" />
 
     </ItemGroup>

diff --git a/backend/Testing/Testing.csproj b/backend/Testing/Testing.csproj
@@ -15,8 +15,8 @@
     <Choose>
         <When Condition=" '$(MercurialVersion)' == '6' ">
             <ItemGroup>
-                <PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-beta0045" />
-                <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.1.29" />
+                <PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-beta0046" />
+                <PackageReference Include="SIL.Chorus.Mercurial" Version="6.*" />
             </ItemGroup>
         </When>
         <Otherwise>

diff --git a/deployment/base/lexbox-deployment.yaml b/deployment/base/lexbox-deployment.yaml
@@ -92,6 +92,8 @@ spec:
                 fieldPath: spec.nodeName
           - name: OTEL_RESOURCE_ATTRIBUTES
             value: k8s.node.name=$(K8S_NODE_NAME)
+          - name: OTEL_DOTNET_EXPERIMENTAL_ASPNETCORE_DISABLE_URL_QUERY_REDACTION
+            value: 'true'
           - name: POSTGRES_DB
             valueFrom:
               secretKeyRef:

diff --git a/deployment/develop/lexbox-deployment.patch.yaml b/deployment/develop/lexbox-deployment.patch.yaml
@@ -21,7 +21,6 @@ spec:
             - name: Email__SmtpPort
               value: '587'
             - name: Email__From
-              # TODO: need to parameterize this
               value: "Language Depot (Develop) <no-reply@develop.languagedepot.org>"
             - name: Email__BaseUrl
               value: "https://develop.lexbox.org"
diff --git a/deployment/production/lexbox-deployment.patch.yaml b/deployment/production/lexbox-deployment.patch.yaml
@@ -21,7 +21,8 @@ spec:
             - name: Email__SmtpPort
               value: '587'
             - name: Email__From
-              # TODO: need to parameterize this
               value: "Language Depot <no-reply@languagedepot.org>"
+            - name: Email__CreateProjectEmailDestination
+              value: "admin@languagedepot.org"
             - name: Email__BaseUrl
               value: "https://languagedepot.org"
diff --git a/deployment/staging/lexbox-deployment.patch.yaml b/deployment/staging/lexbox-deployment.patch.yaml
@@ -24,7 +24,6 @@ spec:
             - name: Email__SmtpPort
               value: '587'
             - name: Email__From
-              # TODO: need to parameterize this
               value: "Language Depot (Staging) <no-reply@staging.languagedepot.org>"
             - name: Email__BaseUrl
               value: "https://staging.languagedepot.org"
diff --git a/frontend/package.json b/frontend/package.json
@@ -16,7 +16,7 @@
 		"test-flaky": "playwright test --retries=3 -j 30%",
 		"test-hard": "playwright test --repeat-each=3 -j 30%",
 		"test-report": "playwright show-report test-results/_html-report",
-    "_env-comment": "Run any command with .env.local loaded: (e.g. `pnpm run env test-flaky`)",
+		"_env-comment": "Run any command with .env.local loaded: (e.g. `pnpm run env run test -g \"test name\")",
 		"env": "dotenvx run --env-file=.env.local -- pnpm",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
@@ -27,79 +27,79 @@
 		"clean": "rimraf node_modules .svelte-kit"
 	},
 	"devDependencies": {
-		"@dotenvx/dotenvx": "^0.37.0",
-		"@egoist/tailwindcss-icons": "^1.7.4",
-		"@eslint/js": "^8.56.0",
-		"@graphql-codegen/cli": "^5.0.0",
-		"@graphql-codegen/client-preset": "^4.1.0",
-		"@graphql-codegen/schema-ast": "^4.0.0",
-		"@graphql-codegen/typescript": "^4.0.1",
+		"@dotenvx/dotenvx": "^0.37.1",
+		"@egoist/tailwindcss-icons": "^1.8.0",
+		"@eslint/js": "^8.57.0",
+		"@graphql-codegen/cli": "^5.0.2",
+		"@graphql-codegen/client-preset": "^4.2.5",
+		"@graphql-codegen/schema-ast": "^4.0.2",
+		"@graphql-codegen/typescript": "^4.0.6",
 		"@graphql-typed-document-node/core": "^3.2.0",
-		"@iconify-json/mdi": "^1.1.64",
-		"@playwright/test": "^1.41.1",
+		"@iconify-json/mdi": "^1.1.66",
+		"@playwright/test": "^1.44.0",
 		"@sveltejs/adapter-node": "^4.0.1",
-		"@sveltejs/kit": "^2.5.0",
-		"@sveltejs/vite-plugin-svelte": "^3.0.2",
-		"@tailwindcss/typography": "^0.5.10",
+		"@sveltejs/kit": "^2.5.8",
+		"@sveltejs/vite-plugin-svelte": "^3.1.0",
+		"@tailwindcss/typography": "^0.5.13",
 		"@types/mjml": "^4.7.4",
-		"@types/node": "^20.11.16",
+		"@types/node": "^20.12.12",
 		"@types/zxcvbn": "^4.4.4",
-		"@typescript-eslint/eslint-plugin": "^6.20.0",
-		"@typescript-eslint/parser": "^6.20.0",
-		"@urql/core": "^4.2.3",
+		"@typescript-eslint/eslint-plugin": "^6.21.0",
+		"@typescript-eslint/parser": "^6.21.0",
+		"@urql/core": "^5.0.3",
 		"@urql/devtools": "^2.0.3",
-		"@urql/exchange-graphcache": "^6.4.0",
-		"@urql/svelte": "^4.0.4",
-		"autoprefixer": "^10.4.17",
-		"daisyui": "^4.7.2",
-		"eslint": "^8.56.0",
-		"eslint-plugin-svelte": "^2.35.1",
+		"@urql/exchange-graphcache": "^6.5.1",
+		"@urql/svelte": "^4.2.0",
+		"autoprefixer": "^10.4.19",
+		"daisyui": "^4.11.1",
+		"eslint": "^8.57.0",
+		"eslint-plugin-svelte": "^2.39.0",
 		"globals": "^13.24.0",
 		"graphql": "^16.8.1",
 		"jwt-decode": "^4.0.0",
-		"postcss": "^8.4.33",
-		"rimraf": "^5.0.5",
-		"svelte": "^4.2.9",
-		"svelte-check": "^3.6.3",
+		"postcss": "^8.4.38",
+		"rimraf": "^5.0.7",
+		"svelte": "^4.2.17",
+		"svelte-check": "^3.7.1",
 		"svelte-eslint-parser": "^0.33.1",
-		"svelte-preprocess": "^5.1.3",
+		"svelte-preprocess": "^5.1.4",
 		"svelte-turnstile": "^0.5.0",
 		"sveltekit-superforms": "^1.13.4",
-		"tailwindcss": "^3.4.1",
+		"tailwindcss": "^3.4.3",
 		"tslib": "^2.6.2",
-		"type-fest": "^4.10.2",
+		"type-fest": "^4.18.2",
 		"typescript": "^5.3.3",
-		"vite": "^5.2.9",
+		"vite": "^5.2.11",
 		"vite-plugin-graphql-codegen": "^3.3.6",
-		"vitest": "^1.2.2",
-		"zod": "^3.22.4",
+		"vitest": "^1.6.0",
+		"zod": "^3.23.8",
 		"zxcvbn": "^4.4.2"
 	},
 	"type": "module",
 	"dependencies": {
-		"@floating-ui/dom": "^1.6.1",
-		"@opentelemetry/api": "^1.7.0",
-		"@opentelemetry/auto-instrumentations-node": "^0.41.0",
-		"@opentelemetry/auto-instrumentations-web": "^0.36.0",
-		"@opentelemetry/context-zone": "^1.21.0",
-		"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
-		"@opentelemetry/instrumentation": "^0.48.0",
-		"@opentelemetry/resources": "^1.21.0",
-		"@opentelemetry/sdk-node": "^0.48.0",
-		"@opentelemetry/sdk-trace-web": "^1.21.0",
-		"@opentelemetry/semantic-conventions": "^1.21.0",
+		"@floating-ui/dom": "^1.6.5",
+		"@opentelemetry/api": "^1.8.0",
+		"@opentelemetry/auto-instrumentations-node": "^0.46.1",
+		"@opentelemetry/auto-instrumentations-web": "^0.39.0",
+		"@opentelemetry/context-zone": "^1.24.1",
+		"@opentelemetry/exporter-trace-otlp-http": "^0.51.1",
+		"@opentelemetry/instrumentation": "^0.51.1",
+		"@opentelemetry/resources": "^1.24.1",
+		"@opentelemetry/sdk-node": "^0.51.1",
+		"@opentelemetry/sdk-trace-web": "^1.24.1",
+		"@opentelemetry/semantic-conventions": "^1.24.1",
 		"@tailwindcss/container-queries": "^0.1.1",
 		"@types/js-cookie": "^3.0.6",
 		"@types/set-cookie-parser": "^2.4.7",
 		"@vitejs/plugin-basic-ssl": "^1.1.0",
 		"css-tree": "^2.3.1",
 		"js-cookie": "^3.0.5",
-		"mjml": "^4.15.2",
+		"mjml": "^4.15.3",
 		"set-cookie-parser": "^2.6.0",
-		"svelte-exmarkdown": "^3.0.3",
+		"svelte-exmarkdown": "^3.0.5",
 		"svelte-intl-precompile": "^0.12.3",
-		"sveltekit-search-params": "^2.1.0",
-		"tus-js-client": "^4.0.1",
+		"sveltekit-search-params": "^2.1.2",
+		"tus-js-client": "^4.1.0",
 		"viewer": "workspace:*"
 	}
 }