update lnksToType to addCardFilter

Author: tintinthong

packages/base/card-api.gts

@@ -44,6 +44,7 @@ import {
   type CardResourceMeta,
   CodeRef,
   CommandContext,
+  type Filter,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { initSharedState } from './shared-state';
@@ -1090,7 +1091,13 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
     }
     return class LinksToComponent extends GlimmerComponent<{
       Element: HTMLElement;
-      Args: { Named: { format?: Format; displayContainer?: boolean } };
+      Args: {
+        Named: {
+          format?: Format;
+          displayContainer?: boolean;
+          addCardFilter?: Filter;
+        };
+      };
       Blocks: {};
     }> {
       <template>
@@ -1099,6 +1106,7 @@ class LinksTo<CardT extends CardDefConstructor> implements Field<CardT> {
             <LinksToEditor
               @model={{(getInnerModel)}}
               @field={{linksToField}}
+              @addCardFilter={{@addCardFilter}}
               ...attributes
             />
           {{else}}
@@ -1812,7 +1820,7 @@ export type BaseDefComponent = ComponentLike<{
     fieldName: string | undefined;
     context?: CardContext;
     canEdit?: boolean;
-    linksToType?: CodeRef;
+    addCardFilter?: Filter;
   };
 }>;
 

packages/base/catalog-entry.gts

@@ -131,6 +131,10 @@ export class CatalogEntry extends CardDef {
       }
     });
 
+    get addCardFilter() {
+      return { type: this.args.model.ref };
+    }
+
     <template>
       <div class='container'>
         <div class='header'>
@@ -171,7 +175,7 @@ export class CatalogEntry extends CardDef {
           {{#if (eq @model.specType 'field')}}
             <@fields.containedExamples />
           {{else}}
-            <@fields.linkedExamples @linksToType={{@model.ref}} />
+            <@fields.linkedExamples @addCardFilter={{@model.ref}} />
           {{/if}}
         </div>
         <div class='module section'>
@@ -341,8 +345,14 @@ export class CatalogEntry extends CardDef {
       let url = new URL(this.args.model.id);
       return codeRefWithAbsoluteURL(this.args.model.ref, url);
     }
+
+    get addCardFilter() {
+      return {
+        type: this.absoluteRef,
+      };
+    }
     <template>
-      <@fields.linkedExamples @linksToType={{this.absoluteRef}} />
+      <@fields.linkedExamples @addCardFilter={{this.addCardFilter}} />
     </template>
   };
 }

packages/base/field-component.gts

@@ -21,6 +21,7 @@ import {
   Loader,
   type CodeRef,
   type Permissions,
+  type Filter,
 } from '@cardstack/runtime-common';
 import type { ComponentLike } from '@glint/template';
 import { CardContainer } from '@cardstack/boxel-ui/components';
@@ -37,7 +38,7 @@ export interface BoxComponentSignature {
     Named: {
       format?: Format;
       displayContainer?: boolean;
-      linksToType?: CodeRef;
+      addCardFilter?: Filter;
     };
   };
   Blocks: {};
@@ -194,7 +195,7 @@ export function getBoxComponent(
     Args: {
       format?: Format;
       displayContainer?: boolean;
-      linksToType?: CodeRef;
+      addCardFilter?: Filter;
     };
   }> = <template>
     <CardContextConsumer as |context|>
@@ -248,7 +249,7 @@ export function getBoxComponent(
                           (not field.computeVia)
                           permissions.canWrite
                         }}
-                        @linksToType={{@linksToType}}
+                        @addCardFilter={{@addCardFilter}}
                       />
                     </CardContainer>
                   </DefaultFormatsProvider>
@@ -276,7 +277,7 @@ export function getBoxComponent(
                         (not field.computeVia)
                         permissions.canWrite
                       }}
-                      @linksToType={{@linksToType}}
+                      @addCardFilter={{@addCardFilter}}
                     />
                   </div>
                 </DefaultFormatsProvider>
@@ -293,7 +294,7 @@ export function getBoxComponent(
                     @fieldName={{model.name}}
                     @context={{context}}
                     @canEdit={{and (not field.computeVia) permissions.canWrite}}
-                    @linksToType={{@linksToType}}
+                    @addCardFilter={{@addCardFilter}}
                     ...attributes
                   />
                 </DefaultFormatsProvider>

packages/base/links-to-editor.gts

@@ -22,6 +22,7 @@ import {
   identifyCard,
   CardContextName,
   RealmURLContextName,
+  type Filter,
 } from '@cardstack/runtime-common';
 import { AddButton, IconButton } from '@cardstack/boxel-ui/components';
 import { IconMinusCircle } from '@cardstack/boxel-ui/icons';
@@ -33,6 +34,7 @@ interface Signature {
   Args: {
     model: Box<CardDef | null>;
     field: Field<typeof CardDef>;
+    addCardFilter?: Filter;
   };
 }
 

packages/base/links-to-many-component.gts

@@ -29,7 +29,7 @@ import {
   getPlural,
   CardContextName,
   RealmURLContextName,
-  type CodeRef,
+  type Filter,
 } from '@cardstack/runtime-common';
 import { IconMinusCircle, IconX, FourLines } from '@cardstack/boxel-ui/icons';
 import { eq } from '@cardstack/boxel-ui/helpers';
@@ -48,7 +48,7 @@ interface Signature {
     model: Box<CardDef[]>;
     field: Field<typeof CardDef>;
     childFormat: 'atom' | 'fitted';
-    linksToType?: CodeRef;
+    addCardFilter?: Filter;
   };
 }
 
@@ -87,12 +87,13 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
     let selectedCardsQuery =
       selectedCards?.map((card: any) => ({ not: { eq: { id: card.id } } })) ??
       [];
-    let type =
-      this.args.linksToType ??
-      identifyCard(this.args.field.card) ??
-      baseCardRef;
+    let type = identifyCard(this.args.field.card) ?? baseCardRef;
     let filter = {
-      every: [{ type }, ...selectedCardsQuery],
+      every: [
+        { type },
+        ...selectedCardsQuery,
+        ...(this.args.addCardFilter ? [this.args.addCardFilter] : []),
+      ],
     };
     let chosenCard: CardDef | undefined = await chooseCard(
       { filter },
@@ -385,7 +386,7 @@ export function getLinksToManyComponent({
               defaultFormats.cardDef
               model
             }}
-            @linksToType={{@linksToType}}
+            @addCardFilter={{@addCardFilter}}
             ...attributes
           />
         {{else}}