Merge branch 'main' into CS-7693-embedded-account-card

cardstack · Jan 24, 2025 · 3bb19b7 · 3bb19b7
2 parents 2ca2580 + 32a3e8a
commit 3bb19b7
Show file tree

Hide file tree

Showing 112 changed files with 1,922 additions and 480 deletions.
diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
@@ -1699,7 +1699,10 @@ export class BaseDef {
       }
       return Object.fromEntries(
         Object.entries(
-          getFields(value, { includeComputeds: true, usedFieldsOnly: true }),
+          getFields(value, {
+            includeComputeds: true,
+            usedLinksToFieldsOnly: true,
+          }),
         ).map(([fieldName, field]) => {
           let rawValue = peekAtField(value, fieldName);
           if (field?.fieldType === 'linksToMany') {
@@ -1967,7 +1970,7 @@ export function subscribeToChanges(
   changeSubscribers.add(subscriber);
 
   let fields = getFields(fieldOrCard, {
-    usedFieldsOnly: true,
+    usedLinksToFieldsOnly: true,
     includeComputeds: false,
   });
   Object.keys(fields).forEach((fieldName) => {
@@ -2010,7 +2013,7 @@ export function unsubscribeFromChanges(
   changeSubscribers.delete(subscriber);
 
   let fields = getFields(fieldOrCard, {
-    usedFieldsOnly: true,
+    usedLinksToFieldsOnly: true,
     includeComputeds: false,
   });
   Object.keys(fields).forEach((fieldName) => {
@@ -2308,7 +2311,7 @@ function serializeCardResource(
   let { includeUnrenderedFields: remove, ...fieldOpts } = opts ?? {};
   let { id: removedIdField, ...fields } = getFields(model, {
     ...fieldOpts,
-    usedFieldsOnly: !opts?.includeUnrenderedFields,
+    usedLinksToFieldsOnly: !opts?.includeUnrenderedFields,
   });
   let fieldResources = Object.entries(fields)
     .filter(([_fieldName, field]) =>
@@ -2830,7 +2833,7 @@ export async function recompute(
       Object.keys(
         getFields(model, {
           includeComputeds: true,
-          usedFieldsOnly: !opts?.recomputeAllFields,
+          usedLinksToFieldsOnly: !opts?.recomputeAllFields,
         }),
       ),
     );
@@ -2936,15 +2939,15 @@ export async function getIfReady<T extends BaseDef, K extends keyof T>(
 
 export function getFields(
   card: typeof BaseDef,
-  opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
+  opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
 ): { [fieldName: string]: Field<BaseDefConstructor> };
 export function getFields<T extends BaseDef>(
   card: T,
-  opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
+  opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
 ): { [P in keyof T]?: Field<BaseDefConstructor> };
 export function getFields(
   cardInstanceOrClass: BaseDef | typeof BaseDef,
-  opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
+  opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
 ): { [fieldName: string]: Field<BaseDefConstructor> } {
   let obj: object | null;
   let usedFields: string[] = [];
@@ -2979,9 +2982,10 @@ export function getFields(
         !['contains', 'containsMany'].includes(maybeField.fieldType)
       ) {
         if (
-          opts?.usedFieldsOnly &&
+          opts?.usedLinksToFieldsOnly &&
           !usedFields.includes(maybeFieldName) &&
-          !maybeField.isUsed
+          !maybeField.isUsed &&
+          !['contains', 'containsMany'].includes(maybeField.fieldType)
         ) {
           return [];
         }

diff --git a/packages/base/cards-grid.gts b/packages/base/cards-grid.gts
@@ -384,13 +384,19 @@ class Isolated extends Component<typeof CardsGrid> {
           on: catalogEntryRef,
           eq: { ref: activeFilterRef },
         },
+        sort: [
+          {
+            by: 'createdAt',
+            direction: 'desc',
+          },
+        ],
       };
     }
     let card = await chooseCard<CatalogEntry>(
       {
         filter: {
           on: catalogEntryRef,
-          every: [{ eq: { isField: false } }],
+          every: [{ eq: { specType: 'card' } }],
         },
       },
       { preselectedCardTypeQuery },