Merge pull request #471 from SELab-2/admin-tree-fixes

fix: Admin and Tree fixes
SELab-2 · May 24, 2024 · 4e0f50f · 4e0f50f
2 parents 9d9fda6 + 518cb18
commit 4e0f50f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/frontend/src/components/projects/ProjectStructureEditor.vue b/frontend/src/components/projects/ProjectStructureEditor.vue
@@ -114,6 +114,7 @@ function selectStructureCheck(node: TreeNode): void {
                         separator=","
                         :model-value="node.data.getObligatedExtensionList()"
                         @update:model-value="node.data.setObligatedExtensionList($event)"
+                        @keydown.enter="(event: KeyboardEvent) => event.preventDefault()"
                         v-tooltip="t('views.projects.structureChecks.obligatedExtensions')"
                     >
                         <template #chip="{ value }">
@@ -127,6 +128,7 @@ function selectStructureCheck(node: TreeNode): void {
                         separator=","
                         :model-value="node.data.getBlockedExtensionList()"
                         @update:model-value="node.data.setBlockedExtensionList($event)"
+                        @keydown.enter="(event: KeyboardEvent) => event.preventDefault()"
                         v-tooltip="t('views.projects.structureChecks.blockedExtensions')"
                     >
                         <template #chip="{ value }">

diff --git a/frontend/src/views/admin/DockerImagesView.vue b/frontend/src/views/admin/DockerImagesView.vue
@@ -171,7 +171,7 @@ const onSelect = (selected: any[] | null): void => {
         <Title>
             <div class="gap-3 mb-3">{{ t('admin.dockerImages.title') }}</div>
         </Title>
-        <Body class="w-full">
+        <Body>
             <SelectButton
                 class="mb-3 gap-3 w-3"
                 v-model="selectedOption"
@@ -199,7 +199,11 @@ const onSelect = (selected: any[] | null): void => {
                                 <InputText v-model="filter['search']" :placeholder="t('admin.search.general')" />
                             </IconField>
                         </div>
-                        <Button class="w-1 mb-3 gap-3" :disabled="multiRemove" @click="toggleSafetyGuardMultiRemove">
+                        <Button
+                            class="w-auto mb-3 gap-3 justify-content-center"
+                            :disabled="multiRemove"
+                            @click="toggleSafetyGuardMultiRemove"
+                        >
                             {{ t('admin.delete') }}
                         </Button>
                     </template>
@@ -238,7 +242,7 @@ const onSelect = (selected: any[] | null): void => {
                     </Column>
                     <Column key="remove" :header-style="{ width: '11%' }" class="p-col">
                         <template #body="{ data }">
-                            <Button @click="() => toggleSafetyGuardRemove(data)" class="justify-content-center">
+                            <Button @click="() => toggleSafetyGuardRemove(data)" class="justify-content-center w-auto">
                                 {{ t('admin.delete') }}
                             </Button>
                         </template>

diff --git a/frontend/src/views/admin/UsersView.vue b/frontend/src/views/admin/UsersView.vue
@@ -156,7 +156,7 @@ const saveItem = async (): Promise<void> => {
         <Title>
             {{ t('admin.users.title') }}
         </Title>
-        <Body class="w-full">
+        <Body>
             <LazyDataTable
                 :pagination="pagination"
                 :entities="users"
@@ -209,9 +209,9 @@ const saveItem = async (): Promise<void> => {
                 </Column>
                 <Column :header-style="{ width: '12%' }" class="p-col">
                     <template #body="{ data }">
-                        <Button @click="() => showPopup(data)" class="justify-content-center">{{
-                            t('admin.edit')
-                        }}</Button>
+                        <Button @click="() => showPopup(data)" class="justify-content-center w-auto">
+                            {{ t('admin.edit') }}
+                        </Button>
                     </template>
                 </Column>
             </LazyDataTable>