From 29f46845a93d510ebc8d591fcc4de4e1d92ae2b6 Mon Sep 17 00:00:00 2001
From: Alex <41288429+Dvinyanin@users.noreply.github.com>
Date: Fri, 10 Jun 2022 16:44:46 +0700
Subject: [PATCH] Filter subissues (#2051)

Signed-off-by: Dvinyanin Alexandr <dvinyanin.alexandr@gmail.com>
---
 .../src/components/issues/Board.svelte        |  2 +-
 .../components/issues/IssuesContent.svelte    |  9 ++------
 .../src/components/issues/IssuesHeader.svelte |  9 ++------
 .../src/components/issues/IssuesView.svelte   |  7 ++++---
 .../src/components/issues/ListView.svelte     | 21 +++++--------------
 plugins/tracker/src/index.ts                  | 11 ++++++++++
 6 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/plugins/tracker-resources/src/components/issues/Board.svelte b/plugins/tracker-resources/src/components/issues/Board.svelte
index d495b07cbd..d89c3c8cec 100644
--- a/plugins/tracker-resources/src/components/issues/Board.svelte
+++ b/plugins/tracker-resources/src/components/issues/Board.svelte
@@ -115,7 +115,7 @@
     search=""
     {states}
     {options}
-    query={{}}
+    query={{ attachedTo: tracker.ids.NoParent }}
     fieldName={'status'}
     rankFieldName={'rank'}
     on:content={(evt) => {
diff --git a/plugins/tracker-resources/src/components/issues/IssuesContent.svelte b/plugins/tracker-resources/src/components/issues/IssuesContent.svelte
index 9b37be59b4..b9a21c1043 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesContent.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesContent.svelte
@@ -2,18 +2,13 @@
   import type { Ref, WithLookup } from '@anticrm/core'
   import { Component } from '@anticrm/ui'
   import { BuildModelKey, Viewlet } from '@anticrm/view'
-  import { IssuesDateModificationPeriod, IssuesGrouping, IssuesOrdering, Team } from '@anticrm/tracker'
+  import { Team, ViewOptions } from '@anticrm/tracker'
 
   export let currentSpace: Ref<Team>
   export let viewlet: WithLookup<Viewlet> | undefined
   export let config: (string | BuildModelKey)[] | undefined = undefined
   export let query = {}
-  export let viewOptions: {
-    groupBy: IssuesGrouping
-    orderBy: IssuesOrdering
-    completedIssuesPeriod: IssuesDateModificationPeriod
-    shouldShowEmptyGroups: boolean
-  }
+  export let viewOptions: ViewOptions
 </script>
 
 {#if viewlet?.$lookup?.descriptor?.component}
diff --git a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
index fec29d4713..26444073f3 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Ref, WithLookup } from '@anticrm/core'
-  import { IssuesDateModificationPeriod, IssuesGrouping, IssuesOrdering, Team } from '@anticrm/tracker'
+  import { Team, ViewOptions } from '@anticrm/tracker'
   import { Button, Icon, Tooltip, IconOptions, showPopup, eventToHTMLElement } from '@anticrm/ui'
   import { Filter, Viewlet } from '@anticrm/view'
   import { FilterButton } from '@anticrm/view-resources'
@@ -12,12 +12,7 @@
   export let viewlets: WithLookup<Viewlet>[] = []
   export let label: string
   export let filters: Filter[] = []
-  export let viewOptions: {
-    groupBy: IssuesGrouping
-    orderBy: IssuesOrdering
-    completedIssuesPeriod: IssuesDateModificationPeriod
-    shouldShowEmptyGroups: boolean
-  }
+  export let viewOptions: ViewOptions
 
   const handleOptionsEditorOpened = (event: MouseEvent) => {
     if (!currentSpace) {
diff --git a/plugins/tracker-resources/src/components/issues/IssuesView.svelte b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
index e80cc38bfb..ff14e70c28 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesView.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
@@ -2,7 +2,7 @@
   import core, { Ref, Space, WithLookup } from '@anticrm/core'
   import { IntlString, translate } from '@anticrm/platform'
   import { getClient } from '@anticrm/presentation'
-  import { IssuesDateModificationPeriod, IssuesGrouping, IssuesOrdering, Team } from '@anticrm/tracker'
+  import { IssuesDateModificationPeriod, IssuesGrouping, IssuesOrdering, Team, ViewOptions } from '@anticrm/tracker'
   import { Button, IconDetails } from '@anticrm/ui'
   import view, { Filter, Viewlet } from '@anticrm/view'
   import { FilterBar } from '@anticrm/view-resources'
@@ -19,11 +19,12 @@
 
   let viewlet: WithLookup<Viewlet> | undefined = undefined
   let filters: Filter[]
-  let viewOptions = {
+  let viewOptions: ViewOptions = {
     groupBy: IssuesGrouping.Status,
     orderBy: IssuesOrdering.Status,
     completedIssuesPeriod: IssuesDateModificationPeriod.All,
-    shouldShowEmptyGroups: false
+    shouldShowEmptyGroups: false,
+    shouldShowSubIssues: false
   }
   let resultQuery = {}
 
diff --git a/plugins/tracker-resources/src/components/issues/ListView.svelte b/plugins/tracker-resources/src/components/issues/ListView.svelte
index eae9146eb7..354197230a 100644
--- a/plugins/tracker-resources/src/components/issues/ListView.svelte
+++ b/plugins/tracker-resources/src/components/issues/ListView.svelte
@@ -2,14 +2,7 @@
   import { ScrollBox } from '@anticrm/ui'
   import IssuesListBrowser from './IssuesListBrowser.svelte'
   import tracker from '../../plugin'
-  import {
-    Issue,
-    IssuesDateModificationPeriod,
-    IssuesGrouping,
-    IssuesOrdering,
-    IssueStatus,
-    Team
-  } from '@anticrm/tracker'
+  import { Issue, IssueStatus, Team, ViewOptions } from '@anticrm/tracker'
   import { Class, Doc, Ref, SortingOrder, WithLookup } from '@anticrm/core'
   import {
     getCategories,
@@ -26,16 +19,12 @@
   export let currentSpace: Ref<Team>
   export let config: (string | BuildModelKey)[]
   export let query = {}
-  export let viewOptions: {
-    groupBy: IssuesGrouping
-    orderBy: IssuesOrdering
-    completedIssuesPeriod: IssuesDateModificationPeriod
-    shouldShowEmptyGroups: boolean
-  }
+  export let viewOptions: ViewOptions
 
-  $: ({ groupBy, orderBy, shouldShowEmptyGroups } = viewOptions)
+  $: ({ groupBy, orderBy, shouldShowEmptyGroups, shouldShowSubIssues } = viewOptions)
   $: groupByKey = issuesGroupKeyMap[groupBy]
   $: orderByKey = issuesOrderKeyMap[orderBy]
+  $: subIssuesQuery = shouldShowSubIssues ? {} : { attachedTo: tracker.ids.NoParent }
 
   const statusesQuery = createQuery()
   let statuses: IssueStatus[] = []
@@ -58,7 +47,7 @@
   let issues: WithLookup<Issue>[] = []
   $: issuesQuery.query(
     tracker.class.Issue,
-    query,
+    { ...subIssuesQuery, ...query },
     (result) => {
       issues = result
     },
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index e937587734..158e61d74c 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -172,6 +172,17 @@ export interface Project extends Doc {
   documents: number
 }
 
+/**
+ * @public
+ */
+export interface ViewOptions {
+  groupBy: IssuesGrouping
+  orderBy: IssuesOrdering
+  completedIssuesPeriod: IssuesDateModificationPeriod
+  shouldShowEmptyGroups: boolean
+  shouldShowSubIssues: boolean
+}
+
 /**
  * @public
  */