feat(workflows): fix navigation

kaleidos-ventures · Sep 27, 2023 · cb10884 · cb10884
1 parent 741ac8f
commit cb10884
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/...ga/src/app/modules/project/feature-new-workflow/project-feature-new-workflow.component.ts b/...ga/src/app/modules/project/feature-new-workflow/project-feature-new-workflow.component.ts
@@ -67,7 +67,6 @@ export class ProjectFeatureNewWorkflowComponent {
   public get getPreviousUrl(): string[] {
     const previousUrl = this.routeHistoryService.getPreviousUrl();
     const project = this.state.get('project');
-    console.log({ previousUrl });
     return previousUrl
       ? [previousUrl]
       : [`/project/${project.id}${project.slug}/overview`];

diff --git a/.../apps/taiga/src/app/modules/project/feature-shell/project-feature-shell-routing.module.ts b/.../apps/taiga/src/app/modules/project/feature-shell/project-feature-shell-routing.module.ts
@@ -88,7 +88,7 @@ const routes: Routes = [
         canDeactivate: [CanDeactivateGuard],
         data: {
           kanban: true,
-          reuseComponent: true,
+          reuseComponent: false,
         },
       },
       {

diff --git a/...aiga/src/app/modules/project/feature-view-setter/project-feature-view-setter.component.ts b/...aiga/src/app/modules/project/feature-view-setter/project-feature-view-setter.component.ts
@@ -41,7 +41,7 @@ import {
 } from '@angular/router';
 import { RxState } from '@rx-angular/state';
 import { CommonModule } from '@angular/common';
-import { StoryDetail, StoryView, Project, Story } from '@taiga/data';
+import { StoryDetail, StoryView, Project, Story, Workflow } from '@taiga/data';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 interface ProjectFeatureViewSetterComponentState {
@@ -99,11 +99,6 @@ export class ProjectFeatureViewSetterComponent implements OnDestroy {
       )
     );
 
-    this.state.connect(
-      'isKanban',
-      this.state.select('url').pipe(map((url) => url.endsWith('/kanban')))
-    );
-
     this.state.hold(
       this.state.select('kanbanHost').pipe(distinctUntilChanged(), filterNil()),
       (host) => {
@@ -128,7 +123,21 @@ export class ProjectFeatureViewSetterComponent implements OnDestroy {
     ])
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(([url, data, params]) => {
-        if (!url.endsWith('/kanban') && !!data.stories) {
+        this.state.connect(
+          'isKanban',
+          this.state
+            .select('url')
+            .pipe(
+              map((url) =>
+                url.endsWith(`/kanban/${params.workflow as Workflow['slug']}`)
+              )
+            )
+        );
+
+        if (
+          !url.endsWith(`/kanban/${params.workflow as Workflow['slug']}`) &&
+          !!data.stories
+        ) {
           const storyParams = params as StoryParams;
           const needRedirect = params.slug !== (data.project as Project).slug;
           if (needRedirect) {