Merge branch 'master' into goal-timeline

Author: imnasnainaec

Backend.Tests/Controllers/StatisticsControllerTests.cs

@@ -151,21 +151,21 @@ public async Task TestGetSemanticDomainUserCountsNoPermission()
         {
             _statsController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
 
-            var result = await _statsController.GetSemanticDomainUserCounts(_projId, "en");
+            var result = await _statsController.GetSemanticDomainUserCounts(_projId);
             Assert.That(result, Is.InstanceOf<ForbidResult>());
         }
 
         [Test]
         public async Task TestGetSemanticDomainUserCountsMissingProject()
         {
-            var result = await _statsController.GetSemanticDomainUserCounts(MissingId, "en");
+            var result = await _statsController.GetSemanticDomainUserCounts(MissingId);
             Assert.That(result, Is.InstanceOf<NotFoundObjectResult>());
         }
 
         [Test]
         public async Task TestGetSemanticDomainUserCounts()
         {
-            var result = await _statsController.GetSemanticDomainUserCounts(_projId, "en");
+            var result = await _statsController.GetSemanticDomainUserCounts(_projId);
             Assert.That(result, Is.InstanceOf<OkObjectResult>());
         }
     }

Backend.Tests/Controllers/UserControllerTests.cs

@@ -70,7 +70,7 @@ public void TestResetPasswordRequest()
             // Returns Ok regardless of if user exists.
             var noUserResult = _userController.ResetPasswordRequest(new()).Result;
             Assert.That(noUserResult, Is.TypeOf<OkResult>());
-            var username = (_userRepo.Create(new() { Username = "Imarealboy" }).Result)!.Username;
+            var username = _userRepo.Create(new() { Username = "Imarealboy" }).Result!.Username;
             var yesUserResult = _userController.ResetPasswordRequest(new() { EmailOrUsername = username }).Result;
             Assert.That(yesUserResult, Is.TypeOf<OkResult>());
         }
@@ -342,14 +342,5 @@ public void TestIsEmailOrUsernameAvailable()
             var result5 = (ObjectResult)_userController.IsEmailOrUsernameAvailable("").Result;
             Assert.That(result5.Value, Is.False);
         }
-
-        [Test]
-        public void TestIsUserSiteAdminNoPermission()
-        {
-            _userController.ControllerContext.HttpContext = PermissionServiceMock.UnauthorizedHttpContext();
-            var result = _userController.IsUserSiteAdmin().Result;
-            Assert.That(result, Is.InstanceOf<ObjectResult>());
-            Assert.That(((ObjectResult)result).Value, Is.False);
-        }
     }
 }

Backend/Controllers/StatisticsController.cs

@@ -48,7 +48,6 @@ public async Task<IActionResult> GetSemanticDomainCounts(string projectId, strin
             return Ok(await _statService.GetSemanticDomainCounts(projectId, lang));
         }
 
-
         /// <summary> Get a list of <see cref="WordsPerDayPerUserCount"/>s of a specific project in order </summary>
         /// <returns> A list of <see cref="WordsPerDayPerUserCount"/>s </returns>
         [HttpGet("GetWordsPerDayPerUserCounts", Name = "GetWordsPerDayPerUserCounts")]
@@ -70,7 +69,6 @@ public async Task<IActionResult> GetWordsPerDayPerUserCounts(string projectId)
             return Ok(await _statService.GetWordsPerDayPerUserCounts(projectId));
         }
 
-
         /// <summary> Get a <see cref="ChartRootData"/> to generate an estimate Line Chart </summary>
         [HttpGet("GetProgressEstimationLineChartRoot", Name = "GetProgressEstimationLineChartRoot")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ChartRootData))]
@@ -91,7 +89,6 @@ public async Task<IActionResult> GetProgressEstimationLineChartRoot(string proje
             return Ok(await _statService.GetProgressEstimationLineChartRoot(projectId, proj.WorkshopSchedule));
         }
 
-
         /// <summary> Get a <see cref="ChartRootData"/> to generate a Line Chart </summary>
         [HttpGet("GetLineChartRootData", Name = "GetLineChartRootData")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ChartRootData))]
@@ -112,13 +109,11 @@ public async Task<IActionResult> GetLineChartRootData(string projectId)
             return Ok(await _statService.GetLineChartRootData(projectId));
         }
 
-
-
         /// <summary> Get a list of <see cref="SemanticDomainUserCount"/>s of a specific project in order </summary>
         /// <returns> A list of <see cref="SemanticDomainUserCount"/>s </returns>
         [HttpGet("GetSemanticDomainUserCounts", Name = "GetSemanticDomainUserCounts")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(List<SemanticDomainUserCount>))]
-        public async Task<IActionResult> GetSemanticDomainUserCounts(string projectId, string lang)
+        public async Task<IActionResult> GetSemanticDomainUserCounts(string projectId)
         {
             if (!await _permissionService.HasProjectPermission(HttpContext, Permission.Statistics, projectId))
             {

Backend/Controllers/UserController.cs

@@ -275,13 +275,5 @@ public async Task<IActionResult> DeleteUser(string userId)
 
             return await _userRepo.Delete(userId) ? Ok() : NotFound();
         }
-
-        /// <summary> Checks if current user is a site administrator. </summary>
-        [HttpGet("issiteadmin", Name = "IsUserSiteAdmin")]
-        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(bool))]
-        public async Task<IActionResult> IsUserSiteAdmin()
-        {
-            return Ok(await _permissionService.IsSiteAdmin(HttpContext));
-        }
     }
 }

Backend/Dockerfile

@@ -7,7 +7,7 @@
 ############################################################
 
 # Docker multi-stage build
-FROM mcr.microsoft.com/dotnet/sdk:8.0.406-jammy AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.409-jammy AS builder
 WORKDIR /app
 
 # Copy csproj and restore (fetch dependencies) as distinct layers.
@@ -19,7 +19,7 @@ COPY . ./
 RUN dotnet publish -c Release -o build
 
 # Build runtime image.
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.13-jammy
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.16-jammy
 
 ENV ASPNETCORE_URLS=http://+:5000
 ENV COMBINE_IS_IN_CONTAINER=1

Dockerfile

@@ -7,7 +7,7 @@
 ############################################################
 
 # User guide build environment
-FROM python:3.12.8-slim-bookworm AS user_guide_builder
+FROM python:3.12.10-slim-bookworm AS user_guide_builder
 
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
@@ -24,7 +24,7 @@ COPY docs/user_guide docs/user_guide
 RUN tox -e user-guide
 
 # Frontend build environment.
-FROM node:20.18.1-bookworm-slim AS frontend_builder
+FROM node:20.19.1-bookworm-slim AS frontend_builder
 WORKDIR /app
 
 # Install app dependencies.
@@ -36,7 +36,7 @@ COPY . ./
 RUN npm run build
 
 # Production environment.
-FROM nginx:1.27
+FROM nginx:1.28.0
 
 WORKDIR /app
 

README.md

@@ -228,8 +228,8 @@ environment. This will be denoted with the `(venv)` prefix on the prompt.
 With an active virtual environment, install Python development requirements for this project:
 
 ```bash
-python -m pip install --upgrade pip pip-tools
-python -m piptools sync dev-requirements.txt
+python -m pip -q install --upgrade pip pip-tools
+python -m piptools sync -q dev-requirements.txt
 ```
 
 The following Python scripts can now be run from the virtual environment.
@@ -246,12 +246,19 @@ To run all Python linting steps:
 tox
 ```
 
-To upgrade all pinned dependencies:
+To upgrade all pinned development dependencies:
 
 ```bash
 python -m piptools compile --upgrade dev-requirements.in
 ```
 
+To upgrade the pinned dependencies for deployment:
+
+```bash
+cd deploy
+python -m piptools compile --upgrade requirements.in
+```
+
 To upgrade the pinned dependencies for the Maintenance container:
 
 ```bash
@@ -976,13 +983,13 @@ Task: add an existing user to a project
 Run:
 
 ```bash
-kubectl exec -it deployment/maintenance -- add_user_to_proj.py --project <PROJECT_NAME> --user <USER>
+kubectl -n thecombine exec -it deployment/maintenance -- add_user_to_proj.py --project <PROJECT_NAME> --user <USER>
 ```
 
 For additional options, run:
 
 ```bash
-kubectl exec -it deployment/maintenance -- add_user_to_proj.py --help`
+kubectl -n thecombine exec -it deployment/maintenance -- add_user_to_proj.py --help
 ```
 
 #### Backup _TheCombine_
@@ -992,7 +999,7 @@ Task: Backup the CombineDatabase and the Backend files to the Amazon Simple Stor
 Run:
 
 ```bash
-kubectl exec -it deployment/maintenance -- combine_backup.py [--verbose]
+kubectl -n thecombine exec -it deployment/maintenance -- combine_backup.py [--verbose]
 ```
 
 Notes:
@@ -1010,7 +1017,7 @@ Task: Delete a project
 Run:
 
 ```bash
-kubectl exec -it deployment/maintenance -- rm_project.py <PROJECT_NAME>
+kubectl -n thecombine exec -it deployment/maintenance -- rm_project.py <PROJECT_NAME>
 ```
 
 You may specify more than one `<PROJECT_NAME>` to delete multiple projects.
@@ -1022,7 +1029,7 @@ Task: Restore the CombineDatabase and the Backend files from a backup stored on
 Run:
 
 ```bash
-kubectl exec -it deployment/maintenance -- combine_restore.py [--verbose] [BACKUP_NAME]
+kubectl -n thecombine exec -it deployment/maintenance -- combine_restore.py [--verbose] [BACKUP_NAME]
 ```
 
 Note:

database/Dockerfile

@@ -5,7 +5,7 @@
 #   - Intel/AMD 64-bit
 #   - ARM 64-bit
 ############################################################
-FROM mongo:7.0.16-jammy
+FROM mongo:7.0.20-jammy
 
 WORKDIR /
 

deploy/Dockerfile

@@ -5,7 +5,7 @@
 #   - Intel/AMD 64-bit
 ############################################################
 
-FROM python:3.12.8-slim-bookworm
+FROM python:3.12.10-slim-bookworm
 
 USER root
 

deploy/requirements.txt

@@ -4,56 +4,56 @@
 #
 #    pip-compile requirements.in
 #
-ansible==11.1.0
+ansible==11.6.0
     # via -r requirements.in
-ansible-core==2.18.1
+ansible-core==2.18.6
     # via ansible
-cachetools==5.5.0
+cachetools==5.5.2
     # via google-auth
-certifi==2024.8.30
+certifi==2025.4.26
     # via
     #   kubernetes
     #   requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.0
+charset-normalizer==3.4.2
     # via requests
-cryptography==44.0.0
+cryptography==45.0.4
     # via
     #   ansible-core
     #   pyopenssl
-durationpy==0.9
+durationpy==0.10
     # via kubernetes
-google-auth==2.36.0
+google-auth==2.40.3
     # via kubernetes
 idna==3.10
     # via requests
-jinja2==3.1.4
+jinja2==3.1.6
     # via
     #   -r requirements.in
     #   ansible-core
     #   jinja2-base64-filters
 jinja2-base64-filters==0.1.4
     # via -r requirements.in
-kubernetes==31.0.0
+kubernetes==33.1.0
     # via -r requirements.in
 markupsafe==3.0.2
     # via jinja2
 oauthlib==3.2.2
     # via
     #   kubernetes
     #   requests-oauthlib
-packaging==24.2
+packaging==25.0
     # via ansible-core
 pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.1
+pyasn1-modules==0.4.2
     # via google-auth
 pycparser==2.22
     # via cffi
-pyopenssl==24.3.0
+pyopenssl==25.1.0
     # via -r requirements.in
 python-dateutil==2.9.0.post0
     # via kubernetes
@@ -62,21 +62,23 @@ pyyaml==6.0.2
     #   -r requirements.in
     #   ansible-core
     #   kubernetes
-requests==2.32.3
+requests==2.32.4
     # via
     #   kubernetes
     #   requests-oauthlib
 requests-oauthlib==2.0.0
     # via kubernetes
 resolvelib==1.0.1
     # via ansible-core
-rsa==4.9
+rsa==4.9.1
     # via google-auth
 six==1.17.0
     # via
     #   kubernetes
     #   python-dateutil
-urllib3==2.2.3
+typing-extensions==4.14.0
+    # via pyopenssl
+urllib3==2.4.0
     # via
     #   kubernetes
     #   requests

deploy/scripts/setup_files/cluster_config.yaml

@@ -45,10 +45,11 @@ cert-manager:
     name: cert-manager
     reference: jetstack/cert-manager
     namespace: cert-manager
-    version: v1.12.3
+    version: v1.17.1
     wait: true
     override:
-      installCRDs: true
+      crds:
+        enabled: true
 
 nginx-ingress-controller:
   repo:
@@ -68,7 +69,7 @@ rancher-ui:
     name: rancher
     reference: rancher-stable/rancher
     namespace: cattle-system
-    version: 2.7.6
+    version: 2.10.4
     wait: true
     override:
       hostname: rancher.thecombine.app