Skip to content

feat(hypergraph): use native spaceId/spaceIds/typeIds filters for entities query #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baiirun wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −9
Open

feat(hypergraph): use native spaceId/spaceIds/typeIds filters for entities query #588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 46 additions & 9 deletions packages/hypergraph/src/entity/find-many-public.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,29 @@ const buildEntitiesQuery = (
.filter(Boolean)
.join(', ');

const orderByArgs = useOrderBy ? 'propertyId: $propertyId\n sortDirection: $sortDirection\n ' : '';
const entitySpaceFilter =
spaceSelection.mode === 'single'
? 'spaceIds: {in: [$spaceId]},'
: spaceSelection.mode === 'many'
? 'spaceIds: {in: $spaceIds},'
: '';
const valuesListFilter =
spaceSelection.mode === 'single'
? '(filter: { spaceId: { is: $spaceId } })'
: spaceSelection.mode === 'many'
? '(filter: { spaceId: { in: $spaceIds } })'
: '';

return `
// entitiesOrderedByProperty doesn't support the native typeIds filter yet,
// so we fall back to the relation-based filter for orderBy queries
if (useOrderBy) {
const orderByArgs = 'propertyId: $propertyId\n sortDirection: $sortDirection\n ';
const entitySpaceFilter =
spaceSelection.mode === 'single'
? 'spaceIds: {in: [$spaceId]},'
: spaceSelection.mode === 'many'
? 'spaceIds: {in: $spaceIds},'
: '';

return `
query ${queryName}(${variableDefinitions}) {
entities: ${queryName}(
${orderByArgs}filter: { and: [{
relations: {some: {typeId: {is: "8f151ba4de204e3c9cb499ddf96f48f1"}, toEntityId: {in: $typeIds}}},
relations: {some: {typeId: {is: "8f151ba4de204e3c9cb499ddf96f48f1"}, toEntityId: {in: $typeIds}}},
${entitySpaceFilter}
}, $filter]}
first: $first
Expand All @@ -95,6 +99,39 @@ query ${queryName}(${variableDefinitions}) {
}
${level1Relations}
}
}`;
}

// For the regular entities query, use the native spaceId/spaceIds and typeIds filters
const spaceArg =
spaceSelection.mode === 'single'
? 'spaceId: $spaceId'
: spaceSelection.mode === 'many'
? 'spaceIds: {in: $spaceIds}'
: '';

return `
query ${queryName}(${variableDefinitions}) {
entities: ${queryName}(
${spaceArg}
typeIds: {in: $typeIds}
filter: $filter
first: $first
offset: $offset
) {
id
name${spaceIdsSelection}
valuesList${valuesListFilter} {
propertyId
text
boolean
float
datetime
point
schedule
}
${level1Relations}
}
}`;
};

Expand Down
Loading