Skip to content

Commit 9e459ff

Browse files
committed
fix(frontend): fix usager-docs download
1 parent 158ea3d commit 9e459ff

File tree

8 files changed

+33
-26
lines changed

8 files changed

+33
-26
lines changed

packages/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@domifa/backend",
33
"private": true,
4-
"version": "2.157.0",
4+
"version": "2.173.26",
55
"description": "",
66
"author": "",
77
"license": "MIT",

packages/backend/src/usagers/controllers/export-structure-usagers.controller.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { format } from "date-fns";
1313
import { renderStructureUsagersExcel } from "../services/xlsx-structure-usagers-renderer";
1414
import { AppLogsService } from "../../modules/app-logs/app-logs.service";
1515
import { domifaConfig } from "../../config";
16-
import { captureMessage } from "@sentry/node";
1716

1817
@UseGuards(AuthGuard("jwt"), AppUserGuard)
1918
@ApiTags("export")
@@ -40,11 +39,12 @@ export class ExportStructureUsagersController {
4039
const usagers = await this.usagersService.export(user.structureId);
4140
const workbook = renderStructureUsagersExcel(usagers, user.structure);
4241

43-
const message = `[EXPORT] [${domifaConfig().envId}] start at ${format(
44-
new Date(),
45-
"dd/MM/yyyy - HH:mm"
46-
)}`;
47-
captureMessage(message);
42+
appLogger.info(
43+
`[EXPORT] [${domifaConfig().envId}] start at ${format(
44+
new Date(),
45+
"dd/MM/yyyy - HH:mm"
46+
)}`
47+
);
4848

4949
try {
5050
res.setHeader(

packages/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@domifa/frontend",
3-
"version": "2.148.1",
3+
"version": "2.173.26",
44
"main": "index.js",
55
"author": "Incubateur des Ministères Sociaux <dsi-incubateur@sg.social.gouv.fr> (https://incubateur.social.gouv.fr)",
66
"license": "Apache-2.0",

packages/frontend/src/app/modules/usager-dossier/components/base-usager-dossier-page/base-usager-dossier-page.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ export class BaseUsagerDossierPageComponent implements OnInit, OnDestroy {
4747
this.subscription.add(
4848
this.store.select(selectUsagerById(id)).subscribe({
4949
next: (usager: UsagerLight) => {
50-
this.usager = new UsagerFormModel(usager);
50+
if (usager) {
51+
this.usager = new UsagerFormModel(usager);
52+
}
5153
},
5254
error: (error) => {
5355
console.error("Erreur lors de la récupération du dossier:", error);

packages/frontend/src/app/modules/usager-dossier/components/step-decision/step-decision.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ <h3>Pièces jointes</h3>
209209
</div>
210210
<div class="mb-5">
211211
<app-display-usager-docs
212-
[editPJ]="editPJ"
212+
[me]="me"
213+
[editPJ]="true"
213214
[usager]="usager"
214215
></app-display-usager-docs>
215216
</div>

packages/frontend/src/app/modules/usager-dossier/components/step-documents/step-documents.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ <h2 class="form-title">Pièces justificatives complétant le dossier</h2>
1515

1616
<div class="py-3">
1717
<app-display-usager-docs
18-
[usager]="usager"
18+
[me]="me"
1919
[editPJ]="true"
20+
[usager]="usager"
2021
></app-display-usager-docs>
2122
</div>
2223

packages/frontend/src/app/modules/usager-notes/components/base-usager-notes/base-usager-notes.component.ts

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,28 @@ export class BaseUsagerNotesComponent implements OnInit, OnDestroy {
6060
.pipe(select(selectUsagerById(this.usager.ref)), take(1))
6161
.subscribe((usager: UsagerLight) => {
6262
if (usager) {
63-
this.subscription.add(
64-
this.usagerNotesService
65-
.getNotes(usager, this.params, this.getArchivedNotes)
66-
.subscribe({
67-
next: (notes: PageResults<UsagerNote>) => {
68-
this.notes = notes.data;
69-
this.loading = false;
70-
},
71-
error: () => {
72-
this.toastService.error("Impossible d'afficher les notes");
73-
this.loading = false;
74-
},
75-
})
76-
);
63+
this.getNotes(usager);
7764
}
7865
});
7966
}
8067

68+
private getNotes(usager: UsagerLight) {
69+
this.subscription.add(
70+
this.usagerNotesService
71+
.getNotes(usager, this.params, this.getArchivedNotes)
72+
.subscribe({
73+
next: (notes: PageResults<UsagerNote>) => {
74+
this.notes = notes.data;
75+
this.loading = false;
76+
},
77+
error: () => {
78+
this.toastService.error("Impossible d'afficher les notes");
79+
this.loading = false;
80+
},
81+
})
82+
);
83+
}
84+
8185
public closeModals() {
8286
this.modalService.dismissAll();
8387
}

packages/frontend/src/app/modules/usager-shared/components/display-usager-docs/display-usager-docs.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<th scope="col">Ajouté le</th>
2424
<th scope="col" class="d-print-none text-end">Actions</th>
2525
</tr>
26-
2726
<tr
2827
*ngFor="let document of docs; let indexDocs = index"
2928
[attr.aria-rowindex]="indexDocs + 1"

0 commit comments

Comments
 (0)