Board components

src/app/actions/board-ui.actions.ts

@@ -0,0 +1,19 @@
+import { Action } from '@ngrx/store';
+import { BoardState } from '../states/board.state';
+
+export const LOCK_BOARD = '[board-ui] Lock';
+export const UNLOCK_BOARD = '[board-ui] Unlock';
+
+
+export class LockBoard implements Action {
+  readonly type = LOCK_BOARD;
+}
+
+export class UnlockBoard implements Action {
+  readonly type = UNLOCK_BOARD;
+}
+
+
+export type All
+  = LockBoard
+  | UnlockBoard;

src/app/actions/board.actions.ts

@@ -27,4 +27,3 @@ export type All
   = Get
   | GetSuccess
   | GetError;
-

src/app/actions/column-workitem.action.spec.ts

@@ -0,0 +1,46 @@
+import { WorkItemUI } from '../models/work-item';
+import * as ColumnWorkItemActions from './column-workitem.action';
+
+describe('Unit Test :: ColumnWorkItem Actions', () => {
+  it('UpdateColumnWorkItem :: should create update action', () => {
+    const payload = {
+      workItem: {} as WorkItemUI,
+      reorder: {
+        workitem: {} as WorkItemUI,
+        destinationWorkitemID: '',
+        direction: 'above'
+      },
+      prevColumnId: ''
+    };
+    const action = new ColumnWorkItemActions.Update(payload);
+    expect({...action}).toEqual({
+      type: ColumnWorkItemActions.UPDATE,
+      payload: payload
+    });
+  });
+
+  it('UpdateColumnWorkitemSuccess :: should create UpdateSuccess action', () => {
+    const payload = {
+      workItemId: '',
+      prevColumnId: '',
+      newColumnIds: ['', '']
+    };
+    const action = new ColumnWorkItemActions.UpdateSuccess(payload);
+    expect({...action}).toEqual({
+      type: ColumnWorkItemActions.UPDATE_SUCCESS,
+      payload: payload
+    });
+  });
+
+  it('UpdateColumnWorkitemError :: should create UpdateError action', () => {
+    const payload = {
+      prevColumnId: '',
+      newColumnIds: ['', '']
+    };
+    const action = new ColumnWorkItemActions.UpdateError(payload);
+    expect({...action}).toEqual({
+      type: ColumnWorkItemActions.UPDATE_ERROR,
+      payload: payload
+    });
+  });
+});

src/app/actions/column-workitem.action.ts

@@ -0,0 +1,68 @@
+import { Action } from '@ngrx/store';
+import { WorkItemService, WorkItemUI } from './../models/work-item';
+
+export const UPDATE = '[column workitem] Update';
+export const UPDATE_SUCCESS = '[column workitem] UpdateSuccess';
+export const UPDATE_ERROR = '[column workitem] UpdateError';
+
+export class Update implements Action {
+  payload: {
+    workItem: WorkItemUI,
+    reorder: {
+        workitem: WorkItemUI,
+        destinationWorkitemID: string,
+        direction: string
+      },
+    prevColumnId: string
+  };
+
+  constructor(payload: {
+    workItem: WorkItemUI,
+    reorder: {
+        workitem: WorkItemUI,
+        destinationWorkitemID: string,
+        direction: string
+      },
+    prevColumnId: string
+  }) {
+    this.payload = payload;
+  }
+  readonly type = UPDATE;
+}
+
+export class UpdateSuccess implements Action {
+  payload: {
+    workItemId: string,
+    prevColumnId: string,
+    newColumnIds: string[]
+  };
+
+  constructor(payload: {
+    workItemId: string,
+    prevColumnId: string,
+    newColumnIds: string[]
+  }) {
+    this.payload = payload;
+  }
+  readonly type = UPDATE_SUCCESS;
+}
+
+export class UpdateError implements Action {
+  payload: {
+    prevColumnId: string,
+    newColumnIds: string[]
+  };
+
+  constructor(payload: {
+    prevColumnId: string,
+    newColumnIds: string[]
+  }) {
+    this.payload = payload;
+  }
+  readonly type = UPDATE_ERROR;
+}
+
+export type All
+  = Update
+  | UpdateSuccess
+  | UpdateError;

src/app/actions/index.actions.ts

@@ -12,3 +12,4 @@ export { All as WITypeActions } from './work-item-type.actions';
 export { All as WorkItemActions } from './work-item.actions';
 export { All as EventActions } from './event.action';
 export { All as BoardActions } from './board.actions';
+export { All as BoardUIActions } from './board-ui.actions';

src/app/actions/work-item.actions.ts

@@ -115,7 +115,7 @@ export class UpdateError implements Action {
   readonly type = UPDATE_ERROR;
 }
 
-export class Reoder implements Action {
+export class Reorder implements Action {
   readonly type = REORDER;
   payload: {
     workitem: WorkItemUI,
@@ -184,7 +184,7 @@ export type All
   | GetChildren
   | GetChildrenSuccess
   | GetChildrenError
-  | Reoder
+  | Reorder
   | UpdateWorkitemIteration
   | CreateLink
   | DeleteLink;

src/app/components_ngrx/assignee/assignee.component.html

@@ -1,6 +1,6 @@
   <ng-container *ngIf="assignees.length < 1">
     <span class="dib fa fa-user-plus user-assign-icon margin-right-5"></span>
-    <small class="dib">Unassigned</small>
+    <small *ngIf="!overlapAvatar" class="dib">Unassigned</small>
   </ng-container>
   <ng-container *ngIf="showFullName">
     <div class="f8-assignees dib margin-right-15 margin-bottom-7"
@@ -17,7 +17,7 @@
   </ng-container>
   <ng-container *ngIf="!showFullName">
     <div class="f8-assignees dib margin-bottom-7">
-      <user-avatar 
+      <user-avatar
         *ngFor="let assignee of assignees | slice:0:truncateAfter"
         [imgTooltip]="assignee?.name"
         [imgPlacement]="'left'"

src/app/components_ngrx/group-types-panel/group-types-panel.component.html

@@ -26,7 +26,7 @@
         class="fab-planner-iteration"
         [takeFromInput]="false"
         [collection]="item.typeList"
-        [witGroup]="item.name"
+        [witGroup]="item"
         [showTree]="showTree"
         [showCompleted]="showCompleted"
         [sidePanelOpen]="sidePanelOpen"

src/app/components_ngrx/group-types-panel/group-types-panel.component.ts

@@ -98,10 +98,21 @@ export class GroupTypesComponent implements OnInit, OnDestroy {
     //reverse function jsonToQuery(second_join);
   }
 
+  fnBuildQueryParamForBoard(witGroup) {
+    const type_query = this.filterService.queryBuilder(
+      'boardContextId', this.filterService.equal_notation, witGroup.id
+    );
+    // join query with typeQuery
+    const second_join = this.filterService.queryJoiner(
+      {}, this.filterService.and_notation, type_query
+    );
+    return this.filterService.jsonToQuery(second_join);
+  }
+
   addRemoveQueryParams(witGroup) {
     // If it's a board view then quoery should only have the board id
     if (this.context === 'board') {
-      return {boardContextId: witGroup.id};
+      return {q: this.fnBuildQueryParamForBoard(witGroup)};
     }
 
     // For list view it works differently
@@ -134,11 +145,23 @@ export class GroupTypesComponent implements OnInit, OnDestroy {
       this.route.queryParams.subscribe(val => {
         if (val.hasOwnProperty('q')) {
           let selectedTypeGroup: GroupTypeUI;
-          const selectedTypeGroupName =
-            this.filterService.getConditionFromQuery(val.q, 'typegroup.name');
-          if (selectedTypeGroupName) {
-            selectedTypeGroup =
-              this.groupTypes.find(g => g.name === selectedTypeGroupName);
+          if (val['q'].includes('boardContextId')) {
+            //filter service getConditionFromQuery returns undefined for non AND operations
+            let selectedTypeGroupId = this.filterService.getConditionFromQuery(val.q, 'boardContextId');
+            if (selectedTypeGroupId === undefined) {
+              selectedTypeGroupId = this.filterService.queryToFlat(val.q)[0].value;
+            }
+            if (selectedTypeGroupId) {
+              selectedTypeGroup =
+                this.groupTypes.find(g => g.id === selectedTypeGroupId);
+            }
+          } else {
+            const selectedTypeGroupName =
+              this.filterService.getConditionFromQuery(val.q, 'typegroup.name');
+            if (selectedTypeGroupName) {
+              selectedTypeGroup =
+                this.groupTypes.find(g => g.name === selectedTypeGroupName);
+            }
           }
           if (selectedTypeGroup && !selectedTypeGroup.selected) {
             this.store.dispatch(new GroupTypeActions.SelectType(selectedTypeGroup));
@@ -154,15 +177,6 @@ export class GroupTypesComponent implements OnInit, OnDestroy {
         } else {
           this.showCompleted = '';
         }
-
-        // If it's a board view then check for board context ID
-        if (val.hasOwnProperty('boardContextId')) {
-          const selectedTypeGroup: GroupTypeUI =
-              this.groupTypes.find(g => g.id === val.boardContextId);
-          if (selectedTypeGroup) {
-            this.store.dispatch(new GroupTypeActions.SelectType(selectedTypeGroup));
-          }
-        }
       })
     );
   }

src/app/components_ngrx/iteration-list-entry/iteration-list-entry.component.html

@@ -47,7 +47,7 @@
   </div>
   <a
     class="f8-itr__header"
-    [routerLink]="getRouterLink()"
+    [routerLink]="[]"
     [queryParams]="addRemoveQueryParams(iteration.id)"
     title="{{iteration.name}}">
     <div class="truncate padding-right-15">

src/app/components_ngrx/iteration-list-entry/iteration-list-entry.component.ts

@@ -25,6 +25,7 @@ import { AuthenticationService } from 'ngx-login-client';
 import { Dialog } from 'ngx-widgets';
 import { Subscription } from 'rxjs/Subscription';
 
+import { GroupTypeUI } from '../../models/group-types.model';
 import { IterationUI } from '../../models/iteration.model';
 import { FilterService } from '../../services/filter.service';
 import { GroupTypesService } from '../../services/group-types.service';
@@ -40,7 +41,7 @@ export class IterationListEntryComponent implements OnInit, OnDestroy {
   @Input() iteration: IterationUI;
   @Input() selected: boolean = false;
   @Input() collection = [];
-  @Input() witGroup: string = '';
+  @Input() witGroup: GroupTypeUI;
   @Input() showTree: string = '';
   @Input() showCompleted: string = '';
   @Input() context: 'list' | 'board'; // 'list' or 'board'
@@ -86,7 +87,7 @@ export class IterationListEntryComponent implements OnInit, OnDestroy {
 
   constructURL(iterationId: string) {
     //Query for work item type group
-    const type_query = this.filterService.queryBuilder('typegroup.name', this.filterService.equal_notation, this.witGroup);
+    const type_query = this.filterService.queryBuilder('typegroup.name', this.filterService.equal_notation, this.witGroup.name);
     //Query for space
     const space_query = this.filterService.queryBuilder('space', this.filterService.equal_notation, this.spaceId);
     //Query for iteration
@@ -100,7 +101,23 @@ export class IterationListEntryComponent implements OnInit, OnDestroy {
     return this.filterService.jsonToQuery(third_join);
   }
 
+  constructURLforBoard(iterationId: string) {
+    //Query for work item type group
+    const type_query = this.filterService.queryBuilder('boardContextId', this.filterService.equal_notation, this.witGroup.id);
+    //Query for iteration
+    const iteration_query = this.filterService.queryBuilder('iteration', this.filterService.equal_notation, iterationId);
+    // join type and iteration query
+    const first_join = this.filterService.queryJoiner({}, this.filterService.and_notation, type_query);
+    const second_join = this.filterService.queryJoiner(first_join, this.filterService.and_notation, iteration_query);
+    return this.filterService.jsonToQuery(second_join);
+  }
+
   addRemoveQueryParams(iterationId: string) {
+    if (this.context === 'board') {
+      return {
+        q: this.constructURLforBoard(iterationId)
+      };
+    }
     if (this.showCompleted && this.showTree) {
       return {
         q: this.constructURL(iterationId),
@@ -124,10 +141,6 @@ export class IterationListEntryComponent implements OnInit, OnDestroy {
     }
   }
 
-  getRouterLink() {
-    return this.context === 'board' ? ['..'] : [];
-  }
-
   toggleChildrenDisplay(iteration) {
     // TODO: Dispatch an action to this
     iteration.showChildren = !iteration.showChildren;

src/app/components_ngrx/iteration-tree/iteration-tree.component.ts

@@ -6,6 +6,7 @@ import {
   SimpleChange,
   SimpleChanges
 } from '@angular/core';
+import { GroupTypeUI } from '../../models/group-types.model';
 import { IterationUI } from '../../models/iteration.model';
 import { IterationListEntryComponent } from '../iteration-list-entry/iteration-list-entry.component';
 
@@ -18,7 +19,7 @@ export class IterationTreeComponent {
 
   @Input() iterationList: IterationUI[] = [];
   @Input() collection: any;
-  @Input() witGroup: string = '';
+  @Input() witGroup: GroupTypeUI;
   @Input() showTree: string = '';
   @Input() showCompleted: string = '';
   @Input() context: 'list' | 'board'; // 'list' or 'board'

src/app/components_ngrx/iterations-panel/iterations-panel.component.html

@@ -23,7 +23,7 @@
       [class.hide]="!sidePanelOpen">
       Iterations
   </p>
-    <infotip 
+    <infotip
       [infotipText]="infotipText"
       [class.dib]="sidePanelOpen"
       [class.hide]="!sidePanelOpen">
@@ -36,7 +36,7 @@
       *ngFor="let iteration of activeIterations | async">
       <a
         [routerLinkActive]="'f8-itr--selected'"
-        [routerLink]="getRouterLink()" [attr.data-id]="iteration.id"
+        [routerLink]="[]" [attr.data-id]="iteration.id"
         [queryParams]="addRemoveQueryParams(iteration.id)"
         title="{{ iteration.resolvedParentPath +
           '/' + iteration.name }}">