Skip to content

Commit

Permalink
fix: show more button missing when grouping tasks by project in tasks…
Browse files Browse the repository at this point in the history
… tab EXO-72589  Meeds-io/meeds#2441 (#432) (#433)

prior to this change show more button was missing because of false value
check for "filter Active". 

after this change, the number of tasks in the retreived projects is counted and the show more button is displayed.
  • Loading branch information
hthabti authored and exo-swf committed Oct 2, 2024
1 parent 4a9e2d9 commit a72d74d
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export default {
},
computed: {
canShowMore() {
return this.tasks.length >= this.limitToFetch && !this.filterActive;
return this.tasks.length >= this.limitToFetch;
},
showPlaceholder() {
return !this.tasks?.length && !this.loadingTasks && !this.filterActive;
Expand Down Expand Up @@ -306,6 +306,7 @@ export default {
this.labels = filterLabels.labels;
if (this.primaryFilter === 'ALL') {
this.taskQueryFilter = e;
this.taskQueryFilter.limit = this.limit;
this.resetSearch();
this.searchTasks(this.taskQueryFilter);
} else {
Expand Down Expand Up @@ -341,6 +342,10 @@ export default {
return this.$tasksService.filterTasksList(tasksFilter,this.groupBy,this.orderBy,this.labels).then(data => {
if (data.projectName){
this.filterTaskQueryResult = data;
let numberOfTasksInProjects = 0;
this.tasks = this.filterTaskQueryResult.tasks;
this.tasks.forEach(projectTasks => numberOfTasksInProjects += projectTasks.length);
this.tasks.length = numberOfTasksInProjects;
this.filterActive=true;
} else {
this.tasks = data && data.tasks || [];
Expand Down

0 comments on commit a72d74d

Please sign in to comment.