@lblod/ember-rdfa-editor-lblod-plugins 32.0.0 → 32.1.0-dev.2e9fd650499765c0030b9262f90aa975fdfd7a2f

package/.changeset/empty-donkeys-change.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add new plugin for document validation with SHACL

package/.changeset/tidy-dancers-grow.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Fix missing translations in citation-plugin

package/.changeset/wicked-tools-serve.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Improve translations of worship-plugin (capitalization, add missing translations etc.)

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 32.1.0
+
+### Minor Changes
+
+- [#573](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/573) [`be9e2f4`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/be9e2f476266037926f43f2729aae7e969c55652) Thanks [@elpoelma](https://github.com/elpoelma)! - Roadsign-regulation-plugin: differentiate between 'Verkeersbord' and 'Onderbord' signs
+
+### Patch Changes
+
+- [#576](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/576) [`c68bef3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/c68bef3a3e215e0d721894b72f8e0754b9988ca9) Thanks [@elpoelma](https://github.com/elpoelma)! - Slightly readjust styling of `snippet` and `structure` nodes, to ensure better cursor behaviour in firefox.
+  Note: for the better cursor behaviour in firefox to work as expected, `@lblod/ember-rdfa-editor` version [12.8.0](https://github.com/lblod/ember-rdfa-editor/releases/tag/%40lblod%2Fember-rdfa-editor%4012.8.0) or higher needs to be installed.
+
 ## 32.0.0
 
 ### Major Changes

package/addon/components/citation-plugin/citations/search-modal.hbs

@@ -38,8 +38,8 @@
                 @allowClear={{false}}
                 @disabled={{false}}
                 @searchEnabled={{true}}
-                @loadingMessage={{t 'citaten-plugin.alert.loading'}}
-                @noMatchesMessage={{t 'citaten-plugin.alert.no-results'}}
+                @loadingMessage={{t 'common.loading'}}
+                @noMatchesMessage={{t 'common.search.no-results'}}
                 @searchMessage={{t 'citaten-plugin.search.placeholder'}}
                 @options={{this.legislationTypes}}
                 @selected={{this.legislationSelected}}

package/addon/components/document-validation-plugin/card.gts

@@ -0,0 +1,131 @@
+import Component from '@glimmer/component';
+import { SayController } from '@lblod/ember-rdfa-editor';
+import AuCard from '@appuniversum/ember-appuniversum/components/au-card';
+import { documentValidationPluginKey } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-validation-plugin';
+import AuIcon from '@appuniversum/ember-appuniversum/components/au-icon';
+import { CloseFilledIcon } from '@appuniversum/ember-appuniversum/components/icons/close-filled';
+import { CheckFilledIcon } from '@appuniversum/ember-appuniversum/components/icons/check-filled';
+import { selectNodeBySubject } from '@lblod/ember-rdfa-editor/commands/_private/rdfa-commands/select-node-by-subject';
+import { on } from '@ember/modifier';
+import { fn } from '@ember/helper';
+import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
+import { ExternalLinkIcon } from '@appuniversum/ember-appuniversum/components/icons/external-link';
+import removeQuotes from '@lblod/ember-rdfa-editor-lblod-plugins/utils/remove-quotes';
+import t from 'ember-intl/helpers/t';
+import type { ShaclValidationReport } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-validation-plugin';
+import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+
+interface Sig {
+  Args: {
+    controller: SayController;
+  };
+}
+
+export default class DocumentValidationPluginCard extends Component<Sig> {
+  get documentValidationErrors() {
+    const { report } = documentValidationPluginKey.getState(
+      this.controller.mainEditorView.state,
+    );
+    if (!report) return undefined;
+    return shaclReportToErrorArray(report);
+  }
+  get propertiesWithoutErrors() {
+    const { propertiesWithoutErrors } = documentValidationPluginKey.getState(
+      this.controller.mainEditorView.state,
+    );
+    return propertiesWithoutErrors;
+  }
+  get controller() {
+    return this.args.controller;
+  }
+  goToSubject = (subject: string) => {
+    this.controller.doCommand(selectNodeBySubject({ subject }), {
+      view: this.controller.mainEditorView,
+    });
+    this.controller.focus();
+  };
+  get isValidDocument() {
+    return this.documentValidationErrors?.length === 0;
+  }
+  <template>
+    {{#if this.documentValidationErrors}}
+      <AuCard
+        @flex={{true}}
+        @divided={{true}}
+        @isOpenInitially={{true}}
+        @expandable={{true}}
+        @shadow={{true}}
+        @size='small'
+        class={{if
+          this.isValidDocument
+          'say-document-validation__card-valid'
+          'say-document-validation__card-invalid'
+        }}
+        as |c|
+      >
+        <c.header>
+          <p class='au-u-medium au-u-h6'>
+            {{#if this.isValidDocument}}
+              {{t 'document-validation-plugin.valid-document-title'}}
+            {{else}}
+              {{t 'document-validation-plugin.invalid-document-title'}}
+            {{/if}}
+          </p>
+        </c.header>
+        <c.content>
+          <p class='au-u-medium au-u-para-small'>{{t
+              'document-validation-plugin.description'
+            }}</p>
+          {{#each this.propertiesWithoutErrors as |property|}}
+            <div class='say-document-validation__error-container'>
+              <AuIcon
+                @icon={{CheckFilledIcon}}
+                @size='large'
+                @ariaHidden={{true}}
+                class='say-document-validation__icon-success au-u-margin-right-small'
+              />
+              {{property.message}}
+            </div>
+          {{/each}}
+          {{#each this.documentValidationErrors as |error|}}
+            <div class='say-document-validation__error-container'>
+              <AuIcon
+                @icon={{CloseFilledIcon}}
+                @size='large'
+                @ariaHidden={{true}}
+                class='say-document-validation__icon-error au-u-margin-right-small'
+              />
+              {{error.message}}
+              <AuButton
+                class='au-u-padding-left-none au-u-padding-right-none'
+                @icon={{ExternalLinkIcon}}
+                @skin='link'
+                title={{error.subject}}
+                {{on 'click' (fn this.goToSubject error.subject)}}
+              >{{t 'document-validation-plugin.see-related-node'}}</AuButton>
+            </div>
+          {{/each}}
+        </c.content>
+
+      </AuCard>
+    {{/if}}
+  </template>
+}
+
+function shaclReportToErrorArray(report: ShaclValidationReport) {
+  let errorArray = [];
+  const factory = new SayDataFactory();
+  for (const r of report.results) {
+    const match = [
+      ...r.dataset.match(
+        r.sourceShape,
+        factory.namedNode('http://www.w3.org/ns/shacl#resultMessage'),
+      ),
+    ][0];
+    errorArray.push({
+      message: removeQuotes(match.object.value),
+      subject: r.focusNode?.value,
+    });
+  }
+  return errorArray;
+}

package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts

@@ -19,6 +19,7 @@ import { eq } from 'ember-truth-helpers';
 import t from 'ember-intl/helpers/t';
 import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
+import { SIGN_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 
 type Signature = {
   Args: {
@@ -44,8 +45,10 @@ export default class RoadSignsTable extends Component<Signature> {
   categories = (measureConcept: MobilityMeasureConcept) => {
     const categorySet: Set<string> = new Set();
     for (const signConcept of measureConcept.signConcepts) {
-      const categories = signConcept.classifications;
-      addAll(categorySet, ...categories);
+      if (signConcept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
+        const categoryLabels = signConcept.categories.map((cat) => cat.label);
+        addAll(categorySet, ...categoryLabels);
+      }
     }
     return [...categorySet].sort();
   };

package/addon/components/snippet-plugin/nodes/snippet.gts

@@ -226,7 +226,7 @@ export default class SnippetNode extends Component<Signature> {
           </span>
           {{this.node.attrs.title}}
         </div>
-        <div class='say-snippet-content'>
+        <div class='say-snippet-body'>
           {{yield}}
           <div class='say-snippet-icons' contenteditable='false'>
             <SnippetButton

package/addon/components/structure-plugin/_private/structure.gts

@@ -226,9 +226,7 @@ export default class Structure extends Component<Sig> {
           </Tag>
         {{/let}}
       </div>
-      <div class='say-structure__content'>
-        {{yield}}
-      </div>
+      {{yield}}
     </div>
   </template>
 }

package/addon/components/template-comments-plugin/template-comment.hbs

@@ -8,7 +8,5 @@
     {{if this.selectionInside "ProseMirror-selectednode"}}
     say-default-cursor'
 >
-  <div class='say-text-cursor'>
-    {{yield}}
-  </div>
+  {{yield}}
 </AuAlert>

package/addon/components/worship-plugin/administrative-unit-picker.hbs

@@ -1,9 +1,9 @@
 {{! @glint-nocheck: not typesafe yet }}
 <PowerSelect
   @loadingMessage={{t 'common.search.loading'}}
-  @searchMessage={{t 'worship-plugin.modal.search.search'}}
-  @noMatchesMessage={{t 'worship-plugin.modal.search.no-results'}}
-  @placeholderMessage={{t 'worship-plugin.modal.fields.admin-unit'}}
+  @searchMessage={{t 'worship-plugin.modal.fields.admin-unit.search'}}
+  @noMatchesMessage={{t 'worship-plugin.modal.fields.admin-unit.no-results'}}
+  @placeholder={{t 'worship-plugin.modal.fields.admin-unit.placeholder'}}
   @allowClear={{true}}
   @renderInPlace={{true}}
   @searchEnabled={{true}}

package/addon/components/worship-plugin/search-modal.hbs

@@ -18,21 +18,21 @@
         <div class='au-c-sidebar'>
           <div class='au-c-sidebar__content au-u-padding'>
             <AuHeading @level='3' @skin='4' class='au-u-padding-bottom-small'>
-              {{t 'worship-plugin.modal.search.title'}}
+              {{t 'worship-plugin.modal.filter-on'}}
             </AuHeading>
             <AuLabel class='au-margin-bottom-small' for='searchTerm'>
-              {{t 'worship-plugin.modal.fields.name'}}
+              {{t 'worship-plugin.modal.fields.name.label'}}
             </AuLabel>
             <AuNativeInput
               @type='text'
               @width='block'
               id='searchTerm'
               value={{this.searchText}}
-              placeholder={{t 'worship-plugin.modal.search.placeholder'}}
+              placeholder={{t 'worship-plugin.modal.fields.name.placeholder'}}
               {{on 'input' this.setInputSearchText}}
             />
             <AuLabel class='au-margin-bottom-small' for='admin-unit-select'>
-              {{t 'worship-plugin.modal.fields.admin-unit'}}
+              {{t 'worship-plugin.modal.fields.admin-unit.label'}}
             </AuLabel>
             <WorshipPlugin::AdministrativeUnitPicker
               id='admin-unit-select'

package/addon/plugins/document-validation-plugin/index.ts

@@ -0,0 +1,150 @@
+import factory from '@rdfjs/dataset';
+import SHACLValidator from 'rdf-validate-shacl';
+import { Parser as ParserN3 } from 'n3';
+import { RdfaParser } from 'rdfa-streaming-parser';
+import { ProsePlugin, PluginKey, EditorView } from '@lblod/ember-rdfa-editor';
+import removeQuotes from '@lblod/ember-rdfa-editor-lblod-plugins/utils/remove-quotes';
+import {
+  DataFactory,
+  DatasetCore,
+  DatasetCoreFactory,
+  Quad,
+} from '@rdfjs/types';
+import ValidationReport from 'rdf-validate-shacl/src/validation-report';
+import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+
+export const documentValidationPluginKey = new PluginKey('DOCUMENT_VALIDATION');
+
+interface DocumentValidationPluginArgs {
+  documentShape: string;
+}
+
+export type ShaclValidationReport = ValidationReport.ValidationReport<
+  DataFactory<Quad, Quad> &
+    DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>
+>;
+
+interface documentValidationTransactionMeta {
+  type: string;
+  report: ValidationReport;
+  propertiesWithoutErrors: string[];
+}
+
+export const documentValidationPlugin = (
+  options: DocumentValidationPluginArgs,
+) =>
+  new ProsePlugin({
+    key: documentValidationPluginKey,
+    state: {
+      init() {
+        return {
+          validationCallback: validationCallback,
+          documentShape: options.documentShape,
+        };
+      },
+      apply(tr, state) {
+        const pluginTransaction = tr.getMeta(documentValidationPluginKey) as
+          | documentValidationTransactionMeta
+          | undefined;
+        if (pluginTransaction) {
+          if (pluginTransaction.type === 'setNewReport') {
+            return {
+              ...state,
+              report: pluginTransaction.report,
+              propertiesWithoutErrors:
+                pluginTransaction.propertiesWithoutErrors,
+            };
+          }
+        }
+
+        return state;
+      },
+    },
+  });
+
+async function validationCallback(view: EditorView, documentHtml: string) {
+  const { documentShape } = documentValidationPluginKey.getState(view.state);
+  const rdf = await htmlToRdf(documentHtml);
+  const shacl = await parse(documentShape);
+
+  const validator = new SHACLValidator(shacl, {
+    // @ts-expect-error ts doesn't recognize the configuration parameter not sure why
+    allowNamedNodeInList: true,
+  });
+  const report = validator.validate(rdf);
+  const sayFactory = new SayDataFactory();
+  const propertyPred = sayFactory.namedNode(
+    'http://www.w3.org/ns/shacl#property',
+  );
+  const propertyNodes = [
+    ...shacl.match(undefined, propertyPred, undefined),
+  ].map((quad: Quad) => quad.object);
+
+  const propertiesWithErrors: string[] = [];
+  for (const r of report.results) {
+    const shapeId = r.sourceShape?.value;
+    if (shapeId) propertiesWithErrors.push(shapeId);
+  }
+  const propertiesWithoutErrorsArray = propertyNodes.filter(
+    (term) => !propertiesWithErrors.includes(term.value),
+  );
+
+  const successMessagePred = sayFactory.namedNode(
+    'http://mu.semte.ch/vocabularies/ext/successMessage',
+  );
+  const propertiesWithoutErrors = propertiesWithoutErrorsArray
+    .map((propertyNode) => {
+      const match = shacl.match(propertyNode, successMessagePred, undefined);
+      const message = [...match][0]?.object.value;
+      return message ? { message: removeQuotes(message) } : undefined;
+    })
+    .filter((message) => message);
+  const transaction = view.state.tr;
+  transaction.setMeta(documentValidationPluginKey, {
+    type: 'setNewReport',
+    report,
+    propertiesWithoutErrors,
+  });
+  transaction.setMeta('addToHistory', false);
+  view.dispatch(transaction);
+}
+
+interface N3Parser {
+  parse: (
+    triples: string,
+    callback: (error: string, quad: Quad) => void,
+  ) => void;
+}
+
+async function parse(triples: string): Promise<DatasetCore<Quad>> {
+  return new Promise((resolve, reject) => {
+    // @ts-expect-error we have to use a custom type to make the quads compatible or else ts will complain
+    const parser: N3Parser = new ParserN3();
+    const dataset = factory.dataset();
+    parser.parse(triples, (error, quad) => {
+      if (error) {
+        console.warn(error);
+        reject(error);
+      } else if (quad) {
+        dataset.add(quad);
+      } else {
+        resolve(dataset);
+      }
+    });
+  });
+}
+
+function htmlToRdf(html: string): Promise<DatasetCore<Quad>> {
+  return new Promise((res, rej) => {
+    const myParser = new RdfaParser({ contentType: 'text/html' });
+    const dataset = factory.dataset();
+    myParser
+      .on('data', (data) => {
+        dataset.add(data);
+      })
+      .on('error', rej)
+      .on('end', () => res(dataset));
+    myParser.write(html);
+    myParser.end();
+  });
+}

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -25,7 +25,8 @@ import { buildArticleStructure } from '../../decision-plugin/utils/build-article
 import { insertArticle } from '../../decision-plugin/actions/insert-article';
 import { SignConcept } from '../schemas/sign-concept';
 import {
-  SIGN_CONCEPT_TYPE_LABELS,
+  ROAD_SIGN_CATEGORIES,
+  SIGN_CONCEPT_TYPES,
   SIGN_TYPE_MAPPING,
   SIGN_TYPES,
   ZONALITY_OPTIONS,
@@ -190,9 +191,28 @@ function constructMeasureBody(
   return schema.nodes.paragraph.create({}, nodes);
 }
 
+function determineSignLabel(signConcept: SignConcept) {
+  switch (signConcept.type) {
+    case SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT:
+      return 'Verkeerslicht';
+    case SIGN_CONCEPT_TYPES.ROAD_MARKING:
+      return 'Wegmarkering';
+    case SIGN_CONCEPT_TYPES.ROAD_SIGN:
+      if (
+        signConcept.categories
+          .map((cat) => cat.uri)
+          .includes(ROAD_SIGN_CATEGORIES.ONDERBORD)
+      ) {
+        return 'Onderbord';
+      } else {
+        return 'Verkeersbord';
+      }
+  }
+}
+
 function constructSignNode(signConcept: SignConcept, schema: Schema) {
   const signUri = `http://data.lblod.info/verkeerstekens/${uuid()}`;
-  const prefix = SIGN_CONCEPT_TYPE_LABELS[signConcept.type];
+  const prefix = determineSignLabel(signConcept);
   const node = schema.nodes.inline_rdfa.create(
     {
       rdfaNodeType: 'resource',

package/addon/plugins/roadsign-regulation-plugin/constants.ts

@@ -29,9 +29,25 @@ export const SIGN_TYPE_MAPPING = {
   [SIGN_CONCEPT_TYPES.ROAD_MARKING]: SIGN_TYPES.ROAD_MARKING,
 } as const;
 
-export const SIGN_CONCEPT_TYPE_LABELS = {
-  [SIGN_CONCEPT_TYPES.TRAFFIC_SIGN]: 'Verkeersteken',
-  [SIGN_CONCEPT_TYPES.ROAD_SIGN]: 'Verkeersbord',
-  [SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT]: 'Verkeerslicht',
-  [SIGN_CONCEPT_TYPES.ROAD_MARKING]: 'Wegmarkering',
-} as const;
+export const ROAD_SIGN_CATEGORIES = {
+  XXBORD:
+    'https://data.vlaanderen.be/id/concept/Verkeersbordcategorie/ae1b7231-1f31-492d-947a-25fc5d114492',
+  'XX-AWVBORD':
+    'https://data.vlaanderen.be/id/concept/Verkeersbordcategorie/8e302648-0eca-478b-8b48-67c3b0e39c0a',
+  GEVAARSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/2982567006d9e19f04063df73123f56f40e3a28941031a7ba6e6667f64740fa9',
+  STILSTAANPARKEERBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/29ea3335e357e414d07229242607b352941c0c21e78760600cc0f5270f18c38b',
+  VOORRANGSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/737da5751bc7f311398a834f34df310dd95255a0b62afa2db2882c72d54b47d2',
+  ZONEBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/86a67f3cba6512ae10c4b9b09ba35d8c80109189b44d37e848858af9efb37019',
+  VERBODSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/955a9adc73d076a2a424754cd540b73da8d15fb002ab6c9f115d080edddb57e8',
+  ONDERBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/991b04b477b77bc7cf1414fb5d255cc4435dd9c1681e8de66f770710c1c83ad0',
+  GEBODSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/9d84069e70f192b7a474d02f07687bc3343ee324207ad9e093c0b2f5def647f8',
+  AANWIJSBORD:
+    'http://data.vlaanderen.be/id/concept/Verkeersbordcategorie/9ea8f8b421343370d20a8bd45d6226aadc48125bda8ddbbeeb53d99f181ee05a',
+};

package/addon/plugins/roadsign-regulation-plugin/queries/road-sign-category.ts

@@ -2,6 +2,7 @@ import {
   BindingObject,
   executeQuery,
   objectify,
+  sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 import {
   RoadSignCategory,
@@ -10,16 +11,18 @@ import {
 
 type QueryOptions = {
   abortSignal?: AbortSignal;
+  roadSignConceptUri?: string;
 };
 
 export default async function queryRoadSignCategories(
   endpoint: string,
   options: QueryOptions = {},
 ) {
-  const { abortSignal } = options;
+  const { abortSignal, roadSignConceptUri } = options;
   const query = /* sparql */ `
     PREFIX mobiliteit: <https://data.vlaanderen.be/ns/mobiliteit#>
     PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+    PREFIX dct: <http://purl.org/dc/terms/>
 
     SELECT DISTINCT
       ?uri
@@ -27,6 +30,8 @@ export default async function queryRoadSignCategories(
     WHERE {
       ?uri a mobiliteit:Verkeersbordcategorie;
            skos:prefLabel ?label.
+
+      ${roadSignConceptUri ? `${sparqlEscapeUri(roadSignConceptUri)} dct:type ?uri` : ''}
     }
   `;
   const queryResult = await executeQuery<BindingObject<RoadSignCategory>>({

package/addon/plugins/roadsign-regulation-plugin/queries/sign-concept.ts

@@ -6,6 +6,8 @@ import {
   sparqlEscapeUri,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/sparql-helpers';
 import { SignConcept, SignConceptSchema } from '../schemas/sign-concept';
+import queryRoadSignCategories from './road-sign-category';
+import { SIGN_CONCEPT_TYPES } from '../constants';
 
 type QueryOptions = {
   imageBaseUrl?: string;
@@ -31,7 +33,6 @@ export async function querySignConcepts(
       ?code
       ?zonality
       (CONCAT(${sparqlEscapeString(imageBaseUrl ?? '')}, "/files/", ?imageId, "/download") AS ?image)
-      (GROUP_CONCAT(?classification; SEPARATOR="|") AS ?classifications)
     WHERE {
       ?uri
         a mobiliteit:Verkeerstekenconcept;
@@ -44,9 +45,6 @@ export async function querySignConcepts(
       OPTIONAL {
         ?uri ext:zonality ?zonality.
       }
-      OPTIONAL {
-        ?uri dct:type/skos:prefLabel ?classification.
-      }
 
       VALUES ?type {
         <https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept>
@@ -63,13 +61,21 @@ export async function querySignConcepts(
     abortSignal,
   });
   const bindings = queryResult.results.bindings;
-  const processed = bindings.map(objectify).map((binding) => {
-    return {
-      ...binding,
-      classifications: binding.classifications
-        ? binding.classifications.split('|')
-        : [],
-    };
-  });
-  return SignConceptSchema.array().parse(processed);
+  const concepts = SignConceptSchema.array().parse(bindings.map(objectify));
+  const conceptsWithCategories = await Promise.all(
+    concepts.map(async (concept) => {
+      if (concept.type === SIGN_CONCEPT_TYPES.ROAD_SIGN) {
+        const categories = await queryRoadSignCategories(endpoint, {
+          roadSignConceptUri: concept.uri,
+        });
+        return {
+          ...concept,
+          categories,
+        };
+      } else {
+        return concept;
+      }
+    }),
+  );
+  return conceptsWithCategories;
 }

package/addon/plugins/roadsign-regulation-plugin/schemas/sign-concept.ts

@@ -1,13 +1,27 @@
 import { z } from 'zod';
 import { SIGN_CONCEPT_TYPES, ZONALITY_OPTIONS } from '../constants';
+import { RoadSignCategorySchema } from './road-sign-category';
 
-export const SignConceptSchema = z.object({
-  uri: z.string(),
-  code: z.string(),
-  type: z.nativeEnum(SIGN_CONCEPT_TYPES),
-  image: z.string(),
-  classifications: z.array(z.string()).default([]),
-  zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
-});
+export const SignConceptSchema = z
+  .object({
+    uri: z.string(),
+    code: z.string(),
+    image: z.string(),
+    zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
+  })
+  .and(
+    z.discriminatedUnion('type', [
+      z.object({
+        type: z.literal(SIGN_CONCEPT_TYPES.ROAD_SIGN),
+        categories: z.array(RoadSignCategorySchema).default([]),
+      }),
+      z.object({
+        type: z.enum([
+          SIGN_CONCEPT_TYPES.ROAD_MARKING,
+          SIGN_CONCEPT_TYPES.TRAFFIC_LIGHT,
+        ]),
+      }),
+    ]),
+  );
 
 export type SignConcept = z.infer<typeof SignConceptSchema>;

package/addon/plugins/snippet-plugin/nodes/snippet.ts

@@ -175,6 +175,7 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
     allowMultipleSnippets: { default: false },
   },
   component: SnippetComponent,
+  contentDomClassNames: ['say-snippet-content'],
   content: options.allowedContent || DEFAULT_CONTENT_STRING,
   serialize(node) {
     const listNames = node.attrs.snippetListNames as string[];

package/addon/plugins/structure-plugin/node.ts

@@ -118,6 +118,7 @@ export const emberNodeConfig: (
   return {
     name: 'structure',
     component: Structure as unknown as ComponentLike,
+    contentDomClassNames: ['say-structure__content'],
     inline: false,
     group: 'block structure',
     content: 'block+',

package/addon/plugins/template-comments-plugin/node.ts

@@ -22,6 +22,7 @@ export const emberNodeConfig: () => EmberNodeConfig = () => {
   return {
     name: 'template-comment',
     component: TemplateCommentsComponent as unknown as ComponentLike,
+    contentDomClassNames: ['say-template-comment-content'],
     inline: false,
     group: 'block',
     content: 'block+',

package/addon/plugins/variable-plugin/variables/date.ts

@@ -282,6 +282,7 @@ const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
   draggable: false,
   atom: true,
   recreateUriFunction: recreateVariableUris,
+  needsFFKludge: true,
   defining: false,
   options,
   attrs: {