refactoring

dBildungsplattform · Aug 28, 2024 · 0d40778 · 0d40778
1 parent 16dcefb
commit 0d40778
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 27 deletions.
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -11,7 +11,7 @@ router.beforeEach(async (to: RouteLocationNormalized, _from: RouteLocationNormal
   const authStore: AuthStore = useAuthStore();
 
   await authStore.initializeAuthStatus();
-
+  if (to.path != '/profile') sessionStorage.setItem('previousUrl', to.path);
   // Redirect authenticated users trying to access the login page to the start page
   if (to.path === '/' && authStore.isAuthed) {
     return { path: '/start' };
@@ -49,7 +49,6 @@ router.beforeEach(async (to: RouteLocationNormalized, _from: RouteLocationNormal
         return { path: 'not-found' };
     }
   }
-
   return true;
 });
 

diff --git a/src/utils/routing.ts b/src/utils/routing.ts
diff --git a/src/views/admin/KlasseCreationView.vue b/src/views/admin/KlasseCreationView.vue
@@ -22,7 +22,6 @@
   import KlasseForm from '@/components/form/KlasseForm.vue';
   import SuccessTemplate from '@/components/admin/klassen/SuccessTemplate.vue';
   import { getValidationSchema, getVuetifyConfig } from '@/utils/validationKlasse';
-import { setPreviousUrl } from '@/utils/routing';
 
   const { t }: Composer = useI18n({ useScope: 'global' });
   const router: Router = useRouter();
@@ -169,7 +168,6 @@ import { setPreviousUrl } from '@/utils/routing';
   });
 
   onMounted(async () => {
-    setPreviousUrl();
     await personenkontextStore.processWorkflowStep({ limit: 25 });
     organisationStore.createdKlasse = null;
     organisationStore.errorCode = '';

diff --git a/src/views/admin/KlasseDetailsView.vue b/src/views/admin/KlasseDetailsView.vue
@@ -19,7 +19,6 @@
   import SuccessTemplate from '@/components/admin/klassen/SuccessTemplate.vue';
   import KlasseDelete from '@/components/admin/klassen/KlasseDelete.vue';
   import { getValidationSchema, getVuetifyConfig } from '@/utils/validationKlasse';
-import { setPreviousUrl } from '@/utils/routing';
 
   const route: RouteLocationNormalizedLoaded = useRoute();
   const router: Router = useRouter();
@@ -143,7 +142,6 @@ import { setPreviousUrl } from '@/utils/routing';
   }
 
   onBeforeMount(async () => {
-    setPreviousUrl();
     organisationStore.errorCode = '';
     // Retrieves the Klasse using the Id in the route since that's all we have
     await organisationStore.getOrganisationById(currentOrganisationId, OrganisationsTyp.Klasse);

diff --git a/src/views/admin/KlassenManagementView.vue b/src/views/admin/KlassenManagementView.vue
@@ -18,7 +18,6 @@
   import { useRouter, type Router } from 'vue-router';
   import KlasseDelete from '@/components/admin/klassen/KlasseDelete.vue';
   import SpshAlert from '@/components/alert/SpshAlert.vue';
-import { setPreviousUrl } from '@/utils/routing';
 
   const authStore: AuthStore = useAuthStore();
   const organisationStore: OrganisationStore = useOrganisationStore();
@@ -342,7 +341,6 @@ import { setPreviousUrl } from '@/utils/routing';
     router.push({ name: 'klasse-details', params: { id: item.id } });
   }
   onMounted(async () => {
-    setPreviousUrl();
     await organisationStore.getAllOrganisationen({
       offset: (searchFilterStore.klassenPage - 1) * searchFilterStore.klassenPerPage,
       limit: searchFilterStore.klassenPerPage,

diff --git a/src/views/admin/PersonCreationView.vue b/src/views/admin/PersonCreationView.vue
@@ -37,7 +37,6 @@
   import { useKlassen } from '@/composables/useKlassen';
   import PersonenkontextCreate from '@/components/admin/personen/PersonenkontextCreate.vue';
   import { type TranslatedObject } from '@/types.d';
-import { setPreviousUrl } from '@/utils/routing';
 
   const router: Router = useRouter();
   const personStore: PersonStore = usePersonStore();
@@ -249,7 +248,6 @@ import { setPreviousUrl } from '@/utils/routing';
   });
 
   onMounted(async () => {
-    setPreviousUrl();
     await personenkontextStore.processWorkflowStep({ limit: 25 });
     personStore.errorCode = '';
     personenkontextStore.createdPersonWithKontext = null;

diff --git a/src/views/admin/PersonDetailsView.vue b/src/views/admin/PersonDetailsView.vue
@@ -34,7 +34,6 @@
   import PersonenkontextCreate from '@/components/admin/personen/PersonenkontextCreate.vue';
   import { type TranslatedObject } from '@/types.d';
   import KlasseChange from '@/components/admin/klassen/KlasseChange.vue';
-  import { setPreviousUrl } from '@/utils/routing';
 
   const { mdAndDown }: { mdAndDown: Ref<boolean> } = useDisplay();
 
@@ -705,7 +704,6 @@
   }
 
   onBeforeMount(async () => {
-    setPreviousUrl();
     personStore.resetState();
     personenkontextStore.errorCode = '';
     await personStore.getPersonById(currentPersonId);

diff --git a/src/views/admin/PersonManagementView.vue b/src/views/admin/PersonManagementView.vue
@@ -22,7 +22,6 @@
   import ResultTable, { type TableRow } from '@/components/admin/ResultTable.vue';
   import SearchField from '@/components/admin/SearchField.vue';
   import { type TranslatedObject } from '@/types.d';
-  import { setPreviousUrl } from '@/utils/routing';
 
   const searchFieldComponent: Ref = ref();
 
@@ -288,7 +287,6 @@
   }
 
   onMounted(async () => {
-    setPreviousUrl();
     if (filterOrSearchActive.value) {
       selectedSchulen.value = searchFilterStore.selectedSchulen || [];
       selectedRollen.value = searchFilterStore.selectedRollen || [];

diff --git a/src/views/admin/SchuleCreationView.vue b/src/views/admin/SchuleCreationView.vue
@@ -18,7 +18,6 @@
   import { object, string } from 'yup';
   import { toTypedSchema } from '@vee-validate/yup';
   import { DIN_91379A_EXT, NO_LEADING_TRAILING_SPACES } from '@/utils/validation';
-  import { setPreviousUrl } from '@/utils/routing';
 
   const { mdAndDown }: { mdAndDown: Ref<boolean> } = useDisplay();
 
@@ -135,7 +134,6 @@
   }
 
   onMounted(async () => {
-    setPreviousUrl();
     organisationStore.createdSchule = null;
     /* listen for browser changes and prevent them when form is dirty */
     window.addEventListener('beforeunload', preventNavigation);

diff --git a/src/views/admin/SchuleManagementView.vue b/src/views/admin/SchuleManagementView.vue
@@ -6,7 +6,6 @@
   import type { VDataTableServer } from 'vuetify/lib/components/index.mjs';
   import { OrganisationsTyp, useOrganisationStore, type OrganisationStore } from '@/stores/OrganisationStore';
   import { type SearchFilterStore, useSearchFilterStore } from '@/stores/SearchFilterStore';
-  import { setPreviousUrl } from '@/utils/routing';
 
   const organisationStore: OrganisationStore = useOrganisationStore();
   const searchFilterStore: SearchFilterStore = useSearchFilterStore();
@@ -49,7 +48,6 @@
   }
 
   onMounted(async () => {
-    setPreviousUrl();
     await organisationStore.getAllOrganisationen({
       offset: (searchFilterStore.schulenPage - 1) * searchFilterStore.schulenPerPage,
       limit: searchFilterStore.schulenPerPage,

diff --git a/src/views/admin/rollen/RolleCreationView.vue b/src/views/admin/rollen/RolleCreationView.vue
@@ -40,7 +40,6 @@
   } from '@/utils/validationRolle';
   import SuccessTemplate from '@/components/admin/rollen/SuccessTemplate.vue';
   import { type TranslatedObject } from '@/types.d';
-  import { setPreviousUrl } from '@/utils/routing';
 
   const rolleStore: RolleStore = useRolleStore();
   const organisationStore: OrganisationStore = useOrganisationStore();
@@ -181,7 +180,6 @@
   }
 
   onMounted(async () => {
-    setPreviousUrl();
     rolleStore.createdRolle = null;
     await organisationStore.getAllOrganisationen({
       systemrechte: ['ROLLEN_VERWALTEN'],

diff --git a/src/views/admin/rollen/RolleDetailsView.vue b/src/views/admin/rollen/RolleDetailsView.vue
@@ -38,7 +38,6 @@
   import RolleDelete from '@/components/admin/rollen/RolleDelete.vue';
   import { type TranslatedObject } from '@/types.d';
   import SuccessTemplate from '@/components/admin/rollen/SuccessTemplate.vue';
-import { setPreviousUrl } from '@/utils/routing';
 
   const route: RouteLocationNormalizedLoaded = useRoute();
   const router: Router = useRouter();
@@ -243,7 +242,6 @@ import { setPreviousUrl } from '@/utils/routing';
   };
 
   onBeforeMount(async () => {
-    setPreviousUrl();
     rolleStore.errorCode = '';
     await rolleStore.getRolleById(currentRolleId);
     await organisationStore.getOrganisationById(

diff --git a/src/views/admin/rollen/RolleManagementView.vue b/src/views/admin/rollen/RolleManagementView.vue
@@ -14,7 +14,6 @@
   import { useOrganisationStore, type Organisation, type OrganisationStore } from '@/stores/OrganisationStore';
   import { useRouter, type Router } from 'vue-router';
   import { useSearchFilterStore, type SearchFilterStore } from '@/stores/SearchFilterStore';
-import { setPreviousUrl } from '@/utils/routing';
 
   const rolleStore: RolleStore = useRolleStore();
   const organisationStore: OrganisationStore = useOrganisationStore();
@@ -95,7 +94,6 @@ import { setPreviousUrl } from '@/utils/routing';
   }
 
   onMounted(async () => {
-    setPreviousUrl();
     await organisationStore.getAllOrganisationen();
     await rolleStore.getAllRollen({
       offset: (searchFilterStore.rollenPage - 1) * searchFilterStore.rollenPerPage,