linting and changeset

lblod · Sep 9, 2024 · a114436 · a114436
1 parent ec6098f
commit a114436
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 72 deletions.
diff --git a/.changeset/mean-deers-call.md b/.changeset/mean-deers-call.md
@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add autofill variable
diff --git a/addon/components/variable-plugin/autofilled/insert.hbs b/addon/components/variable-plugin/autofilled/insert.hbs
@@ -24,7 +24,7 @@
     @checked={{this.convertToString}}
     @onChange={{this.updateConvertToString}}
   >
-     {{t 'variable-plugin.autofill.convertToString'}}
+    {{t 'variable-plugin.autofill.convertToString'}}
   </AuCheckbox>
 </AuFormRow>
 <AuButton {{on 'click' this.insert}}>

diff --git a/addon/components/variable-plugin/autofilled/insert.ts b/addon/components/variable-plugin/autofilled/insert.ts
@@ -46,7 +46,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
   }
 
   @action
-  updateConvertToString(value: boolean){
+  updateConvertToString(value: boolean) {
     this.convertToString = value;
   }
 
@@ -89,7 +89,7 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
           },
         ],
         autofillKey: this.autofillKey,
-        convertToString: this.convertToString
+        convertToString: this.convertToString,
       },
 
       this.schema.node('placeholder', {

diff --git a/addon/components/variable-plugin/autofilled/nodeview.hbs b/addon/components/variable-plugin/autofilled/nodeview.hbs
@@ -5,21 +5,21 @@
   class='variable'
   {{on 'click' this.onClick}}
 >
-    <EmberNode::EmbeddedEditor
-      @controller={{@controller}}
-      @view={{@view}}
-      @getPos={{@getPos}}
-      @node={{@node}}
-      @selected={{@selected}}
-      @initEditor={{this.initEditor}}
-      @nodeViews={{@nodeViews}}
-      @plugins={{this.plugins}}
-      @decorations={{@decorations}}
-      @contentDecorations={{@contentDecorations}}
-    />
-    {{#if this.label}}
-      <span class='label'>
-        ({{this.label}})
-      </span>
-    {{/if}}
+  <EmberNode::EmbeddedEditor
+    @controller={{@controller}}
+    @view={{@view}}
+    @getPos={{@getPos}}
+    @node={{@node}}
+    @selected={{@selected}}
+    @initEditor={{this.initEditor}}
+    @nodeViews={{@nodeViews}}
+    @plugins={{this.plugins}}
+    @decorations={{@decorations}}
+    @contentDecorations={{@contentDecorations}}
+  />
+  {{#if this.label}}
+    <span class='label'>
+      ({{this.label}})
+    </span>
+  {{/if}}
 </AuPill>
diff --git a/addon/components/variable-plugin/autofilled/nodeview.ts b/addon/components/variable-plugin/autofilled/nodeview.ts
@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import { NodeSelection, ProsePlugin, SayView, Transaction } from '@lblod/ember-rdfa-editor';
+import { NodeSelection, ProsePlugin, SayView } from '@lblod/ember-rdfa-editor';
 import { editableNodePlugin } from '@lblod/ember-rdfa-editor/plugins/editable-node';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -9,7 +9,6 @@ import { EmberNodeArgs } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { EXT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 
-
 export default class AutoFilledVariableNodeViewComponent extends Component<EmberNodeArgs> {
   PencilIcon = PencilIcon;
 

diff --git a/addon/plugins/variable-plugin/plugins/autofiller.ts b/addon/plugins/variable-plugin/plugins/autofiller.ts
@@ -6,13 +6,13 @@ import {
   Transaction,
 } from '@lblod/ember-rdfa-editor';
 import { changedDescendants } from '@lblod/ember-rdfa-editor/utils/_private/changed-descendants';
-import {undoDepth} from '@lblod/ember-rdfa-editor/plugins/history'
+import { undoDepth } from '@lblod/ember-rdfa-editor/plugins/history';
 
 type AutofilledArgs = {
   autofilledValues: {
-    [Key: string]: string
-  }
-}
+    [Key: string]: string;
+  };
+};
 
 export function variableAutofillerPlugin(config: AutofilledArgs): ProsePlugin {
   return new ProsePlugin({
@@ -28,9 +28,7 @@ export function variableAutofillerPlugin(config: AutofilledArgs): ProsePlugin {
           newState.doc,
           0,
           (node: PNode, pos: number) => {
-            if (
-              node.type.name === 'autofilled_variable'
-            ) {
+            if (node.type.name === 'autofilled_variable') {
               autofilledVariables.push({ node, pos });
               return false;
             }
@@ -39,39 +37,52 @@ export function variableAutofillerPlugin(config: AutofilledArgs): ProsePlugin {
         );
       } else {
         newState.doc.descendants((node: PNode, pos: number) => {
-          if (
-            node.type.name === 'autofilled_variable'
-          ) {
+          if (node.type.name === 'autofilled_variable') {
             autofilledVariables.push({ node, pos });
             return false;
           }
           return true;
-        })
+        });
       }
       if (autofilledVariables.length) {
         const tr = newState.tr;
-        autofilledVariables.reverse()
+        autofilledVariables.reverse();
         for (const { node, pos } of autofilledVariables) {
-          autofillVariable(node, pos, config.autofilledValues, tr, newState.schema)
+          autofillVariable(
+            node,
+            pos,
+            config.autofilledValues,
+            tr,
+            newState.schema,
+          );
         }
         return tr;
       }
-      return newState.tr;;
+      return newState.tr;
     },
   });
 }
 
-function autofillVariable(node: PNode, pos: number, values: {[Key: string]: string}, tr: Transaction, schema: Schema) {
+function autofillVariable(
+  node: PNode,
+  pos: number,
+  values: { [Key: string]: string },
+  tr: Transaction,
+  schema: Schema,
+) {
   const autofillKey = node.attrs.autofillKey;
-    const value = values[autofillKey]
-    if(value) {
-      const nodeSize = node.nodeSize;
-      const valueNode = schema.text(value);
-      if(node.attrs.convertToString === true || node.attrs.convertToString === "true" ) {
-          tr.replaceRangeWith(pos, pos+nodeSize , valueNode)
-          return;
-      } else {
-        tr.replaceRangeWith(pos + 1, pos+nodeSize - 1, valueNode)
-      }
+  const value = values[autofillKey] as string;
+  if (value) {
+    const nodeSize = node.nodeSize;
+    const valueNode = schema.text(value);
+    if (
+      node.attrs.convertToString === true ||
+      node.attrs.convertToString === 'true'
+    ) {
+      tr.replaceRangeWith(pos, pos + nodeSize, valueNode);
+      return;
+    } else {
+      tr.replaceRangeWith(pos + 1, pos + nodeSize - 1, valueNode);
     }
+  }
 }
diff --git a/addon/plugins/variable-plugin/variables/autofilled.ts b/addon/plugins/variable-plugin/variables/autofilled.ts
@@ -48,12 +48,12 @@ const parseDOM = [
           return false;
         }
         const autofillKey = node.dataset.autofillKey;
-        const convertToString = node.dataset.convertToString
+        const convertToString = node.dataset.convertToString;
         return {
           ...attrs,
           autofillKey,
-          convertToString
-        }
+          convertToString,
+        };
       }
 
       return false;
@@ -78,7 +78,7 @@ const parseDOM = [
         const variableInstance = parseVariableInstance(node);
         const label = parseLabel(node);
         const autofillKey = node.dataset.autofillKey;
-        const convertToString = node.dataset.convertToString
+        const convertToString = node.dataset.convertToString;
         return {
           __rdfaId: uuidv4(),
           subject: mappingSubject,
@@ -109,7 +109,7 @@ const parseDOM = [
             },
           ],
           autofillKey,
-          convertToString
+          convertToString,
         };
       }
 
@@ -126,18 +126,12 @@ const toDOM = (node: PNode): DOMOutputSpec => {
     attrs: {
       ...node.attrs,
       'data-autofill-key': node.attrs.autofillKey,
-      'data-convert-to-string': node.attrs.convertToString
+      'data-convert-to-string': node.attrs.convertToString,
     },
     content: 0,
   });
 };
 
-type AutofilledArgs = {
-  autofilledValues: {
-    [Key: string]: string
-  }
-}
-
 const emberNodeConfig: EmberNodeConfig = {
   name: 'autofilled-variable',
   component: AutofilledNodeViewComponent as unknown as ComponentLike,
@@ -154,11 +148,11 @@ const emberNodeConfig: EmberNodeConfig = {
   attrs: {
     ...rdfaAttrSpec({ rdfaAware }),
     autofillKey: {
-      default: ''
+      default: '',
     },
     convertToString: {
-      default: false
-    }
+      default: false,
+    },
   },
   toDOM,
   parseDOM,

diff --git a/addon/plugins/variable-plugin/variables/index.ts b/addon/plugins/variable-plugin/variables/index.ts
@@ -5,4 +5,4 @@ export * from './location';
 export * from './address';
 export * from './date';
 export * from './person';
-export * from './autofilled'
+export * from './autofilled';
diff --git a/tests/dummy/app/controllers/besluit-sample.ts b/tests/dummy/app/controllers/besluit-sample.ts
@@ -73,7 +73,7 @@ import {
   personVariableView,
   person_variable,
   autofilled_variable,
-  autofilledVariableView
+  autofilledVariableView,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
 import {
   osloLocation,
@@ -291,8 +291,8 @@ export default class BesluitSampleController extends Controller {
         autofilledValues: {
           administrativeUnit: 'Geemente Aalst',
           dateRightNow: new Date().toLocaleString(),
-        }
-      }
+        },
+      },
     };
   }
 
@@ -322,7 +322,7 @@ export default class BesluitSampleController extends Controller {
       inline_rdfa: inlineRdfaWithConfigView({ rdfaAware: true })(controller),
       structure: structureView(controller),
       mandatee_table: mandateeTableView(controller),
-      autofilled_variable: autofilledVariableView(controller)
+      autofilled_variable: autofilledVariableView(controller),
     } satisfies Record<string, SayNodeViewConstructor>;
   };
   @tracked plugins: Plugin[] = [

diff --git a/tests/dummy/app/controllers/regulatory-statement-sample.ts b/tests/dummy/app/controllers/regulatory-statement-sample.ts
@@ -72,7 +72,7 @@ import {
   personVariableView,
   person_variable,
   autofilled_variable,
-  autofilledVariableView
+  autofilledVariableView,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/variables';
 import { VariableConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/insert-variable-card';
 import {
@@ -324,9 +324,8 @@ export default class RegulatoryStatementSampleController extends Controller {
         endpoint: '/codex/sparql',
       } as CitationPluginConfig,
       autofilledVariable: {
-        autofilledValues: {
-        }
-      }
+        autofilledValues: {},
+      },
     };
   }
 
@@ -357,7 +356,7 @@ export default class RegulatoryStatementSampleController extends Controller {
       inline_rdfa: inlineRdfaWithConfigView({ rdfaAware: true })(controller),
       snippet_placeholder: snippetPlaceholderView(controller),
       snippet: snippetView(this.config.snippet)(controller),
-      autofilled_variable: autofilledVariableView(controller)
+      autofilled_variable: autofilledVariableView(controller),
     };
   };
   @tracked plugins: Plugin[] = [