taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapt taskboard filter for use include/exclude modes

stable
Héctor Fernández Cascallar 2019-01-10 17:33:50 +01:00 committed by Alex Hermida
parent 7b2c266eea
commit e3803af3a5
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
app/coffee/modules/taskboard/main.coffee
View File

@ -57,6 +57,15 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
"tgFilterRemoteStorageService" "tgFilterRemoteStorageService"
] ]
excludePrefix: "exclude_"
filterCategories: [
"tags",
"status",
"assigned_to",
"owner",
"role",
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @rs2, @params, @q, @appMetaService, @location, @navUrls, constructor: (@scope, @rootscope, @repo, @confirm, @rs, @rs2, @params, @q, @appMetaService, @location, @navUrls,
@events, @analytics, @translate, @errorHandlingService, @taskboardTasksService, @events, @analytics, @translate, @errorHandlingService, @taskboardTasksService,
@taskboardIssuesService, @storage, @filterRemoteStorageService) -> @taskboardIssuesService, @storage, @filterRemoteStorageService) ->
@ -115,12 +124,12 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
@.generateFilters() @.generateFilters()
removeFilter: (filter) -> removeFilter: (filter) ->
@.unselectFilter(filter.dataType, filter.id) @.unselectFilter(filter.dataType, filter.id, false, filter.mode)
@.loadTasks() @.loadTasks()
@.generateFilters() @.generateFilters()
addFilter: (newFilter) -> addFilter: (newFilter) ->
@.selectFilter(newFilter.category.dataType, newFilter.filter.id) @.selectFilter(newFilter.category.dataType, newFilter.filter.id, false, newFilter.mode)
@.loadTasks() @.loadTasks()
@.generateFilters() @.generateFilters()
@ -144,11 +153,10 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
saveCustomFilter: (name) -> saveCustomFilter: (name) ->
filters = {} filters = {}
urlfilters = @location.search() urlfilters = @location.search()
filters.tags = urlfilters.tags for key in @.filterCategories
filters.status = urlfilters.status excludeKey = @.excludePrefix.concat(key)
filters.assigned_to = urlfilters.assigned_to filters[key] = urlfilters[key]
filters.owner = urlfilters.owner filters[excludeKey] = urlfilters[excludeKey]
filters.role = urlfilters.role
@filterRemoteStorageService.getFilters(@scope.projectId, 'tasks-custom-filters').then (userFilters) => @filterRemoteStorageService.getFilters(@scope.projectId, 'tasks-custom-filters').then (userFilters) =>
userFilters[name] = filters userFilters[name] = filters
@ -163,33 +171,34 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
loadFilters = {} loadFilters = {}
loadFilters.project = @scope.projectId loadFilters.project = @scope.projectId
loadFilters.milestone = @scope.sprintId loadFilters.milestone = @scope.sprintId
loadFilters.tags = urlfilters.tags
loadFilters.status = urlfilters.status
loadFilters.assigned_to = urlfilters.assigned_to
loadFilters.owner = urlfilters.owner
loadFilters.role = urlfilters.role
loadFilters.q = urlfilters.q loadFilters.q = urlfilters.q
for key in @.filterCategories
excludeKey = @.excludePrefix.concat(key)
loadFilters[key] = urlfilters[key]
loadFilters[excludeKey] = urlfilters[excludeKey]
return @q.all([ return @q.all([
@rs.tasks.filtersData(loadFilters), @rs.tasks.filtersData(loadFilters),
@filterRemoteStorageService.getFilters(@scope.projectId, 'tasks-custom-filters') @filterRemoteStorageService.getFilters(@scope.projectId, 'tasks-custom-filters')
]).then (result) => ]).then (result) =>
data = result[0] data = result[0]
customFiltersRaw = result[1] customFiltersRaw = result[1]
dataCollection = {}
statuses = _.map data.statuses, (it) -> dataCollection.status = _.map data.statuses, (it) ->
it.id = it.id.toString() it.id = it.id.toString()
return it return it
tags = _.map data.tags, (it) -> dataCollection.tags = _.map data.tags, (it) ->
it.id = it.name it.id = it.name
return it return it
tagsWithAtLeastOneElement = _.filter tags, (tag) -> tagsWithAtLeastOneElement = _.filter dataCollection.tags, (tag) ->
return tag.count > 0 return tag.count > 0
assignedTo = _.map data.assigned_to, (it) -> dataCollection.assigned_to = _.map data.assigned_to, (it) ->
if it.id if it.id
it.id = it.id.toString() it.id = it.id.toString()
else else
@ -198,7 +207,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
it.name = it.full_name || "Unassigned" it.name = it.full_name || "Unassigned"
return it return it
role = _.map data.roles, (it) -> dataCollection.role = _.map data.roles, (it) ->
if it.id if it.id
it.id = it.id.toString() it.id = it.id.toString()
else else
@ -207,7 +216,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
it.name = it.name || "Unassigned" it.name = it.name || "Unassigned"
return it return it
owner = _.map data.owners, (it) -> dataCollection.owner = _.map data.owners, (it) ->
it.id = it.id.toString() it.id = it.id.toString()
it.name = it.full_name it.name = it.full_name
@ -215,25 +224,14 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
@.selectedFilters = [] @.selectedFilters = []
if loadFilters.status for key in @.filterCategories
selected = @.formatSelectedFilters("status", statuses, loadFilters.status) excludeKey = @.excludePrefix.concat(key)
@.selectedFilters = @.selectedFilters.concat(selected) if loadFilters[key]
selected = @.formatSelectedFilters(key, dataCollection[key], loadFilters[key])
if loadFilters.tags @.selectedFilters = @.selectedFilters.concat(selected)
selected = @.formatSelectedFilters("tags", tags, loadFilters.tags) if loadFilters[excludeKey]
@.selectedFilters = @.selectedFilters.concat(selected) selected = @.formatSelectedFilters(key, dataCollection[key], loadFilters[excludeKey], "exclude")
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.assigned_to
selected = @.formatSelectedFilters("assigned_to", assignedTo, loadFilters.assigned_to)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.owner
selected = @.formatSelectedFilters("owner", owner, loadFilters.owner)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.role
selected = @.formatSelectedFilters("role", role, loadFilters.role)
@.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q @.filterQ = loadFilters.q
@ -241,29 +239,29 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.STATUS"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.STATUS"),
dataType: "status", dataType: "status",
content: statuses content: dataCollection.status
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.TAGS"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.TAGS"),
dataType: "tags", dataType: "tags",
content: tags, content: dataCollection.tags,
hideEmpty: true, hideEmpty: true,
totalTaggedElements: tagsWithAtLeastOneElement.length totalTaggedElements: tagsWithAtLeastOneElement.length
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ASSIGNED_TO"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.ASSIGNED_TO"),
dataType: "assigned_to", dataType: "assigned_to",
content: assignedTo content: dataCollection.assigned_to
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"),
dataType: "role", dataType: "role",
content: role content: dataCollection.role
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
dataType: "owner", dataType: "owner",
content: owner content: dataCollection.owner
} }
] ]
@ -357,7 +355,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
if @.isFilterDataTypeSelected('assigned_to') || @.isFilterDataTypeSelected('role') if @.isFilterDataTypeSelected('assigned_to') || @.isFilterDataTypeSelected('role')
@.loadIssues() @.loadIssues()
initializeSubscription: -> initializeSubscription: ->
routingKey = "changes.project.#{@scope.projectId}.tasks" routingKey = "changes.project.#{@scope.projectId}.tasks"
@events.subscribe @scope, routingKey, debounceLeading(500, (message) => @events.subscribe @scope, routingKey, debounceLeading(500, (message) =>