From 479fa62ffb0543eea995cfbec0f618816246285d Mon Sep 17 00:00:00 2001 From: Niels V Date: Wed, 7 Feb 2024 15:44:44 +0100 Subject: [PATCH 1/3] fetch content from file if not present on the versioned-notulen --- app/controllers/meetings/publish/notulen.js | 5 +++++ app/models/versioned-notulen.js | 1 + 2 files changed, 6 insertions(+) diff --git a/app/controllers/meetings/publish/notulen.js b/app/controllers/meetings/publish/notulen.js index 18043b2f7..f4065c67b 100644 --- a/app/controllers/meetings/publish/notulen.js +++ b/app/controllers/meetings/publish/notulen.js @@ -3,6 +3,7 @@ import Controller from '@ember/controller'; import { task } from 'ember-concurrency'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; +import { isEmpty } from '@ember/utils'; export default class MeetingsPublishNotulenController extends Controller { @service store; @@ -148,6 +149,10 @@ export default class MeetingsPublishNotulenController extends Controller { this.publishedResource = publishedResource; } this.publicBehandelingUris = publicNotulen.publicBehandelingen || []; + if (isEmpty(publicNotulen.content)) { + const fileMeta = await publicNotulen.file; + publicNotulen.content = await (await fetch(fileMeta.downloadLink)).text(); + } this.notulen = publicNotulen; } else { try { diff --git a/app/models/versioned-notulen.js b/app/models/versioned-notulen.js index 53cd26242..5f72b3e20 100644 --- a/app/models/versioned-notulen.js +++ b/app/models/versioned-notulen.js @@ -14,4 +14,5 @@ export default class VersionedNotulesModel extends Model { publishedResource; @belongsTo('editor-document', { inverse: null }) editorDocument; @belongsTo('zitting', { inverse: null }) zitting; + @belongsTo('file', { inverse: null }) file; } From 088527e241defa9c6badc4a3e137951f7bd830ab Mon Sep 17 00:00:00 2001 From: abeforgit Date: Wed, 20 Mar 2024 21:37:28 +0100 Subject: [PATCH 2/3] add changeset --- .changeset/calm-baboons-itch.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/calm-baboons-itch.md diff --git a/.changeset/calm-baboons-itch.md b/.changeset/calm-baboons-itch.md new file mode 100644 index 000000000..02597d8d9 --- /dev/null +++ b/.changeset/calm-baboons-itch.md @@ -0,0 +1,5 @@ +--- +"frontend-gelinkt-notuleren": minor +--- + +support notulen publications as files From e3ee35a248b38a0caf27c6d4427eb8ee07085e51 Mon Sep 17 00:00:00 2001 From: abeforgit Date: Thu, 21 Mar 2024 03:38:11 +0100 Subject: [PATCH 3/3] fix: lint --- app/controllers/meetings/publish/notulen.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/meetings/publish/notulen.js b/app/controllers/meetings/publish/notulen.js index f4065c67b..b05f4a77f 100644 --- a/app/controllers/meetings/publish/notulen.js +++ b/app/controllers/meetings/publish/notulen.js @@ -151,7 +151,9 @@ export default class MeetingsPublishNotulenController extends Controller { this.publicBehandelingUris = publicNotulen.publicBehandelingen || []; if (isEmpty(publicNotulen.content)) { const fileMeta = await publicNotulen.file; - publicNotulen.content = await (await fetch(fileMeta.downloadLink)).text(); + publicNotulen.content = await ( + await fetch(fileMeta.downloadLink) + ).text(); } this.notulen = publicNotulen; } else {