Improve types of variable plugin config

lblod · Apr 17, 2024 · f473cdf · f473cdf
1 parent 2b3babf
commit f473cdf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/addon/components/variable-plugin/insert-variable-card.ts b/addon/components/variable-plugin/insert-variable-card.ts
@@ -7,9 +7,16 @@ import { hasGroups } from '@lblod/ember-rdfa-editor/utils/node-utils';
 import { service } from '@ember/service';
 import IntlService from 'ember-intl/services/intl';
 
+type VariableComponentArgs = {
+  Args: {
+    Named: {
+      controller: SayController;
+    };
+  };
+};
 export type VariableConfig = {
   label: string;
-  component: ComponentLike;
+  component: ComponentLike<VariableComponentArgs>;
   options?: unknown;
 };
 

diff --git a/addon/utils/namespace.ts b/addon/utils/namespace.ts
@@ -1,9 +1,5 @@
 import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
-import {
-  isRdfaAttrs,
-  RdfaAttrs,
-  RdfaResourceAttrs,
-} from '@lblod/ember-rdfa-editor/core/schema';
+import { isRdfaAttrs, RdfaAttrs } from '@lblod/ember-rdfa-editor/core/schema';
 import {
   sayDataFactory,
   type SayNamedNode,
@@ -61,7 +57,7 @@ export function hasOutgoingNamedNodeTriple(
   ) {
     return false;
   }
-  return (rdfaAttrs as RdfaResourceAttrs).properties.some((prop) => {
+  return rdfaAttrs.properties.some((prop) => {
     return (
       prop.object.termType === 'NamedNode' &&
       predicate.matches(prop.predicate) &&

diff --git a/tests/dummy/app/controllers/editable-node.ts b/tests/dummy/app/controllers/editable-node.ts
@@ -204,34 +204,28 @@ export default class EditableBlockController extends Controller {
     return [
       {
         label: 'text',
-        // @ts-expect-error Unclear why these types don't agree
         component: TextVariableInsertComponent,
       },
       {
         label: 'number',
-        // @ts-expect-error Unclear why these types don't agree
         component: NumberInsertComponent,
       },
       {
         label: 'date',
-        // @ts-expect-error Unclear why these types don't agree
         component: DateInsertVariableComponent,
       },
       {
         label: 'location',
-        // @ts-expect-error Unclear why these types don't agree
         component: LocationInsertComponent,
         options: this.locationOptions,
       },
       {
         label: 'codelist',
-        // @ts-expect-error Unclear why these types don't agree
         component: CodelistInsertComponent,
         options: this.codelistOptions,
       },
       {
         label: 'address',
-        // @ts-expect-error Unclear why these types don't agree
         component: VariablePluginAddressInsertVariableComponent,
       },
     ];

diff --git a/tests/dummy/app/controllers/editable-nodes-regulatory-statement.ts b/tests/dummy/app/controllers/editable-nodes-regulatory-statement.ts
@@ -220,34 +220,28 @@ export default class RegulatoryStatementSampleController extends Controller {
     return [
       {
         label: 'text',
-        // @ts-expect-error Unclear why these types don't agree
         component: TextVariableInsertComponent,
       },
       {
         label: 'number',
-        // @ts-expect-error Unclear why these types don't agree
         component: NumberInsertComponent,
       },
       {
         label: 'date',
-        // @ts-expect-error Unclear why these types don't agree
         component: DateInsertVariableComponent,
       },
       {
         label: 'location',
-        // @ts-expect-error Unclear why these types don't agree
         component: LocationInsertComponent,
         options: this.locationOptions,
       },
       {
         label: 'codelist',
-        // @ts-expect-error Unclear why these types don't agree
         component: CodelistInsertComponent,
         options: this.codelistOptions,
       },
       {
         label: 'address',
-        // @ts-expect-error Unclear why these types don't agree
         component: VariablePluginAddressInsertVariableComponent,
       },
     ];

diff --git a/tests/dummy/app/controllers/regulatory-statement-sample.ts b/tests/dummy/app/controllers/regulatory-statement-sample.ts
@@ -188,34 +188,28 @@ export default class RegulatoryStatementSampleController extends Controller {
     return [
       {
         label: 'text',
-        // @ts-expect-error Unclear why these types don't agree
         component: TextVariableInsertComponent,
       },
       {
         label: 'number',
-        // @ts-expect-error Unclear why these types don't agree
         component: NumberInsertComponent,
       },
       {
         label: 'date',
-        // @ts-expect-error Unclear why these types don't agree
         component: DateInsertVariableComponent,
       },
       {
         label: 'location',
-        // @ts-expect-error Unclear why these types don't agree
         component: LocationInsertComponent,
         options: this.locationOptions,
       },
       {
         label: 'codelist',
-        // @ts-expect-error Unclear why these types don't agree
         component: CodelistInsertComponent,
         options: this.codelistOptions,
       },
       {
         label: 'address',
-        // @ts-expect-error Unclear why these types don't agree
         component: VariablePluginAddressInsertVariableComponent,
       },
     ];