UBERF-9264: Fix set/unset parent issue

models/tracker/src/actions.ts

@@ -276,6 +276,30 @@ export function createActions (builder: Builder, issuesId: string, componentsId:
     },
     tracker.action.SetParent
   )
+  createAction(
+    builder,
+    {
+      action: view.actionImpl.UpdateDocument,
+      actionProps: {
+        key: 'attachedTo',
+        value: tracker.ids.NoParent
+      },
+      query: {
+        attachedTo: { $ne: tracker.ids.NoParent }
+      },
+      label: tracker.string.UnsetParentIssue,
+      icon: tracker.icon.UnsetParent,
+      input: 'none',
+      category: tracker.category.Tracker,
+      target: tracker.class.Issue,
+      context: {
+        mode: ['context'],
+        application: tracker.app.Tracker,
+        group: 'associate'
+      }
+    },
+    tracker.action.UnsetParent
+  )
 
   createAction(
     builder,

models/tracker/src/plugin.ts

@@ -15,8 +15,7 @@
 //
 import { type DocUpdateMessageViewlet } from '@hcengineering/activity'
 import { type ChatMessageViewlet } from '@hcengineering/chunter'
-import { type StatusCategory, type Doc, type Ref, type DocManager } from '@hcengineering/core'
-import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
+import { type Doc, type DocManager, type Ref, type StatusCategory } from '@hcengineering/core'
 import { type NotificationGroup, type NotificationType } from '@hcengineering/notification'
 import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform'
 import { type ProjectType } from '@hcengineering/task'
@@ -87,10 +86,6 @@ export default mergeIds(trackerId, tracker, {
     MilestoneChatMessageViewlet: '' as Ref<ChatMessageViewlet>,
     DefaultProjectType: '' as Ref<ProjectType>
   },
-  completion: {
-    IssueQuery: '' as Resource<ObjectSearchFactory>,
-    IssueCategory: '' as Ref<ObjectSearchCategory>
-  },
   actionImpl: {
     Move: '' as ViewAction,
     CopyToClipboard: '' as ViewAction,

packages/presentation/src/components/ObjectPopup.svelte

@@ -24,8 +24,8 @@
   import type { IntlString } from '@hcengineering/platform'
   import { Label } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import presentation from '..'
-  import { ObjectCreate } from '../types'
+  import presentation, { searchFor, type SearchItem } from '..'
+  import { ObjectCreate, type ObjectSearchCategory } from '../types'
   import { createQuery } from '../utils'
   import DocPopup from './DocPopup.svelte'
 
@@ -46,7 +46,8 @@
   export let width: 'medium' | 'large' | 'full' | 'auto' = 'medium'
   export let size: 'small' | 'medium' | 'large' = 'large'
 
-  export let searchMode: 'field' | 'fulltext' | 'disabled' = 'field'
+  export let searchMode: 'field' | 'fulltext' | 'disabled' | 'spotlight' = 'field'
+  export let category: Ref<ObjectSearchCategory> | undefined = undefined
   export let searchField: string = 'name'
   export let groupBy = '_class'
 
@@ -74,21 +75,39 @@
   let search: string = ''
   let objects: Doc[] = []
 
+  let extraItems: Ref<Doc>[] = []
+
   const query = createQuery()
 
   $: noSearchField = searchMode === 'disabled'
   $: _idExtra = typeof docQuery?._id === 'object' ? docQuery?._id : {}
+  $: if (searchMode === 'spotlight' && search !== '') {
+    void searchSpotlight(search).then((items) => {
+      extraItems = items.map((it) => it.item.id)
+    })
+  } else {
+    extraItems = []
+  }
+  $: fquery = {
+    ...(docQuery ?? {}),
+    ...(() => {
+      switch (searchMode) {
+        case 'disabled':
+          return { _id: { $nin: ignoreObjects, ..._idExtra } }
+        case 'fulltext':
+          return { $search: search, _id: { $nin: ignoreObjects, ..._idExtra } }
+        case 'spotlight':
+          return extraItems.length > 0
+            ? { _id: { $in: extraItems, $nin: ignoreObjects } }
+            : { _id: { $nin: ignoreObjects, ..._idExtra } }
+        default:
+          return { [searchField]: { $like: '%' + search + '%' }, _id: { $nin: ignoreObjects, ..._idExtra } }
+      }
+    })()
+  }
   $: query.query<Doc>(
     _class,
-    {
-      ...(docQuery ?? {}),
-      ...(searchMode !== 'disabled' && search !== ''
-        ? searchMode === 'fulltext'
-          ? { $search: search }
-          : { [searchField]: { $like: '%' + search + '%' } }
-        : {}),
-      _id: { $nin: ignoreObjects, ..._idExtra }
-    },
+    fquery,
     (result) => {
       result.sort(sort)
       if (created.length > 0) {
@@ -100,6 +119,10 @@
     },
     { ...(options ?? {}), limit: 200 }
   )
+
+  async function searchSpotlight (search: string): Promise<SearchItem[]> {
+    return (await searchFor('spotlight', search, category, 50)).items
+  }
 </script>
 
 <DocPopup

packages/presentation/src/search.ts

@@ -65,15 +65,16 @@ async function searchCategory (
   client: TxOperations,
   cl: Ref<Class<Doc>>,
   query: string,
-  categories: ObjectSearchCategory[]
+  categories: ObjectSearchCategory[],
+  limit?: number
 ): Promise<SearchSection | undefined> {
   const r = await client.searchFulltext(
     {
       query: `${query}*`,
       classes: [cl]
     },
     {
-      limit: 5
+      limit: limit ?? 5
     }
   )
   const category = findCategoryByClass(categories, cl)
@@ -84,12 +85,13 @@ async function doFulltextSearch (
   client: TxOperations,
   classes: Array<Ref<Class<Doc>>>,
   query: string,
-  categories: ObjectSearchCategory[]
+  categories: ObjectSearchCategory[],
+  limit?: number
 ): Promise<SearchSection[]> {
   const sections: SearchSection[] = []
   const promises: Array<Promise<SearchSection | undefined>> = []
   for (const cl of classes) {
-    promises.push(searchCategory(client, cl, query, categories))
+    promises.push(searchCategory(client, cl, query, categories, limit))
   }
 
   const resolvedSections = await Promise.all(promises)
@@ -113,7 +115,9 @@ const categoriesByContext = new Map<string, ObjectSearchCategory[]>()
 
 export async function searchFor (
   context: 'mention' | 'spotlight',
-  query: string
+  query: string,
+  category?: Ref<ObjectSearchCategory>,
+  limit?: number
 ): Promise<{ items: SearchItem[], query: string }> {
   const client = getClient()
   let categories = categoriesByContext.get(context)
@@ -129,12 +133,13 @@ export async function searchFor (
   }
 
   const classesToSearch: Array<Ref<Class<Doc>>> = []
-  for (const cat of categories) {
+  const cats = category === undefined ? categories : categories.filter((it) => it._id === category)
+  for (const cat of cats) {
     if (cat.classToSearch !== undefined) {
       classesToSearch.push(cat.classToSearch)
     }
   }
 
-  const sections = await doFulltextSearch(client, classesToSearch, query, categories)
+  const sections = await doFulltextSearch(client, classesToSearch, query, categories, limit)
   return { items: packSearchResultsForListView(sections), query }
 }

plugins/tracker-assets/lang/cs.json

@@ -276,7 +276,8 @@
     "DefaultIssueStatus": "Výchozí stav úkolu",
     "IssueStatus": "Stav",
     "Extensions": "Rozšíření",
-    "RoleLabel": "Role: {role}"
+    "RoleLabel": "Role: {role}",
+    "UnsetParentIssue": "Odebrat nadřazený úkol"
   },
   "status": {}
 }

plugins/tracker-assets/lang/de.json

@@ -286,7 +286,8 @@
     "DefaultIssueStatus": "Standard-Aufgabenstatus",
     "IssueStatus": "Status",
     "Extensions": "Erweiterungen",
-    "RoleLabel": "Rolle: {role}"
+    "RoleLabel": "Rolle: {role}",
+    "UnsetParentIssue": "Übergeordnete Aufgabe entfernen"
   },
   "status": {}
 }

plugins/tracker-assets/lang/en.json

@@ -286,7 +286,8 @@
     "DefaultIssueStatus": "Default issue status",
     "IssueStatus": "Status",
     "Extensions": "Extensions",
-    "RoleLabel": "Role: {role}"
+    "RoleLabel": "Role: {role}",
+    "UnsetParentIssue": "Unset parent issue"
   },
   "status": {}
 }

plugins/tracker-assets/lang/es.json

@@ -269,7 +269,8 @@
     "DefaultIssueStatus": "Estado de problema predeterminado",
     "IssueStatus": "Estado",
     "Extensions": "Extensions",
-    "RoleLabel": "Role: {role}"
+    "RoleLabel": "Role: {role}",
+    "UnsetParentIssue": "Unset parent issue"
   },
   "status": {}
 }

plugins/tracker-assets/lang/fr.json

@@ -269,7 +269,8 @@
     "DefaultIssueStatus": "Statut par défaut de l'issue",
     "IssueStatus": "Statut",
     "Extensions": "Extensions",
-    "RoleLabel": "Rôle : {role}"
+    "RoleLabel": "Rôle : {role}",
+    "UnsetParentIssue": "Désélectionner l'issue parent"
   },
   "status": {}
 }

plugins/tracker-assets/lang/it.json

@@ -269,7 +269,8 @@
     "DefaultIssueStatus": "Stato predefinito della issue",
     "IssueStatus": "Stato",
     "Extensions": "Estensioni",
-    "RoleLabel": "Ruolo: {role}"
+    "RoleLabel": "Ruolo: {role}",
+    "UnsetParentIssue": "Annulla l'issue genitore"
   },
   "status": {}
 }

plugins/tracker-assets/lang/pt.json

@@ -269,7 +269,8 @@
     "DefaultIssueStatus": "Estado padrão do problema",
     "IssueStatus": "Estado",
     "Extensions": "Extensions",
-    "RoleLabel": "Cargo: {role}"
+    "RoleLabel": "Cargo: {role}",
+    "UnsetParentIssue": "Desmarcar problema pai"
   },
   "status": {}
 }

plugins/tracker-assets/lang/ru.json

@@ -286,7 +286,8 @@
     "DefaultIssueStatus": "Статус по умолчанию",
     "IssueStatus": "Статус",
     "Extensions": "Дополнительно",
-    "RoleLabel": "Роль: {role}"
+    "RoleLabel": "Роль: {role}",
+    "UnsetParentIssue": "Снять родительскую задачу"
   },
   "status": {}
 }

plugins/tracker-assets/lang/zh.json

@@ -286,7 +286,8 @@
     "DefaultIssueStatus": "默认问题状态",
     "IssueStatus": "状态",
     "Extensions": "扩展",
-    "RoleLabel": "角色：{role}"
+    "RoleLabel": "角色：{role}",
+    "UnsetParentIssue": "取消父问题"
   },
   "status": {}
 }

plugins/tracker-assets/src/index.ts

@@ -36,6 +36,7 @@ loadMetadata(tracker.icon, {
   Labels: `${icons}#labels`,
   DueDate: `${icons}#dueDate`, // TODO: add icon
   Parent: `${icons}#parent-issue`, // TODO: add icon
+  UnsetParent: `${icons}#unset-parent-issue`, // TODO: add icon
   Milestone: `${icons}#milestone`,
   IssueTemplates: `${icons}#issuetemplates`,
   Start: `${icons}#start`,

plugins/tracker-resources/src/components/SetParentIssueActionPopup.svelte

@@ -66,32 +66,21 @@
 
   $: selected = !Array.isArray(value) ? ('attachedTo' in value ? value.attachedTo : undefined) : undefined
   $: ignoreObjects = !Array.isArray(value) ? ('_id' in value ? [value._id] : []) : undefined
-  $: docQuery = {
-    'parents.parentId': {
-      $nin: [
-        ...new Set(
-          (Array.isArray(value) ? value : [value])
-            .map((issue) => ('_id' in issue ? issue._id : null))
-            .filter((x): x is Ref<Issue> => x !== null)
-        )
-      ]
-    }
-  }
 </script>
 
 <ObjectPopup
   _class={tracker.class.Issue}
   {options}
-  {docQuery}
   {selected}
+  category={tracker.completion.IssueCategory}
   multiSelect={false}
   allowDeselect={true}
   placeholder={tracker.string.SetParent}
   create={undefined}
   {ignoreObjects}
   shadows={true}
   {width}
-  searchMode={'fulltext'}
+  searchMode={'spotlight'}
   on:update
   on:close={onClose}
 >

plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte

@@ -175,6 +175,13 @@
   $: taskType = issue?.kind !== undefined ? $taskTypeStore.get(issue?.kind) : undefined
 
   $: projectType = taskType?.parent !== undefined ? $typeStore.get(taskType.parent) : undefined
+
+  async function unsetParentIssue (): Promise<void> {
+    if (issue === undefined || readonly) return
+
+    await client.update(issue, { attachedTo: tracker.ids.NoParent })
+    Analytics.handleEvent(TrackerEvents.IssueParentUnset, { issue: issue.identifier ?? issue._id })
+  }
 </script>
 
 {#if !embedded}
@@ -276,8 +283,22 @@
     </svelte:fragment>
 
     {#if hasParentIssue}
-      <div class="mb-6">
+      <div class="mb-6 flex-row-center">
         <SubIssueSelector {issue} />
+        {#if !readonly}
+          <div class="ml-2">
+            <Button
+              icon={tracker.icon.UnsetParent}
+              iconProps={{ size: 'medium' }}
+              kind={'regular'}
+              showTooltip={{ label: tracker.string.UnsetParentIssue }}
+              dataId={'btnUnsetParent'}
+              on:click={() => {
+                void unsetParentIssue()
+              }}
+            />
+          </div>
+        {/if}
       </div>
     {/if}
     <EditBox