@lblod/ember-rdfa-editor-lblod-plugins 35.1.2 → 35.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.2.0
+
+### Minor Changes
+
+- [#640](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/640) [`3180369`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/31803691c6e577dfed2d6e0f91962a5180906101) Thanks [@abeforgit](https://github.com/abeforgit)! - Add option to explicitly configure subject to link locations to
+
+### Patch Changes
+
+- [#639](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/639) [`0946fdb`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/0946fdb3561050ed2b4f197305b0556007fe32d3) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix typing in besluit topic select
+
+- [#638](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/638) [`32f2217`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/32f22174393411561665f3266db62eb463bfc4ea) Thanks [@piemonkey](https://github.com/piemonkey)! - Invert oslo-location toggle to be 'GRB' in place of 'Open Streetmap'
+
 ## 35.1.2
 
 ### Patch Changes

package/addon/components/besluit-topic-plugin/besluit-topic-select.ts

@@ -6,6 +6,8 @@ import { BesluitTopic } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/bes
 
 type Args = {
   besluitTopics: BesluitTopic[];
+  selected?: BesluitTopic[];
+  onchange: (topic: BesluitTopic[]) => void;
 };
 
 export default class BesluitTopicSelectComponent extends Component<Args> {

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

@@ -52,12 +52,12 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     const uri = `http://data.lblod.info/variables/${
       this.args.templateMode ? '--ref-uuid4-' : ''
     }${uuidv4()}`;
-    replaceSelectionWithLocation(
-      this.controller,
-      uri,
-      undefined,
-      this.args.config.subjectTypesToLinkTo,
-    );
+    replaceSelectionWithLocation({
+      controller: this.controller,
+      subject: uri,
+      subjectTypes: this.args.config.subjectTypesToLinkTo,
+      explicitSubjectToLinkTo: this.args.config.explicitSubjectToLinkTo,
+    });
   }
 
   <template>

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

@@ -35,6 +35,9 @@ import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transactio
 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';
+import type { FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+import { PROV } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 
 export type CurrentLocation = Address | GlobalCoordinates | undefined;
 
@@ -274,13 +277,29 @@ export default class LocationPluginInsertComponent extends Component<Signature>
     if (toInsert) {
       this.modalOpen = false;
       if (this.selectedLocationNode) {
-        // Update, while keeping backlinks intact
-        const { pos } = this.selectedLocationNode;
+        const df = new SayDataFactory();
+        const { pos, value: locNode } = this.selectedLocationNode;
+        // The location's subject has likely changed, so we should update the external links too
+        // if they exist
+        // NOTE: It's VERY important that this is done without mutating the triple objects
+        // otherwise the attributes will not update as expected when undo-ing
+        const newExternalTriples: FullTriple[] = (
+          locNode.attrs.externalTriples as FullTriple[]
+        ).map((tr) => {
+          if (PROV('atLocation').matches(tr.predicate)) {
+            return { ...tr, object: df.namedNode(toInsert.uri) };
+          } else {
+            return tr;
+          }
+        }); // update the location value and the external triples
         this.controller.withTransaction((tr) => {
           return transactionCombinator(
             this.controller.activeEditorState,
-            tr.setNodeAttribute(pos, 'value', toInsert),
+            tr
+              .setNodeAttribute(pos, 'value', toInsert)
+              .setNodeAttribute(pos, 'externalTriples', newExternalTriples),
           )([
+            // Update the subject uri, while keeping backlinks intact
             updateSubject({
               pos,
               targetSubject: toInsert.uri,
@@ -292,12 +311,13 @@ export default class LocationPluginInsertComponent extends Component<Signature>
         });
       } else {
         // Insert
-        replaceSelectionWithLocation(
-          this.controller,
-          toInsert.uri,
+        replaceSelectionWithLocation({
+          controller: this.controller,
+          subject: toInsert.uri,
           toInsert,
-          this.args.config.subjectTypesToLinkTo,
-        );
+          subjectTypes: this.args.config.subjectTypesToLinkTo,
+          explicitSubjectToLinkTo: this.args.config.explicitSubjectToLinkTo,
+        });
       }
     }
   }

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

@@ -230,7 +230,7 @@ class MapWrapper extends Component<MapWrapperSig> {
 
 export default class LocationPluginMapComponent extends Component<Signature> {
   @tracked vertices: GlobalCoordinates[] = [];
-  @tracked useOpenStreetMaps = false;
+  @tracked useGRB = true;
 
   // Use untracked properties as otherwise the map jumps to any area or location we pick
   existingAreaBounds = generateBoundsFromShape(this.args.existingArea);
@@ -275,7 +275,7 @@ export default class LocationPluginMapComponent extends Component<Signature> {
   }
 
   get tileProvider() {
-    if (this.useOpenStreetMaps) {
+    if (!this.useGRB) {
       return TILE_PROVIDER_CONSTANTS.OPEN_STREET_MAP;
     } else {
       return TILE_PROVIDER_CONSTANTS.GRB;
@@ -331,10 +331,11 @@ export default class LocationPluginMapComponent extends Component<Signature> {
             as |c|
           >
             <c.content>
-              <AuToggleSwitch @onChange={{set this 'useOpenStreetMaps'}}>
-                <p class='au-u-para-tiny'>{{t
-                    'location-plugin.use-open-street-map'
-                  }}</p>
+              <AuToggleSwitch
+                @checked={{this.useGRB}}
+                @onChange={{set this 'useGRB'}}
+              >
+                <p class='au-u-para-tiny'>{{t 'location-plugin.use-grb'}}</p>
               </AuToggleSwitch>
             </c.content>
           </AuCard>

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

@@ -1,5 +1,13 @@
-import { SayController, NodeSelection, PNode } from '@lblod/ember-rdfa-editor';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import {
+  SayController,
+  NodeSelection,
+  PNode,
+  RdfaAttrs,
+} from '@lblod/ember-rdfa-editor';
+import {
+  SayDataFactory,
+  sayDataFactory,
+} from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import {
   PROV,
   RDF,
@@ -12,6 +20,29 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { Area, Place } from './geo-helpers';
 import { Address } from './address-helpers';
+import { FullTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
+
+const df = new SayDataFactory();
+interface ReplaceSelectionWithLocationArgs {
+  /** SayController */
+  controller: SayController;
+  /** The uri of the Location resource */
+  subject: string;
+  /** The object representing the location to insert */
+  toInsert?: Place | Address | Area;
+  /**
+   * A list of Resources, each will be looked at in turn to compare the
+   * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
+   * used, etc.
+   *
+   * If found, the location will be linked to that resource using prov:atLocation
+   */
+  subjectTypes?: Resource[];
+  /**
+   * If present, the location will be linked to this uri using prov:atLocation using external triples.
+   */
+  explicitSubjectToLinkTo?: string;
+}
 
 /**
  * Creates an 'OSLO location' node in place of the selection, along with the RDFa to create a triple
@@ -19,18 +50,14 @@ import { Address } from './address-helpers';
  * prov:atLocation. This doesn't work well with the RDFa tools, but since refactoring is required to
  * clean up the RDFa structure inherited from variables and to make it work well with 'undo', this
  * work was put off until then.
- * @param controller - SayController
- * @param toInsert - The object representing the location to insert
- * @param subjectTypes - A list of Resources, each will be looked at in turn to compare the
- * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
- * used, etc.
  */
-export function replaceSelectionWithLocation(
-  controller: SayController,
-  subject: string,
-  toInsert?: Place | Address | Area,
-  subjectTypes?: Resource[],
-) {
+export function replaceSelectionWithLocation({
+  controller,
+  subject,
+  toInsert,
+  subjectTypes,
+  explicitSubjectToLinkTo,
+}: ReplaceSelectionWithLocationArgs) {
   let resourceToLink: { pos: number; node: PNode } | undefined;
   subjectTypes?.forEach((subjectType) => {
     if (!resourceToLink) {
@@ -59,7 +86,16 @@ export function replaceSelectionWithLocation(
           ),
         },
       ];
-
+  let externalTriples: FullTriple[];
+  if (explicitSubjectToLinkTo) {
+    externalTriples = [
+      {
+        subject: df.namedNode(explicitSubjectToLinkTo),
+        predicate: PROV('atLocation').full,
+        object: df.namedNode(subject),
+      },
+    ];
+  }
   controller.withTransaction((tr) => {
     tr.replaceSelectionWith(
       controller.schema.node('oslo_location', {
@@ -69,7 +105,8 @@ export function replaceSelectionWithLocation(
         value: toInsert,
         properties: [],
         backlinks,
-      }),
+        externalTriples,
+      } satisfies RdfaAttrs & { value: Place | Address | Area | undefined }),
     );
     if (tr.selection.$anchor.nodeBefore) {
       const resolvedPos = tr.doc.resolve(

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

@@ -49,6 +49,7 @@ export interface LocationPluginConfig {
   defaultPlaceUriRoot: string;
   defaultPointUriRoot: string;
   subjectTypesToLinkTo?: Resource[];
+  explicitSubjectToLinkTo?: string;
   additionalRDFTypes?: NamedNode[];
 }
 

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

@@ -21,10 +21,10 @@ export function replaceSelectionWithLocation(
   toInsert: Place | Address | Area,
   subjectTypes?: Resource[],
 ) {
-  return replaceSelectionWithLocationInternal(
+  return replaceSelectionWithLocationInternal({
     controller,
-    toInsert.uri,
+    subject: toInsert.uri,
     toInsert,
     subjectTypes,
-  );
+  });
 }

package/declarations/addon/components/besluit-topic-plugin/besluit-topic-select.d.ts

@@ -2,6 +2,8 @@ import Component from '@glimmer/component';
 import { BesluitTopic } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/fetchBesluitTopics';
 type Args = {
     besluitTopics: BesluitTopic[];
+    selected?: BesluitTopic[];
+    onchange: (topic: BesluitTopic[]) => void;
 };
 export default class BesluitTopicSelectComponent extends Component<Args> {
     AlertTriangleIcon: import("@ember/component/template-only").TOC<import("@appuniversum/ember-appuniversum/components/icons/alert-triangle").AlertTriangleIconSignature>;

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

@@ -20,7 +20,7 @@ interface Signature {
 }
 export default class LocationPluginMapComponent extends Component<Signature> {
     vertices: GlobalCoordinates[];
-    useOpenStreetMaps: boolean;
+    useGRB: boolean;
     existingAreaBounds: LatLngBoundsExpression | undefined;
     existingLocationCoords: GlobalCoordinates | undefined;
     mapLocation: LeafletMapStart;

package/declarations/addon/plugins/location-plugin/_private/utils/node-utils.d.ts

@@ -2,16 +2,32 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import { Resource } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { Area, Place } from './geo-helpers';
 import { Address } from './address-helpers';
+interface ReplaceSelectionWithLocationArgs {
+    /** SayController */
+    controller: SayController;
+    /** The uri of the Location resource */
+    subject: string;
+    /** The object representing the location to insert */
+    toInsert?: Place | Address | Area;
+    /**
+     * A list of Resources, each will be looked at in turn to compare the
+     * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
+     * used, etc.
+     *
+     * If found, the location will be linked to that resource using prov:atLocation
+     */
+    subjectTypes?: Resource[];
+    /**
+     * If present, the location will be linked to this uri using prov:atLocation using external triples.
+     */
+    explicitSubjectToLinkTo?: string;
+}
 /**
  * Creates an 'OSLO location' node in place of the selection, along with the RDFa to create a triple
  * with the nearest parent of one of the passed types as the subject and the predicate
  * prov:atLocation. This doesn't work well with the RDFa tools, but since refactoring is required to
  * clean up the RDFa structure inherited from variables and to make it work well with 'undo', this
  * work was put off until then.
- * @param controller - SayController
- * @param toInsert - The object representing the location to insert
- * @param subjectTypes - A list of Resources, each will be looked at in turn to compare the
- * `rdf:type` of the resource, if no parent is found matching the first, then the second will be
- * used, etc.
  */
-export declare function replaceSelectionWithLocation(controller: SayController, subject: string, toInsert?: Place | Address | Area, subjectTypes?: Resource[]): void;
+export declare function replaceSelectionWithLocation({ controller, subject, toInsert, subjectTypes, explicitSubjectToLinkTo, }: ReplaceSelectionWithLocationArgs): void;
+export {};

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

@@ -5,6 +5,7 @@ export interface LocationPluginConfig {
     defaultPlaceUriRoot: string;
     defaultPointUriRoot: string;
     subjectTypesToLinkTo?: Resource[];
+    explicitSubjectToLinkTo?: string;
     additionalRDFTypes?: NamedNode[];
 }
 export declare const osloLocation: (config: LocationPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;

package/package.json

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

package/translations/en-US.yaml

@@ -434,7 +434,7 @@ lmb-plugin:
 
 location-plugin:
   insert-placeholder: Insert location placeholder
-  use-open-street-map: OpenStreetMap
+  use-grb: GRB
   modal:
     insert: Insert location
     edit: Edit location

package/translations/nl-BE.yaml

@@ -431,7 +431,7 @@ lmb-plugin:
 
 location-plugin:
   insert-placeholder: Voeg locatie-placeholder in
-  use-open-street-map: OpenStreetMap
+  use-grb: GRB
   modal:
     insert: Locatie invoegen
     edit: Bewerk locatie