Release 2025.4.2

.gitignore

@@ -18,6 +18,7 @@ venv/
 
 # production env
 .prod.env
+.sso.env
 
 # generated documentation
 gen
@@ -30,3 +31,7 @@ web-app/.node-version
 mergin-db-ce
 
 docker-compose.local.yml
+
+# SSO
+*.pem
+*.crt

server/mergin/version.py

@@ -4,4 +4,4 @@
 
 
 def get_version():
-    return "2025.4.1"
+    return "2025.4.2"

server/setup.py

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

web-app/packages/admin-app/src/App.vue

@@ -55,11 +55,12 @@ import {
   useNotificationStore,
   useUserStore,
   useLayoutStore,
-  useProjectStore
+  useProjectStore,
+  useRouterTitle
 } from '@mergin/lib'
 import { mapActions, mapState } from 'pinia'
 import { useToast } from 'primevue/usetoast'
-import { defineComponent } from 'vue'
+import { defineComponent, watchEffect } from 'vue'
 import { useMeta } from 'vue-meta'
 
 export default defineComponent({
@@ -120,8 +121,11 @@ export default defineComponent({
     }
   },
   setup() {
+    const { title } = useRouterTitle({
+      defaultTitle: 'Mergin Maps Admin Panel'
+    })
     useMeta({
-      title: 'Mergin Maps',
+      title: 'Mergin Maps Admin Panel',
       meta: [
         {
           name: 'description',
@@ -144,6 +148,9 @@ export default defineComponent({
     notificationStore.init(toast)
     layoutStore.init()
     projectStore.filterPermissions(['editor'], ['edit'])
+    watchEffect(() => {
+      document.title = title.value
+    })
   },
   async created() {
     await this.fetchConfig()

web-app/packages/admin-app/src/router.ts

@@ -13,7 +13,8 @@ import {
   ProjectSettingsView,
   ProjectVersionView,
   ProjectVersionsView,
-  OverviewView
+  OverviewView,
+  getAdminTitle
 } from '@mergin/admin-lib'
 import {
   NotFoundView,
@@ -165,5 +166,10 @@ export const createRouter = (pinia: Pinia) => {
     routeUtils.isSuperUser(to, from, next, userStore)
   })
 
+  router.beforeEach((to, from, next) => {
+    // Set the page title based on the route's meta title
+    to.meta.title = getAdminTitle
+    next()
+  })
   return router
 }

web-app/packages/admin-app/src/shims-vue-router.d.ts

@@ -2,8 +2,6 @@ import 'vue-router'
 
 declare module 'vue-router' {
   interface RouteMeta {
-    public?: boolean
-    allowedForNoWorkspace?: boolean
-    breadcrump?: { title: string; path: string }[]
+    title?: string | string[] | ((route, extened) => string | string[])
   }
 }

web-app/packages/admin-lib/src/modules/admin/routes.ts

@@ -2,7 +2,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
-import { RouteRecord } from 'vue-router'
+import { RouteLocationNormalizedLoaded, RouteRecord } from 'vue-router'
+
+import { AdminRouteParams } from './types'
 
 export enum AdminRoutes {
   ACCOUNTS = 'accounts',
@@ -15,7 +17,27 @@ export enum AdminRoutes {
   ProjectHistory = 'project-versions',
   ProjectSettings = 'project-settings',
   ProjectVersion = 'project-version',
-  FileVersionDetail = 'file-version-detail'
+  FileVersionDetail = 'file-version-detail',
+  Login = 'login'
+}
+
+export const getAdminTitle = (route: RouteLocationNormalizedLoaded) => {
+  const params = route.params as AdminRouteParams
+  const titles: Record<AdminRoutes, string | string[]> = {
+    [AdminRoutes.Login]: ['Sign in', 'Mergin Maps Admin Panel'],
+    [AdminRoutes.ACCOUNTS]: 'Accounts',
+    [AdminRoutes.ACCOUNT]: 'Account details',
+    [AdminRoutes.OVERVIEW]: 'Admin overview',
+    [AdminRoutes.PROJECTS]: 'Projects',
+    [AdminRoutes.PROJECT]: ['Details', params.projectName],
+    [AdminRoutes.SETTINGS]: 'Settings',
+    [AdminRoutes.ProjectTree]: ['Files', params.projectName],
+    [AdminRoutes.ProjectHistory]: ['History', params.projectName],
+    [AdminRoutes.ProjectSettings]: ['Settings', params.projectName],
+    [AdminRoutes.ProjectVersion]: [params.version_id, params.projectName],
+    [AdminRoutes.FileVersionDetail]: [params.path, params.version_id]
+  }
+  return titles[route.name as AdminRoutes]
 }
 
 export const getRoutes = (): RouteRecord[] => []

web-app/packages/admin-lib/src/modules/admin/types.ts

@@ -84,4 +84,12 @@ export interface DownloadReportParams {
   date_to: string
 }
 
+export interface AdminRouteParams {
+  namespace?: string
+  projectName?: string
+  version_id?: string
+  path?: string
+  username?: string
+}
+
 /* eslint-enable camelcase */

web-app/packages/admin-lib/src/modules/admin/views/ProjectVersionView.vue

@@ -62,6 +62,8 @@
         <project-version-changes v-if="data" :version="data" />
       </app-section>
     </app-container>
+    <download-progress />
+    <download-file-large />
   </admin-layout>
 </template>
 
@@ -74,7 +76,9 @@ import {
   useNotificationStore,
   ProjectVersion,
   errorUtils,
-  ProjectVersionChanges
+  ProjectVersionChanges,
+  DownloadProgress,
+  DownloadFileLarge
 } from '@mergin/lib'
 import { computed, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'

web-app/packages/admin-lib/src/shims-vue-router.d.ts

@@ -0,0 +1,7 @@
+import 'vue-router'
+
+declare module 'vue-router' {
+  interface RouteMeta {
+    title?: string | string[] | ((route, extended) => string | string[])
+  }
+}

web-app/packages/app/shims-vue-router.d.ts

@@ -4,6 +4,9 @@ declare module 'vue-router' {
   interface RouteMeta {
     public?: boolean
     allowedForNoWorkspace?: boolean
-    breadcrump?: { title: string; path: string }[]
+    breadcrump?:
+      | { title: string; path: string }[]
+      | ((route) => { title: string; path: string }[])
+    title?: string | string[] | ((route, extended) => string | string[])
   }
 }

web-app/packages/app/src/App.vue

@@ -53,11 +53,13 @@ import {
   useNotificationStore,
   useUserStore,
   InstanceMaintenanceMessage,
-  useProjectStore
+  useProjectStore,
+  useRouterTitle,
+  routeUtils
 } from '@mergin/lib'
 import { mapActions, mapState } from 'pinia'
 import { useToast } from 'primevue/usetoast'
-import { defineComponent } from 'vue'
+import { defineComponent, watchEffect } from 'vue'
 import { useMeta } from 'vue-meta'
 
 export default defineComponent({
@@ -101,8 +103,11 @@ export default defineComponent({
     }
   },
   setup() {
+    const { title } = useRouterTitle({
+      defaultTitle: routeUtils.DEFAULT_PAGE_TITLE
+    })
     useMeta({
-      title: 'Mergin Maps',
+      title: routeUtils.DEFAULT_PAGE_TITLE,
       meta: [
         {
           name: 'description',
@@ -125,6 +130,9 @@ export default defineComponent({
     notificationStore.init(toast)
     layoutStore.init()
     projectStore.filterPermissions(['editor'], ['edit'])
+    watchEffect(() => {
+      document.title = title.value
+    })
   },
   async created() {
     await this.fetchConfig()
@@ -152,7 +160,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(useAppStore, ['setServerError']),
-    ...mapActions(useInstanceStore, ['fetchPing', 'fetchConfig', 'initApp']),
+    ...mapActions(useInstanceStore, ['fetchPing', 'fetchConfig']),
     ...mapActions(useNotificationStore, {
       notificationError: 'error'
     }),