Merge pull request #225 from MerginMaps/develop

Release 2024.2.2

Author: varmar05

docker-compose.yml

@@ -21,7 +21,7 @@ services:
     networks:
       - merginmaps
   server:
-    image: lutraconsulting/merginmaps-backend:2023.6.1
+    image: lutraconsulting/merginmaps-backend:2024.2.2
     container_name: merginmaps-server
     restart: always
     user: 901:999
@@ -35,7 +35,7 @@ services:
     networks:
       - merginmaps
   web:
-    image: lutraconsulting/merginmaps-frontend:2023.6.1
+    image: lutraconsulting/merginmaps-frontend:2024.2.2
     container_name: merginmaps-web
     restart: always
     depends_on:

server/mergin/sync/models.py

@@ -305,6 +305,9 @@ def delete(self, removed_by: int = None):
         - reset project_access
         - decline pending project access requests
         """
+        # do nothing if the project has been already deleted
+        if not self.storage_params:
+            return
         self.name = f"{self.name}_{str(self.id)}"
         # make sure remove_at is not null as it is used as filter for APIs
         if not self.removed_at:

server/mergin/sync/private_api_controller.py

@@ -360,7 +360,7 @@ def get_project_access(id: str):
                 )
                 processed_ids.add(user_id)
     if global_role:
-        for user in User.query.all():
+        for user in User.query.filter_by(active=True).all():
             if user.id not in processed_ids:
                 result.append(
                     {

server/mergin/tests/test_db_hooks.py

@@ -132,3 +132,6 @@ def test_remove_project(client, diff_project):
     assert ProjectAccess.query.filter_by(project_id=project_id).count()
     cleanup(client, [project_dir])
     assert access_request.status == RequestStatus.DECLINED.value
+
+    # try to remove the deleted project
+    assert diff_project.delete() is None

server/mergin/tests/test_private_project_api.py

@@ -515,3 +515,10 @@ def test_get_project_access(client):
     assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 6
     assert sum(map(lambda x: int(x["project_permission"] == "writer"), resp.json)) == 0
     assert sum(map(lambda x: int(x["project_permission"] == "reader"), resp.json)) == 0
+    # pretend a user was deleted to test that api can handle it
+    users[3].inactivate()
+    users[3].anonymize()
+    resp = client.get(url)
+    assert resp.status_code == 200
+    assert len(resp.json) == 5
+    assert sum(map(lambda x: int(x["project_permission"] == "owner"), resp.json)) == 5

server/mergin/version.py

@@ -4,4 +4,4 @@
 
 
 def get_version():
-    return "2024.2.1"
+    return "2024.2.2"

server/setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="mergin",
-    version="2024.2.1",
+    version="2024.2.2",
     url="https://github.com/MerginMaps/mergin",
     license="AGPL-3.0-only",
     author="Lutra Consulting Limited",

web-app/packages/lib/src/common/permission_utils.ts

@@ -120,8 +120,7 @@ export function getProjectRoleNameValues(): DropdownOption<ProjectRoleName>[] {
     {
       value: 'reader',
       label: 'Reader',
-      description: 'Can view project files',
-      disabled: true
+      description: 'Can view project files'
     },
     {
       value: 'writer',