diff --git a/server/mergin/sync/schemas.py b/server/mergin/sync/schemas.py index 019fdacf..081b2ab7 100644 --- a/server/mergin/sync/schemas.py +++ b/server/mergin/sync/schemas.py @@ -294,6 +294,7 @@ class AdminProjectSchema(ma.SQLAlchemyAutoSchema): id = fields.UUID(attribute="Project.id") name = fields.Str(attribute="Project.name") workspace = fields.Method("_workspace_name") + workspace_id = fields.Int(attribute="Project.workspace_id") version = fields.Function( lambda obj: ProjectVersion.to_v_name(obj.Project.latest_version) ) diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py index a678524c..65203849 100644 --- a/server/mergin/sync/workspace.py +++ b/server/mergin/sync/workspace.py @@ -251,7 +251,8 @@ def workspace_count(): def projects_query(self, like: str = None): ws = self.factory_method() query = db.session.query( - Project, literal(ws.name).label("workspace_name") + Project, + literal(ws.name).label("workspace_name"), ).filter(Project.storage_params.isnot(None)) if like: diff --git a/web-app/packages/admin-app/src/modules/user/views/LoginView.vue b/web-app/packages/admin-app/src/modules/user/views/LoginView.vue index f1fb63b1..81e7000b 100644 --- a/web-app/packages/admin-app/src/modules/user/views/LoginView.vue +++ b/web-app/packages/admin-app/src/modules/user/views/LoginView.vue @@ -14,7 +14,6 @@ import { LoginViewTemplate, useUserStore } from '@mergin/lib' import { mapActions } from 'pinia' import { defineComponent } from 'vue' - export default defineComponent({ name: 'LoginView', components: { diff --git a/web-app/packages/admin-app/src/router.ts b/web-app/packages/admin-app/src/router.ts index 32035f5f..de31c932 100644 --- a/web-app/packages/admin-app/src/router.ts +++ b/web-app/packages/admin-app/src/router.ts @@ -8,7 +8,6 @@ import { SettingsView, ProjectsView, ProjectView, - // useAdminStore AdminRoutes } from '@mergin/admin-lib' import { @@ -48,11 +47,7 @@ export const createRouter = (pinia: Pinia) => { { path: '/', name: 'admin', - component: NotFoundView, - beforeEnter: (to, from, next) => { - next('/accounts') - }, - props: true + redirect: '/accounts' }, { path: '/accounts', diff --git a/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue b/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue index 82bd31ea..c8df7db1 100644 --- a/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue +++ b/web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue @@ -58,8 +58,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial {{ slotProps.data.workspace }} diff --git a/web-app/packages/admin-lib/src/modules/admin/types.ts b/web-app/packages/admin-lib/src/modules/admin/types.ts index 2c1c4d99..ed31eddc 100644 --- a/web-app/packages/admin-lib/src/modules/admin/types.ts +++ b/web-app/packages/admin-lib/src/modules/admin/types.ts @@ -54,7 +54,8 @@ export interface AdminProjectListItem extends Project { disk_usage: number id: string name: string - namespace: string + workspace: string + workspace_id: number updated: string version: string removed_at: string