code review fixes

Signed-off-by: Vyacheslav Tumanov <[email protected]>
hcengineering · May 20, 2024 · a700162 · a700162
1 parent 8f31b60
commit a700162
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/plugins/view-resources/src/components/list/ListCategories.svelte b/plugins/view-resources/src/components/list/ListCategories.svelte
@@ -349,21 +349,28 @@
 
   const listCategory: SvelteComponentTyped[] = []
   const listListCategory: ListCategory[] = []
+  function getGroupByKey (
+    docKeys: Partial<DocumentQuery<Doc<Space>>>,
+    category: CategoryType,
+    resultQuery: DocumentQuery<Doc<Space>>
+  ): Partial<DocumentQuery<Doc>> {
+    return {
+      ...docKeys,
+      [groupByKey]:
+        typeof category === 'object'
+          ? category.name !== undefined
+            ? { $in: category.values.flatMap((x) => x._id) }
+            : resultQuery[groupByKey]?.$in?.length !== 0
+              ? undefined
+              : []
+          : category
+    }
+  }
 </script>
 
 {#each categories as category, i (typeof category === 'object' ? category.name : category)}
   {@const items = groupByKey === noCategory ? docs : getGroupByValues(groupByDocs, category)}
-  {@const categoryDocKeys = {
-    ...docKeys,
-    [groupByKey]:
-      typeof category === 'object'
-        ? category.name !== undefined
-          ? { $in: category.values.flatMap((x) => x._id) }
-          : resultQuery[groupByKey]?.$in?.length !== 0
-            ? undefined
-            : []
-        : category
-  }}
+  {@const categoryDocKeys = getGroupByKey(docKeys, category, resultQuery)}
   {#if items.length !== 0}
     <ListCategory
       bind:this={listListCategory[i]}

diff --git a/plugins/view-resources/src/components/list/ListCategory.svelte b/plugins/view-resources/src/components/list/ListCategory.svelte
@@ -109,14 +109,12 @@
 
   $: if (lastLevel) {
     void limiter.add(async () => {
-      // console.log('category Query', _class, { ...resultQuery, ...docKeys })
       loading = docsQuery.query(
         _class,
         { ...resultQuery, ...docKeys },
         (res) => {
           items = res
           loading = false
-          console.log({ docKeys }, res)
           const focusDoc = items.find((it) => it._id === $focusStore.focus?._id)
           if (focusDoc) {
             handleRowFocused(focusDoc)