web/satellite/vuetify-poc: improve team page

This change makes minor improvements to the vuetify team page.

Issue: #6376

Change-Id: Iedd0e1f47d8075f13b424da65d719057eade14ed

web/satellite/vuetify-poc/src/components/TeamTableComponent.vue

@@ -3,27 +3,42 @@
 
 <template>
     <v-card min-height="24" :border="0" class="mb-2 elevation-0">
-        <v-row v-if="modelValue.length > 0" class="justify-end align-center ma-0">
-            <p>{{ modelValue.length }} user{{ modelValue.length !== 1 ? 's' : '' }} selected</p>
+        <v-row v-if="selectedMembers.length > 0" class="justify-end align-center ma-0">
+            <p>{{ selectedMembers.length }} user{{ selectedMembers.length !== 1 ? 's' : '' }} selected</p>
         </v-row>
     </v-card>
     <v-card variant="flat" :border="true" rounded="xlg">
-        <v-text-field
-            v-model="search"
-            label="Search"
-            prepend-inner-icon="mdi-magnify"
-            single-line
-            variant="solo-filled"
-            flat
-            hide-details
-            clearable
-            density="comfortable"
-            rounded="lg"
-            class="mx-2 mt-2"
-        />
+        <v-row align="center" class="ma-0">
+            <v-col v-if="selectedMembers.length" class="px-0 mr-0 ml-2 mt-2" cols="auto">
+                <v-btn
+                    class=" text-caption"
+                    prepend-icon="mdi-trash-can-outline"
+                    variant="outlined"
+                    color="default"
+                    @click="showDeleteDialog"
+                >
+                    Remove
+                </v-btn>
+            </v-col>
+
+            <v-col class="px-0 mx-2 mt-2">
+                <v-text-field
+                    v-model="search"
+                    label="Search"
+                    prepend-inner-icon="mdi-magnify"
+                    single-line
+                    variant="solo-filled"
+                    flat
+                    hide-details
+                    clearable
+                    density="comfortable"
+                    rounded="lg"
+                />
+            </v-col>
+        </v-row>
 
         <v-data-table-server
-            v-model="model"
+            v-model="selectedMembers"
             :search="search"
             :headers="headers"
             :items="projectMembers"
@@ -79,6 +94,7 @@
                                 </v-list-item-title>
                             </v-list-item>
                             <v-list-item
+                                class="text-error"
                                 density="comfortable"
                                 link rounded="lg"
                                 @click="() => onSingleDelete(item.raw.email)"
@@ -99,7 +115,7 @@
 
     <remove-project-member-dialog
         v-model="isRemoveMembersDialogShown"
-        :emails="modelValue"
+        :emails="selectedMembers"
         @deleted="onPostDelete"
     />
 </template>
@@ -109,6 +125,7 @@ import { computed, onMounted, ref, watch } from 'vue';
 import {
     VRow,
     VCard,
+    VCol,
     VTextField,
     VChip,
     VIcon,
@@ -165,21 +182,12 @@ const router = useRouter();
 const notify = useNotify();
 const { isLoading, withLoading } = useLoading();
 
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: string[]): void,
-}>();
-const props = defineProps<{
-    modelValue: string[]
-}>();
-const model = computed<string[]>({
-    get: () => props.modelValue,
-    set: value => emit('update:modelValue', value),
-});
-
 const isRemoveMembersDialogShown = ref<boolean>(false);
 const search = ref<string>('');
 const searchTimer = ref<NodeJS.Timeout>();
 const sortBy = ref([{ key: 'date', order: 'asc' }]);
+const selectedMembers = ref<string[]>([]);
+
 const headers = ref([
     {
         title: 'Name',
@@ -252,18 +260,18 @@ async function onUpdatePage(page: number): Promise<void> {
  * Handles post delete operations.
  */
 async function onPostDelete(): Promise<void> {
-    if (props.modelValue.includes(usersStore.state.user.email)) {
+    if (selectedMembers.value.includes(usersStore.state.user.email)) {
         router.push('/projects');
         return;
     }
 
     search.value = '';
-    emit('update:modelValue', []);
+    selectedMembers.value = [];
     await onUpdatePage(FIRST_PAGE);
 }
 
 function onSingleDelete(email: string): void {
-    emit('update:modelValue', [email]);
+    selectedMembers.value = [email];
     isRemoveMembersDialogShown.value = true;
 }
 
@@ -367,6 +375,4 @@ watch(() => search.value, () => {
 onMounted(() => {
     fetch();
 });
-
-defineExpose({ showDeleteDialog });
 </script>

web/satellite/vuetify-poc/src/components/dialogs/AddTeamMemberDialog.vue

@@ -139,7 +139,7 @@ async function onAddUsersClick(): Promise<void> {
     await withLoading(async () => {
         try {
             await pmStore.inviteMembers([email.value], props.projectId);
-            notify.notify('Invites sent!');
+            notify.success('Invites sent!');
             email.value = '';
         } catch (error) {
             error.message = `Error adding project members. ${error.message}`;

web/satellite/vuetify-poc/src/components/dialogs/RemoveProjectMemberDialog.vue

@@ -60,13 +60,13 @@
             </v-card-item>
 
             <v-card-item class="px-7 py-0">
-                <v-card class="mb-4 pa-4" color="warning">
-                    <p>
+                <v-alert variant="tonal" class="mb-4 pa-4" color="warning">
+                    <template #text>
                         <strong>Please note:</strong> any access grants they have created will still provide
                         them with full access. If necessary, please revoke these access grants to ensure
                         the security of your data.
-                    </p>
-                </v-card>
+                    </template>
+                </v-alert>
 
                 <v-divider />
             </v-card-item>
@@ -80,7 +80,7 @@
                     </v-col>
                     <v-col>
                         <v-btn color="error" variant="flat" block :loading="isLoading" @click="onDelete">
-                            Delete
+                            Remove
                         </v-btn>
                     </v-col>
                 </v-row>
@@ -92,6 +92,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import {
+    VAlert,
     VDialog,
     VCard,
     VCardItem,

web/satellite/vuetify-poc/src/views/Team.vue

@@ -17,20 +17,10 @@
                     </svg>
                     Add Members
                 </v-btn>
-                <v-btn
-                    v-if="selectedMembers.length"
-                    prepend-icon="mdi-trash-can-outline"
-                    variant="outlined"
-                    color="default"
-                    class="ml-2 text-caption"
-                    @click="showDeleteDialog"
-                >
-                    Remove
-                </v-btn>
             </v-row>
         </v-col>
 
-        <TeamTableComponent ref="tableComponent" v-model="selectedMembers" />
+        <TeamTableComponent />
     </v-container>
 
     <add-team-member-dialog v-model="isAddMemberDialogShown" :project-id="selectedProjectID" />
@@ -47,22 +37,10 @@ import PageSubtitleComponent from '@poc/components/PageSubtitleComponent.vue';
 import TeamTableComponent from '@poc/components/TeamTableComponent.vue';
 import AddTeamMemberDialog from '@poc/components/dialogs/AddTeamMemberDialog.vue';
 
-interface DeleteDialog {
-    showDeleteDialog(): void;
-}
-
 const projectsStore = useProjectsStore();
 
-const selectedMembers = ref<string[]>([]);
-const tableComponent = ref<InstanceType<typeof TeamTableComponent> & DeleteDialog>();
 const isAddMemberDialogShown = ref<boolean>(false);
 
 const selectedProjectID = computed((): string => projectsStore.state.selectedProject.id);
 
-/**
- * Makes delete project members dialog visible.
- */
-function showDeleteDialog(): void {
-    tableComponent.value?.showDeleteDialog();
-}
 </script>