MerginMaps · MarcelGeo · Nov 11, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 11, 2024
diff --git a/server/mergin/auth/controller.py b/server/mergin/auth/controller.py
@@ -23,7 +23,7 @@
     user_account_closed,
 )
 from .bearer import encode_token
-from .models import User, LoginHistory
+from .models import User, LoginHistory, UserProfile
 from .schemas import UserSchema, UserSearchSchema, UserProfileSchema, UserInfoSchema
 from .forms import (
     LoginForm,
@@ -449,13 +449,16 @@ def get_paginated_users(
 
     :rtype: Dict[str: List[User], str: Integer]
     """
-    users = User.query.filter(
+    users = User.query.join(UserProfile).filter(
         is_(User.username.ilike("deleted_%"), False) | is_(User.active, True)
     )
 
     if like:
         users = users.filter(
-            User.username.ilike(f"%{like}%") | User.email.ilike(f"%{like}%")
+            User.username.ilike(f"%{like}%")
+            | User.email.ilike(f"%{like}%")
+            | UserProfile.first_name.ilike(f"%{like}%")
+            | UserProfile.last_name.ilike(f"%{like}%")
         )
 
     if descending and order_by:

diff --git a/web-app/packages/admin-app/index.html b/web-app/packages/admin-app/index.html
@@ -11,7 +11,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="/favicon.ico" />
-    <title>Mergin Maps</title>
+    <title>Mergin Maps Admin Panel</title>
   </head>
   <body>
     <noscript>

diff --git a/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue b/web-app/packages/admin-app/src/modules/layout/components/Sidebar.vue
@@ -36,7 +36,7 @@ const sidebarItems = computed<SideBarItemModel[]>(() => [
 
 <template>
   <side-bar-template :sidebarItems="sidebarItems">
-    <template #subtitle>Administration</template>
+    <template #subtitle>Admin panel</template>
     <template #footer>
       <sidebar-footer />
     </template>

diff --git a/web-app/packages/admin-lib/src/modules/admin/adminApi.ts b/web-app/packages/admin-lib/src/modules/admin/adminApi.ts
@@ -6,6 +6,7 @@ import {
   ApiRequestSuccessInfo,
   errorUtils,
   LoginData,
+  PaginatedUsersParams,
   UserProfileResponse,
   UserResponse /*, getDefaultRetryOptions */
 } from '@mergin/lib'
@@ -27,7 +28,9 @@ export const AdminApi = {
     return AdminModule.httpService.post('/app/admin/login', data)
   },
 
-  async fetchUsers(params: UsersParams): Promise<AxiosResponse<UsersResponse>> {
+  async fetchUsers(
+    params: PaginatedUsersParams
+  ): Promise<AxiosResponse<UsersResponse>> {
     return AdminModule.httpService.get(`/app/admin/users`, { params })
   },
 

diff --git a/web-app/packages/admin-lib/src/modules/admin/components/AccountsTable.vue b/web-app/packages/admin-lib/src/modules/admin/components/AccountsTable.vue
@@ -22,7 +22,7 @@
         <span class="p-input-icon-left w-full">
           <i class="ti ti-search paragraph-p3"></i>
           <PInputText
-            placeholder="Search members"
+            placeholder="Search accounts"
             data-cy="search-members-field"
             v-model="searchByName"
             class="w-full"
@@ -141,9 +141,9 @@ export default defineComponent({
       },
       searchByName: '',
       headers: [
-        { field: 'username', header: 'Name', sortable: true },
+        { field: 'username', header: 'Username', sortable: true },
         { field: 'email', header: 'Email', sortable: true },
-        { field: 'profile.name', header: 'Username' },
+        { field: 'profile.name', header: 'Full name' },
         { field: 'active', header: 'Active' }
       ] as TableDataHeader[]
     }

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
@@ -55,15 +55,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               :sortable="header.sortable"
             >
               <template #body="slotProps">
-                <router-link
-                  class="title-t4"
-                  :to="{
-                    name: `adminWorkspace`,
-                    params: { id: slotProps.data.workspace_id }
-                  }"
-                >
-                  {{ slotProps.data.workspace }}
-                </router-link>
+                {{ slotProps.data.workspace }}
               </template>
             </PColumn>
 
@@ -74,16 +66,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               :sortable="header.sortable"
             >
               <template #body="slotProps">
+                <templte v-if="slotProps.data.removed_at">{{
+                  slotProps.data.name
+                }}</templte>
                 <router-link
+                  v-else
                   :to="{
                     name: 'project',
                     params: {
                       namespace: slotProps.data.workspace,
                       projectName: slotProps.data.name
                     }
                   }"
+                  class="font-semibold"
                 >
-                  <strong>{{ slotProps.data.name }}</strong>
+                  {{ slotProps.data.name }}
                 </router-link>
               </template>
             </PColumn>
@@ -119,7 +116,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               :sortable="header.sortable"
             >
               <template #body="slotProps">
-                <span :title="$filters.datetime(slotProps.data.removed_at)">
+                <span
+                  :title="`Scheduled for removal at ${$filters.datetime(
+                    slotProps.data.removed_at
+                  )}`"
+                >
                   {{ $filters.timediff(slotProps.data.removed_at) }}
                 </span>
               </template>
@@ -131,12 +132,19 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
                   class="justify-center px-0"
                   v-if="slotProps.data.removed_at"
                 >
-                  <div style="text-align: end">
+                  <div class="flex align-items-center gap-1">
                     <PButton
                       label="Restore"
                       severity="secondary"
+                      size="small"
                       @click="confirmRestore(slotProps.data)"
                     />
+                    <PButton
+                      label="Delete"
+                      severity="danger"
+                      size="small"
+                      @click="confirmDelete(slotProps.data)"
+                    />
                   </div>
                 </div>
               </template>
@@ -228,7 +236,7 @@ export default defineComponent({
         { header: 'Name', field: 'name', sortable: true },
         { header: 'Last Update', field: 'updated', sortable: true },
         { header: 'Size', field: 'disk_usage', sortable: true },
-        { header: 'Removed', field: 'removed_at', sortable: true },
+        { header: 'Scheduled removal at', field: 'removed_at', sortable: true },
         { header: 'Removed by', field: 'removed_by', sortable: true },
         { header: '', field: 'buttons', sortable: false }
       ]
@@ -241,7 +249,11 @@ export default defineComponent({
   methods: {
     ...mapActions(useDialogStore, { showDialog: 'show' }),
     ...mapActions(useNotificationStore, ['error', 'show']),
-    ...mapActions(useAdminStore, ['getProjects', 'restoreProject']),
+    ...mapActions(useAdminStore, [
+      'getProjects',
+      'restoreProject',
+      'deleteProject'
+    ]),
 
     paginating(options) {
       this.options = options
@@ -302,6 +314,31 @@ export default defineComponent({
       })
     },
 
+    confirmDelete(item) {
+      const props: ConfirmDialogProps = {
+        text: `Are you sure you want to permanently delete this project?`,
+        description: `Deleting this project will remove it
+      and all its data. This action cannot be undone. Type in project name to confirm:`,
+        hint: item.name,
+        confirmText: 'Delete permanently',
+        confirmField: {
+          label: 'Project name',
+          expected: item.name
+        },
+        severity: 'danger'
+      }
+      const listeners = {
+        confirm: async () => {
+          await this.deleteProject({ projectId: item.id })
+          this.fetchProjects()
+        }
+      }
+      this.showDialog({
+        component: ConfirmDialog,
+        params: { props, listeners, dialog: { header: 'Delete project' } }
+      })
+    },
+
     onRefresh() {
       this.fetchProjects()
     }

diff --git a/web-app/packages/admin-lib/src/modules/admin/store.ts b/web-app/packages/admin-lib/src/modules/admin/store.ts
@@ -6,6 +6,7 @@ import {
   errorUtils,
   htmlUtils,
   LoginPayload,
+  PaginatedUsersParams,
   SortingOptions,
   useFormStore,
   useInstanceStore,
@@ -14,6 +15,9 @@ import {
 } from '@mergin/lib'
 import { defineStore, getActivePinia } from 'pinia'
 import Cookies from 'universal-cookie'
+
+import { AdminRoutes } from './routes'
+
 import { AdminApi } from '@/modules/admin/adminApi'
 import {
   LatestServerVersionResponse,
@@ -22,7 +26,6 @@ import {
   UpdateUserPayload,
   UsersResponse
 } from '@/modules/admin/types'
-import { AdminRoutes } from './routes'
 
 export interface AdminState {
   loading: boolean
@@ -110,7 +113,7 @@ export const useAdminStore = defineStore('adminModule', {
       this.isServerConfigHidden = value
     },
 
-    async fetchUsers(payload) {
+    async fetchUsers(payload: { params: PaginatedUsersParams }) {
       const notificationStore = useNotificationStore()
 
       this.setLoading(true)

diff --git a/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue b/web-app/packages/admin-lib/src/modules/admin/views/AccountDetailView.vue
@@ -61,15 +61,17 @@
         </div>
       </app-section>
     </app-container>
-    <app-container>
+    <app-container v-if="userStore.loggedUser?.id !== user?.id">
       <app-section>
         <template #title>Advanced</template>
 
         <app-settings :items="settingsItems">
           <template #notifications>
             <div class="flex-shrink-0 paragraph-p1">
-              <i v-if="profile?.receive_notifications" class="ti ti-check" />
-              <i v-else class="ti ti-x" />
+              <PInputSwitch
+                :model-value="profile?.receive_notifications"
+                disabled
+              />
             </div>
           </template>
           <template #adminAccess>
@@ -78,9 +80,15 @@
                 class="flex align-items-center flex-shrink-0"
                 data-cy="profile-notification"
               >
-                <PInputSwitch
+                <PButton
+                  :severity="user?.is_admin ? 'danger' : 'warning'"
                   :modelValue="user?.is_admin"
-                  @change="switchAdminAccess"
+                  @click="switchAdminAccess"
+                  :label="
+                    !user?.is_admin
+                      ? 'Grant admin access'
+                      : 'Revoke admin access'
+                  "
                 />
               </div>
             </div>
@@ -89,7 +97,7 @@
             <div class="flex-shrink-0">
               <PButton
                 @click="changeStatusDialog"
-                :severity="user?.active ? 'danger' : 'secondary'"
+                :severity="user?.active ? 'warning' : 'secondary'"
                 :label="
                   user?.active ? 'Deactivate account' : 'Activate account'
                 "
@@ -121,7 +129,8 @@ import {
   AppContainer,
   ConfirmDialogProps,
   AppSettings,
-  AppSettingsItemConfig
+  AppSettingsItemConfig,
+  useUserStore
 } from '@mergin/lib'
 import { computed, watch } from 'vue'
 import { useRoute } from 'vue-router'
@@ -132,6 +141,7 @@ import { useAdminStore } from '@/modules/admin/store'
 const route = useRoute()
 const adminStore = useAdminStore()
 const dialogStore = useDialogStore()
+const userStore = useUserStore()
 
 const settingsItems = computed<AppSettingsItemConfig[]>(() => [
   {
@@ -144,7 +154,9 @@ const settingsItems = computed<AppSettingsItemConfig[]>(() => [
   {
     key: 'adminAccess',
     title: 'Access to admin panel',
-    description: 'Enabling this option will provide access to the admin panel.'
+    description: user.value?.is_admin
+      ? 'User has access to the admin panel.'
+      : 'User does not have access to the admin panel.'
   },
   {
     key: 'accountActivation',
@@ -181,12 +193,18 @@ watch(
 )
 
 const changeStatusDialog = () => {
-  const props: ConfirmDialogProps = {
-    confirmText: 'Yes',
-    text: user.value.active
-      ? 'Do you really want deactivate this account?'
-      : 'Do you really want activate this account?'
-  }
+  const props: ConfirmDialogProps = user.value.active
+    ? {
+        confirmText: 'Deactivate',
+        severity: 'warning',
+        text: 'Do you really want deactivate this account?',
+        description:
+          'Deactivating this account will lead to a temporary ban from Mergin Maps usage.'
+      }
+    : {
+        text: 'Do you really want activate this account?',
+        confirmText: 'Activate'
+      }
   const dialog = { header: 'User activation' }
   const listeners = {
     confirm: async () => {
@@ -233,12 +251,42 @@ const confirmDeleteUser = () => {
 }
 
 const switchAdminAccess = async () => {
-  await adminStore.updateUser({
-    username: user.value.username,
-    data: {
-      active: user.value.active,
-      is_admin: !user.value.is_admin
-    }
+  const props: ConfirmDialogProps = !user.value?.is_admin
+    ? {
+        text: `Are you sure to grant access to admin panel to this user?`,
+        description: `This person will have full management access to all data on the server. They will see all users and projects and can update or remove them.`,
+        hint: user.value.username,
+        confirmText: 'Grant access',
+        confirmField: {
+          label: 'Username',
+          expected: user.value.username
+        },
+        severity: 'warning'
+      }
+    : {
+        text: `Are you sure you want to revoke access to admin panel to this user?`,
+        description: `This person will no longer have access to the admin panel.`,
+        hint: user.value.username,
+        confirmText: 'Revoke access',
+        confirmField: {
+          label: 'Username',
+          expected: user.value.username
+        },
+        severity: 'danger'
+      }
+  const listeners = {
+    confirm: async () =>
+      await adminStore.updateUser({
+        username: user.value.username,
+        data: {
+          active: user.value.active,
+          is_admin: !user.value.is_admin
+        }
+      })
+  }
+  dialogStore.show({
+    component: ConfirmDialog,
+    params: { props, listeners, dialog: { header: 'Admin access' } }
   })
 }
 </script>