@lblod/ember-rdfa-editor-lblod-plugins 22.3.0 → 22.4.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 22.4.0
+
+### Minor Changes
+
+- [#471](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/471) [`8132a55`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/8132a550124cf90b47c3d1c759ce43bd9f72cfab) Thanks [@elpoelma](https://github.com/elpoelma)! - Introduce opt-in option to `insert-article` component to allow for inserting decision articles everywhere in a document (not just to the article-container of a decision). Useful when e.g. creating snippets.
+
+### Patch Changes
+
+- [#470](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/470) [`fdfd8b8`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/fdfd8b80c58adc07e968d131dce7618b57b27e49) Thanks [@piemonkey](https://github.com/piemonkey)! - Correct CRS URI used in location plugin to correctly use http: instead of https:
+
 ## 22.3.0
 
 ### Minor Changes

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

@@ -3,36 +3,69 @@ import { on } from '@ember/modifier';
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
-import { SayController } from '@lblod/ember-rdfa-editor';
+import { PNode, SayController } from '@lblod/ember-rdfa-editor';
 import { getCurrentBesluitRange } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/besluit-topic-plugin/utils/helpers';
 import insertArticle from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/commands/insert-article-command';
 import { buildArticleStructure } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/decision-plugin/utils/build-article-structure';
-import t from 'ember-intl/helpers/t';
 import { not } from 'ember-truth-helpers';
+import { service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
+import { recalculateNumbers } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/recalculate-structure-numbers';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 
 export interface InsertArticleOptions {
   uriGenerator?: () => string;
+  insertFreely?: boolean;
 }
 interface Sig {
-  Args: { controller: SayController; options?: InsertArticleOptions };
+  Args: {
+    controller: SayController;
+    label: string;
+    options?: InsertArticleOptions;
+  };
 }
 export default class InsertArticleComponent extends Component<Sig> {
+  @service declare intl: IntlService;
+
   get controller() {
     return this.args.controller;
   }
 
+  get options() {
+    return this.args.options;
+  }
+
+  get label() {
+    return this.args.label ?? this.intl.t('besluit-plugin.insert.article');
+  }
+
   get schema() {
     return this.controller.schema;
   }
+
   get decisionRange() {
     return getCurrentBesluitRange(this.controller);
   }
+
   get decisionLocation() {
     return this.decisionRange
       ? { pos: this.decisionRange.from, node: this.decisionRange.node }
       : null;
   }
+
   get canInsert() {
+    if (this.options?.insertFreely) {
+      return this.canInsertFreely;
+    } else {
+      return this.canInsertInDecision;
+    }
+  }
+
+  get canInsertFreely() {
+    return true;
+  }
+
+  get canInsertInDecision() {
     if (!this.decisionLocation) {
       return false;
     }
@@ -51,15 +84,32 @@ export default class InsertArticleComponent extends Component<Sig> {
       this.schema,
       this.args.options?.uriGenerator,
     );
-    if (!structureNode) {
-      return;
+    if (this.args.options?.insertFreely) {
+      this.insertFreely(structureNode);
+    } else {
+      this.insertInDecision(structureNode);
     }
+  }
+
+  @action
+  insertFreely(node: PNode) {
+    this.controller.withTransaction((tr) => {
+      return transactionCombinator(
+        this.controller.activeEditorState,
+        tr.replaceSelectionWith(node),
+      )([recalculateNumbers]).transaction;
+    });
+    this.controller.focus();
+  }
+
+  @action
+  insertInDecision(node: PNode) {
     if (!this.decisionLocation) {
       return;
     }
     this.controller.doCommand(
       insertArticle({
-        node: structureNode,
+        node,
         decisionLocation: this.decisionLocation,
       }),
     );
@@ -75,7 +125,7 @@ export default class InsertArticleComponent extends Component<Sig> {
         @disabled={{not this.canInsert}}
         {{on 'click' this.doInsert}}
       >
-        {{t 'besluit-plugin.insert.article'}}
+        {{this.label}}
       </AuButton>
     </li>
   </template>

package/addon/plugins/location-plugin/utils/geo-helpers.ts

@@ -110,7 +110,7 @@ export type GeoPos = {
 };
 
 export function constructLambert72GMLString({ x, y }: Lambert72Coordinates) {
-  return `<gml:Point srsName="https://www.opengis.net/def/crs/EPSG/0/31370" xmlns:gml="http://www.opengis.net/gml/3.2"><gml:pos>${x} ${y}</gml:pos></gml:Point>`;
+  return `<gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/31370" xmlns:gml="http://www.opengis.net/gml/3.2"><gml:pos>${x} ${y}</gml:pos></gml:Point>`;
 }
 /**
  * Use a regex to parse a simple point as a GML string and return the coordinates.
@@ -122,7 +122,7 @@ export function parseLambert72GMLString(gml: string): GeoPos {
   // which can be represented. Since we handle only simple points, it's much less complex to just
   // use a simple regex.
   const [_, crs, x, y] =
-    /<gml.Point .*srsName="https:\/\/www.opengis.net\/def\/crs\/([^"]+)".+<gml.pos>(\S+) ([^<]+)<\/gml:pos>/.exec(
+    /<gml.Point .*srsName="https?:\/\/www.opengis.net\/def\/crs\/([^"]+)".+<gml.pos>(\S+) ([^<]+)<\/gml:pos>/.exec(
       gml,
     ) || [];
   if (!crs || crs !== 'EPSG/0/31370') {
@@ -144,11 +144,11 @@ export function constructLambert72WKTString(
 ) {
   if (!Array.isArray(coords)) {
     const { x, y } = coords;
-    return `<https://www.opengis.net/def/crs/EPSG/0/31370> POINT(${x} ${y})`;
+    return `<http://www.opengis.net/def/crs/EPSG/0/31370> POINT(${x} ${y})`;
   } else {
     const points = coords.map(({ x, y }) => `${x} ${y}`).join(', ');
     // Double brackets are not a mistake...
-    return `<https://www.opengis.net/def/crs/EPSG/0/31370> POLYGON((${points}))`;
+    return `<http://www.opengis.net/def/crs/EPSG/0/31370> POLYGON((${points}))`;
   }
 }
 
@@ -171,7 +171,7 @@ export function parseLambert72WKTString(gml: string): GeoPos | GeoPos[] {
   // cases, it's much less complex to just use a simple regex.
 
   const [_, crs, shape, dimensions] =
-    /<https:\/\/www.opengis.net\/def\/crs\/([^"]+)> (POLYGON|POINT)\(\(?([\d,. ]+)\)\)?/.exec(
+    /<https?:\/\/www.opengis.net\/def\/crs\/([^"]+)> (POLYGON|POINT)\(\(?([\d,. ]+)\)\)?/.exec(
       gml,
     ) || [];
   if (crs && crs === 'EPSG/0/31370') {

package/addon/plugins/variable-plugin/utils/address-helpers.ts

@@ -342,7 +342,7 @@ export type Lambert72Coordinates = {
 };
 
 export function constructLambert72GMLString({ x, y }: Lambert72Coordinates) {
-  return `<gml:Point srsName="https://www.opengis.net/def/crs/EPSG/0/31370" xmlns:gml="http://www.opengis.net/gml/3.2"><gml:pos>${x} ${y}</gml:pos></gml:Point>`;
+  return `<gml:Point srsName="http://www.opengis.net/def/crs/EPSG/0/31370" xmlns:gml="http://www.opengis.net/gml/3.2"><gml:pos>${x} ${y}</gml:pos></gml:Point>`;
 }
 /**
  * Use a regex to parse a simple point as a GML string and return the coordinates.
@@ -354,7 +354,7 @@ export function parseLambert72GMLString(gml: string): Lambert72Coordinates {
   // which can be represented. Since we handle only simple points, it's much less complex to just
   // use a simple regex.
   const [_, crs, x, y] =
-    /<gml.Point .*srsName="https:\/\/www.opengis.net\/def\/crs\/([^"]+)".+<gml.pos>(\S+) ([^<]+)<\/gml:pos>/.exec(
+    /<gml.Point .*srsName="https?:\/\/www.opengis.net\/def\/crs\/([^"]+)".+<gml.pos>(\S+) ([^<]+)<\/gml:pos>/.exec(
       gml,
     ) || [];
   if (!crs || crs !== 'EPSG/0/31370') {
@@ -370,7 +370,7 @@ export function parseLambert72GMLString(gml: string): Lambert72Coordinates {
  * [the GeoSPARQL spec]{@link https://docs.ogc.org/is/22-047r1/22-047r1.html#10-8-1-%C2%A0-well-known-text}
  */
 export function constructLambert72WKTString({ x, y }: Lambert72Coordinates) {
-  return `<https://www.opengis.net/def/crs/EPSG/0/31370> POINT(${x} ${y})`;
+  return `<http://www.opengis.net/def/crs/EPSG/0/31370> POINT(${x} ${y})`;
 }
 /**
  * Use a regex to parse a simple point as a WKT string and return the coordinates.
@@ -382,7 +382,7 @@ export function parseLambert72WKTString(gml: string): Lambert72Coordinates {
   // which can be represented or within untyped libraries (e.g. wicket). Since we handle only simple
   // points, it's much less complex to just use a simple regex.
   const [_, crs, x, y] =
-    /<https:\/\/www.opengis.net\/def\/crs\/([^"]+)> POINT\((\S+) ([^)]+)\)/.exec(
+    /<https?:\/\/www.opengis.net\/def\/crs\/([^"]+)> POINT\((\S+) ([^)]+)\)/.exec(
       gml,
     ) || [];
   if (!crs || crs !== 'EPSG/0/31370') {

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

@@ -1,23 +1,33 @@
 import Component from '@glimmer/component';
-import { SayController } from '@lblod/ember-rdfa-editor';
+import { PNode, SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 export interface InsertArticleOptions {
     uriGenerator?: () => string;
+    insertFreely?: boolean;
 }
 interface Sig {
     Args: {
         controller: SayController;
+        label: string;
         options?: InsertArticleOptions;
     };
 }
 export default class InsertArticleComponent extends Component<Sig> {
+    intl: IntlService;
     get controller(): SayController;
+    get options(): InsertArticleOptions | undefined;
+    get label(): string;
     get schema(): import("prosemirror-model").Schema<any, any>;
     get decisionRange(): import("@lblod/ember-rdfa-editor/plugins/datastore").ElementPNode | undefined;
     get decisionLocation(): {
         pos: number;
-        node: import("prosemirror-model").Node;
+        node: PNode;
     } | null;
     get canInsert(): boolean;
+    get canInsertFreely(): boolean;
+    get canInsertInDecision(): boolean;
     doInsert(): void;
+    insertFreely(node: PNode): void;
+    insertInDecision(node: PNode): void;
 }
 export {};

package/package.json

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