@lblod/ember-rdfa-editor-lblod-plugins 35.1.0 → 35.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.1.1
+
+### Patch Changes
+
+- [#633](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/633) [`2bdb16b`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/2bdb16b0811350bfd01c8a76b316cc0bc9173af9) Thanks [@piemonkey](https://github.com/piemonkey)! - Fix parsing of (deprecated) roadsign_regulation nodes to ignore incorrect `resource="false"` values
+
+- [#632](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/632) [`1b9933c`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/1b9933ca93badb06e3c7cc42797f2cc98bf732e3) Thanks [@piemonkey](https://github.com/piemonkey)! - Update location-plugin types to accept null as well as undefined
+
 ## 35.1.0
 
 ### Minor Changes

package/addon/components/citation-plugin/citation-card.hbs

@@ -7,6 +7,7 @@
     @expandable={{true}}
     @shadow={{true}}
     @size='small'
+    @disableAuContent={{true}}
     {{did-update
       this.resetToDocumentState
       this.documentText

package/addon/components/decision-plugin/insert-article.gts

@@ -20,7 +20,7 @@ export type InsertArticleOptions = StructurePluginOptions & {
 interface Sig {
   Args: {
     controller: SayController;
-    label: string;
+    label?: string;
     options?: InsertArticleOptions;
   };
 }

package/addon/components/location-plugin/edit.gts

@@ -37,6 +37,7 @@ import { type Point } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/locat
 import { type NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import { SUPPORTED_LOCATION_TYPES, type LocationType } from './map';
 import { type SafeString } from '@ember/template';
+import type { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 interface Message {
   skin: AuAlertSignature['Args']['skin'];
@@ -50,7 +51,7 @@ type Signature = {
     locationTypes?: readonly LocationType[];
     locationType: LocationType;
     setLocationType: (type: LocationType) => void;
-    defaultMunicipality?: string;
+    defaultMunicipality: Option<string>;
     currentAddress?: Address;
     selectedLocationNode: ResolvedPNode | null;
     setAddressToInsert: (address: Address | undefined) => void;

package/addon/components/location-plugin/insert.gts

@@ -34,6 +34,7 @@ import LocationMap, {
 import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 import { updateSubject } from '@lblod/ember-rdfa-editor/plugins/rdfa-info/utils';
 import { replaceSelectionWithLocation } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/_private/utils/node-utils';
+import type { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
@@ -58,7 +59,7 @@ interface Signature {
   Args: {
     controller: SayController;
     config: LocationPluginConfig;
-    defaultMunicipality?: string;
+    defaultMunicipality?: Option<string>;
     templateMode?: boolean;
     locationTypes?: LocationType[];
   };

package/addon/components/template-comments-plugin/edit-card.hbs

@@ -6,6 +6,7 @@
     @expandable={{false}}
     @shadow={{true}}
     @size='flush'
+    @disableAuContent={{true}}
     as |c|
   >
     <c.content class='au-c-content--small'>

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

@@ -5,6 +5,7 @@
     @divided={{true}}
     @shadow={{true}}
     @size='small'
+    @disableAuContent={{true}}
     as |c|
   >
     <c.content>

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

@@ -7,6 +7,7 @@
     @expandable={{true}}
     @shadow={{true}}
     @size='small'
+    @disableAuContent={{true}}
     as |c|
   >
     <c.header>
@@ -15,43 +16,45 @@
       </AuHeading>
     </c.header>
     <c.content>
-      <AuLabel for='location-select'>
-        {{this.label}}
-      </AuLabel>
-      {{#if this.multiSelect}}
-        <PowerSelectMultiple
-          id='location-select'
-          @allowClear={{false}}
-          @searchEnabled={{true}}
-          @searchField='label'
-          @options={{this.locationOptions.value.options}}
-          @selected={{this.selectedLocationOption}}
-          @onChange={{this.updateLocationOption}}
-          as |option|
+      <AuContent>
+        <AuLabel for='location-select'>
+          {{this.label}}
+        </AuLabel>
+        {{#if this.multiSelect}}
+          <PowerSelectMultiple
+            id='location-select'
+            @allowClear={{false}}
+            @searchEnabled={{true}}
+            @searchField='label'
+            @options={{this.locationOptions.value.options}}
+            @selected={{this.selectedLocationOption}}
+            @onChange={{this.updateLocationOption}}
+            as |option|
+          >
+            {{option.label}}
+          </PowerSelectMultiple>
+        {{else}}
+          <PowerSelect
+            id='location-select'
+            @dropdownClass='location-select-dropdown'
+            @allowClear={{false}}
+            @searchEnabled={{true}}
+            @searchField='label'
+            @options={{this.locationOptions.value.options}}
+            @selected={{this.selectedLocationOption}}
+            @onChange={{this.updateLocationOption}}
+            as |option|
+          >
+            {{option.label}}
+          </PowerSelect>
+        {{/if}}
+        <AuButton
+          {{on 'click' this.insert}}
+          @disabled={{not this.selectedLocationOption}}
         >
-          {{option.label}}
-        </PowerSelectMultiple>
-      {{else}}
-        <PowerSelect
-          id='location-select'
-          @dropdownClass='location-select-dropdown'
-          @allowClear={{false}}
-          @searchEnabled={{true}}
-          @searchField='label'
-          @options={{this.locationOptions.value.options}}
-          @selected={{this.selectedLocationOption}}
-          @onChange={{this.updateLocationOption}}
-          as |option|
-        >
-          {{option.label}}
-        </PowerSelect>
-      {{/if}}
-      <AuButton
-        {{on 'click' this.insert}}
-        @disabled={{not this.selectedLocationOption}}
-      >
-        {{t 'editor-plugins.utils.insert'}}
-      </AuButton>
+          {{t 'editor-plugins.utils.insert'}}
+        </AuButton>
+      </AuContent>
     </c.content>
   </AuCard>
 {{/if}}

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

@@ -24,7 +24,7 @@ import {
   MOBILITEIT,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { Option } from '@lblod/ember-rdfa-editor/utils/_private/option';
+import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
 export type LocationEditOptions = {
   endpoint: string;

package/addon/components/variable-plugin/number/nodeview.hbs

@@ -22,6 +22,7 @@
         @size='small'
         id='number-input-tooltip'
         @standOut={{true}}
+        @disableAuContent={{true}}
         as |card|
       >
         <card.content>

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

@@ -5,6 +5,7 @@
     @divided={{true}}
     @shadow={{true}}
     @size='small'
+    @disableAuContent={{true}}
     as |c|
   >
     <c.header>

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

@@ -27,6 +27,7 @@ import {
   ModelMigrationGenerator,
 } from '@lblod/ember-rdfa-editor/core/rdfa-types';
 import { getRdfaContentElement } from '@lblod/ember-rdfa-editor/core/schema';
+import type { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
 import {
   getNewZonalityUri,
   isLegacyZonalityUri,
@@ -121,13 +122,28 @@ export const roadsign_regulation: NodeSpec = {
           }
           const { rdfaNodeType, properties, backlinks, __rdfaId } = attrs;
           // We need to ensure that a content-literal for the description is added
-          const propertiesFiltered = properties.filter(
+          let propertiesFiltered = properties.filter(
             (prop) => !DCT('description').matches(prop.predicate),
           );
           propertiesFiltered.push({
             predicate: DCT('description').full,
             object: sayDataFactory.contentLiteral(),
           });
+
+          // Previously having no 'temporal' value could lead to a relationship being added, but
+          // to `resource="false". Strip this.
+          const temporal = node
+            .querySelector(
+              `span[property~='${EXT('temporal').prefixed}'],
+           span[property~='${EXT('temporal').full}']`,
+            )
+            ?.getAttribute('resource');
+          if (temporal === 'false') {
+            propertiesFiltered = propertiesFiltered.filter(
+              (prop) => !EXT('temporal').matches(prop.predicate),
+            );
+          }
+
           return {
             rdfaNodeType,
             __rdfaId,
@@ -203,7 +219,7 @@ export const trafficSignalMigration: ModelMigrationGenerator = (attrs) => {
   return false;
 };
 
-export const trafficMeasureZonalityMigration: ModelMigrationGenerator = (
+export const trafficMeasureModelMigration: ModelMigrationGenerator = (
   attrs,
 ) => {
   const factory = new SayDataFactory();
@@ -218,20 +234,34 @@ export const trafficMeasureZonalityMigration: ModelMigrationGenerator = (
   ) {
     return false;
   }
+
+  // Migrate zonality to new model
+  let newProps: OutgoingTriple[] | undefined;
   const zonalityTriple = getOutgoingTriple(attrs, EXT('zonality'));
-  if (!zonalityTriple) {
-    return false;
+  if (zonalityTriple && isLegacyZonalityUri(zonalityTriple.object.value)) {
+    const newZonalityProp = {
+      predicate: EXT('zonality').full,
+      object: factory.namedNode(getNewZonalityUri(zonalityTriple.object.value)),
+    };
+    newProps = attrs.properties
+      .filter((prop) => !EXT('zonality').matches(prop.predicate))
+      .concat([newZonalityProp]);
   }
-  if (!isLegacyZonalityUri(zonalityTriple.object.value)) {
+
+  // Remove invalid temporal values
+  const temporalTriple = getOutgoingTriple(attrs, EXT('temporal'));
+  if (
+    temporalTriple &&
+    temporalTriple.object.value === 'http://example.org/false'
+  ) {
+    newProps = (newProps ?? attrs.properties).filter(
+      (prop) => !EXT('temporal').matches(prop.predicate),
+    );
+  }
+
+  if (!newProps) {
     return false;
   }
-  const newZonalityProp = {
-    predicate: EXT('zonality').full,
-    object: factory.namedNode(getNewZonalityUri(zonalityTriple.object.value)),
-  };
-  const newProps = attrs.properties
-    .filter((prop) => !EXT('zonality').matches(prop.predicate))
-    .concat([newZonalityProp]);
   return {
     getAttrs: () => {
       return {
@@ -241,3 +271,7 @@ export const trafficMeasureZonalityMigration: ModelMigrationGenerator = (
     },
   } satisfies ModelMigration;
 };
+/**
+ * @deprecated moved to trafficMeasureModelMigration
+ */
+export const trafficMeasureZonalityMigration = trafficMeasureModelMigration;

package/declarations/addon/components/decision-plugin/insert-article.d.ts

@@ -10,7 +10,7 @@ export type InsertArticleOptions = StructurePluginOptions & {
 interface Sig {
     Args: {
         controller: SayController;
-        label: string;
+        label?: string;
         options?: InsertArticleOptions;
     };
 }

package/declarations/addon/components/location-plugin/edit.d.ts

@@ -6,6 +6,7 @@ import { Address } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location
 import { type NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import { type LocationType } from './map';
 import { type SafeString } from '@ember/template';
+import type { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 interface Message {
     skin: AuAlertSignature['Args']['skin'];
     icon: AuAlertSignature['Args']['icon'];
@@ -17,7 +18,7 @@ type Signature = {
         locationTypes?: readonly LocationType[];
         locationType: LocationType;
         setLocationType: (type: LocationType) => void;
-        defaultMunicipality?: string;
+        defaultMunicipality: Option<string>;
         currentAddress?: Address;
         selectedLocationNode: ResolvedPNode | null;
         setAddressToInsert: (address: Address | undefined) => void;

package/declarations/addon/components/location-plugin/insert.d.ts

@@ -7,12 +7,13 @@ import { GeoPos, type GlobalCoordinates } from '@lblod/ember-rdfa-editor-lblod-p
 import { type LocationPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node';
 import { NodeContentsUtils } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/node-contents';
 import { type LocationType } from './map';
+import type { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 interface Signature {
     Args: {
         controller: SayController;
         config: LocationPluginConfig;
-        defaultMunicipality?: string;
+        defaultMunicipality?: Option<string>;
         templateMode?: boolean;
         locationTypes?: LocationType[];
     };

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

@@ -6,4 +6,8 @@ export declare const roadsign_regulation: NodeSpec;
  * namedNodes to encode everything in one inline_rdfa
  **/
 export declare const trafficSignalMigration: ModelMigrationGenerator;
+export declare const trafficMeasureModelMigration: ModelMigrationGenerator;
+/**
+ * @deprecated moved to trafficMeasureModelMigration
+ */
 export declare const trafficMeasureZonalityMigration: ModelMigrationGenerator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "35.1.0",
+  "version": "35.1.1",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",