From 8c749d0baff9dec97127aedfba0deda1cd3fa63b Mon Sep 17 00:00:00 2001 From: Xaviju Date: Tue, 10 Oct 2023 11:06:42 +0200 Subject: [PATCH] feat(workflow): Design review --- .../story-detail-workflow.component.ts | 39 +++++++++++++++++-- .../+state/actions/story-detail.actions.ts | 1 + .../+state/effects/story-detail.effects.ts | 2 +- .../story-detail/story-detail.component.html | 2 +- .../story-detail/story-detail.component.ts | 1 + .../taiga/src/assets/i18n/story/en-US.json | 3 +- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/javascript/apps/taiga/src/app/modules/project/story-detail/components/story-detail-workflow/story-detail-workflow.component.ts b/javascript/apps/taiga/src/app/modules/project/story-detail/components/story-detail-workflow/story-detail-workflow.component.ts index 46c27d769..608576dc8 100644 --- a/javascript/apps/taiga/src/app/modules/project/story-detail/components/story-detail-workflow/story-detail-workflow.component.ts +++ b/javascript/apps/taiga/src/app/modules/project/story-detail/components/story-detail-workflow/story-detail-workflow.component.ts @@ -12,22 +12,28 @@ import { EventEmitter, Input, OnChanges, + OnInit, Output, ViewChild, } from '@angular/core'; import { CommonModule } from '@angular/common'; import { TranslocoDirective } from '@ngneat/transloco'; +import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TuiButtonModule, TuiDataListModule, TuiHostedDropdownComponent, TuiHostedDropdownModule, + TuiNotification, TuiSvgModule, } from '@taiga-ui/core'; -import { StoryDetail, Workflow } from '@taiga/data'; +import { Project, StoryDetail, Workflow } from '@taiga/data'; import { BreadcrumbComponent } from '@taiga/ui/breadcrumb/breadcrumb.component'; +import { AppService } from '~/app/services/app.service'; +import { WsService } from '~/app/services/ws'; +@UntilDestroy() @Component({ selector: 'tg-story-detail-workflow', templateUrl: './story-detail-workflow.component.html', @@ -44,12 +50,12 @@ import { BreadcrumbComponent } from '@taiga/ui/breadcrumb/breadcrumb.component'; TuiSvgModule, ], }) -export class StoryDetailWorkflowComponent implements OnChanges { +export class StoryDetailWorkflowComponent implements OnInit, OnChanges { @Input({ required: true }) public story!: StoryDetail; @Input({ required: true }) - public workflows!: Workflow[]; + public project!: Project; @Input() public canEdit = false; @@ -63,8 +69,14 @@ export class StoryDetailWorkflowComponent implements OnChanges { public openWorkflowList = false; public filteredWorkflows: Workflow[] = []; + constructor(private wsService: WsService, private appService: AppService) {} + + public ngOnInit(): void { + this.events(); + } + public ngOnChanges(): void { - this.filteredWorkflows = this.workflows.filter( + this.filteredWorkflows = this.project.workflows.filter( (workflow) => workflow.slug !== this.story.workflow.slug ); } @@ -78,4 +90,23 @@ export class StoryDetailWorkflowComponent implements OnChanges { this.component?.nativeFocusableElement?.focus(); this.toWorkflow.emit(workflow); } + + public events() { + this.wsService + .projectEvents<{ story: StoryDetail }>('stories.update') + .pipe(untilDestroyed(this)) + .subscribe((msg) => { + const workflowURL = `project/${this.project.id}/${this.project.slug}/kanban/${msg.event.content.story.workflow.slug}`; + this.appService.toastNotification({ + message: 'move.confirm', + paramsMessage: { + workflowURL, + workflowName: msg.event.content.story.workflow.name, + }, + status: TuiNotification.Info, + scope: 'story', + autoClose: true, + }); + }); + } } diff --git a/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/actions/story-detail.actions.ts b/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/actions/story-detail.actions.ts index e65c78d7c..b455b0504 100644 --- a/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/actions/story-detail.actions.ts +++ b/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/actions/story-detail.actions.ts @@ -36,6 +36,7 @@ export const StoryDetailActions = createActionGroup({ }>(), 'Update story workflow': props<{ story: StoryUpdate; + workflow: Workflow; projectId: Project['id']; }>(), 'Delete story': props<{ diff --git a/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/effects/story-detail.effects.ts b/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/effects/story-detail.effects.ts index b0490d042..59d3d7914 100644 --- a/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/effects/story-detail.effects.ts +++ b/javascript/apps/taiga/src/app/modules/project/story-detail/data-access/+state/effects/story-detail.effects.ts @@ -177,7 +177,7 @@ export class StoryDetailEffects { if (httpResponse.status === 400) { this.appService.toastNotification({ message: 'move.error', - paramsMessage: { workflow: action.story.workflow }, + paramsMessage: { workflow: action.workflow.name }, status: TuiNotification.Error, scope: 'story', autoClose: true, diff --git a/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.html b/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.html index 563d291c8..636c9489e 100644 --- a/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.html +++ b/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.html @@ -126,7 +126,7 @@ diff --git a/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.ts b/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.ts index 718697cc7..fafe2b801 100644 --- a/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.ts +++ b/javascript/apps/taiga/src/app/modules/project/story-detail/story-detail.component.ts @@ -492,6 +492,7 @@ export class StoryDetailComponent { this.store.dispatch( StoryDetailActions.updateStoryWorkflow({ projectId: this.state.get('project').id, + workflow, story, }) ); diff --git a/javascript/apps/taiga/src/assets/i18n/story/en-US.json b/javascript/apps/taiga/src/assets/i18n/story/en-US.json index 9b149c91e..780bc6c27 100644 --- a/javascript/apps/taiga/src/assets/i18n/story/en-US.json +++ b/javascript/apps/taiga/src/assets/i18n/story/en-US.json @@ -24,7 +24,8 @@ "empty_description_view_permissions": "This story doesn't have a description yet.", "edit_description": "Edit description", "move": { - "error": "The workflow {{workflow}} does not have any status. Create one and try again." + "error": "The workflow {{workflow}} does not have any status. Create one and try again.", + "confirm": "The story has been moved to the {{workflowName}} workflow" }, "delete": { "delete_story": "Delete Story",