Release 2025.2.3

.github/workflows/code_style.yml

@@ -11,7 +11,7 @@ jobs:
 
       - uses: psf/black@stable
         with:
-          version: 24.4.0
+          version: 25.1.0
           options: "--check --verbose --diff"
           src: "./server"
 

development.md

@@ -21,6 +21,8 @@ $ cd server
 # Install dependencies with pipenv
 # Note: You can append --three flag in older versions of pipenv (< 3.16.8 2023-02-04)
 $ pipenv install --dev
+$ pipenv run pre-commit install
+$ pipenv run pre-commit run --all-files
 $ export FLASK_APP=application; export COLLECT_STATISTICS=0
 $ pipenv run flask init-db
 # create admin user

server/.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.1.0
+    hooks:
+      - id: black
+        language_version: python3.10

server/Pipfile

@@ -51,6 +51,8 @@ pylint = "==3.2.6"
 responses = "==0.21.0"
 pytest-dotenv= "==0.5.2"
 pysqlite3-binary= "==0.5.3"
+black = "==25.1.0"
+pre-commit = "==4.1.0"
 # requirements for pytest on windows
 atomicwrites = "==1.4.0"
 

server/mergin/auth/forms.py

@@ -15,7 +15,7 @@
     EqualTo,
 )
 
-from .models import User
+from .models import MAX_USERNAME_LENGTH, User
 from ..app import UpdateForm, CustomStringField
 
 
@@ -87,7 +87,10 @@ class LoginForm(FlaskForm):
 class RegisterUserForm(FlaskForm):
     username = CustomStringField(
         "Username",
-        validators=[validators.Length(min=4, max=25), username_validation],
+        validators=[
+            validators.Length(min=4, max=MAX_USERNAME_LENGTH),
+            username_validation,
+        ],
     )
     email = CustomStringField(
         "Email Address",

server/mergin/auth/models.py

@@ -14,6 +14,8 @@
 from ..sync.models import ProjectUser
 from ..sync.utils import get_user_agent, get_ip, get_device_id, is_reserved_word
 
+MAX_USERNAME_LENGTH = 50
+
 
 class User(db.Model):
     id = db.Column(db.Integer, primary_key=True)
@@ -203,8 +205,8 @@ def generate_username(cls, email: str) -> Optional[str]:
         ).ljust(4, "0")
         # additional check for reserved words
         username = f"{username}0" if is_reserved_word(username) else username
-        # some value until 25 + space for suffix
-        username = username[:22]
+        # keep some space for suffix
+        username = username[: MAX_USERNAME_LENGTH - 3]
         # check if we already do not have existing usernames
         query = db.session.execute(
             text(

server/mergin/sync/models.py

@@ -90,7 +90,6 @@ def __init__(
         self.public = kwargs.get("public", False)
         latest_files = LatestProjectFiles(project=self)
         db.session.add(latest_files)
-        self.set_role(creator.id, ProjectRole.OWNER)
 
     @property
     def storage(self):

server/mergin/tests/test_auth.py

@@ -851,10 +851,13 @@ def test_username_generation(client):
 
     user = add_user("support1", "user")
     assert User.generate_username("support@example.com") == "support0"
-    assert (
-        User.generate_username("verylonglonglonglonglong@example.com")
-        == "verylonglonglonglonglo"
-    )
+
+    # test long emails
+    username = "a" * 25
+    assert User.generate_username(f"{username}@example.com") == username
+    # shortened version
+    username = "a" * 50
+    assert User.generate_username(f"{username}@example.com") == username[:47]
 
     # test username generation with existing user, case insensitive
     user = add_user("Testuser")

server/mergin/tests/test_celery.py

@@ -10,7 +10,7 @@
 
 from ..app import db
 from ..config import Configuration
-from ..sync.models import Project, AccessRequest, ProjectVersion
+from ..sync.models import Project, AccessRequest, ProjectRole, ProjectVersion
 from ..celery import send_email_async
 from ..sync.tasks import remove_temp_files, remove_projects_backups
 from ..sync.storages.disk import move_to_tmp
@@ -60,6 +60,7 @@ def test_send_email_from_flask(send_email_mock, client):
     user = User.query.filter(User.username == "mergin").first()
     test_workspace = create_workspace()
     p = create_project("testx", test_workspace, user)
+    p.set_role(user.id, ProjectRole.OWNER)
     user2 = add_user("test_user", "ilovemergin")
     login(client, "test_user", "ilovemergin")
     email_data = {

server/mergin/tests/test_project_controller.py

@@ -170,12 +170,15 @@ def test_get_paginated_projects(client):
     for i in range(14):
         create_project("foo" + str(i), test_workspace, user)
 
-    resp = client.get("/v1/project/paginated?page=1&per_page=10")
+    resp = client.get(
+        "/v1/project/paginated?page=1&per_page=10&order_params=created_asc"
+    )
     assert resp.status_code == 200
     resp_data = json.loads(resp.data)
     assert len(resp_data.get("projects")) == 10
     assert resp_data.get("count") == 15
-    assert "foo7" in resp_data.get("projects")[9]["name"]
+    names = [p["name"] for p in resp_data.get("projects")]
+    assert "foo8" in resp_data.get("projects")[9]["name"]
     assert "v0" == resp_data.get("projects")[9]["version"]
 
     resp = client.get(
@@ -194,11 +197,11 @@ def test_get_paginated_projects(client):
 
     # order by workspace name
     resp = client.get(
-        "/v1/project/paginated?page=2&per_page=10&order_params=workspace_asc"
+        "/v1/project/paginated?page=2&per_page=10&order_params=workspace_asc,created_asc"
     )
     resp_data = json.loads(resp.data)
     assert len(resp_data.get("projects")) == 5
-    assert "foo12" in resp_data.get("projects")[-1]["name"]
+    assert "foo13" in resp_data.get("projects")[-1]["name"]
     # tests backward compatibility sort
     resp_alt = client.get(
         "/v1/project/paginated?page=2&per_page=10&order_by=namespace&descending=false"
@@ -295,15 +298,15 @@ def test_get_paginated_projects(client):
     Configuration.GLOBAL_READ = False
     Configuration.GLOBAL_WRITE = False
     Configuration.GLOBAL_ADMIN = False
-    # add new user and let him create one project (total 15+1)
+    # add new user and pretend he created one project (total 15+1)
     user2 = add_user("user2", "ilovemergin")
-    assert not test_workspace.user_has_permissions(user2, "read")
     create_project("created", test_workspace, user2)
+    # without implicit and explicit permissions user should not see any private project (even not that he 'created')
+    assert not test_workspace.user_has_permissions(user2, "read")
     login(client, "user2", "ilovemergin")
     # check one project is 'created', none is 'shared'
     resp = client.get("/v1/project/paginated?page=1&per_page=10&flag=created")
-    assert resp.json["count"] == 1
-    assert resp.json["projects"][0]["name"] == "created"
+    assert resp.json["count"] == 0
     resp = client.get("/v1/project/paginated?page=1&per_page=10&flag=shared")
     assert resp.json["count"] == 0
     # share project explicitly
@@ -2133,7 +2136,8 @@ def test_orphan_project(client):
     test_workspace = create_workspace()
     project = create_project("orphan", test_workspace, user)
     assert project.creator_id == user_id
-    assert project.get_role(user_id) is ProjectRole.OWNER
+    # creator is not direct member by default
+    assert not project.get_role(user_id)
 
     # user is removed by superuser
     login_as_admin(client)

server/mergin/tests/utils.py

@@ -80,7 +80,6 @@ def create_project(name, workspace, user, **kwargs):
 
     p = Project(**project_params, **kwargs)
     p.updated = datetime.utcnow()
-    p.set_role(user.id, ProjectRole.OWNER)
     db.session.add(p)
     db.session.flush()
     changes = UploadChanges(added=[], updated=[], removed=[])

web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss

@@ -106,6 +106,10 @@ img {
   color: map-get($colors, 'medium-green');
 }
 
+.text-color-dark-green {
+  color: map-get($colors, 'dark-green');
+}
+
 .overflow-wrap-anywhere {
   overflow-wrap: anywhere;
 }

web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_variables.scss

@@ -21,13 +21,15 @@ $colors: (
     "night": #12181F,
     "light-green": #EFF5F3,
     "medium-green": #B7CDC4,
+    "dark-green": #6E9991,
     "sun": #F4CB46,
     "sunset": #FFB673,
     "sand": #FFF4E2,
     "primary": $primaryColor,
     "grape": #5A2740,
     "positive": #C0EBCF,
     "negative": #F0C4BC,
+    "negative-light": #FFF0ED,
     "warning": #F7DDAF,
     "earth": #4D2A24,
     "deep-ocean": #1C324A,
@@ -110,5 +112,7 @@ $colors: (
     --sun-color: #{map-get($colors, "sun")};
     --sand-color: #{map-get($colors, "sand")};
     --rose-color: #{map-get($colors, "rose")};
+    --dark-green-color: #{map-get($colors, "dark-green")};
+    --negative-light-color: #{map-get($colors, "negative-light")};
     color-scheme: light;
 }

web-app/packages/lib/src/common/components/TipMessage.vue

@@ -7,30 +7,71 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 <template>
   <!-- Tip from MM -->
   <div
-    class="tip-message flex flex-column row-gap-2 md:flex-row align-items-center border-round-xl p-4"
+    class="tip-message flex flex-column md:flex-row align-items-center border-round-xl p-4"
+    :class="[severityClass]"
   >
-    <div class="md:mr-4">
-      <slot name="image">
-        <img src="@/assets/bulb.svg" aria-label="Bulb" />
-      </slot>
-    </div>
+    <slot name="image">
+      <img
+        v-if="severity === 'info'"
+        width="50"
+        height="50"
+        src="@/assets/bulb.svg"
+        aria-label="Bulb"
+      />
+      <img
+        v-if="severity === 'danger'"
+        width="50"
+        height="50"
+        src="@/assets/exclamation.svg"
+        aria-label="Exclamation"
+      />
+    </slot>
 
-    <div class="text-center md:text-left">
-      <p class="tip-message-title title-t3 mb-1">
+    <div class="md:pl-4 text-center md:text-left">
+      <p :class="['tip-message-title title-t3']">
         <slot name="title">Tip from Mergin Maps</slot>
       </p>
-      <p class="opacity-80 paragraph-p5">
+      <p class="opacity-80 paragraph-p6">
         <slot name="description"></slot>
       </p>
     </div>
   </div>
 </template>
 
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { TipMessageProps } from './types'
+
+type Severity = 'info' | 'danger'
+
+const props = withDefaults(defineProps<TipMessageProps>(), {
+  severity: 'info'
+})
+
+const severityClass = computed(() => {
+  const mapper: Record<Severity, string> = {
+    info: 'tip-message-info',
+    danger: 'tip-message-danger'
+  }
+  return mapper[props.severity]
+})
+</script>
+
 <style scoped lang="scss">
 .tip-message {
-  background-color: var(--light-green-color);
-  &-title {
-    color: var(--deep-ocean-color);
+  &.tip-message-info {
+    background-color: var(--light-green-color);
+    .tip-message-title {
+      color: var(--deep-ocean-color);
+    }
+  }
+
+  &.tip-message-danger {
+    background-color: var(--negative-light-color);
+    .tip-message-title {
+      color: var(--grape-color);
+    }
   }
 }
 </style>

web-app/packages/lib/src/common/components/types.ts

@@ -15,3 +15,9 @@ export interface TableDataHeader {
   sortable?: boolean
   width?: number
 }
+
+export type TipMessageSeverity = 'info' | 'danger'
+
+export interface TipMessageProps {
+  severity?: TipMessageSeverity
+}

web-app/packages/lib/src/modules/dialog/components/ConfirmDialog.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 -->
 
 <template>
-  <div class="flex flex-column align-items-center pb-4 text-center gap-4">
+  <div class="flex flex-column align-items-center pb-4 text-center gap-2">
     <img
       v-if="severity === 'danger'"
       src="@/assets/trash.svg"
@@ -18,20 +18,31 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
     />
     <img v-else src="@/assets/neutral.svg" alt="Cover for confirm dialog" />
     <span class="text-color-forest title-t1">{{ text }}</span>
-    <span class="paragraph-p6 opacity-80">{{ description }}</span>
-    <span class="title-t2">{{ hint }}</span>
-    <span v-if="confirmField" class="flex p-float-label w-full p-input-filled">
-      <PInputText
-        autofocus
-        id="confirmValue"
-        v-model="confirmValue"
-        type="text"
-        class="flex-grow-1"
-      />
-      <label for="confirmValue">{{ confirmField.label }}</label>
-    </span>
+    <span class="paragraph-p5 opacity-80">{{ description }}</span>
+    <span v-if="hint" class="title-t2 my-2">{{ hint }}</span>
+    <div class="flex flex-column gap-3 w-full">
+      <span
+        v-if="confirmField"
+        class="flex flex-column p-input-filled text-left"
+      >
+        <label for="confirmValue">{{ confirmField.label }}</label>
+        <PInputText
+          autofocus
+          :id="'confirmValue'"
+          v-model="confirmValue"
+          type="text"
+          :placeholder="confirmField.placeholder ?? 'Type in value to confirm'"
+        />
+      </span>
+
+      <slot></slot>
 
-    <slot></slot>
+      <!-- Show tip message -->
+      <tip-message v-if="message" :severity="message.severity">
+        <template #title>{{ message.title }}</template>
+        <template #description>{{ message.description }}</template>
+      </tip-message>
+    </div>
 
     <!-- Footer -->
     <div
@@ -62,6 +73,7 @@ import { ref, computed, defineEmits, withDefaults } from 'vue'
 
 import { ConfirmDialogProps } from '../types'
 
+import TipMessage from '@/common/components/TipMessage.vue'
 import { useDialogStore } from '@/modules/dialog/store'
 
 const props = withDefaults(defineProps<ConfirmDialogProps>(), {