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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.4.0
+
+### Minor Changes
+
+- [#636](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/636) [`867383d`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/867383d8ee85dcf30ad7338cd80dc2c0802326c7) Thanks [@piemonkey](https://github.com/piemonkey)! - Use pointer functionality to link to make linking to codelist URIs possible
+
+### Patch Changes
+
+- [#636](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/636) [`aeb74b2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/aeb74b22f159f0297749e430093d90a54f5f34f6) Thanks [@piemonkey](https://github.com/piemonkey)! - Update to [v13.6.0](https://github.com/lblod/ember-rdfa-editor/releases/tag/%40lblod%2Fember-rdfa-editor%4013.6.0) of the editor
+
+## 35.3.0
+
+### Minor Changes
+
+- [#641](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/641) [`062b89a`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/062b89ad35edff9cb0963a17e606497697e7614a) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Add a way to set the required attribute of the label of the besluit type select
+
+### Patch Changes
+
+- [#635](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/635) [`d2ac617`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/d2ac61769c71978bc9bc5e3ff10385057ae807bb) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Fix resetting the placeholder edit card
+
 ## 35.2.0
 
 ### Minor Changes

package/addon/components/besluit-type-plugin/besluit-type-form.gts

@@ -8,6 +8,7 @@ interface Sig {
     types: BesluitType[];
     selectedType?: BesluitTypeInstance;
     setType: (selected: BesluitTypeInstance) => void;
+    required?: boolean;
   };
   Element: HTMLDivElement;
 }
@@ -44,6 +45,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
         @onchange={{this.updateParentType}}
         @selected={{@selectedType.parent}}
         @showWarningWhenEmpty={{false}}
+        @required={{@required}}
       />
       {{#if @selectedType.parent.subTypes.length}}
         <BesluitTypeSelect
@@ -52,6 +54,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
           @onchange={{this.updateSubType}}
           @selected={{@selectedType.subType}}
           @showWarningWhenEmpty={{true}}
+          @required={{@required}}
         />
       {{/if}}
       {{#if @selectedType.subType.subTypes.length}}
@@ -61,6 +64,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
           @onchange={{this.updateSubSubType}}
           @selected={{@selectedType.subSubType}}
           @showWarningWhenEmpty={{true}}
+          @required={{@required}}
         />
       {{/if}}
     </div>

package/addon/components/besluit-type-plugin/besluit-type-select.gts

@@ -15,6 +15,7 @@ interface Sig {
     selected?: BesluitType;
     showWarningWhenEmpty: boolean;
     onchange: (selected: BesluitType) => void;
+    required?: boolean;
   };
   Element: HTMLDivElement;
 }
@@ -43,7 +44,7 @@ export default class BesluitTypePluginBesluitTypeSelectComponent extends Compone
   <template>
     <div ...attributes>
       {{#let (uuidv4) as |id|}}
-        <AuLabel for={{id}}>
+        <AuLabel for={{id}} @required={{@required}}>
           {{t @fieldNameTranslation}}
         </AuLabel>
         <PowerSelect

package/addon/components/placeholder-utils-plugin/edit.gts

@@ -1,7 +1,6 @@
 import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
 import { type ComponentLike } from '@glint/template';
-import { NodeSelection, SayController } from '@lblod/ember-rdfa-editor';
+import { NodeSelection, Node, SayController } from '@lblod/ember-rdfa-editor';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 import AuCard from '@appuniversum/ember-appuniversum/components/au-card';
@@ -14,6 +13,8 @@ import AuNativeInput from '../au-native-input';
 import AuFormRow from '@appuniversum/ember-appuniversum/components/au-form-row';
 import checkEnterAndSubmit from '@lblod/ember-rdfa-editor-lblod-plugins/utils/check-enter-and-submit';
 import { fn } from '@ember/helper';
+import { not } from 'ember-truth-helpers';
+import { trackedReset } from 'tracked-toolbox';
 
 type VariableComponentArgs = {
   Args: {
@@ -34,7 +35,14 @@ type Args = {
 };
 
 export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
-  @tracked editedPlaceholderLabel?: string;
+  @trackedReset({
+    memo: 'selectedPlaceholderNode',
+    update(component: PlaceholderUtilsEditCardComponent) {
+      return component.selectedPlaceholderNode?.attrs.placeholderText;
+    },
+  })
+  placeholderLabel: string | null = null;
+  lastSelectedPlaceholder: Node | null = null;
 
   @service declare intl: IntlService;
 
@@ -50,20 +58,14 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
     ) {
       return selection.node;
     } else {
-      return;
+      return null;
     }
   }
   get showCard() {
     return !!this.selectedPlaceholderNode;
   }
-  get placeholderLabel() {
-    return (
-      this.editedPlaceholderLabel ||
-      this.selectedPlaceholderNode?.attrs.placeholderText
-    );
-  }
   updateLabelPlaceholder = (event: InputEvent) => {
-    this.editedPlaceholderLabel = (event.target as HTMLInputElement).value;
+    this.placeholderLabel = (event.target as HTMLInputElement).value;
   };
   updatePlaceholder = () => {
     const { selection } = this.controller.activeEditorState;
@@ -71,7 +73,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
       return tr.setNodeAttribute(
         selection.$from.pos,
         'placeholderText',
-        this.editedPlaceholderLabel,
+        this.placeholderLabel,
       );
     });
   };
@@ -110,6 +112,7 @@ export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
           <AuButton
             {{on 'click' this.updatePlaceholder}}
             class='au-u-margin-top'
+            @disabled={{not this.placeholderLabel}}
           >
             {{t 'editor-plugins.utils.insert'}}
           </AuButton>

package/addon/components/variable-plugin/marcode/insert.gts

@@ -50,6 +50,7 @@ export default class MarcodeInsertComponent extends Component<Sig> {
       // list in code instead of in the doc?
       hardcodedOptionList: hardcodedMarcodeList,
       label,
+      hasNonLiteralContents: true,
     });
     this.controller.doCommand(replaceSelectionWithAndSelectNode(node), {
       view: this.controller.mainEditorView,

package/addon/plugins/variable-plugin/actions/create-codelist-variable.ts

@@ -30,6 +30,7 @@ export function createCodelistVariable(args: CreateCodelistVariableArgs) {
       subject: args.value,
       variableInstance: args.variableInstance,
       text: args.valueLabel,
+      pointsToNode: args.__rdfaId,
     });
     return schema.nodes.codelist.create(attrs, [codelistOption]);
   }
@@ -42,6 +43,7 @@ type CreateCodelistVariableAttrsArgs = {
   source: string;
   codelist: string;
   hardcodedOptionList?: CodeListOption[];
+  hasNonLiteralContents?: boolean;
 } & AllOrNone<{
   variable: string;
   variableInstance: string;
@@ -57,6 +59,7 @@ export function createCodelistVariableAttrs({
   variable,
   variableInstance,
   hardcodedOptionList,
+  hasNonLiteralContents,
 }: CreateCodelistVariableAttrsArgs) {
   const externalTriples: FullTriple[] = [];
   if (variable) {
@@ -90,6 +93,7 @@ export function createCodelistVariableAttrs({
     variable,
     variableInstance,
     hardcodedOptionList,
+    hasNonLiteralContents: !!hasNonLiteralContents,
   } as CodelistAttrs;
 }
 
@@ -109,12 +113,14 @@ type CreateCodelistOptionNodeAttrsArgs = {
   text: string;
   value?: string;
   variableInstance?: string;
+  pointsToNode?: string;
 };
 
 function createCodelistOptionNodeAttrs({
   subject,
   text,
   variableInstance,
+  pointsToNode,
 }: CreateCodelistOptionNodeAttrsArgs) {
   const backlinks: IncomingTriple[] = [];
   if (variableInstance) {
@@ -135,5 +141,6 @@ function createCodelistOptionNodeAttrs({
     subject,
     properties,
     backlinks,
+    pointsToNode,
   };
 }

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

@@ -35,12 +35,16 @@ export function updateCodelistVariable(
   const variableInstance = selectedCodelist.node.attrs['variableInstance'] as
     | string
     | undefined;
+  const pointerTarget = selectedCodelist.node.attrs['__rdfaId'] as
+    | string
+    | undefined;
   const codelistOptionNodes = selectedOptions.map((option) =>
     createCodelistOptionNode({
       schema: controller.schema,
       text: option.label,
       subject: option.uri,
       variableInstance,
+      pointsToNode: pointerTarget,
     }),
   );
   const range = {

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

@@ -5,6 +5,7 @@ import {
 } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import {
   DOMOutputSpec,
+  EditorState,
   Fragment,
   PNode,
   Schema,
@@ -102,7 +103,7 @@ const parseDOM: TagParseRule[] = [
   },
 ];
 
-const toDOM = (node: PNode): DOMOutputSpec => {
+const toDOM = (node: PNode, state?: EditorState): DOMOutputSpec => {
   const {
     label = 'codelist',
     codelist,
@@ -119,30 +120,36 @@ const toDOM = (node: PNode): DOMOutputSpec => {
   for (let i = 0; i < codelist_option_nodes.length; i++) {
     const codelist_option_node = codelist_option_nodes[i];
     contentArray.push(
-      unwrap(codelist_option_node.type.spec.toDOM)(codelist_option_node),
+      unwrap((codelist_option_node.type.spec as SayNodeSpec).toDOM)(
+        codelist_option_node,
+        state,
+      ),
     );
     if (i !== codelist_option_nodes.length - 1) {
       contentArray.push(', ');
     }
   }
-  return renderRdfaAware({
-    renderable: node,
-    tag: 'span',
-    attrs: {
-      class: `${getClassnamesFromNode(node)}${className}`,
-      'data-say-variable': 'true',
-      'data-say-variable-type': 'codelist',
-      'data-say-node-version': '2',
-      'data-label': label as string | null,
-      'data-codelist': codelist as string,
-      'data-source': source as string,
-      'data-selection-style': selectionStyle as string,
-      'data-variable': variable as string,
-      'data-variable-instance': variableInstance as string,
-      'data-option-list': JSON.stringify(hardcodedOptionList),
+  return renderRdfaAware(
+    {
+      renderable: node,
+      tag: 'span',
+      attrs: {
+        class: `${getClassnamesFromNode(node)}${className}`,
+        'data-say-variable': 'true',
+        'data-say-variable-type': 'codelist',
+        'data-say-node-version': '2',
+        'data-label': label as string | null,
+        'data-codelist': codelist as string,
+        'data-source': source as string,
+        'data-selection-style': selectionStyle as string,
+        'data-variable': variable as string,
+        'data-variable-instance': variableInstance as string,
+        'data-option-list': JSON.stringify(hardcodedOptionList),
+      },
+      contentArray: contentArray.length ? contentArray : [label],
     },
-    contentArray: contentArray.length ? contentArray : [label],
-  });
+    state,
+  );
 };
 
 const emberNodeConfig: EmberNodeConfig = {
@@ -195,14 +202,17 @@ export const codelist_option: SayNodeSpec = {
   attrs: {
     ...rdfaAttrSpec({ rdfaAware }),
   },
-  toDOM: (node) => {
-    return renderRdfaAware({
-      renderable: node,
-      attrs: {
-        'data-say-type': 'codelist_option',
+  toDOM: (node, state) => {
+    return renderRdfaAware(
+      {
+        renderable: node,
+        attrs: {
+          'data-say-type': 'codelist_option',
+        },
+        tag: 'span',
+        content: node.textContent,
       },
-      tag: 'span',
-      content: node.textContent,
-    });
+      state,
+    );
   },
 };

package/declarations/addon/components/besluit-type-plugin/besluit-type-form.d.ts

@@ -6,6 +6,7 @@ interface Sig {
         types: BesluitType[];
         selectedType?: BesluitTypeInstance;
         setType: (selected: BesluitTypeInstance) => void;
+        required?: boolean;
     };
     Element: HTMLDivElement;
 }

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

@@ -7,6 +7,7 @@ interface Sig {
         selected?: BesluitType;
         showWarningWhenEmpty: boolean;
         onchange: (selected: BesluitType) => void;
+        required?: boolean;
     };
     Element: HTMLDivElement;
 }

package/declarations/addon/components/placeholder-utils-plugin/edit.d.ts

@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { type ComponentLike } from '@glint/template';
-import { SayController } from '@lblod/ember-rdfa-editor';
+import { Node, SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type VariableComponentArgs = {
     Args: {
@@ -19,12 +19,12 @@ type Args = {
     variableTypes: VariableConfig[];
 };
 export default class PlaceholderUtilsEditCardComponent extends Component<Args> {
-    editedPlaceholderLabel?: string;
+    placeholderLabel: string | null;
+    lastSelectedPlaceholder: Node | null;
     intl: IntlService;
     get controller(): SayController;
-    get selectedPlaceholderNode(): import("prosemirror-model").Node | undefined;
+    get selectedPlaceholderNode(): Node | null;
     get showCard(): boolean;
-    get placeholderLabel(): any;
     updateLabelPlaceholder: (event: InputEvent) => void;
     updatePlaceholder: () => void;
 }

package/declarations/addon/plugins/variable-plugin/actions/create-codelist-variable.d.ts

@@ -14,12 +14,13 @@ type CreateCodelistVariableAttrsArgs = {
     source: string;
     codelist: string;
     hardcodedOptionList?: CodeListOption[];
+    hasNonLiteralContents?: boolean;
 } & AllOrNone<{
     variable: string;
     variableInstance: string;
     __rdfaId?: string;
 }>;
-export declare function createCodelistVariableAttrs({ selectionStyle, label, source, codelist, __rdfaId, variable, variableInstance, hardcodedOptionList, }: CreateCodelistVariableAttrsArgs): CodelistAttrs;
+export declare function createCodelistVariableAttrs({ selectionStyle, label, source, codelist, __rdfaId, variable, variableInstance, hardcodedOptionList, hasNonLiteralContents, }: CreateCodelistVariableAttrsArgs): CodelistAttrs;
 type CreateCodelistOptionNodeArgs = {
     schema: Schema;
     text: string;
@@ -30,5 +31,6 @@ type CreateCodelistOptionNodeAttrsArgs = {
     text: string;
     value?: string;
     variableInstance?: string;
+    pointsToNode?: string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "35.2.0",
+  "version": "35.4.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -38,8 +38,9 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "lint:prettier": "prettier --check .",
-    "lint:prettier:fix": "prettier --write .",
+    "lint:prettier:fix": "pnpm format",
     "lint:types": "glint",
+    "format": "prettier --write .",
     "start": "concurrently -c \"auto\" -P \"pnpm:serve {@}\" \"pnpm:typecheck\" --",
     "typecheck": "glint --watch --preserveWatchOutput",
     "serve": "ember serve",
@@ -110,9 +111,8 @@
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
     "@glint/template": "^1.5.0",
-    "@graphy/content.ttl.write": "^4.3.7",
-    "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "13.1.1",
+    "@lblod/ember-rdfa-editor": "13.6.0",
+    "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -207,6 +207,7 @@
   "pnpm": {
     "overrides": {
       "babel-plugin-ember-template-compilation": "^2.2.5",
+      "@codemirror/state": "6.5.2",
       "prosemirror-view": "^1.41.5"
     }
   },