Skip to content

Commit 908746b

Browse files
committed
Merge branch 'main' into queue-depth-endpoint
2 parents 5a2d89d + 4677c53 commit 908746b

File tree

191 files changed

+4701
-1298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+4701
-1298
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ Instead of running `pnpm start:base`, you can alternatively use `pnpm start:all`
8484
| :4205 | `/test` realm for matrix client tests (playwright controlled) | 🚫 | 🚫 |
8585
| :4210 | Development Worker Manager (spins up 1 worker by default) || 🚫 |
8686
| :4211 | Test Worker Manager (spins up 1 worker by default) || 🚫 |
87-
| :4212 | Test Worker Manager for matrix client tests (playwright controlled - 1 worker) || 🚫 |
88-
| :4213 | Test Worker Manager for matrix client tests - base realm server (playwright controlled - 1 worker) || 🚫 |
87+
| :4212 | Worker Manager for matrix client tests (playwright controlled - 1 worker) | | 🚫 |
88+
| :4213 | Worker Manager for matrix client tests - base realm server (playwright controlled - 1 worker) || 🚫 |
8989
| :5001 | Mail user interface for viewing emails sent to local SMTP || 🚫 |
9090
| :5435 | Postgres DB || 🚫 |
9191
| :8008 | Matrix synapse server || 🚫 |
@@ -223,7 +223,7 @@ There is a ember-freestyle component explorer available to assist with developme
223223

224224
1. `cd packages/boxel-ui/test-app`
225225
2. `pnpm start`
226-
3. Visit http://localhost:4210/ in your browser
226+
3. Visit http://localhost:4220/ in your browser
227227

228228
## Boxel Motion Demo App
229229

@@ -290,7 +290,7 @@ To run the `packages/realm-server/` workspace tests start:
290290
### Boxel UI
291291

292292
1. `cd packages/boxel-ui/test-app`
293-
2. `pnpm test` (or `pnpm start` and visit http://localhost:4210/tests to run tests in the browser)
293+
2. `pnpm test` (or `pnpm start` and visit http://localhost:4220/tests to run tests in the browser)
294294

295295
### Boxel Motion
296296

packages/base/card-api.gts

+14-10
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,10 @@ export class BaseDef {
16991699
}
17001700
return Object.fromEntries(
17011701
Object.entries(
1702-
getFields(value, { includeComputeds: true, usedFieldsOnly: true }),
1702+
getFields(value, {
1703+
includeComputeds: true,
1704+
usedLinksToFieldsOnly: true,
1705+
}),
17031706
).map(([fieldName, field]) => {
17041707
let rawValue = peekAtField(value, fieldName);
17051708
if (field?.fieldType === 'linksToMany') {
@@ -1967,7 +1970,7 @@ export function subscribeToChanges(
19671970
changeSubscribers.add(subscriber);
19681971

19691972
let fields = getFields(fieldOrCard, {
1970-
usedFieldsOnly: true,
1973+
usedLinksToFieldsOnly: true,
19711974
includeComputeds: false,
19721975
});
19731976
Object.keys(fields).forEach((fieldName) => {
@@ -2010,7 +2013,7 @@ export function unsubscribeFromChanges(
20102013
changeSubscribers.delete(subscriber);
20112014

20122015
let fields = getFields(fieldOrCard, {
2013-
usedFieldsOnly: true,
2016+
usedLinksToFieldsOnly: true,
20142017
includeComputeds: false,
20152018
});
20162019
Object.keys(fields).forEach((fieldName) => {
@@ -2308,7 +2311,7 @@ function serializeCardResource(
23082311
let { includeUnrenderedFields: remove, ...fieldOpts } = opts ?? {};
23092312
let { id: removedIdField, ...fields } = getFields(model, {
23102313
...fieldOpts,
2311-
usedFieldsOnly: !opts?.includeUnrenderedFields,
2314+
usedLinksToFieldsOnly: !opts?.includeUnrenderedFields,
23122315
});
23132316
let fieldResources = Object.entries(fields)
23142317
.filter(([_fieldName, field]) =>
@@ -2830,7 +2833,7 @@ export async function recompute(
28302833
Object.keys(
28312834
getFields(model, {
28322835
includeComputeds: true,
2833-
usedFieldsOnly: !opts?.recomputeAllFields,
2836+
usedLinksToFieldsOnly: !opts?.recomputeAllFields,
28342837
}),
28352838
),
28362839
);
@@ -2936,15 +2939,15 @@ export async function getIfReady<T extends BaseDef, K extends keyof T>(
29362939

29372940
export function getFields(
29382941
card: typeof BaseDef,
2939-
opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
2942+
opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
29402943
): { [fieldName: string]: Field<BaseDefConstructor> };
29412944
export function getFields<T extends BaseDef>(
29422945
card: T,
2943-
opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
2946+
opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
29442947
): { [P in keyof T]?: Field<BaseDefConstructor> };
29452948
export function getFields(
29462949
cardInstanceOrClass: BaseDef | typeof BaseDef,
2947-
opts?: { usedFieldsOnly?: boolean; includeComputeds?: boolean },
2950+
opts?: { usedLinksToFieldsOnly?: boolean; includeComputeds?: boolean },
29482951
): { [fieldName: string]: Field<BaseDefConstructor> } {
29492952
let obj: object | null;
29502953
let usedFields: string[] = [];
@@ -2979,9 +2982,10 @@ export function getFields(
29792982
!['contains', 'containsMany'].includes(maybeField.fieldType)
29802983
) {
29812984
if (
2982-
opts?.usedFieldsOnly &&
2985+
opts?.usedLinksToFieldsOnly &&
29832986
!usedFields.includes(maybeFieldName) &&
2984-
!maybeField.isUsed
2987+
!maybeField.isUsed &&
2988+
!['contains', 'containsMany'].includes(maybeField.fieldType)
29852989
) {
29862990
return [];
29872991
}

packages/base/cards-grid.gts

+7-1
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,19 @@ class Isolated extends Component<typeof CardsGrid> {
384384
on: catalogEntryRef,
385385
eq: { ref: activeFilterRef },
386386
},
387+
sort: [
388+
{
389+
by: 'createdAt',
390+
direction: 'desc',
391+
},
392+
],
387393
};
388394
}
389395
let card = await chooseCard<CatalogEntry>(
390396
{
391397
filter: {
392398
on: catalogEntryRef,
393-
every: [{ eq: { isField: false } }],
399+
every: [{ eq: { specType: 'card' } }],
394400
},
395401
},
396402
{ preselectedCardTypeQuery },

0 commit comments

Comments
 (0)