@lblod/ember-rdfa-editor-lblod-plugins 29.0.1 → 29.1.0

package/.woodpecker/.release.yml

@@ -10,12 +10,15 @@ steps:
       token:
         from_secret: npm_access_token
   push-tagged-build:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: lblod/ember-rdfa-editor-lblod-plugins
       tags: '${CI_COMMIT_TAG##v}'
       purge: true
-    secrets: [docker_username, docker_password]
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
 when:
-  event: tag
-  ref: refs/tags/v*
+  - event: tag
+    ref: refs/tags/v*

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 29.1.0
+
+### Minor Changes
+
+- [#559](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/559) [`34a85e1`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/34a85e14cf9ba4b4996e49c476a775afbe3ab6ac) Thanks [@piemonkey](https://github.com/piemonkey)! - Add style to highlight variables in serialized HTML
+
+- [#555](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/555) [`da5057a`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/da5057ae7cc279c4b3214fd49370e82325ccd9de) Thanks [@elpoelma](https://github.com/elpoelma)! - `roadsign_regulation` node: introduce parse-rule which converts classic `roadsign_regulation` nodes to `block_rdfa` nodes
+
+### Patch Changes
+
+- [#557](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/557) [`710302b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/710302bf659028ae8c0e0cb665a5b414dd9f5b17) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Solves bug with powerselect dropdown not displaying in place
+
 ## 29.0.1
 
 ### Patch Changes

package/addon/components/common/documents/preview.gts

@@ -111,9 +111,7 @@ export default class DocumentPreview<
 
       </div>
       {{#if this.isExpanded}}
-        <div
-          class='say-editor say-content rdfa-annotations rdfa-annotations-highlight rdfa-annotations-hover snippet-preview__content'
-        >
+        <div class='say-editor say-content snippet-preview__content'>
           {{#if this.content}}
             {{this.content}}
           {{else if this.contentTask.isRunning}}

package/addon/components/variable-plugin/location/edit.hbs

@@ -34,6 +34,7 @@
       {{else}}
         <PowerSelect
           id='location-select'
+          @dropdownClass='location-select-dropdown'
           @allowClear={{false}}
           @searchEnabled={{true}}
           @searchField='label'

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

@@ -233,6 +233,9 @@ const serialize =
       renderable: node,
       tag: 'span',
       content: contentNode,
+      attrs: {
+        class: value ? '' : 'say-variable',
+      },
     });
   };
 

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

@@ -6,16 +6,17 @@ import {
   PROV,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 
 const CONTENT_SELECTOR = `div[property~='${
   DCT('description').full
 }'],div[property~='${DCT('description').prefixed}']`;
-const rdfaAware = false;
+
 export const roadsign_regulation: NodeSpec = {
   content: 'block+',
   group: 'block',
   attrs: {
-    ...rdfaAttrSpec({ rdfaAware }),
+    ...rdfaAttrSpec({ rdfaAware: false }),
     resourceUri: {},
     measureUri: {},
     zonality: {},
@@ -61,7 +62,12 @@ export const roadsign_regulation: NodeSpec = {
   parseDOM: [
     {
       tag: 'div',
+      node: 'block_rdfa',
       getAttrs(node: HTMLElement) {
+        const attrs = getRdfaAttrs(node, { rdfaAware: true });
+        if (!attrs || attrs.rdfaNodeType !== 'resource') {
+          return false;
+        }
         if (
           hasRDFaAttribute(
             node,
@@ -71,7 +77,7 @@ export const roadsign_regulation: NodeSpec = {
           node.querySelector(CONTENT_SELECTOR)
         ) {
           const resourceUri = node.getAttribute('resource');
-          const measureUri = node
+          const measureConceptUri = node
             .querySelector(
               `span[property~='${PROV('wasDerivedFrom').prefixed}'],
              span[property~='${PROV('wasDerivedFrom').full}']`,
@@ -83,21 +89,24 @@ export const roadsign_regulation: NodeSpec = {
            span[property~='${EXT('zonality').full}']`,
             )
             ?.getAttribute('resource');
-          if (!resourceUri || !measureUri || !zonality) {
+          if (!resourceUri || !measureConceptUri || !zonality) {
             return false;
           }
-          const temporal = node
-            .querySelector(
-              `span[property~='${EXT('temporal').prefixed}'],
-           span[property~='${EXT('temporal').full}']`,
-            )
-            ?.getAttribute('value');
+          const { rdfaNodeType, properties, backlinks, __rdfaId } = attrs;
+          // We need to ensure that a content-literal for the description is added
+          const propertiesFiltered = properties.filter(
+            (prop) => !DCT('description').matches(prop.predicate),
+          );
+          propertiesFiltered.push({
+            predicate: DCT('description').full,
+            object: sayDataFactory.contentLiteral(),
+          });
           return {
-            resourceUri,
-            measureUri,
-            zonality,
-            temporal,
-            ...getRdfaAttrs(node, { rdfaAware }),
+            rdfaNodeType,
+            __rdfaId,
+            properties: propertiesFiltered,
+            backlinks,
+            label: `Mobiliteitsmaatregel`,
           };
         }
         return false;

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

@@ -378,6 +378,9 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
     renderable: node,
     tag: 'span',
     content: contentNode,
+    attrs: {
+      class: value ? '' : 'say-variable',
+    },
   });
 };
 

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

@@ -103,10 +103,18 @@ const parseDOMLegacy = [
 ];
 
 const toDOM = (node: PNode): DOMOutputSpec => {
+  const onlyContentType =
+    node.content.size === 1 && node.content.firstChild?.type;
+  const className =
+    onlyContentType &&
+    onlyContentType === onlyContentType.schema.nodes['placeholder']
+      ? 'say-variable'
+      : '';
   return renderRdfaAware({
     renderable: node,
     tag: 'span',
     attrs: {
+      class: className,
       'data-autofill-key': node.attrs.autofillKey,
       'data-convert-to-string': node.attrs.convertToString,
       'data-initialized': node.attrs.initialized,

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

@@ -152,10 +152,18 @@ const parseDOMLegacy = [
 
 const toDOM = (node: PNode): DOMOutputSpec => {
   const { selectionStyle } = node.attrs;
+  const onlyContentType =
+    node.content.size === 1 && node.content.firstChild?.type;
+  const className =
+    onlyContentType &&
+    onlyContentType === onlyContentType.schema.nodes['placeholder']
+      ? 'say-variable'
+      : '';
 
   return renderRdfaAware({
     renderable: node,
     attrs: {
+      class: className,
       'data-selection-style': selectionStyle as string,
     },
     tag: 'span',

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

@@ -230,6 +230,7 @@ const serialize = (node: PNode, state: EditorState) => {
       : t('date-plugin.insert.datetime', TRANSLATION_FALLBACKS.insertDateTime);
   }
   const dateAttrs = {
+    class: value ? '' : 'say-variable',
     'data-format': format as string,
     'data-custom': custom ? 'true' : 'false',
     'data-custom-allowed': customAllowed ? 'true' : 'false',

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

@@ -97,9 +97,18 @@ const parseDOMLegacy = [
 ];
 
 const toDOM = (node: PNode): DOMOutputSpec => {
+  const onlyContentType =
+    node.content.size === 1 && node.content.firstChild?.type;
+  const className =
+    onlyContentType &&
+    onlyContentType === onlyContentType.schema.nodes['placeholder']
+      ? 'say-variable'
+      : '';
   return renderRdfaAware({
     renderable: node,
-    attrs: {},
+    attrs: {
+      class: className,
+    },
     tag: 'span',
     content: 0,
   });

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

@@ -184,6 +184,7 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
     renderable: node,
     tag: 'span',
     attrs: {
+      class: value ? '' : 'say-variable',
       'data-written-number': String(writtenNumber ?? false),
       'data-minimum-value': (minimumValue as string) ?? null,
       'data-maximum-value': (maximumValue as string) ?? null,

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

@@ -111,7 +111,9 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
   return renderRdfaAware({
     renderable: node,
     tag: 'span',
-    attrs: {},
+    attrs: {
+      class: person ? '' : 'say-variable',
+    },
     content: person
       ? generatePersonHtml(person)
       : t(

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

@@ -132,10 +132,19 @@ const parseDOMLegacy = [
 ];
 
 const toDOM = (node: PNode): DOMOutputSpec => {
+  const onlyContentType =
+    node.content.size === 1 && node.content.firstChild?.type;
+  const className =
+    onlyContentType &&
+    onlyContentType === onlyContentType.schema.nodes['placeholder']
+      ? 'say-variable'
+      : '';
   return renderRdfaAware({
     renderable: node,
     tag: 'span',
-    attrs: {},
+    attrs: {
+      class: className,
+    },
     content: 0,
   });
 };

package/app/styles/variable-plugin.scss

@@ -129,3 +129,44 @@
     margin-top: 5px;
   }
 }
+
+@media only screen and (min-width: 2500px) {
+  #location-select,
+  .location-select-dropdown {
+    width: 600px;
+  }
+}
+
+@media only screen and (max-width: 2500px) {
+  #location-select,
+  .location-select-dropdown {
+    width: 500px;
+  }
+}
+
+@media only screen and (max-width: 2000px) {
+  #location-select,
+  .location-select-dropdown {
+    width: 400px;
+  }
+}
+
+@media only screen and (max-width: 1700px) {
+  #location-select,
+  .location-select-dropdown {
+    width: 300px;
+  }
+}
+
+@media only screen and (max-width: 1400px) {
+  #location-select,
+  .location-select-dropdown {
+    width: 200px;
+  }
+}
+
+.say-variable {
+  color: var(--au-orange-700);
+  background-color: var(--au-orange-300);
+  font-style: italic;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "29.0.1",
+  "version": "29.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -111,7 +111,7 @@
     "@glint/template": "^1.5.0",
     "@graphy/content.ttl.write": "^4.3.7",
     "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "11.0.0",
+    "@lblod/ember-rdfa-editor": "11.3.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",

package/pnpm-lock.yaml

@@ -187,8 +187,8 @@ importers:
         specifier: 4.3.3
         version: 4.3.3
       '@lblod/ember-rdfa-editor':
-        specifier: 11.0.0
-        version: 11.0.0(nlq6pvqp7wukmbrtxngdh43tfm)
+        specifier: 11.3.0
+        version: 11.3.0(nlq6pvqp7wukmbrtxngdh43tfm)
       '@rdfjs/types':
         specifier: ^1.1.0
         version: 1.1.0
@@ -1717,8 +1717,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@lblod/ember-rdfa-editor@11.0.0':
-    resolution: {integrity: sha512-hHuzfxtIGDAPj1FxofPeUWkKqY/koqrSnba4BKM1fWLRtAo0eozqGSsgYti0hPI5YBzjPB3wLo4RnYMsH8h4WQ==}
+  '@lblod/ember-rdfa-editor@11.3.0':
+    resolution: {integrity: sha512-16tJ+HHqdTuLTV1EzhyJS3u/oJ3JoyJ3YfQlHkyymU49JmeNkqEjAWOJ+VpVLgzKtwOaRdIq78KKbJpVGpOmeg==}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.5.0
       '@ember/test-helpers': ^2.9.4 || ^3.2.1 || ^4.0.2 || ^5.0.0
@@ -12052,7 +12052,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@11.0.0(nlq6pvqp7wukmbrtxngdh43tfm)':
+  '@lblod/ember-rdfa-editor@11.3.0(nlq6pvqp7wukmbrtxngdh43tfm)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.5.0(@ember/test-helpers@3.3.1(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))(webpack@5.97.1))(@glint/environment-ember-loose@1.5.1(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(@types/ember__array@4.0.10(@babel/core@7.26.0))(@types/ember__component@4.0.22(@babel/core@7.26.0))(@types/ember__controller@4.0.12(@babel/core@7.26.0))(@types/ember__object@4.0.12(@babel/core@7.26.0))(@types/ember__routing@4.0.22(@babel/core@7.26.0))(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))))(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))(tracked-built-ins@3.3.0)(webpack@5.97.1)
       '@codemirror/commands': 6.6.0
@@ -12065,7 +12065,7 @@ snapshots:
       '@ember/render-modifiers': 2.1.0(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))
       '@ember/test-helpers': 3.3.1(@babel/core@7.26.0)(@glint/template@1.5.1)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.1)(rsvp@4.8.5)(webpack@5.97.1))(webpack@5.97.1)
       '@embroider/addon-shim': 1.9.0
-      '@embroider/macros': 1.16.10(@glint/template@1.5.1)
+      '@embroider/macros': 1.16.11(@glint/template@1.5.1)
       '@floating-ui/dom': 1.6.7
       '@glimmer/component': 1.1.2(@babel/core@7.26.0)
       '@glimmer/tracking': 1.1.2