TSK-1200: Fix Applications with wrong state

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
hcengineering · Apr 15, 2023 · 1fa9130 · 1fa9130
1 parent 5493534
commit 1fa9130
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 63 deletions.
diff --git a/plugins/workbench-resources/src/components/SpecialView.svelte b/plugins/workbench-resources/src/components/SpecialView.svelte
@@ -51,46 +51,34 @@
   export let createComponent: AnyComponent | undefined
   export let createComponentProps: Record<string, any> = {}
   export let isCreationDisabled = false
-  export let descriptors: Ref<ViewletDescriptor>[] | undefined = [view.viewlet.Table]
+  export let descriptors: Ref<ViewletDescriptor>[] | undefined = undefined
 
   let search = ''
   let viewlet: WithLookup<Viewlet> | undefined
 
-  $: query = viewlet?.baseQuery ?? {}
-
-  $: searchQuery = search === '' ? query : { ...query, $search: search }
-
-  $: resultQuery = searchQuery
-
   const preferenceQuery = createQuery()
   let preference: ViewletPreference | undefined
 
-  let loading = true
-
   let viewlets: WithLookup<Viewlet>[] = []
 
   const viewletQuery = createQuery()
-  let vl = false
-  $: {
-    vl = true
-    viewletQuery.query(
-      view.class.Viewlet,
-      {
-        attachTo: _class,
-        variant: { $exists: false },
-        descriptor: { $in: descriptors ?? [view.viewlet.Table] }
-      },
-      (res) => {
-        vl = false
-        viewlets = res
-      },
-      {
-        lookup: {
-          descriptor: view.class.ViewletDescriptor
-        }
+
+  $: viewletQuery.query(
+    view.class.Viewlet,
+    {
+      attachTo: _class,
+      variant: { $exists: false },
+      ...(descriptors !== undefined ? { descriptor: { $in: descriptors } } : {})
+    },
+    (res) => {
+      viewlets = res
+    },
+    {
+      lookup: {
+        descriptor: view.class.ViewletDescriptor
       }
-    )
-  }
+    }
+  )
 
   let key = makeViewletKey()
 
@@ -100,35 +88,33 @@
     })
   )
 
-  $: update(_class, $activeViewlet[key], viewlets)
-
-  async function update (
-    _class: Ref<Class<Doc>>,
-    active: Ref<Viewlet> | null,
-    viewlets: WithLookup<Viewlet>[]
-  ): Promise<void> {
-    if (vl === false) {
+  $: {
+    const newViewlet = viewlets.find((viewlet) => viewlet?._id === $activeViewlet[key]) ?? viewlets[0]
+    if (viewlet?._id !== newViewlet?._id) {
       preference = undefined
-      viewlet = viewlets.find((viewlet) => viewlet?._id === active) ?? viewlets[0]
-      setActiveViewletId(viewlet?._id)
     }
+    viewlet = newViewlet
   }
 
   $: if (viewlet !== undefined) {
-    setActiveViewletId(viewlet._id)
     preferenceQuery.query(
       view.class.ViewletPreference,
       {
         attachedTo: viewlet._id
       },
       (res) => {
         preference = res[0]
-        loading = false
       },
       { limit: 1 }
     )
+  } else {
+    preferenceQuery.unsubscribe()
   }
 
+  $: query = viewlet?.baseQuery ?? {}
+  $: searchQuery = search === '' ? query : { ...query, $search: search }
+  $: resultQuery = searchQuery
+
   function showCreateDialog () {
     if (createComponent === undefined) return
     showPopup(createComponent, createComponentProps, 'top')
@@ -167,9 +153,13 @@
         size={'small'}
         on:select={(result) => {
           if (result.detail !== undefined) {
-            if (viewlet?._id === result.detail.id) return
+            if (viewlet?._id === result.detail.id) {
+              return
+            }
             viewlet = viewlets.find((vl) => vl._id === result.detail.id)
-            if (viewlet) setActiveViewletId(viewlet._id)
+            if (viewlet) {
+              setActiveViewletId(viewlet._id)
+            }
           }
         }}
       />
@@ -189,9 +179,9 @@
   </div>
 </div>
 
-{#if loading}
+{#if !viewlet?.$lookup?.descriptor?.component || viewlet?.attachTo !== _class || (preference !== undefined && viewlet?._id !== preference.attachedTo)}}
   <Loading />
-{:else if viewlet?.$lookup?.descriptor?.component}
+{:else}
   <FilterBar
     {_class}
     query={searchQuery}
@@ -200,21 +190,19 @@
       resultQuery = { ...query, ...e.detail }
     }}
   />
-  {#key viewlet?._id}
-    <Component
-      is={viewlet.$lookup.descriptor.component}
-      props={{
-        _class,
-        space,
-        options: viewlet.options,
-        config: preference?.config ?? viewlet.config,
-        viewlet,
-        viewOptions,
-        viewOptionsConfig: viewlet.viewOptions?.other,
-        createItemDialog: createComponent,
-        createItemLabel: createLabel,
-        query: resultQuery
-      }}
-    />
-  {/key}
+  <Component
+    is={viewlet.$lookup.descriptor.component}
+    props={{
+      _class,
+      space,
+      options: viewlet.options,
+      config: preference?.config ?? viewlet.config,
+      viewlet,
+      viewOptions,
+      viewOptionsConfig: viewlet.viewOptions?.other,
+      createItemDialog: createComponent,
+      createItemLabel: createLabel,
+      query: resultQuery
+    }}
+  />
 {/if}
diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
@@ -542,7 +542,7 @@ abstract class MongoAdapterBase implements DbAdapter {
 
   find (domain: Domain): StorageIterator {
     const coll = this.db.collection<Doc>(domain)
-    const iterator = coll.find({}, {}).batchSize(100)
+    const iterator = coll.find({}, { sort: { _id: 1 } }).batchSize(100)
 
     return {
       next: async () => {