diff --git a/packages/presentation/src/components/ObjectPopup.svelte b/packages/presentation/src/components/ObjectPopup.svelte index 0336c98c05..6b98b80867 100644 --- a/packages/presentation/src/components/ObjectPopup.svelte +++ b/packages/presentation/src/components/ObjectPopup.svelte @@ -85,8 +85,6 @@ selectedObjects = Array.from(selectedElements) dispatch('update', selectedObjects) - - selectedElements = selectedElements } const client = getClient() diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg index e6d6bb4a7c..520b4e699a 100644 --- a/plugins/tracker-assets/assets/icons.svg +++ b/plugins/tracker-assets/assets/icons.svg @@ -110,4 +110,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/tracker-assets/src/index.ts b/plugins/tracker-assets/src/index.ts index 722d58e518..90f8f97de6 100644 --- a/plugins/tracker-assets/src/index.ts +++ b/plugins/tracker-assets/src/index.ts @@ -49,7 +49,14 @@ loadMetadata(tracker.icon, { ProjectsList: `${icons}#list`, ProjectsTimeline: `${icons}#timeline`, - ProjectMembers: `${icons}#projectMembers` + ProjectMembers: `${icons}#projectMembers`, + + ProjectStatusBacklog: `${icons}#project-status-backlog`, + ProjectStatusPlanned: `${icons}#project-status-planned`, + ProjectStatusInProgress: `${icons}#project-status-in-progress`, + ProjectStatusPaused: `${icons}#project-status-paused`, + ProjectStatusCompleted: `${icons}#project-status-completed`, + ProjectStatusCanceled: `${icons}#project-status-canceled` }) addStringsLoader(trackerId, async (lang: string) => await import(`../lang/${lang}.json`)) diff --git a/plugins/tracker-resources/src/components/projects/NewProject.svelte b/plugins/tracker-resources/src/components/projects/NewProject.svelte index 75bc528914..65e0ec3ed7 100644 --- a/plugins/tracker-resources/src/components/projects/NewProject.svelte +++ b/plugins/tracker-resources/src/components/projects/NewProject.svelte @@ -31,7 +31,7 @@ label: '' as IntlString, description: '', icon: tracker.icon.Projects, - status: ProjectStatus.Planned, + status: ProjectStatus.Backlog, lead: null, members: [], comments: 0, diff --git a/plugins/tracker-resources/src/components/projects/ProjectMembersPresenter.svelte b/plugins/tracker-resources/src/components/projects/ProjectMembersPresenter.svelte index 18b9cce708..732d681700 100644 --- a/plugins/tracker-resources/src/components/projects/ProjectMembersPresenter.svelte +++ b/plugins/tracker-resources/src/components/projects/ProjectMembersPresenter.svelte @@ -41,7 +41,16 @@ return } - await client.update(value, { members: result }) + const memberToPull = value.members.filter((x) => !result.includes(x))[0] + const memberToPush = result.filter((x) => !value.members.includes(x))[0] + + if (memberToPull) { + await client.update(value, { $pull: { members: memberToPull } }) + } + + if (memberToPush) { + await client.update(value, { $push: { members: memberToPush } }) + } } const handleProjectMembersEditorOpened = async (event: MouseEvent) => { diff --git a/plugins/tracker-resources/src/components/projects/ProjectStatusSelector.svelte b/plugins/tracker-resources/src/components/projects/ProjectStatusSelector.svelte index 1fa283f1b5..a646256168 100644 --- a/plugins/tracker-resources/src/components/projects/ProjectStatusSelector.svelte +++ b/plugins/tracker-resources/src/components/projects/ProjectStatusSelector.svelte @@ -31,12 +31,12 @@ $: selectedStatusIcon = selectedProjectStatus ? projectStatusAssets[selectedProjectStatus].icon - : tracker.icon.CategoryBacklog + : tracker.icon.ProjectStatusBacklog $: selectedStatusLabel = shouldShowLabel ? selectedProjectStatus ? projectStatusAssets[selectedProjectStatus].label - : tracker.string.Planned + : tracker.string.Backlog : undefined $: statusesInfo = defaultProjectStatuses.map((s) => ({ id: s, ...projectStatusAssets[s] })) @@ -55,12 +55,12 @@