Skip to content

Commit 40237d4

Browse files
authored
fix(fusager): erreur 500 lien mail sur DS 932 (#826)
## Tickets liés 932 ## Description Fix d'une erreur 500 "getActivePinia()" was called but there was no active Pinia. Are you trying to use a store before calling "app.use(pinia)"? @http://localhost:3000/_nuxt/utils/eig.js:7:19
2 parents 2ab19a0 + 41cba86 commit 40237d4

3 files changed

Lines changed: 28 additions & 19 deletions

File tree

packages/frontend-usagers/src/pages/eig/liste.vue

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,17 @@ import {
123123
ValidationModal,
124124
} from "@vao/shared";
125125
import { mapEigToLabel } from "@vao/shared/src/utils/eigUtils";
126+
import { getEigPermissions, canDelete } from "../../utils/eig";
127+
128+
const eig = reactive({
129+
allowEigReadWrite: false,
130+
allowEigReadOnly: false,
131+
canDelete,
132+
});
133+
134+
const { allowEigReadWrite, allowEigReadOnly } = getEigPermissions();
135+
eig.allowEigReadWrite = allowEigReadWrite;
136+
eig.allowEigReadOnly = allowEigReadOnly;
126137
127138
const DsfrButton = resolveComponent("DsfrButton");
128139

packages/frontend-usagers/src/stores/eig.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineStore } from "pinia";
2-
import { $fetchBackend, eig, logger } from "#imports";
2+
import { $fetchBackend, getEigPermissions, logger } from "#imports";
33
import { eigModel } from "@vao/shared";
44
import { getTagSejourLibelle } from "@vao/shared/src/utils/eigUtils";
55

@@ -17,9 +17,9 @@ export const useEigStore = defineStore("eig", {
1717
canModify() {
1818
return (
1919
!this.currentEig ||
20-
(eig.allowEigReadWrite &&
20+
(getEigPermissions.allowEigReadWrite &&
2121
this.currentEig?.statut === eigModel.Statuts.BROUILLON &&
22-
eig.isDeclarationligibleToEig({
22+
getEigPermissions.isDeclarationligibleToEig({
2323
dateDebut: this.currentEig.dateDebut,
2424
dateFin: this.currentEig.dateFin,
2525
statut: this.currentEig.dsStatut,
@@ -71,7 +71,7 @@ export const useEigStore = defineStore("eig", {
7171
async get({ limit, offset, sortBy, sortDirection, search } = {}) {
7272
log.i("fetchEig - IN");
7373
try {
74-
const { eig } = await $fetchBackend(`/eig/me`, {
74+
const { eig } = await $fetchBackend("/eig/me", {
7575
method: "GET",
7676
credentials: "include",
7777
params: {
@@ -108,7 +108,7 @@ export const useEigStore = defineStore("eig", {
108108
},
109109
async create(data) {
110110
try {
111-
return await $fetchBackend(`/eig`, {
111+
return await $fetchBackend("/eig", {
112112
method: "POST",
113113
credentials: "include",
114114
body: {
@@ -145,7 +145,7 @@ export const useEigStore = defineStore("eig", {
145145
},
146146
async setAvailableDs(search = null) {
147147
try {
148-
const res = await $fetchBackend(`/eig/available-ds`, {
148+
const res = await $fetchBackend("/eig/available-ds", {
149149
method: "GET",
150150
credentials: "include",
151151
params: { search },

packages/frontend-usagers/src/utils/eig.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import dayjs from "dayjs";
22
import { eigModel } from "@vao/shared";
33
import { DeclarationSejour, useUserStore } from "#imports";
44
import { ROLES as userRolesRef } from "../helpers/users";
5-
const userStore = useUserStore();
65

76
const isDeclarationligibleToEig = (d) =>
87
dayjs(d.dateDebut).format("YYYY-MM-DD") <= dayjs().format("YYYY-MM-DD") &&
@@ -16,16 +15,15 @@ const isDeclarationligibleToEig = (d) =>
1615

1716
const canDelete = (statut) => eigModel.Statuts.BROUILLON === statut;
1817

19-
const allowEigReadWrite = userStore.user?.roles?.includes(
20-
userRolesRef.EIG_ECRITURE,
21-
);
22-
const allowEigReadOnly = userStore.user?.roles?.includes(
23-
userRolesRef.EIG_LECTURE,
24-
);
25-
26-
export default {
27-
allowEigReadWrite,
28-
allowEigReadOnly,
29-
isDeclarationligibleToEig,
30-
canDelete,
18+
const getEigPermissions = () => {
19+
const userStore = useUserStore();
20+
const allowEigReadWrite = userStore.user?.roles?.includes(
21+
userRolesRef.EIG_ECRITURE,
22+
);
23+
const allowEigReadOnly = userStore.user?.roles?.includes(
24+
userRolesRef.EIG_LECTURE,
25+
);
26+
return { allowEigReadWrite, allowEigReadOnly };
3127
};
28+
29+
export { isDeclarationligibleToEig, canDelete, getEigPermissions };

0 commit comments

Comments
 (0)