Feature/regulatory statements #325

nvdk · 2022-09-12T12:50:11Z

reworking #317 a bit for a cleaner diff, needs lblod/app-gelinkt-notuleren#111 as a backend

- list view working - can create new statements - edit page needs more work

nvdk · 2022-09-15T11:19:06Z

app/components/document-creator.js

@@ -81,7 +81,7 @@ export default class DocumentCreatorComponent extends Component {
    if (this.template) {
      if (this.template.reload) {
        // regular templates from templatesForContext do not return body of template
-        await this.template.reload();
+        await this.template.reload(this.template);


this is odd, reload doesn't require a param afaik:
https://api.emberjs.com/ember-data/3.28/classes/Model/methods/reload?anchor=reload

aah but here's the fun part
template is not an ember-data model here
look at the RegulatoryAttachmentsFetcher service
it makes a raw sparql request and from the bindings it creates an object which does have a reload method that takes an argument

Ah yes sorry, forgot about this comment, basically I wanted to make it compatible with the old document creator and it was the best way I came up with

If anyone has a better idea feel free to suggest it

but, why? we already check if the object has a reload function and only execute reload then?

Because I need a hook to fetch the template content, so I don't fetch all the contents before the user selects the one he wants to use.

nvdk · 2022-09-15T11:21:07Z

app/services/regulatory-attachments-fetcher.js

@@ -51,8 +53,14 @@ export default class RegulatoryAttachmentsFetcher extends Service {
      const templates = bindings.map((binding) => ({
        container: binding.container.value,
        title: binding.title.value,
+        reload: async (template) => {
+          const response = await fetch(
+            `${config.regulatoryStatementPreviewEndpoint}/${binding.uuid.value}`


as discussed I think this should use the regular file service

created https://binnenland.atlassian.net/browse/GN-3732

come on it's the year 2022

the original regex was too loose, it picked up variable specs of the form ${name} and then tried to evaluate "name". Replaced with an exact match for ${generateUuid()} since that's all we support anyway.

to avoid npm woes from overly strict peerdep on editor

Repair basic RB registry integration

lagartoverde

Works as expected, but the table of contents plugin is not updating at all

elpoelma · 2022-10-04T08:25:15Z

Works as expected, but the table of contents plugin is not updating at all

I will look into it.

elpoelma · 2022-10-04T08:54:09Z

The issue with the table of contents not updating with the template content lies in the article-structure-plugin. The main issue is that two different divs with the type say:DocumentContent are created:

one div with the structure of the template
one div with the 'Insert here' text
The problem is that the first div with say:DocumentContent does not contain the necessary prefixes for the editor to resolve the rdfa of its content, that is why the table of contents can not detect it.

elpoelma · 2022-10-04T10:07:26Z

This PR for the registry: lblod/frontend-reglementaire-bijlage#27 adds new prefixes to the root of the document so the rdfa content is correctly resolved. It also changes the type-uri for a reglementaire bijlage.

… backend PR is merged

abeforgit

doesnt work (anymore)
creating a template errors out
and this is with setting the endpoints correctly to the dev server

elpoelma · 2022-10-04T19:00:50Z

doesnt work (anymore) creating a template errors out and this is with setting the endpoints correctly to the dev server

Locally it seems to work for me, what specific errors do you get? JSON parsing errors?

abeforgit · 2022-10-04T19:12:03Z

yep my bad, set up the wrong preview endpoint

nvdk · 2022-10-05T08:30:58Z

so I understand correctly the outstanding issues (TOC not updating) is an issue in the registry and this is ready to be merged?

elpoelma · 2022-10-05T08:45:04Z

so I understand correctly the outstanding issues (TOC not updating) is an issue in the registry and this is ready to be merged?

The issue is also solved in the registry and is merged.

abeforgit · 2022-10-05T10:36:49Z

app/routes/inbox/regulatory-statements.js

+
+  async model(params) {
+    const options = {
+      sort: params.sort,


this view should sort on date created by default
https://binnenland.atlassian.net/browse/GN-3735 tracked here if too much work

…d-on-valid-throught

…ught Filter based on validThrough property

…-contents-plugin

Update toc plugin which fixes issues with overflowing entries

abeforgit · 2022-10-05T13:55:17Z

about the endpoints, do we add the dev backends in the dev env like we do for roadsigns?
I could see it being annoying if you want to override that backend with an env var on your local, but on the other hand, how often would that happen anyway

edit: this is done now

Add RB endpoints to devenv

the template referenced all kinds of stuff that should be on the controller, except there was no controller

the param was never passed to the query, so the value was never used. We were lucky the default size of 20 seems like a sensible amount.

Fix sorting, search and pagination on RS overview page

nvdk and others added 11 commits September 12, 2022 13:27

bump @lblod/ember-rdfa-editor-citaten-plugin to 0.17.3

d6a2aab

added ember-rdfa-editor-table-of-contents-plugin

3ef47e4

table of contents working pending plugin update

9810450

update article structure plugin

0d3351e

fix scroll issue on regulatory statements

4f8f623

update plugins

816f490

add mockup of regulatory statements

18a7720

add modal

ae8d8eb

prototype overview

7c53a74

add versions, reduce columns

dcf0c9c

design tweaks

b8bbcc0

nvdk changed the base branch from master to futurenow September 12, 2022 12:52

bump caniuse browser definitions

01a09c4

nvdk changed the base branch from futurenow to master September 12, 2022 12:54

Niels V added 3 commits September 12, 2022 15:16

regulatory statements overview: fetch data from backend

a3985d5

abstract document creator for reuse in regulatory statements

d164bb9

initial wiring of regulatory statements prototype

6cabc35

- list view working - can create new statements - edit page needs more work

nvdk force-pushed the feature/regulatory-statements branch from 0b5ffc0 to 6cabc35 Compare September 12, 2022 14:52

lagartoverde added 2 commits September 13, 2022 14:30

Fetch templates from backend

164b72e

it should work, needs testing

c63dffb

nvdk commented Sep 15, 2022

View reviewed changes

lagartoverde added 3 commits September 16, 2022 16:13

now working, needs a lot more features

0769906

show view

40f8ae3

add save

726e3d9

lagartoverde force-pushed the feature/regulatory-statements branch from 29e0f5b to 726e3d9 Compare September 19, 2022 11:38

abeforgit added 5 commits September 23, 2022 03:27

refactor(cleanup): replace var with const

e836ed7

come on it's the year 2022

fix(rb-templates): use a regex that doesnt interpret variables

029561a

the original regex was too loose, it picked up variable specs of the form ${name} and then tried to evaluate "name". Replaced with an exact match for ${generateUuid()} since that's all we support anyway.

chore(deps): bump editor and some plugins

dee04d4

chore(deps): bump roadsign to last bugfix

20c65f0

to avoid npm woes from overly strict peerdep on editor

Merge pull request #326 from lblod/bug/fix-rb-integration

c8167c9

Repair basic RB registry integration

lagartoverde approved these changes Oct 4, 2022

View reviewed changes

Filter based on valid through

093a963

elpoelma and others added 4 commits October 4, 2022 12:08

add dossier and say prefixes

60d110b

Changed query to make it more semantically correct, need testing when…

8f889a0

… backend PR is merged

update toc plugin which fixes issues with overflowing entries

aa3cb19

add lblodgn prefix and lblodgn:ReglementaireBijlage uri

bf33d0b

abeforgit requested changes Oct 4, 2022

View reviewed changes

abeforgit self-requested a review October 4, 2022 19:23

Merge branch 'master' into feature/regulatory-statements

7ee4f44

Fixed typo in query

689fa7c

abeforgit requested changes Oct 5, 2022

View reviewed changes

abeforgit added 4 commits October 5, 2022 12:42

Merge branch 'feature/regulatory-statements' into feature/filter-base…

2494efc

…d-on-valid-throught

Merge pull request #333 from lblod/feature/filter-based-on-valid-thro…

ffdd2a5

…ught Filter based on validThrough property

Merge branch 'feature/regulatory-statements' into chore/bump-table-of…

abc6776

…-contents-plugin

Merge pull request #334 from lblod/chore/bump-table-of-contents-plugin

527b5ce

Update toc plugin which fixes issues with overflowing entries

abeforgit added 5 commits October 5, 2022 16:23

chore(dx): add dev RB backends to dev environment setup

abd875c

Merge pull request #335 from lblod/chore/add-rb-endpoints-to-devenv

eefbd86

Add RB endpoints to devenv

fix(RS): fix default sorting, search and pagination for RS overview

e1928d9

the template referenced all kinds of stuff that should be on the controller, except there was no controller

fix(agendapoints): make the pagesize param actually do something

ce36083

the param was never passed to the query, so the value was never used. We were lucky the default size of 20 seems like a sensible amount.

Merge pull request #336 from lblod/bug/sort-regulatory-statements

170dc78

Fix sorting, search and pagination on RS overview page

abeforgit merged commit 4632e9b into master Oct 5, 2022

abeforgit deleted the feature/regulatory-statements branch October 5, 2022 18:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/regulatory statements #325

Feature/regulatory statements #325

nvdk commented Sep 12, 2022 •

edited

Loading

nvdk Sep 15, 2022

abeforgit Oct 5, 2022

lagartoverde Oct 5, 2022

lagartoverde Oct 5, 2022

nvdk Oct 5, 2022

lagartoverde Oct 5, 2022

nvdk Sep 15, 2022

abeforgit Oct 4, 2022

lagartoverde left a comment

elpoelma commented Oct 4, 2022

elpoelma commented Oct 4, 2022

elpoelma commented Oct 4, 2022

abeforgit left a comment •

edited

Loading

elpoelma commented Oct 4, 2022

abeforgit commented Oct 4, 2022

nvdk commented Oct 5, 2022

elpoelma commented Oct 5, 2022

abeforgit Oct 5, 2022

abeforgit Oct 5, 2022

abeforgit commented Oct 5, 2022 •

edited

Loading

Feature/regulatory statements #325

Feature/regulatory statements #325

Conversation

nvdk commented Sep 12, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lagartoverde left a comment

Choose a reason for hiding this comment

elpoelma commented Oct 4, 2022

elpoelma commented Oct 4, 2022

elpoelma commented Oct 4, 2022

abeforgit left a comment • edited Loading

Choose a reason for hiding this comment

elpoelma commented Oct 4, 2022

abeforgit commented Oct 4, 2022

nvdk commented Oct 5, 2022

elpoelma commented Oct 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abeforgit commented Oct 5, 2022 • edited Loading

nvdk commented Sep 12, 2022 •

edited

Loading

abeforgit left a comment •

edited

Loading

abeforgit commented Oct 5, 2022 •

edited

Loading