Merge branch 'main' into update-test-seeding

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Changed
 
 - Updated layer management to use the .NET API.
+- Update stratigraphy management to use the .NET API.
+- Hide outer ring for disabled radio buttons.
 
 ## v2.0.506 - 2023-12-21
 

src/api-legacy/__init__.py

@@ -36,7 +36,6 @@
 
 # Profiles's ACTION Handlers
 from bms.v1.borehole.profile.viewer import ProfileViewerHandler
-from bms.v1.borehole.profile.producer import ProfileProducerHandler
 
 # Profiles layers's ACTION Handlers
 from bms.v1.borehole.profile.layer.viewer import ProfileLayerViewerHandler

src/api-legacy/main.py

@@ -146,7 +146,6 @@ async def close(application):
 
         # Profile handlers
         ProfileViewerHandler,
-        ProfileProducerHandler,
 
         # Layer handlers
         ProfileLayerViewerHandler,
@@ -221,11 +220,9 @@ async def close(application):
 
         # Profile handlers
         (r'/api/v1/borehole/profile', ProfileViewerHandler),
-        (r'/api/v1/borehole/profile/edit', ProfileProducerHandler),
 
         # Profile Layer handlers
         (r'/api/v1/borehole/profile/layer', ProfileLayerViewerHandler),
-        (r'/api/v1/borehole/profile/layer/edit', ProfileProducerHandler),
 
         # Other handlers
         (r'/api/v1/borehole/codes', CodeListHandler),

src/api/BoreholeFileUploadService.cs

@@ -2,7 +2,6 @@
 using Amazon.S3.Model;
 using BDMS.Models;
 using Microsoft.EntityFrameworkCore;
-using System.Security.Claims;
 using System.Security.Cryptography;
 
 namespace BDMS;
@@ -52,7 +51,7 @@ public async Task UploadFileAndLinkToBorehole(IFormFile file, int boreholeId)
         using var transaction = context.Database.CurrentTransaction == null ? await context.Database.BeginTransactionAsync().ConfigureAwait(false) : null;
         try
         {
-            var userName = httpContextAccessor.HttpContext.User.FindFirst(ClaimTypes.Name).Value;
+            var userName = httpContextAccessor.HttpContext?.GetUserName();
 
             var user = await context.Users
                 .AsNoTracking()
@@ -70,7 +69,7 @@ public async Task UploadFileAndLinkToBorehole(IFormFile file, int boreholeId)
                 var bdmsFile = new Models.File { Name = file.FileName, NameUuid = fileNameGuid, Hash = base64Hash, Type = file.ContentType };
 
                 await context.Files.AddAsync(bdmsFile).ConfigureAwait(false);
-                await context.UpdateChangeInformationAndSaveChangesAsync(httpContextAccessor.HttpContext).ConfigureAwait(false);
+                await context.UpdateChangeInformationAndSaveChangesAsync(httpContextAccessor.HttpContext!).ConfigureAwait(false);
 
                 fileId = bdmsFile.Id;
 
@@ -85,7 +84,7 @@ public async Task UploadFileAndLinkToBorehole(IFormFile file, int boreholeId)
             var boreholeFile = new BoreholeFile { FileId = (int)fileId, BoreholeId = boreholeId, UserId = user.Id, Attached = DateTime.UtcNow };
 
             await context.BoreholeFiles.AddAsync(boreholeFile).ConfigureAwait(false);
-            await context.UpdateChangeInformationAndSaveChangesAsync(httpContextAccessor.HttpContext).ConfigureAwait(false);
+            await context.UpdateChangeInformationAndSaveChangesAsync(httpContextAccessor.HttpContext!).ConfigureAwait(false);
 
             if (transaction != null) await transaction.CommitAsync().ConfigureAwait(false);
         }

src/api/Controllers/BoreholeController.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
-using System.Security.Claims;
 
 namespace BDMS.Controllers;
 
@@ -36,7 +35,7 @@ public async Task<ActionResult<int>> CopyAsync([Required] int id, [Required] int
         var user = await context.Users
             .Include(u => u.WorkgroupRoles)
             .AsNoTracking()
-            .SingleOrDefaultAsync(u => u.Name == HttpContext.User.FindFirst(ClaimTypes.Name).Value)
+            .SingleOrDefaultAsync(u => u.Name == HttpContext.GetUserName())
             .ConfigureAwait(false);
 
         if (user == null || !user.WorkgroupRoles.Any(w => w.WorkgroupId == workgroupId && w.Role == Role.Editor))