@lblod/ember-rdfa-editor-lblod-plugins 35.6.0 → 36.0.0-dev.4018d7344a8035f5d7c13157cfa138608306e73c

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/.changeset/empty-swans-study.md +5 -0
  2. package/.changeset/moody-paws-punch.md +5 -0
  3. package/CHANGELOG.md +20 -0
  4. package/addon/components/roadsign-regulation-plugin/expanded-measure.gts +85 -15
  5. package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts +10 -0
  6. package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts +3 -0
  7. package/addon/plugins/decision-plugin/actions/insert-article.ts +89 -46
  8. package/addon/plugins/location-plugin/utils/get-document-locations.ts +63 -0
  9. package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts +7 -83
  10. package/addon/plugins/roadsign-regulation-plugin/helpers/construct-measure-fragment.ts +96 -0
  11. package/addon/plugins/structure-plugin/monads/regenerate-rdfa-links.ts +113 -40
  12. package/addon/plugins/variable-plugin/actions/create-classic-location-variable.ts +3 -10
  13. package/addon/plugins/variable-plugin/contextual-actions/index.ts +188 -0
  14. package/addon/plugins/variable-plugin/utils/codelist-utils.ts +1 -1
  15. package/addon/utils/document-structure-utils.ts +17 -0
  16. package/addon/utils/set-utils.ts +18 -0
  17. package/declarations/addon/components/roadsign-regulation-plugin/expanded-measure.d.ts +22 -1
  18. package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts +2 -1
  19. package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-table.d.ts +2 -0
  20. package/declarations/addon/plugins/decision-plugin/actions/insert-article.d.ts +1 -0
  21. package/declarations/addon/plugins/location-plugin/utils/get-document-locations.d.ts +4 -0
  22. package/declarations/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.d.ts +2 -1
  23. package/declarations/addon/plugins/roadsign-regulation-plugin/helpers/construct-measure-fragment.d.ts +4 -0
  24. package/declarations/addon/plugins/structure-plugin/monads/regenerate-rdfa-links.d.ts +6 -0
  25. package/declarations/addon/plugins/variable-plugin/actions/create-classic-location-variable.d.ts +1 -1
  26. package/declarations/addon/plugins/variable-plugin/contextual-actions/index.d.ts +17 -0
  27. package/declarations/addon/plugins/variable-plugin/utils/codelist-utils.d.ts +10 -0
  28. package/declarations/addon/utils/document-structure-utils.d.ts +6 -0
  29. package/declarations/addon/utils/set-utils.d.ts +8 -0
  30. package/package.json +3 -3
  31. package/translations/en-US.yaml +5 -1
  32. package/translations/nl-BE.yaml +9 -5
@@ -0,0 +1,5 @@
1
+ ---
2
+ '@lblod/ember-rdfa-editor-lblod-plugins': patch
3
+ ---
4
+
5
+ fix function signature for place description context actions
@@ -0,0 +1,5 @@
1
+ ---
2
+ '@lblod/ember-rdfa-editor-lblod-plugins': patch
3
+ ---
4
+
5
+ Improve performance of automatic structure-linking
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @lblod/ember-rdfa-editor-lblod-plugins
2
2
 
3
+ ## 36.0.0
4
+
5
+ ### Major Changes
6
+
7
+ - [#637](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/637) [`d2d939b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d2d939bd5fe39e51146ad1df777aa48d6f54236b) Thanks [@kobemertens](https://github.com/kobemertens)! - Bump editor
8
+
9
+ - [#637](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/637) [`23a40c0`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/23a40c0389687eb34933fd2e740789ac29450e1e) Thanks [@kobemertens](https://github.com/kobemertens)! - Add contextual actions for inserting place descriptions
10
+
11
+ ### Minor Changes
12
+
13
+ - [#651](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/651) [`c03484c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/c03484cd40fca81c9cdeafa3f0d5f2dcbb6b340f) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Add function to search the document for oslo locations
14
+
15
+ ### Patch Changes
16
+
17
+ - [#643](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/643) [`42cd09c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/42cd09c7b199b7c4f487d90b1823f272fe5ff0ab) Thanks [@kobemertens](https://github.com/kobemertens)! - Add slash commands plugin
18
+
19
+ - [#648](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/648) [`329813f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/329813f43ee6cdbc25a8c0acb18ba2188f753d1b) Thanks [@kobemertens](https://github.com/kobemertens)! - Adds ability to choose insert position for a mobility measure article
20
+
21
+ - [`8ac430e`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/8ac430e1b89167275c7cceeb50e331bfe271e46a) Thanks [@kobemertens](https://github.com/kobemertens)! - fix translation mobility measure insert position
22
+
3
23
  ## 35.6.0
4
24
 
5
25
  ### Minor Changes
@@ -5,7 +5,6 @@ import { tracked } from '@glimmer/tracking';
5
5
  import t from 'ember-intl/helpers/t';
6
6
  import MeasurePreview from './measure-preview';
7
7
  import AuRadioGroup from '@appuniversum/ember-appuniversum/components/au-radio-group';
8
- import AuButtonGroup from '@appuniversum/ember-appuniversum/components/au-button-group';
9
8
  import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
10
9
  import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
11
10
  import { action } from '@ember/object';
@@ -16,10 +15,15 @@ import {
16
15
  } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
17
16
  import { Task } from 'ember-concurrency';
18
17
  import { isSome } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
18
+ import set from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/set';
19
+ import { service } from '@ember/service';
20
+ import IntlService from 'ember-intl/services/intl';
21
+ import { PNode } from '@lblod/ember-rdfa-editor';
22
+ import PowerSelect from 'ember-power-select/components/power-select';
19
23
 
20
24
  export type InsertMobilityMeasureTask = Task<
21
25
  void,
22
- [MobilityMeasureConcept, ZonalOrNot, boolean]
26
+ [MobilityMeasureConcept, ZonalOrNot, boolean, number?]
23
27
  >;
24
28
  type Signature = {
25
29
  Args: {
@@ -27,12 +31,43 @@ type Signature = {
27
31
  selectRow: (uri: string) => void;
28
32
  insert: InsertMobilityMeasureTask;
29
33
  endpoint: string;
34
+ articleNodes: PNode[];
30
35
  };
31
36
  };
32
37
 
38
+ type InsertPositionOption = {
39
+ label: string;
40
+ position: 'first' | 'last' | 'custom';
41
+ insertIndex?: number;
42
+ };
43
+
33
44
  export default class ExpandedMeasure extends Component<Signature> {
45
+ @service declare intl: IntlService;
46
+
34
47
  @tracked zonalityValue?: ZonalOrNot;
35
48
  @tracked temporalValue?: boolean;
49
+ @tracked selectedInsertPosition: InsertPositionOption;
50
+
51
+ insertPositionOptionFirst: InsertPositionOption;
52
+ insertPositionOptionLast: InsertPositionOption;
53
+
54
+ constructor(owner: unknown, args: Signature['Args']) {
55
+ super(owner, args);
56
+ this.insertPositionOptionFirst = {
57
+ label: this.intl.t(
58
+ 'editor-plugins.roadsign-regulation.expanded-measure.as-first-article',
59
+ ),
60
+ position: 'first',
61
+ insertIndex: 0,
62
+ };
63
+ this.insertPositionOptionLast = {
64
+ label: this.intl.t(
65
+ 'editor-plugins.roadsign-regulation.expanded-measure.as-last-article',
66
+ ),
67
+ position: 'last',
68
+ };
69
+ this.selectedInsertPosition = this.insertPositionOptionLast;
70
+ }
36
71
 
37
72
  get isPotentiallyZonal() {
38
73
  return this.args.concept.zonality === ZONALITY_OPTIONS.POTENTIALLY_ZONAL;
@@ -41,6 +76,7 @@ export default class ExpandedMeasure extends Component<Signature> {
41
76
  get insertButtonDisabled() {
42
77
  return (
43
78
  (this.isPotentiallyZonal && !this.zonalityValue) ||
79
+ this.args.insert.isRunning ||
44
80
  (this.args.concept.variableSignage && !isSome(this.temporalValue))
45
81
  );
46
82
  }
@@ -57,11 +93,13 @@ export default class ExpandedMeasure extends Component<Signature> {
57
93
 
58
94
  @action
59
95
  insert() {
96
+ const { insertIndex } = this.selectedInsertPosition;
60
97
  this.args.insert.perform(
61
98
  this.args.concept,
62
99
  // POTENTIALLY_ZONAL option is filtered out by requiring a zonalityValue to submit
63
100
  (this.zonalityValue ?? this.args.concept.zonality) as ZonalOrNot,
64
101
  this.temporalValue ?? false,
102
+ insertIndex,
65
103
  );
66
104
  }
67
105
 
@@ -70,6 +108,29 @@ export default class ExpandedMeasure extends Component<Signature> {
70
108
  this.args.selectRow(this.args.concept.uri);
71
109
  }
72
110
 
111
+ get articlesInDocument() {
112
+ return this.args.articleNodes;
113
+ }
114
+
115
+ get insertPositionOptions() {
116
+ return [
117
+ this.insertPositionOptionLast,
118
+ this.insertPositionOptionFirst,
119
+ ...this.articlesInDocument.slice(1).map((_, index) => ({
120
+ label: this.intl.t(
121
+ 'editor-plugins.roadsign-regulation.expanded-measure.after-article-x',
122
+ { articleNumber: index + 1 },
123
+ ),
124
+ position: 'custom',
125
+ insertIndex: index + 1,
126
+ })),
127
+ ];
128
+ }
129
+
130
+ get insertPositionDropdownTitle() {
131
+ return this.selectedInsertPosition?.label.toLowerCase();
132
+ }
133
+
73
134
  <template>
74
135
  <tr class='au-c-data-table__detail'>
75
136
  <td colspan='5' class='au-o-flow au-o-flow--small'>
@@ -135,19 +196,28 @@ export default class ExpandedMeasure extends Component<Signature> {
135
196
  </AuRadioGroup>
136
197
  </div>
137
198
  {{/if}}
138
- <AuButtonGroup>
139
- <AuButton
140
- {{on 'click' this.insert}}
141
- @loading={{@insert.isRunning}}
142
- @loadingMessage={{t 'common.loading'}}
143
- @disabled={{this.insertButtonDisabled}}
144
- >
145
- {{t 'editor-plugins.utils.insert'}}
146
- </AuButton>
147
- <AuButton @skin='secondary' {{on 'click' this.unselectRow}}>
148
- {{t 'editor-plugins.utils.cancel'}}
149
- </AuButton>
150
- </AuButtonGroup>
199
+ <AuHeading @level='6' @skin='6'>
200
+ {{t
201
+ 'editor-plugins.roadsign-regulation.expanded-measure.insert-position'
202
+ }}
203
+ </AuHeading>
204
+ <PowerSelect
205
+ class='au-u-1-5'
206
+ @allowClear={{false}}
207
+ @onChange={{set this 'selectedInsertPosition'}}
208
+ @selected={{this.selectedInsertPosition}}
209
+ @options={{this.insertPositionOptions}}
210
+ as |option|
211
+ >{{option.label}}</PowerSelect>
212
+ <AuButton
213
+ {{on 'click' this.insert}}
214
+ @skin='primary'
215
+ @loading={{@insert.isRunning}}
216
+ @loadingMessage={{t 'common.loading'}}
217
+ @disabled={{this.insertButtonDisabled}}
218
+ >
219
+ {{t 'common.insert'}}
220
+ </AuButton>
151
221
  </td>
152
222
  </tr>
153
223
  </template>
@@ -41,6 +41,7 @@ import { Variable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsig
41
41
  import { generateVariableInstanceUri } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/variable-helpers';
42
42
  import { mapObject } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/map-object';
43
43
  import { v4 as uuid } from 'uuid';
44
+ import { getArticleNodes } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/document-structure-utils';
44
45
 
45
46
  type Option = {
46
47
  uri: string;
@@ -319,6 +320,7 @@ export default class RoadsignsModal extends Component<Signature> {
319
320
  concept: MobilityMeasureConcept,
320
321
  zonality: ZonalOrNot,
321
322
  temporal: boolean,
323
+ position?: number,
322
324
  ) => {
323
325
  if (!this.decisionLocation) {
324
326
  return;
@@ -355,6 +357,7 @@ export default class RoadsignsModal extends Component<Signature> {
355
357
  decisionUri,
356
358
  zonality,
357
359
  temporal,
360
+ position,
358
361
  })(this.controller.mainEditorState).transaction;
359
362
  },
360
363
  { view: this.controller.mainEditorView },
@@ -386,6 +389,12 @@ export default class RoadsignsModal extends Component<Signature> {
386
389
  this.pageNumber = pageNumber;
387
390
  }
388
391
 
392
+ get articleNodes() {
393
+ return getArticleNodes(this.controller.mainEditorState).map(
394
+ (node) => node.node,
395
+ );
396
+ }
397
+
389
398
  <template>
390
399
  <AuModal
391
400
  class='au-c-modal--flush'
@@ -516,6 +525,7 @@ export default class RoadsignsModal extends Component<Signature> {
516
525
  @isLoading={{this.measureConceptsQuery.isRunning}}
517
526
  @insert={{this.insertMeasure}}
518
527
  @options={{@options}}
528
+ @articleNodes={{this.articleNodes}}
519
529
  />
520
530
  {{#if this.measureConceptCount}}
521
531
  {{#let
@@ -21,6 +21,7 @@ import { on } from '@ember/modifier';
21
21
  import { fn } from '@ember/helper';
22
22
  import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
23
23
  import removeZFromLabel from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/helpers/removeZFromLabel';
24
+ import { PNode } from '@lblod/ember-rdfa-editor';
24
25
 
25
26
  type Signature = {
26
27
  Args: {
@@ -28,6 +29,7 @@ type Signature = {
28
29
  content?: MobilityMeasureConcept[];
29
30
  isLoading?: boolean;
30
31
  insert: InsertMobilityMeasureTask;
32
+ articleNodes: PNode[];
31
33
  };
32
34
  };
33
35
 
@@ -163,6 +165,7 @@ export default class RoadSignsTable extends Component<Signature> {
163
165
  @insert={{@insert}}
164
166
  @selectRow={{this.selectRow}}
165
167
  @endpoint={{@options.endpoint}}
168
+ @articleNodes={{@articleNodes}}
166
169
  />
167
170
  {{/if}}
168
171
  {{else}}
@@ -20,6 +20,7 @@ interface InsertArticleToDecisionArgs {
20
20
  node: PNode;
21
21
  decisionUri: string;
22
22
  insertFreely?: false;
23
+ position?: number;
23
24
  }
24
25
  interface InsertArticleFreelyArgs {
25
26
  node: PNode;
@@ -46,7 +47,7 @@ export function insertArticle(
46
47
  };
47
48
  }
48
49
 
49
- const { decisionUri } = args;
50
+ const { decisionUri, position } = args;
50
51
  const decision = getNodesBySubject(state, decisionUri)[0];
51
52
  if (!decision) {
52
53
  return {
@@ -55,56 +56,98 @@ export function insertArticle(
55
56
  result: false,
56
57
  };
57
58
  }
59
+
58
60
  const decisionResource = decision.value.attrs.subject;
59
61
  const container = getOutgoingTriple(decision.value.attrs, PROV('value'));
60
- if (container) {
61
- const location = findNodeByRdfaId(state.doc, container.object.value);
62
- if (location) {
63
- const insertLocation = location.pos + location.value.nodeSize - 1;
64
- const factory = new SayDataFactory();
65
- const tr = state.tr;
66
- const combiResult = transactionCombinator(
67
- state,
68
- tr.replaceWith(insertLocation, insertLocation, node),
69
- )([
70
- addPropertyToNode({
71
- resource: decisionResource,
72
- property: {
73
- predicate: ELI('has_part').full,
74
- object: factory.resourceNode(node.attrs.subject),
75
- },
76
- }),
77
- recalculateNumbers,
78
- ]);
79
-
80
- const { result, transaction } = combiResult;
81
-
82
- transaction.setSelection(
83
- TextSelection.create(
84
- transaction.doc,
85
- insertLocation + 1,
86
- insertLocation + node.nodeSize - 1,
87
- ),
88
- );
89
-
90
- transaction.scrollIntoView();
91
- return {
92
- initialState: state,
93
- transaction,
94
- result: result.every((ok) => ok),
95
- };
96
- } else {
97
- return {
98
- initialState: state,
99
- transaction: state.tr,
100
- result: false,
101
- };
102
- }
62
+ if (!container) {
63
+ return {
64
+ initialState: state,
65
+ transaction: state.tr,
66
+ result: false,
67
+ };
68
+ }
69
+
70
+ const location = findNodeByRdfaId(state.doc, container.object.value);
71
+ if (!location) {
72
+ return {
73
+ initialState: state,
74
+ transaction: state.tr,
75
+ result: false,
76
+ };
103
77
  }
78
+
79
+ const insertLocation = resolveInsertLocation(location, position);
80
+
81
+ const factory = new SayDataFactory();
82
+ const tr = state.tr;
83
+ const combiResult = transactionCombinator(
84
+ state,
85
+ tr.replaceWith(insertLocation, insertLocation, node),
86
+ )([
87
+ addPropertyToNode({
88
+ resource: decisionResource,
89
+ property: {
90
+ predicate: ELI('has_part').full,
91
+ object: factory.resourceNode(node.attrs.subject),
92
+ },
93
+ }),
94
+ recalculateNumbers,
95
+ ]);
96
+
97
+ const { result, transaction } = combiResult;
98
+
99
+ transaction.setSelection(
100
+ TextSelection.create(
101
+ transaction.doc,
102
+ insertLocation + 1,
103
+ insertLocation + node.nodeSize - 1,
104
+ ),
105
+ );
106
+
107
+ transaction.scrollIntoView();
104
108
  return {
105
109
  initialState: state,
106
- transaction: state.tr,
107
- result: false,
110
+ transaction,
111
+ result: result.every((ok) => ok),
108
112
  };
109
113
  };
110
114
  }
115
+
116
+ /**
117
+ * Resolves the document position at which to insert a new article node
118
+ *
119
+ * - If `position` is undefined, insert at the end of the container.
120
+ * - If `position` is 0, insert before the first child.
121
+ * - If `position` >= childCount, insert after the last child (append).
122
+ * - Otherwise, insert before the child at that index.
123
+ */
124
+ function resolveInsertLocation(
125
+ location: { pos: number; value: PNode },
126
+ position: number | undefined,
127
+ ): number {
128
+ const containerNode = location.value;
129
+
130
+ if (position === undefined) {
131
+ return location.pos + containerNode.nodeSize - 1;
132
+ }
133
+
134
+ const childCount = containerNode.childCount;
135
+
136
+ if (position >= childCount) {
137
+ return location.pos + containerNode.nodeSize - 1;
138
+ }
139
+
140
+ let offset = location.pos + 1; // +1 to step inside the container node
141
+ let articleIndex = 0;
142
+ for (const child of containerNode.children) {
143
+ if (articleIndex === position) {
144
+ return offset;
145
+ }
146
+ offset += child.nodeSize;
147
+ if (child.attrs.structureType === 'article') {
148
+ articleIndex += 1;
149
+ }
150
+ }
151
+
152
+ return location.pos + containerNode.nodeSize - 1;
153
+ }
@@ -0,0 +1,63 @@
1
+ import { EditorState } from '@lblod/ember-rdfa-editor';
2
+ import { Area, Place } from './geo-helpers';
3
+ import { Address } from './address-helpers';
4
+
5
+ type LocationsWithDistanceType = {
6
+ location: Place | Address | Area;
7
+ distance: number;
8
+ };
9
+
10
+ type LocationMetadataType = {
11
+ [locationUri: string]: { ocurrences: number; distance: number };
12
+ };
13
+
14
+ export default function getDocumentLocations(state: EditorState) {
15
+ const doc = state.doc;
16
+ const locationsWithDistance: LocationsWithDistanceType[] = [];
17
+ const selection = state.selection;
18
+ doc.descendants((node, pos) => {
19
+ if (node.type.name === 'oslo_location') {
20
+ const distance = Math.abs(pos - selection.from);
21
+ locationsWithDistance.push({
22
+ location: node.attrs.value,
23
+ distance: distance,
24
+ });
25
+ return false;
26
+ }
27
+ return true;
28
+ });
29
+ const locationMetadata: LocationMetadataType = {};
30
+ const locationsDedup: (Place | Address | Area)[] = [];
31
+ for (const locationWithDistance of locationsWithDistance) {
32
+ const uri =
33
+ (locationWithDistance.location as Address).belgianAddressUri ||
34
+ locationWithDistance.location.uri;
35
+ if (!locationMetadata[uri]) {
36
+ locationMetadata[uri] = {
37
+ ocurrences: 1,
38
+ distance: locationWithDistance.distance,
39
+ };
40
+ locationsDedup.push(locationWithDistance.location);
41
+ } else {
42
+ locationMetadata[uri].ocurrences++;
43
+ if (locationWithDistance.distance < locationMetadata[uri].distance) {
44
+ locationMetadata[uri].distance = locationWithDistance.distance;
45
+ }
46
+ }
47
+ }
48
+
49
+ const locations = locationsDedup.sort((a, b) => {
50
+ const uriA = (a as Address).belgianAddressUri || a.uri;
51
+ const uriB = (b as Address).belgianAddressUri || b.uri;
52
+ if (
53
+ locationMetadata[uriA].ocurrences === locationMetadata[uriB].ocurrences
54
+ ) {
55
+ return locationMetadata[uriA].distance - locationMetadata[uriB].distance;
56
+ } else {
57
+ return (
58
+ locationMetadata[uriB].ocurrences - locationMetadata[uriA].ocurrences
59
+ );
60
+ }
61
+ });
62
+ return locations;
63
+ }
@@ -7,10 +7,7 @@ import {
7
7
  } from '@lblod/ember-rdfa-editor';
8
8
  import { v4 as uuid } from 'uuid';
9
9
  import { addPropertyToNode } from '@lblod/ember-rdfa-editor/utils/rdfa-utils';
10
- import {
11
- type IncomingTriple,
12
- type FullTriple,
13
- } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
10
+ import { type FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
14
11
  import {
15
12
  DCT,
16
13
  EXT,
@@ -36,16 +33,12 @@ import {
36
33
  ZONALITY_OPTIONS,
37
34
  ZonalOrNot,
38
35
  } from '../constants';
39
- import { createTextVariable } from '../../variable-plugin/actions/create-text-variable';
40
- import { createNumberVariable } from '../../variable-plugin/actions/create-number-variable';
41
- import { createDateVariable } from '../../variable-plugin/actions/create-date-variable';
42
- import { createClassicLocationVariable } from '../../variable-plugin/actions/create-classic-location-variable';
43
36
  import { isTrafficSignal, TrafficSignal } from '../schemas/traffic-signal';
44
37
  import { MobilityMeasureDesign } from '../schemas/mobility-measure-design';
45
38
  import { VariableInstance } from '../schemas/variable-instance';
46
- import { createCodelistVariable } from '../../variable-plugin/actions/create-codelist-variable';
47
39
  import removeZFromLabel from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/helpers/removeZFromLabel';
48
40
  import { namespace } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
41
+ import { constructMeasureFragment } from '../helpers/construct-measure-fragment';
49
42
 
50
43
  // This is defined locally as it's an implementation quirk that we don't want to use generally
51
44
  const RELATIE_OBJECT = namespace(
@@ -60,6 +53,7 @@ type InsertMeasureArgs = {
60
53
  variables: Record<string, VariableInstance & { __rdfaId: string }>;
61
54
  templateString: string;
62
55
  decisionUri: string;
56
+ position?: number;
63
57
  articleUriGenerator?: () => string;
64
58
  } & (
65
59
  | {
@@ -78,6 +72,7 @@ export default function insertMeasure({
78
72
  templateString,
79
73
  articleUriGenerator,
80
74
  decisionUri,
75
+ position,
81
76
  ...args
82
77
  }: InsertMeasureArgs): TransactionMonad<boolean> {
83
78
  return function (state: EditorState) {
@@ -153,7 +148,7 @@ export default function insertMeasure({
153
148
  ];
154
149
  }
155
150
  const measureUri = `http://data.lblod.info/mobiliteitsmaatregels/${uuid()}`;
156
- const measureBody = constructMeasureBody(
151
+ const measureBody = constructMeasureFragment(
157
152
  templateString,
158
153
  variables,
159
154
  schema,
@@ -221,7 +216,7 @@ export default function insertMeasure({
221
216
  ],
222
217
  externalTriples,
223
218
  },
224
- [measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
219
+ [...measureBody, ...signSection, ...(temporalNode ? [temporalNode] : [])],
225
220
  );
226
221
  const articleNode = buildArticleStructure(
227
222
  state.schema,
@@ -230,6 +225,7 @@ export default function insertMeasure({
230
225
  const initialTransaction = insertArticle({
231
226
  node: articleNode,
232
227
  decisionUri,
228
+ position,
233
229
  })(state).transaction;
234
230
  const resultingSelection = initialTransaction.selection;
235
231
  const { transaction, result } = transactionCombinator(
@@ -268,34 +264,6 @@ export default function insertMeasure({
268
264
  };
269
265
  }
270
266
 
271
- function constructMeasureBody(
272
- templateString: string,
273
- variables: Record<string, VariableInstance>,
274
- schema: Schema,
275
- backlinks?: IncomingTriple[],
276
- ) {
277
- const parts = templateString.split(/(\$\{[^{}$]+\})/);
278
- const nodes = [];
279
- for (const part of parts) {
280
- if (!part) {
281
- continue;
282
- }
283
- const match = /^\$\{([^{}$]+)\}$/.exec(part);
284
- if (match) {
285
- const variableName = match[1];
286
- const matchedVariable = variables[variableName];
287
- if (matchedVariable) {
288
- nodes.push(constructVariableNode(matchedVariable, schema, backlinks));
289
- } else {
290
- nodes.push(schema.text(part));
291
- }
292
- } else {
293
- nodes.push(schema.text(part));
294
- }
295
- }
296
- return schema.nodes.paragraph.create({}, nodes);
297
- }
298
-
299
267
  function determineSignLabel(signConcept: TrafficSignalConcept) {
300
268
  switch (signConcept.type) {
301
269
  case TRAFFIC_SIGNAL_CONCEPT_TYPES.TRAFFIC_LIGHT:
@@ -363,47 +331,3 @@ function constructSignalNode(
363
331
  );
364
332
  return node;
365
333
  }
366
-
367
- function constructVariableNode(
368
- variableInstance: VariableInstance,
369
- schema: Schema,
370
- backlinks?: IncomingTriple[],
371
- ) {
372
- const variable = variableInstance.variable;
373
- const valueStr =
374
- variableInstance.value instanceof Date
375
- ? variableInstance.value.toISOString()
376
- : variableInstance.value?.toString();
377
- const args = {
378
- schema,
379
- backlinks,
380
- variable: variable.uri,
381
- variableInstance: variableInstance.uri,
382
- __rdfaId: variableInstance.__rdfaId,
383
- value: valueStr,
384
- valueLabel:
385
- 'valueLabel' in variableInstance
386
- ? variableInstance.valueLabel
387
- : undefined,
388
- label: variable.label,
389
- };
390
- switch (variable.type) {
391
- case 'text':
392
- return createTextVariable(args);
393
- case 'number':
394
- return createNumberVariable(args);
395
- case 'date':
396
- return createDateVariable(args);
397
- case 'codelist':
398
- return createCodelistVariable({
399
- ...args,
400
- source: variable.source,
401
- codelist: variable.codelistUri,
402
- });
403
- case 'location':
404
- return createClassicLocationVariable({
405
- ...args,
406
- source: variable.source,
407
- });
408
- }
409
- }