hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-11-22 11:42:30 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UBER-898: Assignee rules and general rules fix (#3894)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2023-10-26 17:22:57 +07:00 committed by GitHub
parent 28e881b78a
commit 95b237b9af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/presentation/src/rules.ts
View File

@ -41,9 +41,12 @@ export function getDocRules<T extends Doc> (documents: Doc | Doc[], field: strin
// Check individual rules and form a result query
for (const r of rules.fieldRules) {
if (r.field === field) {
const _docs = docs.map((doc) =>
r.mixin !== undefined && h.hasMixin(doc, r.mixin) ? h.as(doc, r.mixin) : doc
)
const _docs = docs
.map((doc) => (r.mixin !== undefined ? (h.hasMixin(doc, r.mixin) ? h.as(doc, r.mixin) : undefined) : doc))
.filter((it) => it) as Doc[]
if (_docs.length === 0) {
continue
}
if (matchQuery(_docs, r.query, r.mixin ?? rules.ofClass, h).length === _docs.length) {
// We have rule match.
if (r.disableUnset === true) {

29
plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
View File

@ -17,7 +17,7 @@
import { AssigneeBox, AssigneePopup, personAccountByIdStore } from '@hcengineering/contact-resources'
import { AssigneeCategory } from '@hcengineering/contact-resources/src/assignee'
import { Account, Doc, DocumentQuery, Ref, Space } from '@hcengineering/core'
import { getClient } from '@hcengineering/presentation'
import { RuleApplyResult, getClient, getDocRules } from '@hcengineering/presentation'
import { Component, Issue } from '@hcengineering/tracker'
import { ButtonKind, ButtonSize, IconSize, TooltipAlignment } from '@hcengineering/ui'
import { createEventDispatcher } from 'svelte'
@ -43,11 +43,12 @@
$: _object =
(typeof object !== 'string' ? object : undefined) ?? (typeof value !== 'string' ? value : undefined) ?? []
$: docs = Array.isArray(_object) ? _object : [_object]
$: cdocs = docs.filter((d) => '_class' in d) as Doc[]
const client = getClient()
const dispatch = createEventDispatcher()
const docQuery: DocumentQuery<Employee> = { active: true }
const handleAssigneeChanged = async (newAssignee: Ref<Person> | undefined | null) => {
if (newAssignee === undefined || (!Array.isArray(_object) && _object?.assignee === newAssignee)) {
return
@ -75,8 +76,6 @@
function getCategories (object: Object | Object[]): void {
categories = []
const docs = Array.isArray(object) ? object : [object]
const cdocs = docs.filter((d) => '_class' in d) as Doc[]
if (cdocs.length > 0) {
categories.push({
label: tracker.string.PreviousAssigned,
@ -130,12 +129,28 @@
? _object.assignee
: _object.reduce((v, it) => (v != null && v === it.assignee ? it.assignee : null), _object[0]?.assignee) ??
undefined) ?? undefined
let rulesQuery: RuleApplyResult<Employee> | undefined
let query: DocumentQuery<Employee>
$: if (cdocs.length > 0) {
rulesQuery = getDocRules<Employee>(cdocs, 'assignee')
if (rulesQuery !== undefined) {
query = { ...(rulesQuery?.fieldQuery ?? {}), active: true }
} else {
query = { _id: 'none' as Ref<Employee>, active: true }
rulesQuery = {
disableEdit: true,
disableUnset: true,
fieldQuery: {}
}
}
}
</script>
{#if _object}
{#if isAction}
<AssigneePopup
{docQuery}
docQuery={query}
{categories}
icon={contact.icon.Person}
selected={sel}
@ -153,7 +168,7 @@
/>
{:else}
<AssigneeBox
{docQuery}
docQuery={query}
{focusIndex}
label={tracker.string.Assignee}
placeholder={tracker.string.Assignee}