From 82cf92fb36df9060f834c9beae6856217f3f2d3e Mon Sep 17 00:00:00 2001 From: Brent Silkyn <160223373+bsilkyn@users.noreply.github.com> Date: Mon, 20 May 2024 09:36:26 +0200 Subject: [PATCH 1/4] fix: Admin panel fix (#427) * chore: make /admin/ redirect to /admin/users/ #356 * chore: make change size depending on screen size #356 * chore: replace "public" ToggleButton by a ToggleSwitch #356 * chore: add "remove" button #356 * chore: visual layout remove button for selected docker images #356 * chore: make multiRemove button disabled when nothing's selected #356 * chore: add selectedItems variable, so I can reach that when the objects are actually being removed #356 * chore: error message for case saving when no item is selected (shouldn't actually happen ever) #356 * chore: not able to upload when there is no name for docker image #356 * chore: make selection an option instead of mandatory for LazyDataTable #356 * chore: documentation UsersView #356 * chore: documentation DockerImagesView #356 * chore: translations + try at allowing and file upload after 1st upload #356 * chore: change to list when uploading #356 * chore: after dockerImage is removed separately, remove it from list of selectedItems #356 * chore: implement multiRemove of docker images #356 * fix: lint fix #356 * fix: correct "or" filter for functions of user to an "and" filter #356 * docs: extra documentation of DockerImagesView.vue #356 * fix: replace Dialog by ConfirmDialog #356 * style: linting fix #356 * docs: extra doc for DockerImagesView.vue #356 * chore: translation corrections #356 * chore: joining of functions (fillCreators and fillDestroyers) for a code execution speedup (hopefully) #356 * style: lint fix #356 * chore: change word in header in admin panel from "ypovoli" to "admin" #356 * chore: translation fixes #356 * chore: forgot to remove stuff in Dutch translations #356 --- backend/api/views/docker_view.py | 8 + backend/api/views/user_view.py | 2 +- frontend/src/assets/lang/app/en.json | 14 +- frontend/src/assets/lang/app/nl.json | 13 +- .../src/components/admin/LazyDataTable.vue | 35 ++- .../components/layout/admin/AdminHeader.vue | 2 +- .../composables/services/docker.service.ts | 24 ++- frontend/src/config/endpoints.ts | 2 + frontend/src/router/router.ts | 3 +- frontend/src/views/admin/AdminView.vue | 9 - frontend/src/views/admin/DockerImagesView.vue | 199 +++++++++++++----- frontend/src/views/admin/UsersView.vue | 53 +++-- 12 files changed, 274 insertions(+), 90 deletions(-) delete mode 100644 frontend/src/views/admin/AdminView.vue diff --git a/backend/api/views/docker_view.py b/backend/api/views/docker_view.py index 1e2da9d7..6fad8423 100644 --- a/backend/api/views/docker_view.py +++ b/backend/api/views/docker_view.py @@ -61,6 +61,14 @@ def patch_public(self, request: Request, **_) -> Response: return Response(serializer.data) + @action(detail=False, methods=['DELETE'], permission_classes=[IsAdminUser]) + def delete(self, request: Request, **_) -> Response: + response = self.queryset.filter(id__in=request.data['ids']).delete() + + return Response(response) + + # TODO: Maybe not necessary + # https://www.django-rest-framework.org/api-guide/permissions/#overview-of-access-restriction-methods def list(self, request: Request) -> Response: images: BaseManager[DockerImage] = DockerImage.objects.all() if not request.user.is_staff: diff --git a/backend/api/views/user_view.py b/backend/api/views/user_view.py index 3a65fa37..9d8b33a2 100644 --- a/backend/api/views/user_view.py +++ b/backend/api/views/user_view.py @@ -57,7 +57,7 @@ def search(self, request: Request) -> Response: role_filters = Q() for role in roles: - role_filters |= Q(**{f"{role}__isnull": False, f"{role}__is_active": True}) + role_filters &= Q(**{f"{role}__isnull": False, f"{role}__is_active": True}) queryset = queryset.filter( role_filters, diff --git a/frontend/src/assets/lang/app/en.json b/frontend/src/assets/lang/app/en.json index bafc4d00..9e86d683 100644 --- a/frontend/src/assets/lang/app/en.json +++ b/frontend/src/assets/lang/app/en.json @@ -245,6 +245,14 @@ "login": { "success": "You have successfully logged in.", "error": "An error occurred while logging in." + }, + "admin": { + "save": { + "error": { + "title": "Invalid save operation", + "detail": "You are trying to save an item without selecting it" + } + } } } }, @@ -287,6 +295,7 @@ "edit": "Edit", "cancel": "Cancel", "save": "Save", + "delete": "Delete", "users": { "title": "Users", "username": "Username", @@ -316,7 +325,9 @@ "private": "Private" }, "none_found": "No matching data.", - "loading": "Loading data. Please wait." + "loading": "Loading data. Please wait.", + "safeGuard": "Are you sure?", + "no_file": "No file found." }, "primevue": { "startsWith": "Starts with", @@ -416,6 +427,7 @@ "emptySelectionMessage": "No selected item", "emptySearchMessage": "No results found", "emptyMessage": "No available options", + "emptyFileSelect": "No file selected", "aria": { "trueLabel": "True", "falseLabel": "False", diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json index 7864c171..884cb246 100644 --- a/frontend/src/assets/lang/app/nl.json +++ b/frontend/src/assets/lang/app/nl.json @@ -242,6 +242,14 @@ "login": { "success": "Je bent succesvol ingelogd.", "error": "Er is een fout opgetreden tijdens het inloggen." + }, + "admin": { + "save": { + "error": { + "title": "Ongeldige opsla operatie", + "detail": "U probeert een item op te slaan zonder dit te selecteren" + } + } } } }, @@ -283,6 +291,7 @@ "edit": "Bewerken", "cancel": "Annuleer", "save": "Sla op", + "delete": "Verwijder", "users": { "title": "Gebruikers", "username": "Gebruikersnaam", @@ -312,7 +321,8 @@ "private": "Privaat" }, "none_found": "Geen overeenkomende data gevonden.", - "loading": "Aan het laden. Wacht een momentje aub." + "loading": "Aan het laden. Wacht even aub.", + "safeGuard": "Bent u het zeker?" }, "primevue": { "accept": "Ja", @@ -364,6 +374,7 @@ "emptyMessage": "Geen resultaten gevonden", "emptySearchMessage": "Geen resultaten gevonden", "emptySelectionMessage": "Geen optie geselecteerd", + "emptyFileSelect": "Geen bestand geselecteerd", "endsWith": "Eindigt met", "equals": "Is gelijk aan", "fileSizeTypes": [ diff --git a/frontend/src/components/admin/LazyDataTable.vue b/frontend/src/components/admin/LazyDataTable.vue index 9a1e2a32..dcdfe499 100644 --- a/frontend/src/components/admin/LazyDataTable.vue +++ b/frontend/src/components/admin/LazyDataTable.vue @@ -8,14 +8,27 @@ import { type Filter } from '@/types/filter/Filter.ts'; import Column from 'primevue/column'; /* Properties */ -const props = defineProps<{ - pagination: PaginatorResponse | null; - entities: any[] | null; // list containing all the entities displayed by data table after executing get method - get: () => Promise; // get method for backend - search: (filters: Filter, page: number, pageSize: number) => Promise; - filter: Filter; - onFilter: (callback: () => Promise, debounce?: number | undefined, immediate?: boolean | undefined) => void; -}>(); +const props = withDefaults( + defineProps<{ + pagination: PaginatorResponse | null; + entities: any[] | null; // list containing all the entities displayed by data table after executing get method + get: () => Promise; // get method for backend + search: (filters: Filter, page: number, pageSize: number) => Promise; + filter: Filter; + onFilter: ( + callback: () => Promise, + debounce?: number | undefined, + immediate?: boolean | undefined, + ) => void; + select?: boolean; + }>(), + { + select: false, + }, +); + +/* Emits */ +const emit = defineEmits(['select']); /* Injections */ const { t } = useI18n(); @@ -59,17 +72,21 @@ const onSelectAllChange = (event: DataTableSelectAllChangeEvent): void => { props.get().then(() => { selectAll.value = true; selected.value = props.entities; + emit('select', selected.value); }); } else { selectAll.value = false; selected.value = []; + emit('select', selected.value); } }; const onRowSelect = (): void => { selectAll.value = selected.value?.length === (props.pagination?.count ?? 0); + emit('select', selected.value); }; const onRowUnselect = (): void => { selectAll.value = false; + emit('select', selected.value); }; defineExpose({ fetch }); @@ -109,7 +126,7 @@ defineExpose({ fetch }); {{ t('admin.loading') }} - + diff --git a/frontend/src/components/layout/admin/AdminHeader.vue b/frontend/src/components/layout/admin/AdminHeader.vue index 731accb5..06e38cc3 100644 --- a/frontend/src/components/layout/admin/AdminHeader.vue +++ b/frontend/src/components/layout/admin/AdminHeader.vue @@ -53,7 +53,7 @@ const items = computed(() => [
diff --git a/frontend/src/composables/services/docker.service.ts b/frontend/src/composables/services/docker.service.ts index 69b25946..072be900 100644 --- a/frontend/src/composables/services/docker.service.ts +++ b/frontend/src/composables/services/docker.service.ts @@ -3,7 +3,14 @@ import { Response } from '@/types/Response.ts'; import { endpoints } from '@/config/endpoints.ts'; import { type Ref, ref } from 'vue'; import { type Filter } from '@/types/filter/Filter.ts'; -import { create, getList, getPaginatedList, patch } from '@/composables/services/helpers.ts'; +import { + create, + getList, + getPaginatedList, + patch, + deleteId, + deleteIdWithData, +} from '@/composables/services/helpers.ts'; import { type PaginatorResponse } from '@/types/filter/Paginator.ts'; interface DockerImagesState { @@ -14,6 +21,8 @@ interface DockerImagesState { searchDockerImages: (filters: Filter, page: number, pageSize: number) => Promise; patchDockerImage: (dockerData: DockerImage) => Promise; createDockerImage: (dockerData: DockerImage, file: File) => Promise; + deleteDockerImage: (id: string) => Promise; + deleteDockerImages: (ids: string[]) => Promise; } export function useDockerImages(): DockerImagesState { @@ -51,6 +60,17 @@ export function useDockerImages(): DockerImagesState { ); } + async function deleteDockerImage(id: string): Promise { + const endpoint = endpoints.dockerImages.retrieve.replace('{id}', id); + await deleteId(endpoint, response, Response.fromJSON); + } + + async function deleteDockerImages(ids: string[]): Promise { + const endpoint = endpoints.dockerImages.deleteMany; + const data = { ids }; + await deleteIdWithData(endpoint, data, response, Response.fromJSON); + } + return { pagination, dockerImages, @@ -60,5 +80,7 @@ export function useDockerImages(): DockerImagesState { searchDockerImages, patchDockerImage, createDockerImage, + deleteDockerImage, + deleteDockerImages, }; } diff --git a/frontend/src/config/endpoints.ts b/frontend/src/config/endpoints.ts index a468d0c9..9472e004 100644 --- a/frontend/src/config/endpoints.ts +++ b/frontend/src/config/endpoints.ts @@ -21,8 +21,10 @@ export const endpoints = { }, dockerImages: { index: '/api/docker-images/', + retrieve: '/api/docker-images/{id}/', search: '/api/docker-images/search/', patch: '/api/docker-images/{id}/public/', + deleteMany: '/api/docker-images/delete/', }, students: { index: '/api/students/', diff --git a/frontend/src/router/router.ts b/frontend/src/router/router.ts index 7ba5863d..d47ccc7e 100644 --- a/frontend/src/router/router.ts +++ b/frontend/src/router/router.ts @@ -19,7 +19,6 @@ import CreateProjectView from '@/views/projects/CreateProjectView.vue'; import UpdateProjectView from '@/views/projects/UpdateProjectView.vue'; import SearchCourseView from '@/views/courses/SearchCourseView.vue'; import SubmissionView from '@/views/submissions/SubmissionView.vue'; -import AdminView from '@/views/admin/AdminView.vue'; import UsersView from '@/views/admin/UsersView.vue'; import ProjectsView from '@/views/projects/ProjectsView.vue'; import DockerImagesView from '@/views/admin/DockerImagesView.vue'; @@ -156,7 +155,7 @@ const routes: RouteRecordRaw[] = [ path: '/admin/', beforeEnter: AdminGuard, children: [ - { path: '', component: AdminView, name: 'admin' }, + { path: '', redirect: { name: 'admin-users' } }, { path: 'users', component: UsersView, name: 'admin-users' }, { path: 'docker-images', component: DockerImagesView, name: 'admin-dockerImages' }, ], diff --git a/frontend/src/views/admin/AdminView.vue b/frontend/src/views/admin/AdminView.vue deleted file mode 100644 index 3d3b29da..00000000 --- a/frontend/src/views/admin/AdminView.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/frontend/src/views/admin/DockerImagesView.vue b/frontend/src/views/admin/DockerImagesView.vue index 5ab0003d..4dad963f 100644 --- a/frontend/src/views/admin/DockerImagesView.vue +++ b/frontend/src/views/admin/DockerImagesView.vue @@ -2,10 +2,13 @@ import FileUpload, { type FileUploadUploaderEvent } from 'primevue/fileupload'; import InputText from 'primevue/inputtext'; import InputSwitch from 'primevue/inputswitch'; -import ToggleButton from 'primevue/togglebutton'; import SelectButton from 'primevue/selectbutton'; -import Dialog from 'primevue/dialog'; +import ConfirmDialog from 'primevue/confirmdialog'; import Button from 'primevue/button'; +import InputIcon from 'primevue/inputicon'; +import Column from 'primevue/column'; +import IconField from 'primevue/iconfield'; +import { useConfirm } from 'primevue/useconfirm'; import AdminLayout from '@/components/layout/admin/AdminLayout.vue'; import Title from '@/components/layout/Title.vue'; import Body from '@/components/layout/Body.vue'; @@ -13,54 +16,138 @@ import LazyDataTable from '@/components/admin/LazyDataTable.vue'; import { useDockerImages } from '@/composables/services/docker.service.ts'; import { useFilter } from '@/composables/filters/filter.ts'; import { useI18n } from 'vue-i18n'; -import { ref } from 'vue'; +import { computed, ref } from 'vue'; import { useRoute } from 'vue-router'; import { DockerImage } from '@/types/DockerImage.ts'; import { getDockerImageFilters } from '@/types/filter/Filter.ts'; -import InputIcon from 'primevue/inputicon'; -import Column from 'primevue/column'; -import IconField from 'primevue/iconfield'; /* Injection */ const { t } = useI18n(); const { query } = useRoute(); -const { pagination, dockerImages, getDockerImages, searchDockerImages, patchDockerImage, createDockerImage } = - useDockerImages(); +const { + pagination, + dockerImages, + getDockerImages, + searchDockerImages, + patchDockerImage, + createDockerImage, + deleteDockerImage, + deleteDockerImages, +} = useDockerImages(); const { filter, onFilter } = useFilter(getDockerImageFilters(query)); +const confirm = useConfirm(); +/* State */ const dataTable = ref(); const editItem = ref(DockerImage.blankDockerImage()); const addItem = ref(DockerImage.blankDockerImage()); const selectOptions = ref(['admin.list', 'admin.add']); -const selected = ref(t(selectOptions.value[0])); +const selectedOption = ref(selectOptions.value[0]); + +const multiRemove = computed(() => { + return (selectedItems.value?.length === undefined || selectedItems.value?.length === 0) ?? false; +}); +const selectedItems = ref(null); const columns = ref([ { field: 'id', header: 'admin.id' }, { field: 'name', header: 'admin.docker_images.name' }, { field: 'owner', header: 'admin.docker_images.owner' }, ]); -// const publicOptions = ref>([ -// { value: true, label: 'public' }, -// { value: false, label: 'private' }, -// ]); -const showSafetyGuard = ref(false); +const safetyGuardFunction = ref<() => Promise>(async () => {}); + +const fileUpload = ref(); -const toggleSafetyGuard = (data: DockerImage): void => { +/** + * A function to make the confirmation dialog pop up + */ +const activateSafetyGuard = (): void => { + confirm.require({ + message: t('admin.safeGuard'), + rejectLabel: t('primevue.reject'), + acceptLabel: t('primevue.accept'), + accept: safetyGuardCleanup, + }); +}; +/** + * Hides safety guard, executes function that safety guard guards against and fetches data again + */ +const safetyGuardCleanup = (): void => { + safetyGuardFunction.value().then(() => { + dataTable.value.fetch(); + }); +}; +/** + * Show safety guard for changing public status and set up values for when confirmed + * @param data Docker Image data of docker image whose public status needs to be changed. + */ +const toggleSafetyGuardEdit = (data: DockerImage): void => { editItem.value.public = !data.public; editItem.value.id = data.id; - showSafetyGuard.value = true; + safetyGuardFunction.value = changePublicStatus; + activateSafetyGuard(); +}; +/** + * Changes the public status in the backend of the docker image whose attributes are in editItem's value attribute + */ +const changePublicStatus = async (): Promise => { + await patchDockerImage(editItem.value); +}; +/** + * Show safety guard for removing a docker image from the backend and set up values for when confirmed + * @param data Docker Image data of docker image to be removed + */ +const toggleSafetyGuardRemove = (data: DockerImage): void => { + editItem.value = data; + safetyGuardFunction.value = removeItem; + activateSafetyGuard(); }; -const changePublicStatus = async (dockerData: DockerImage): Promise => { - showSafetyGuard.value = false; - await patchDockerImage(dockerData); - await dataTable.value.fetch(); +/** + * Removes the docker image in the backend whose attributes are in editItem's value attribute + */ +const removeItem = async (): Promise => { + await deleteDockerImage(editItem.value.id); + // remove the item from the list of selectedItems + const index = selectedItems.value?.indexOf(editItem.value) ?? -1; + if (index !== -1) { + selectedItems.value?.splice(index, 1); + } }; +/** + * Show safety guard for removing multiple docker images at once in the backend + */ +const toggleSafetyGuardMultiRemove = (): void => { + safetyGuardFunction.value = removeItems; + activateSafetyGuard(); +}; +/** + * Removes the docker images in the backend described by the selectedItems variable + */ +const removeItems = async (): Promise => { + const ids = selectedItems.value?.map((item) => item.id) ?? []; + await deleteDockerImages(ids); + selectedItems.value = []; +}; +/** + * Handles an upload event containing docker image file and uploads this together with other attributes to backend + * @param event Event containing docker image file in files attributes + */ const upload = async (event: FileUploadUploaderEvent): Promise => { const files: File[] = event.files as File[]; await createDockerImage(addItem.value, files[0]); addItem.value.name = ''; + selectedOption.value = selectOptions.value[0]; +}; + +/** + * A function to be triggered when (an) item(s) are selected, and changes the multiRemove Button's disabled status + * accordingly. + * @param selected A list of all the selected docker images. + */ +const onSelect = (selected: any[] | null): void => { + selectedItems.value = selected; }; @@ -70,8 +157,13 @@ const upload = async (event: FileUploadUploaderEvent): Promise => {
{{ t('admin.docker_images.title') }}
- -
+ +
=> { :filter="filter" :on-filter="onFilter" ref="dataTable" + select + @select="onSelect" > => { :field="column.field" :header="t(column.header)" :show-filter-menu="false" - :style="{ maxWidth: '3rem' }" + :header-style="{ width: '25%' }" + class="p-col" > diff --git a/frontend/src/views/admin/UsersView.vue b/frontend/src/views/admin/UsersView.vue index c073e34b..cfa95ee6 100644 --- a/frontend/src/views/admin/UsersView.vue +++ b/frontend/src/views/admin/UsersView.vue @@ -18,6 +18,7 @@ import { useStudents } from '@/composables/services/student.service.ts'; import { useAssistant } from '@/composables/services/assistant.service.ts'; import { useTeacher } from '@/composables/services/teacher.service.ts'; import { useFilter } from '@/composables/filters/filter.ts'; +import { useMessagesStore } from '@/store/messages.store.ts'; import { roles, type Role, User } from '@/types/users/User.ts'; import { getUserFilters } from '@/types/filter/Filter.ts'; @@ -25,6 +26,7 @@ import { useRoute } from 'vue-router'; /* Composable injections */ const { t } = useI18n(); +const { addErrorMessage } = useMessagesStore(); const { query } = useRoute(); const { pagination, users, getUsers, searchUsers, toggleAdmin } = useUser(); const { createStudent, deleteStudent } = useStudents(); @@ -32,11 +34,12 @@ const { createAssistant, deleteAssistant } = useAssistant(); const { createTeacher, deleteTeacher } = useTeacher(); const { filter, onFilter } = useFilter(getUserFilters(query)); -onMounted(async () => { - fillCreators(); - fillDestroyers(); +/* Initialization */ +onMounted(() => { + fillCreatorsDestroyers(); }); +/* State */ const creators = ref Promise>>({}); const createFunctions = ref Promise>>([createStudent, createAssistant, createTeacher]); const destroyers = ref Promise>>({}); @@ -57,25 +60,31 @@ const roleOptions = computed(() => { return roles.toSpliced(0, 1); }); -const fillCreators = (): void => { +/* Functions */ +/** + * FillCreatorsDestroyers fills 2 dictionaries: a dictionary that links a role to the function that creates an instance + * of the role in the backend AND a dictionary that links a role to the function that destroys an instance of that role + * in the backend. + */ +const fillCreatorsDestroyers = (): void => { for (let i = 1; i < roles.length; i++) { const role: Role = roles[i]; creators.value[role] = createFunctions.value[i - 1]; - } -}; - -const fillDestroyers = (): void => { - for (let i = 1; i < roles.length; i++) { - const role: Role = roles[i]; destroyers.value[role] = destroyFunctions.value[i - 1]; } }; - +/** + * A function to that shows a popup to edit the User item + * @param data This contains the attributes of the User item to be edited. + */ const showPopup = (data: any): void => { editItem.value = JSON.parse(JSON.stringify(data)); // I do this to get a deep copy of the role array popupEdit.value = true; }; - +/** + * Removes or adds role to roles list of User to be edited + * @param role + */ const updateRole = (role: Role): void => { const index = editItem.value.roles.findIndex((role2: string) => role === role2); if (index !== -1) { @@ -86,21 +95,27 @@ const updateRole = (role: Role): void => { editItem.value.roles.push(role); } }; - +/** + * saveItem saves the editItem with its edited values to the backend + */ const saveItem = async (): Promise => { const value = pagination.value; if (value?.results !== null) { + // retrieve the original values of the User we're editing const index = value.results.findIndex((row: User) => row.id === editItem.value.id); const paginationItem = value.results[index]; for (let i = 1; i < roles.length; i++) { const role = roles[i]; + // determine whether a role is in our original item and whether it's in our update item + // knowing this, we know which roles to destroy in the backend and which to create const paginationIncludes = paginationItem.roles.includes(role); const editIncludes = editItem.value.roles.includes(role); if (!paginationIncludes && editIncludes) { // add role in backend const func = creators.value[role]; + // if the role that needs to be created is a student, a studentId needs to be supplied as well if (role === 'student') { const data: Record = { ...editItem.value, @@ -121,8 +136,9 @@ const saveItem = async (): Promise => { // update locally await dataTable.value.fetch(); } else { - // raise error TODO + addErrorMessage(t('toasts.admin.save.error.title'), t('toasts.admin.save.error.detail')); } + // stop showing popup popupEdit.value = false; }; @@ -158,7 +174,8 @@ const saveItem = async (): Promise => { :field="column.field" :header="t(column.header)" :show-filter-menu="false" - :style="{ minWidth: '14rem' }" + :header-style="{ width: '22%' }" + class="p-col" > - + From 1ab223e3c1375a5b14c8cfd1884b6dbdf04ab6ab Mon Sep 17 00:00:00 2001 From: Vincent Vallaeys Date: Mon, 20 May 2024 15:11:08 +0200 Subject: [PATCH 2/4] Adds all possible error messages to submission fixtures --- backend/api/fixtures/realistic/realistic.yaml | 306 ++++++++++++++++++ 1 file changed, 306 insertions(+) diff --git a/backend/api/fixtures/realistic/realistic.yaml b/backend/api/fixtures/realistic/realistic.yaml index bf2f4f15..2b101567 100644 --- a/backend/api/fixtures/realistic/realistic.yaml +++ b/backend/api/fixtures/realistic/realistic.yaml @@ -324,6 +324,54 @@ submission_time: 2024-05-11 12:08:21.147551+00:00 is_valid: true zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 5 + fields: + group: 1 + submission_number: 5 + submission_time: 2024-05-12 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 6 + fields: + group: 1 + submission_number: 6 + submission_time: 2024-05-13 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 7 + fields: + group: 1 + submission_number: 7 + submission_time: 2024-05-14 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 8 + fields: + group: 1 + submission_number: 8 + submission_time: 2024-05-15 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 9 + fields: + group: 1 + submission_number: 9 + submission_time: 2024-05-16 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip +- model: api.submission + pk: 10 + fields: + group: 1 + submission_number: 10 + submission_time: 2024-05-17 12:08:21.147551+00:00 + is_valid: true + zip: fixtures/realistic/projects/0/0/submissions/1/submission_2/submission.zip # MARK: Check Result - model: api.checkresult @@ -434,6 +482,168 @@ submission: 4 result: SUCCESS error_message: null +- model: api.checkresult + pk: 13 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 5 + result: FAILED + error_message: BLOCKED_EXTENSION +- model: api.checkresult + pk: 14 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 5 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 15 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 5 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 16 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 6 + result: FAILED + error_message: OBLIGATED_EXTENSION_NOT_FOUND +- model: api.checkresult + pk: 17 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 6 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 18 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 6 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 19 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 7 + result: FAILED + error_message: FILE_DIR_NOT_FOUND +- model: api.checkresult + pk: 20 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 7 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 21 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 7 + result: FAILED + error_message: FAILED_STRUCTURE_CHECK +- model: api.checkresult + pk: 22 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 8 + result: SUCCESS + error_message: null +- model: api.checkresult + pk: 23 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 8 + result: FAILED + error_message: DOCKER_IMAGE_ERROR +- model: api.checkresult + pk: 24 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 8 + result: FAILED + error_message: TIME_LIMIT +- model: api.checkresult + pk: 25 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 9 + result: SUCCESS + error_message: null +- model: api.checkresult + pk: 26 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 9 + result: FAILED + error_message: MEMORY_LIMIT +- model: api.checkresult + pk: 27 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 9 + result: FAILED + error_message: CHECK_ERROR +- model: api.checkresult + pk: 28 + fields: + polymorphic_ctype: + - api + - structurecheckresult + submission: 10 + result: SUCCESS + error_message: null +- model: api.checkresult + pk: 29 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 10 + result: FAILED + error_message: RUNTIME_ERROR +- model: api.checkresult + pk: 30 + fields: + polymorphic_ctype: + - api + - extracheckresult + submission: 10 + result: FAILED + error_message: UNKNOWN # MARK: Strucure Check results - model: api.structurecheckresult @@ -452,6 +662,30 @@ pk: 10 fields: structure_check: 0 +- model: api.structurecheckresult + pk: 13 + fields: + structure_check: 0 +- model: api.structurecheckresult + pk: 16 + fields: + structure_check: 0 +- model: api.structurecheckresult + pk: 19 + fields: + structure_check: 0 +- model: api.structurecheckresult + pk: 22 + fields: + structure_check: 0 +- model: api.structurecheckresult + pk: 25 + fields: + structure_check: 0 +- model: api.structurecheckresult + pk: 28 + fields: + structure_check: 0 # MARK: Extra Check Results - model: api.extracheckresult @@ -502,6 +736,78 @@ extra_check: 1 log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt artifact: "" +- model: api.extracheckresult + pk: 14 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 15 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" +- model: api.extracheckresult + pk: 17 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 18 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" +- model: api.extracheckresult + pk: 20 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 21 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" +- model: api.extracheckresult + pk: 23 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 24 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" +- model: api.extracheckresult + pk: 26 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 27 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" +- model: api.extracheckresult + pk: 29 + fields: + extra_check: 0 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_0.txt + artifact: "" +- model: api.extracheckresult + pk: 30 + fields: + extra_check: 1 + log_file: fixtures/realistic/projects/0/0/submissions/1/submission_2/logs/log_extra_check_1.txt + artifact: "" # MARK: Teachers - model: api.teacher From 00f5ea2a162a8113c76d99b3522c8e769ced23e9 Mon Sep 17 00:00:00 2001 From: Bram Meir <159529490+BramMeir@users.noreply.github.com> Date: Mon, 20 May 2024 15:15:48 +0200 Subject: [PATCH 3/4] Cleanup translations (#442) * fix: show toggle button project list also when there are only projects in the past * fix: cleanup translations * fix: default submission status argument * chore: remove unused translations * chore: cleanup translations * fix: linting --- frontend/src/assets/lang/app/en.json | 88 +++++------------- frontend/src/assets/lang/app/nl.json | 89 ++++++------------- .../src/components/admin/LazyDataTable.vue | 2 +- .../components/layout/admin/AdminHeader.vue | 2 +- .../components/layout/admin/AdminSidebar.vue | 2 +- .../src/components/projects/ProjectList.vue | 14 +-- .../TeacherAssistantSearch.vue | 3 + .../buttons/CourseRoleAddButton.vue | 2 +- frontend/src/types/Project.ts | 2 +- frontend/src/views/admin/DockerImagesView.vue | 12 +-- frontend/src/views/admin/UsersView.vue | 2 +- .../src/views/authentication/VerifyView.vue | 11 ++- .../src/views/courses/SearchCourseView.vue | 2 +- .../src/views/projects/CreateProjectView.vue | 10 +-- .../src/views/projects/UpdateProjectView.vue | 8 +- 15 files changed, 90 insertions(+), 159 deletions(-) diff --git a/frontend/src/assets/lang/app/en.json b/frontend/src/assets/lang/app/en.json index 9e86d683..b90ecd77 100644 --- a/frontend/src/assets/lang/app/en.json +++ b/frontend/src/assets/lang/app/en.json @@ -2,16 +2,14 @@ "layout": { "header": { "logo": "Ghent University logo", - "login": "login", + "login": "Login", "view": "View as {0}", "user": "Logged in as {0}", "navigation": { "dashboard": "Dashboard", "calendar": "Calendar", - "courses": "courses", - "projects": "projects", - "settings": "preferences", - "help": "help" + "courses": "Courses", + "projects": "Projects" }, "language": { "nl": "Nederlands", @@ -46,7 +44,7 @@ "coming": "Near deadlines", "deadline": "Deadline", "days": "Today at {hour} | Tomorrow at {hour} | In {count} days", - "ago": "{count} days ago", + "ago": "1 day ago | {count} days ago", "groupName": "Group name", "groupPopulation": "Size", "groupStatus": "Status", @@ -63,10 +61,10 @@ "edit": "Edit project", "name": "Project name", "description": "Description", - "start_date": "Start project", - "group_size": "Number of students in a group (1 for an individual project)", - "number_of_groups": "Number of groups (optional, otherwise #students / group size)", - "max_score": "Maximum score that can be achieved", + "startDate": "Start project", + "numberStudentsGroup": "Number of students in a group (1 for an individual project)", + "numberOfGroups": "Number of groups (optional, otherwise #students / group size)", + "maxScore": "Maximum score that can be achieved", "visibility": "Make project visible to students", "scoreVisibility": "Make score, when uploaded, automatically visible to students", "submissionStructure": "Structure of how a submission should be made", @@ -82,7 +80,7 @@ "dockerImage": "Docker image", "timeLimit": "Time limit for execution (in seconds)", "memoryLimit": "Memory limit for execution (in MB)", - "showLog": "Making the extra logs of the docker container visible to the students" + "showLog": "Make the extra logs of the docker container visible to the students" } }, "submissions": { @@ -110,7 +108,6 @@ "clone": "Clone course", "cloneAssistants": "Clone assistants:", "cloneTeachers": "Clone teachers:", - "cloneCourse": "Clone teachers:", "name": "Course name", "description": "Description", "excerpt": "Short description", @@ -122,17 +119,14 @@ "noProjects": "No projects available for this course", "teachersAndAssistants": { "title": "People linked to this course", - "enroll": "Add as {0}", - "leave": "Remove from course", "edit": "Edit users", "search": { "search": "Search", "faculty": "Faculty", - "role": "Role", - "no_role": "None", + "noRole": "None", "placeholder": "Search a user by name", "title": "Find users to link to this course", - "results": "{0} users found for set filters" + "results": "1 user found for set filters | {count} users found for set filters" } }, "search": { @@ -141,10 +135,7 @@ "year": "Academic year", "placeholder": "Search a course by name", "title": "Search a course", - "results": "{0} courses found for set filters" - }, - "searchByLink": { - "placeholder": "Find a course using the registration link" + "results": "1 course found for set filters | {count} courses found for set filters" }, "share": { "title": "Activate invitation link", @@ -157,14 +148,13 @@ "helpers": { "errors": { "notFound": "Not found", - "notFoundDetail": "Source not found", - "unauthorized": "unauthorized", + "notFoundDetail": "Source not found.", + "unauthorized": "Unauthorized", "unauthorizedDetail": "You are not authorized to access this resource.", - "server": "Server Error", - "serverDetail": "An error occurred on the server.", - "network": "Network Error", + "server": "Server error", + "network": "Network error", "networkDetail": "Unable to reach the server.", - "request": "request error", + "request": "Request error", "requestDetail": "An error occurred while creating the request." } } @@ -176,8 +166,6 @@ "createProject": "Create a new project", "searchCourse": "Search a course", "createCourse": "Create a new course", - "public": "Public", - "protected": "Protected", "csv": "Download grades as a .csv file" }, "card": { @@ -201,7 +189,6 @@ "teacher": "No courses found. Create a new course with the button below.", "search": "No courses found for the given search criteria." }, - "noResults": "No results.", "noIncomingProjects": "No projects with a deadline within 7 days.", "selectCourse": "Select the course for which you want to create a project:", "showPastProjects": "Projects with passed deadline" @@ -250,7 +237,7 @@ "save": { "error": { "title": "Invalid save operation", - "detail": "You are trying to save an item without selecting it" + "detail": "You are trying to save an item without selecting it." } } } @@ -266,25 +253,8 @@ "leaveCourse": "Are you sure you want to leave this course? You will no longer have access to this course.", "shareCourse": "By activating the invitation link, you allow students in possession of this link to enroll in this course. Please copy the generated link, only when you click on \"Activate invitation link\" will this link become active." }, - "protectedCourses": { - "screen1": { - "title": "Obtain invitation link", - "content": "Teachers can choose to make their courses private. This means you have to ask the teacher for an invitation link, to be able to join the course." - }, - "screen2": { - "title": "Search course", - "content": "Use the invitation link to search a course. If you can't find the course, ask the teacher to share a new link." - - }, - "screen3": { - "title": "Enroll", - "content": "Enroll in the course. Now you can see all the current projects, deadlines, ..." - - } - }, "admin": { "title": "Admin", - "keyword": "Keyword", "id": "ID", "list": "List", "add": "Add", @@ -303,31 +273,19 @@ "roles": "Roles" }, "user": "User", - "assistants": { - "title": "Assistants" - }, "assistant": "Assistant", - "students": { - "title": "Students" - }, "student": "Student", - "teachers": { - "title": "Teachers" - }, "teacher": "Teacher", - "catalog": "Catalog", - "docker_images": { + "dockerImages": { "title": "Docker Images", - "name_input": "Name of docker image", + "nameInput": "Name of docker image", "name": "Name", "owner": "Owner ID", - "public": "Public", - "private": "Private" + "public": "Public" }, - "none_found": "No matching data.", + "noneFound": "No matching data.", "loading": "Loading data. Please wait.", - "safeGuard": "Are you sure?", - "no_file": "No file found." + "safeGuard": "Are you sure?" }, "primevue": { "startsWith": "Starts with", diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json index 884cb246..e9ed6148 100644 --- a/frontend/src/assets/lang/app/nl.json +++ b/frontend/src/assets/lang/app/nl.json @@ -9,9 +9,7 @@ "dashboard": "Dashboard", "calendar": "Kalender", "courses": "Vakken", - "projects": "Projecten", - "settings": "Voorkeuren", - "help": "Help" + "projects": "Projecten" }, "language": { "nl": "Nederlands", @@ -25,7 +23,7 @@ "projects": "Lopende projecten" }, "verify": { - "redirect": "Je wordt zo meteen doorverwezen" + "redirect": "Je wordt zo meteen doorverwezen..." }, "login": { "title": "Inloggen", @@ -34,7 +32,7 @@ "button": "UGent login", "card": { "title": "Ypovoli", - "subtitle": "Het officieel indieningsplatform van de Universiteit Gent." + "subtitle": "Het officiële indieningsplatform van de Universiteit Gent." } }, "calendar": { @@ -46,7 +44,7 @@ "coming": "Aankomende deadlines", "deadline": "Deadline", "days": "Vandaag om {hour} | Morgen om {hour} | Over {count} dagen", - "ago": "{count} dagen geleden", + "ago": "1 dag geleden | {count} dagen geleden", "groupName": "Groepsnaam", "groupPopulation": "Grootte", "groupStatus": "Status", @@ -63,14 +61,16 @@ "edit": "Bewerk project", "name": "Projectnaam", "description": "Beschrijving", - "start_date": "Start project", - "group_size": "Aantal studenten per groep (1 voor individueel project)", - "number_of_groups": "Aantal groepen (optioneel, anders #studenten / grootte groep)", - "max_score": "Maximale te behalen score", + "startDate": "Start project", + "numberStudentsGroup": "Aantal studenten per groep (1 voor individueel project)", + "numberOfGroups": "Aantal groepen (optioneel, anders #studenten / grootte groep)", + "maxScore": "Maximale te behalen score", "visibility": "Project zichtbaar maken voor studenten", "scoreVisibility": "Maak score, wanneer ingevuld, automatisch zichtbaar voor studenten", "submissionStructure": "Structuur van hoe de indiening moet gebeuren", "noStudents": "Geen studenten in deze groep", + "locked": "Gesloten", + "unlocked": "Open", "extraChecks": { "title": "Automatische checks op een indiening", "add": "Nieuwe check", @@ -84,7 +84,7 @@ } }, "submissions": { - "title": "Inzendingen", + "title": "Indieningen", "submit": "Indienen", "course": "Vak", "chooseFile": "Kies bestand(en)", @@ -112,24 +112,21 @@ "description": "Beschrijving", "excerpt": "Korte beschrijving", "faculty": "Faculteit", - "private": "Gesloten vak (studenten kunnen enkel inschrijven via uitnodigingslink)", + "private": "Gesloten vak (studenten kunnen enkel inschrijven met een uitnodigingslink)", "year": "Academiejaar", "enroll": "Inschrijven", "leave": "Uitschrijven", "noProjects": "Geen projecten beschikbaar voor dit vak", "teachersAndAssistants": { "title": "Lesgevers gelinkt aan dit vak", - "enroll": "Voeg toe als {0}", - "leave": "Verwijder uit vak", "edit": "Bewerk gebruikers", "search": { "search": "Zoeken", "faculty": "Faculteit", - "role": "Rol", - "no_role": "Geen", + "noRole": "Geen", "placeholder": "Zoek een gebruiker op naam", "title": "Zoek gebuikers om aan dit vak toe te voegen", - "results": "{0} gebruikers gevonden voor ingestelde filters" + "results": "1 gebruiker gevonden voor ingestelde filters | {count} gebruikers gevonden voor ingestelde filters" } }, "search": { @@ -138,28 +135,24 @@ "year": "Academiejaar", "placeholder": "Zoek een vak op naam", "title": "Zoek een vak", - "results": "{0} vakken gevonden voor ingestelde filters" - }, - "searchByLink": { - "placeholder": "Zoek een vak gebruik makende van een uitnodigingslink" + "results": "1 vak gevonden voor ingestelde filters | {count} vakken gevonden voor ingestelde filters" }, "share": { "title": "Activeer invitatielink", "duration": "Geldigheidsduur van link (in dagen):", "link": "Invitatielink:" } - } + } }, "composables": { "helpers": { "errors": { - "notFound": "Niet Gevonden", + "notFound": "Niet gevonden", "notFoundDetail": "Bron niet gevonden.", "unauthorized": "Onbevoegd", "unauthorizedDetail": "Je bent niet bevoegd om deze bron te bereiken.", - "server": "Server Fout", - "serverDetail": "Er vond een fout plaats op de server.", - "network": "Netwerk Fout", + "server": "Server fout", + "network": "Netwerk fout", "networkDetail": "Kan de server niet bereiken.", "request": "Fout verzoek", "requestDetail": "Een fout vond plaats tijdens het maken van het verzoek." @@ -173,8 +166,6 @@ "createProject": "Creëer nieuw project", "searchCourse": "Zoek een vak", "createCourse": "Maak een vak", - "public": "Publiek", - "protected": "Besloten", "csv": "Download punten als een .csv bestand" }, "card": { @@ -191,14 +182,13 @@ "list": { "noProjects": { "student": "Geen lopende projecten gevonden voor alle ingeschreven vakken. Schrijf in op een openbaar vak met de zoekfunctie, of gebruik een uitnodiginslink van een lesgever.", - "teacher": "Geen lopende projecten gevonden voor de vakken waarvoor je lesgever bent." + "teacher": "Geen lopende projecten gevonden voor de vakken waarvoor je lesgever bent. Maak een nieuw project voor een vak met onderstaande knop." }, "noCourses": { "student": "Geen vakken gevonden. Schrijf in op een openbaar vak met de zoekfunctie, of gebruik een uitnodiginslink van een lesgever.", "teacher": "Geen vakken gevonden. Maak een vak aan met onderstaande knop.", "search": "Geen vakken gevonden voor de gegeven zoekcriteria." }, - "noResults": "Geen resultaten.", "noIncomingProjects": "Geen projecten met een deadline binnen de 7 dagen.", "selectCourse": "Selecteer het vak waarvoor je een project wil maken:", "showPastProjects": "Projecten met verstreken deadline" @@ -246,8 +236,8 @@ "admin": { "save": { "error": { - "title": "Ongeldige opsla operatie", - "detail": "U probeert een item op te slaan zonder dit te selecteren" + "title": "Ongeldige opsla bewerking", + "detail": "U probeert een item op te slaan zonder dit te selecteren." } } } @@ -263,24 +253,8 @@ "leaveCourse": "Ben je zeker dat je dit vak wil verlaten? Je zal geen toegang meer hebben tot dit vak.", "shareCourse": "Door het activeren van de invitatielink staat u studenten in bezit van deze link toe zich in te schrijven voor dit vak. Gelieve de gegenereerde link te kopiëren, pas wanneer u op \"Activeer invitatielink\" klikt zal deze link actief worden." }, - "protectedCourses": { - "screen1": { - "title": "Bemachtigen link", - "content": "Professoren kunnen kiezen om hun vakken niet publiek te maken. Vraag de prof om een invitatielink te delen om te kunnen toetreden tot het vak." - }, - "screen2": { - "title": "Vak zoeken", - "content": "Gebruik de link om het vak te zoeken. Als je het vak niet kan vinden, kan je de prof vragen om een nieuwe link te delen." - - }, - "screen3": { - "title": "Inschrijven", - "content": "Schrijf je in voor het vak. Je kan nu een overzicht raadplegen van alle lopende projecten, deadlines, ..." - } - }, "admin": { "title": "Beheerder", - "keyword": "Trefwoord", "id": "ID", "list": "Lijst", "add": "Voeg toe", @@ -299,28 +273,17 @@ "roles": "Functies" }, "user": "Gebruiker", - "assistants": { - "title": "Assistenten" - }, "assistant": "Assistent", - "students": { - "title": "Studenten" - }, "student": "Student", - "teachers": { - "title": "Proffen" - }, "teacher": "Prof", - "catalog": "Catalogus", - "docker_images": { + "dockerImages": { "title": "Docker Images", - "name_input": "Naam van docker image", + "nameInput": "Naam van docker image", "name": "Naam", "owner": "Eigenaar ID", - "public": "Publiek", - "private": "Privaat" + "public": "Publiek" }, - "none_found": "Geen overeenkomende data gevonden.", + "noneFound": "Geen overeenkomende data gevonden.", "loading": "Aan het laden. Wacht even aub.", "safeGuard": "Bent u het zeker?" }, diff --git a/frontend/src/components/admin/LazyDataTable.vue b/frontend/src/components/admin/LazyDataTable.vue index dcdfe499..49b91e89 100644 --- a/frontend/src/components/admin/LazyDataTable.vue +++ b/frontend/src/components/admin/LazyDataTable.vue @@ -118,7 +118,7 @@ defineExpose({ fetch });