Skip to content

UBER-1038: Fix flicking during issue creation #3826

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

Merged
haiodo merged 1 commit into from
Oct 11, 2023
Merged

UBER-1038: Fix flicking during issue creation #3826

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions packages/query/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ export class LiveQuery extends TxProcessor implements Client {

for (const queries of this.queries) {
const isTx = hierarchy.isDerived(queries[0], core.class.Tx)
const isMixin = hierarchy.isDerived(tx.mixin, queries[0])

for (const q of queries[1]) {
if (isTx) {
// handle add since Txes are immutable
Expand Down Expand Up @@ -455,9 +455,9 @@ export class LiveQuery extends TxProcessor implements Client {
await this.sort(q, tx)
const udoc = q.result.find((p) => p._id === tx.objectId)
await this.updatedDocCallback(udoc, q)
} else if (isMixin) {
} else if (queries[0] === tx.mixin) {
// Mixin potentially added to object we doesn't have in out results
const doc = await this.client.findOne(q._class, { _id: tx.objectId }, q.options)
const doc = await this.client.findOne(q._class, { ...q.query, _id: tx.objectId }, q.options)
if (doc !== undefined) {
await this.handleDocAdd(q, doc, false)
}
Expand Down
48 changes: 11 additions & 37 deletions plugins/view-resources/src/components/list/List.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

$: queryNoLookup = noLookup(resultQuery)

let fastQueryIds: Ref<Doc>[] = []
let fastQueryIds: Set<Ref<Doc>> = new Set()

let categoryQueryOptions: Partial<FindOptions<Doc>>
$: categoryQueryOptions = {
Expand All @@ -79,46 +79,20 @@
queryNoLookup,
(res) => {
fastDocs = res
fastQueryIds = res.map((it) => it._id)
fastQueryIds = new Set(res.map((it) => it._id))
},
{ ...categoryQueryOptions, limit: 1000 }
)
$: {
let doQuery = false
let _idQuery: DocumentQuery<Doc>['_id'] = { $nin: fastQueryIds }

if (fastQueryIds.length > 0) {
doQuery = true

if (typeof resultQuery._id === 'object' && resultQuery._id?.$in !== undefined) {
const inIds = new Set(resultQuery._id.$in)
fastQueryIds.forEach((it) => inIds.delete(it))
_idQuery = { $in: Array.from(inIds) }
if (inIds.size === 0) {
doQuery = false
}
} else if (typeof resultQuery._id === 'object' && resultQuery._id?.$nin !== undefined) {
const ninIds = new Set(resultQuery._id.$in)
fastQueryIds.forEach((it) => ninIds.add(it))
_idQuery = { $nin: Array.from(ninIds) }
}
}

if (doQuery) {
docsQuerySlow.query(
_class,
{ ...queryNoLookup, _id: _idQuery },
(res) => {
slowDocs = res
},
categoryQueryOptions
)
} else {
docsQuerySlow.unsubscribe()
}
}
$: docsQuerySlow.query(
_class,
queryNoLookup,
(res) => {
slowDocs = res
},
categoryQueryOptions
)

$: docs = [...fastDocs, ...slowDocs]
$: docs = [...fastDocs, ...slowDocs.filter((it) => !fastQueryIds.has(it._id))]

function getProjection (fields: string[], query: DocumentQuery<Doc>): Record<string, number> {
const res: Record<string, number> = {}
Expand Down