mirror of
https://github.com/hcengineering/platform.git
synced 2025-06-06 07:46:32 +00:00
Add project selector (#1973)
Signed-off-by: Dvinyanin Alexandr <dvinyanin.alexandr@gmail.com>
This commit is contained in:
parent
c703fbd2e0
commit
84cfd93227
@ -9,6 +9,7 @@ Platform:
|
|||||||
- Allow to define table columns order
|
- Allow to define table columns order
|
||||||
- Fix skills/labels selection and show real usage counter
|
- Fix skills/labels selection and show real usage counter
|
||||||
- Fix skills/labels activity
|
- Fix skills/labels activity
|
||||||
|
- Project selector in issue list
|
||||||
|
|
||||||
HR:
|
HR:
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
import { showPopup } from '@anticrm/ui'
|
import { showPopup } from '@anticrm/ui'
|
||||||
import StatusFilterMenuSection from './StatusFilterMenuSection.svelte'
|
import StatusFilterMenuSection from './StatusFilterMenuSection.svelte'
|
||||||
import PriorityFilterMenuSection from './PriorityFilterMenuSection.svelte'
|
import PriorityFilterMenuSection from './PriorityFilterMenuSection.svelte'
|
||||||
|
import ProjectFilterMenuSection from './ProjectFilterMenuSection.svelte'
|
||||||
import FilterMenu from '../FilterMenu.svelte'
|
import FilterMenu from '../FilterMenu.svelte'
|
||||||
import {
|
import {
|
||||||
defaultPriorities,
|
defaultPriorities,
|
||||||
@ -40,6 +41,7 @@
|
|||||||
$: defaultStatusIds = defaultStatuses.map((x) => x._id)
|
$: defaultStatusIds = defaultStatuses.map((x) => x._id)
|
||||||
$: groupedByStatus = getGroupedIssues('status', issues, defaultStatusIds)
|
$: groupedByStatus = getGroupedIssues('status', issues, defaultStatusIds)
|
||||||
$: groupedByPriority = getGroupedIssues('priority', issues, defaultPriorities)
|
$: groupedByPriority = getGroupedIssues('priority', issues, defaultPriorities)
|
||||||
|
$: groupedByProject = getGroupedIssues('project', issues)
|
||||||
|
|
||||||
const handleStatusFilterMenuSectionOpened = (event: MouseEvent | KeyboardEvent) => {
|
const handleStatusFilterMenuSectionOpened = (event: MouseEvent | KeyboardEvent) => {
|
||||||
const statusGroups: { [key: string]: number } = {}
|
const statusGroups: { [key: string]: number } = {}
|
||||||
@ -82,6 +84,25 @@
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleProjectFilterMenuSectionOpened = (event: MouseEvent | KeyboardEvent) => {
|
||||||
|
const projectGroups: { [key: string]: number } = {}
|
||||||
|
|
||||||
|
for (const [project, value] of Object.entries(groupedByProject)) {
|
||||||
|
projectGroups[project] = value?.length ?? 0
|
||||||
|
}
|
||||||
|
showPopup(
|
||||||
|
ProjectFilterMenuSection,
|
||||||
|
{
|
||||||
|
groups: projectGroups,
|
||||||
|
selectedElements: currentFilterQuery?.project?.[currentFilterMode] ?? [],
|
||||||
|
index,
|
||||||
|
onUpdate,
|
||||||
|
onBack
|
||||||
|
},
|
||||||
|
targetHtml
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const actions: FilterAction[] = [
|
const actions: FilterAction[] = [
|
||||||
{
|
{
|
||||||
...getIssueFilterAssetsByType('status'),
|
...getIssueFilterAssetsByType('status'),
|
||||||
@ -90,6 +111,10 @@
|
|||||||
{
|
{
|
||||||
...getIssueFilterAssetsByType('priority'),
|
...getIssueFilterAssetsByType('priority'),
|
||||||
onSelect: handlePriorityFilterMenuSectionOpened
|
onSelect: handlePriorityFilterMenuSectionOpened
|
||||||
|
},
|
||||||
|
{
|
||||||
|
...getIssueFilterAssetsByType('project'),
|
||||||
|
onSelect: handleProjectFilterMenuSectionOpened
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
</script>
|
</script>
|
||||||
|
@ -0,0 +1,66 @@
|
|||||||
|
<!--
|
||||||
|
// Copyright © 2022 Hardcore Engineering Inc.
|
||||||
|
//
|
||||||
|
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License. You may
|
||||||
|
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
//
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
-->
|
||||||
|
<script lang="ts">
|
||||||
|
import { translate } from '@anticrm/platform'
|
||||||
|
import { IconNavPrev } from '@anticrm/ui'
|
||||||
|
import FilterMenuSection from '../FilterMenuSection.svelte'
|
||||||
|
import tracker from '../../plugin'
|
||||||
|
import { FilterSectionElement } from '../../utils'
|
||||||
|
import { getClient } from '@anticrm/presentation'
|
||||||
|
|
||||||
|
export let selectedElements: any[] = []
|
||||||
|
export let groups: { [key: string]: number }
|
||||||
|
export let index: number = 0
|
||||||
|
export let onUpdate: (result: { [p: string]: any }, filterIndex?: number) => void
|
||||||
|
export let onBack: (() => void) | undefined = undefined
|
||||||
|
|
||||||
|
const getFilterElements = async (groups: { [key: string]: number }, selected: any[]) => {
|
||||||
|
const elements: FilterSectionElement[] = []
|
||||||
|
|
||||||
|
const client = getClient()
|
||||||
|
const projects = await client.findAll(tracker.class.Project, {})
|
||||||
|
for (const [key, value] of Object.entries(groups)) {
|
||||||
|
const project = key === 'null' ? null : key
|
||||||
|
const label = project
|
||||||
|
? projects.find(({ _id }) => _id === project)?.label
|
||||||
|
: await translate(tracker.string.NoProject, {})
|
||||||
|
|
||||||
|
if (!label) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
elements.splice(project ? 1 : 0, 0, {
|
||||||
|
icon: tracker.icon.Project,
|
||||||
|
title: label,
|
||||||
|
count: value,
|
||||||
|
isSelected: selected.includes(project),
|
||||||
|
onSelect: () => onUpdate({ project }, index)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return onBack
|
||||||
|
? [
|
||||||
|
{
|
||||||
|
icon: IconNavPrev,
|
||||||
|
title: await translate(tracker.string.Back, {}),
|
||||||
|
onSelect: onBack
|
||||||
|
},
|
||||||
|
...elements
|
||||||
|
]
|
||||||
|
: elements
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{#await getFilterElements(groups, selectedElements) then actions}
|
||||||
|
<FilterMenuSection {actions} {onBack} on:close />
|
||||||
|
{/await}
|
@ -53,6 +53,7 @@ export const issuesGroupByOptions: Record<IssuesGrouping, IntlString> = {
|
|||||||
[IssuesGrouping.Status]: tracker.string.Status,
|
[IssuesGrouping.Status]: tracker.string.Status,
|
||||||
[IssuesGrouping.Assignee]: tracker.string.Assignee,
|
[IssuesGrouping.Assignee]: tracker.string.Assignee,
|
||||||
[IssuesGrouping.Priority]: tracker.string.Priority,
|
[IssuesGrouping.Priority]: tracker.string.Priority,
|
||||||
|
[IssuesGrouping.Project]: tracker.string.Project,
|
||||||
[IssuesGrouping.NoGrouping]: tracker.string.NoGrouping
|
[IssuesGrouping.NoGrouping]: tracker.string.NoGrouping
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,13 +70,14 @@ export const issuesDateModificationPeriodOptions: Record<IssuesDateModificationP
|
|||||||
[IssuesDateModificationPeriod.PastMonth]: tracker.string.PastMonth
|
[IssuesDateModificationPeriod.PastMonth]: tracker.string.PastMonth
|
||||||
}
|
}
|
||||||
|
|
||||||
export type IssuesGroupByKeys = keyof Pick<Issue, 'status' | 'priority' | 'assignee'>
|
export type IssuesGroupByKeys = keyof Pick<Issue, 'status' | 'priority' | 'assignee' | 'project'>
|
||||||
export type IssuesOrderByKeys = keyof Pick<Issue, 'status' | 'priority' | 'modifiedOn' | 'dueDate'>
|
export type IssuesOrderByKeys = keyof Pick<Issue, 'status' | 'priority' | 'modifiedOn' | 'dueDate'>
|
||||||
|
|
||||||
export const issuesGroupKeyMap: Record<IssuesGrouping, IssuesGroupByKeys | undefined> = {
|
export const issuesGroupKeyMap: Record<IssuesGrouping, IssuesGroupByKeys | undefined> = {
|
||||||
[IssuesGrouping.Status]: 'status',
|
[IssuesGrouping.Status]: 'status',
|
||||||
[IssuesGrouping.Priority]: 'priority',
|
[IssuesGrouping.Priority]: 'priority',
|
||||||
[IssuesGrouping.Assignee]: 'assignee',
|
[IssuesGrouping.Assignee]: 'assignee',
|
||||||
|
[IssuesGrouping.Project]: 'project',
|
||||||
[IssuesGrouping.NoGrouping]: undefined
|
[IssuesGrouping.NoGrouping]: undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,9 +95,10 @@ export const issuesSortOrderMap: Record<IssuesOrderByKeys, SortingOrder> = {
|
|||||||
dueDate: SortingOrder.Descending
|
dueDate: SortingOrder.Descending
|
||||||
}
|
}
|
||||||
|
|
||||||
export const issuesGroupEditorMap: Record<'status' | 'priority', AnyComponent | undefined> = {
|
export const issuesGroupEditorMap: Record<'status' | 'priority' | 'project', AnyComponent | undefined> = {
|
||||||
status: tracker.component.StatusEditor,
|
status: tracker.component.StatusEditor,
|
||||||
priority: tracker.component.PriorityEditor
|
priority: tracker.component.PriorityEditor,
|
||||||
|
project: tracker.component.ProjectEditor
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getIssuesModificationDatePeriodTime = (period: IssuesDateModificationPeriod | null): number => {
|
export const getIssuesModificationDatePeriodTime = (period: IssuesDateModificationPeriod | null): number => {
|
||||||
@ -206,6 +209,12 @@ export const getIssueFilterAssetsByType = (type: string): { icon: Asset, label:
|
|||||||
label: tracker.string.Priority
|
label: tracker.string.Priority
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case 'project': {
|
||||||
|
return {
|
||||||
|
icon: tracker.icon.Project,
|
||||||
|
label: tracker.string.Project
|
||||||
|
}
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
return undefined
|
return undefined
|
||||||
}
|
}
|
||||||
|
@ -71,6 +71,7 @@ export enum IssuesGrouping {
|
|||||||
Status = 'status',
|
Status = 'status',
|
||||||
Assignee = 'assignee',
|
Assignee = 'assignee',
|
||||||
Priority = 'priority',
|
Priority = 'priority',
|
||||||
|
Project = 'project',
|
||||||
NoGrouping = 'noGrouping'
|
NoGrouping = 'noGrouping'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user