Merge pull request #198 from abes-esr/develop

develop to main
abes-esr · Jan 8, 2025 · 9edd645 · 9edd645
2 parents 9e97cb2 + dff078d
commit 9edd645
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Item",
-	"version": "3.3.0",
+	"version": "3.3.1-SNAPSHOT",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",

diff --git a/src/components/Structure/Navbar.vue b/src/components/Structure/Navbar.vue
@@ -178,7 +178,13 @@ const authStore = useAuthStore()
 const emit = defineEmits(['close'])
 
 function navigateTo(routeName) {
-  router.push({ name: routeName }).catch(err => {})
+  if ((routeName === 'suppression') || (routeName === "recouvrement") || (routeName === "exemplarisation") || (routeName === "modification")) {
+    let newRouteName = "/" + routeName + "/empty"
+    router.replace(newRouteName).catch(err => {});
+    router.currentRoute.value.fullPath = "/suppression/empty";
+  } else {
+    router.push({ name: routeName }).catch(err => {})
+  }
   fixNavBarModel.value ? '' : emit('close')
 }
 

diff --git a/src/views/Exemplarisation/ExempSteps.vue b/src/views/Exemplarisation/ExempSteps.vue
@@ -113,7 +113,7 @@
 
 <script setup>
 
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import itemService from '@/service/ItemService';
 import router from '@/router';
 import SelectFile from '@/components/SelectFile.vue';
@@ -138,8 +138,17 @@ const isLoading = ref(false);
 const dialog = ref(false);
 const suppDialog = ref(false);
 
+watch(router.currentRoute, (newValue) => {
+  if (newValue.fullPath.includes("empty")) {
+    cleanPath()
+    raz();
+    currentStep.value = 1;
+    prev();
+  }
+})
+
 onMounted(() => {
-  if (props.id) {
+  if ((props.id !== 'empty') && (props.id != null)) {
     itemService.getDemande(props.id, 'EXEMP')
       .then(response => {
         demande.value = response.data;
@@ -169,9 +178,18 @@ onMounted(() => {
       .catch(() => {
         router.replace('/exemplarisation');
       });
+  } else {
+    cleanPath();
   }
 });
 
+function cleanPath() {
+  if (router.currentRoute.value.fullPath.includes("empty")) {
+    router.replace('/exemplarisation');
+    router.currentRoute.value.fullPath = "/exemplarisation";
+  }
+}
+
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
     next();
@@ -270,6 +288,12 @@ function prev() {
   changeEtat();
 }
 
+function raz() {
+  isLoading.value = false;
+  alertMessage.value = '';
+  alertType.value = 'success';
+}
+
 function changeEtat() {
   if ((currentStep.value + 1) === 1) {
     itemService.choixEtape(demande.value.id, 2, 'EXEMP')

diff --git a/src/views/Modification/ModifSteps.vue b/src/views/Modification/ModifSteps.vue
@@ -157,7 +157,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import router from '@/router';
 import itemService from '@/service/ItemService';
 import Rcr from '@/components/Rcr.vue';
@@ -188,6 +188,14 @@ const typeTraitementSelected = ref();
 const emits = defineEmits(['backendError']);
 const props = defineProps({ id: { type: String } });
 
+watch(router.currentRoute, (newValue) => {
+  if (newValue.fullPath.includes("empty")) {
+    cleanPath()
+    currentStep.value = 1;
+    prev();
+  }
+})
+
 onMounted(() => {
   if (props.id) {
     itemService.getDemande(props.id, 'MODIF')
@@ -227,9 +235,18 @@ onMounted(() => {
       .catch(() => {
         router.replace('/modification');
       });
+  } else {
+    cleanPath();
   }
 });
 
+function cleanPath() {
+  if (router.currentRoute.value.fullPath.includes("empty")) {
+    router.replace('/modification');
+    router.currentRoute.value.fullPath = "/modification";
+  }
+}
+
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
     next();

diff --git a/src/views/Recouvrement/RecouvSteps.vue b/src/views/Recouvrement/RecouvSteps.vue
@@ -80,7 +80,7 @@
 <script setup>
 import Rcr from '@/components/Rcr.vue';
 import SelectFile from '@/components/SelectFile.vue';
-import { onMounted, ref } from 'vue';
+import {onMounted, ref, watch} from 'vue'
 import itemService from '@/service/ItemService';
 import router from '@/router';
 import DialogSuppression from '@/components/Dialog/DialogSuppression.vue';
@@ -99,10 +99,17 @@ const isLoading = ref(false);
 const dialog = ref(false);
 const suppDialog = ref(false);
 
-
+watch(router.currentRoute, (newValue) => {
+  if (newValue.fullPath.includes("empty")) {
+    cleanPath()
+    raz();
+    currentStep.value = 1;
+    prev();
+  }
+})
 
 onMounted(() => {
-  if(props.id){
+  if((props.id !== 'empty') && (props.id != null)){
     itemService.getDemande(props.id, "RECOUV")
       .then(response => {
         demande.value = response.data;
@@ -113,9 +120,18 @@ onMounted(() => {
       }).catch(() => {
         router.replace("/recouvrement");
     })
+  } else {
+    cleanPath();
   }
 })
 
+function cleanPath() {
+  if (router.currentRoute.value.fullPath.includes("empty")) {
+    router.replace('/recouvrement');
+    router.currentRoute.value.fullPath = "/recouvrement";
+  }
+}
+
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
     next();
@@ -168,4 +184,10 @@ function next() {
 function prev() {
   currentStep.value--;
 }
+
+function raz() {
+  isLoading.value = false;
+  alertMessage.value = '';
+  alertType.value = 'success';
+}
 </script>
diff --git a/src/views/Suppression/SuppSteps.vue b/src/views/Suppression/SuppSteps.vue
@@ -160,7 +160,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import TypeFile from '@/components/Supp/TypeFile.vue';
 import SelectFile from '@/components/SelectFile.vue';
 import itemService from '@/service/ItemService';
@@ -192,8 +192,16 @@ const alertType = ref('success');
 const dialog = ref(false);
 const suppDialog = ref(false);
 
+watch(router.currentRoute, (newValue) => {
+  if (newValue.fullPath.includes("empty")) {
+    cleanPath()
+    currentStep.value = 1;
+    prev();
+  }
+})
+
 onMounted(() => {
-  if (props.id) {
+  if ((props.id !== 'empty') && (props.id != null)) {
     itemService.getDemande(props.id, 'SUPP')
       .then(response => {
         demande.value = response.data;
@@ -228,9 +236,18 @@ onMounted(() => {
       .catch(() => {
         router.replace('/suppression');
       });
+  } else {
+    cleanPath();
   }
 });
 
+function cleanPath() {
+  if (router.currentRoute.value.fullPath.includes("empty")) {
+    router.replace('/suppression');
+    router.currentRoute.value.fullPath = "/suppression";
+  }
+}
+
 function createDemande() {
   if (demande.value && (rcrSelected.value === demande.value.rcr)) {
     next();