diff --git a/src/components/InProgressItems.vue b/src/components/InProgressItems.vue index 45043355..3fce6c74 100644 --- a/src/components/InProgressItems.vue +++ b/src/components/InProgressItems.vue @@ -248,10 +248,10 @@ export default { { label: 'Project', className: 'project', - isSortingActive: this.inProgressNuggetsSortCriteria.field === 'projectTitle', + isSortingActive: this.inProgressNuggetsSortCriteria.field === 'projectId', isFilteringActive: null, - field: 'projectTitle', - filteringItems: null + field: 'projectId', + filteringItems: this.projects }, { label: 'Priority', @@ -279,7 +279,8 @@ export default { 'inProgressNuggetsSortCriteria', 'inProgressNuggetsFilters', 'issueBoarding', - 'issueKind' + 'issueKind', + 'projects' ]) }, watch: { diff --git a/src/components/NeedEstimateItems.vue b/src/components/NeedEstimateItems.vue index bfdfe302..7ac0a07e 100644 --- a/src/components/NeedEstimateItems.vue +++ b/src/components/NeedEstimateItems.vue @@ -206,9 +206,9 @@ export default { { label: 'Project', className: 'project', - isSortingActive: this.needEstimateSortCriteria.field === 'projectTitle', + isSortingActive: this.needEstimateSortCriteria.field === 'projectId', isFilteringActive: null, - field: 'projectTitle', + field: 'projectId', filteringItems: null }, { diff --git a/src/components/NewlyAssigned.vue b/src/components/NewlyAssigned.vue index cea08047..8034df19 100644 --- a/src/components/NewlyAssigned.vue +++ b/src/components/NewlyAssigned.vue @@ -201,9 +201,9 @@ export default { { label: 'Project', className: 'project', - isSortingActive: this.newlyAssignedSortCriteria.field === 'projectTitle', + isSortingActive: this.newlyAssignedSortCriteria.field === 'projectId', isFilteringActive: null, - field: 'projectTitle', + field: 'projectId', filteringItems: null }, { diff --git a/src/components/UpcomingItems.vue b/src/components/UpcomingItems.vue index 500f2f8a..99f197a1 100644 --- a/src/components/UpcomingItems.vue +++ b/src/components/UpcomingItems.vue @@ -245,10 +245,10 @@ export default { { label: 'Project', className: 'project', - isSortingActive: this.upcomingNuggetsSortCriteria.field === 'projectTitle', + isSortingActive: this.upcomingNuggetsSortCriteria.field === 'projectId', isFilteringActive: null, - field: 'projectTitle', - filteringItems: this.projectTitle + field: 'projectId', + filteringItems: this.projects }, { label: 'Priority', @@ -276,7 +276,8 @@ export default { 'upcomingNuggetsSortCriteria', 'upcomingNuggetsFilters', 'issueKind', - 'issueBoarding' + 'issueBoarding', + 'projects' ]) }, watch: { diff --git a/src/store.js b/src/store.js index a6ac2929..a44620e9 100644 --- a/src/store.js +++ b/src/store.js @@ -125,14 +125,14 @@ function initialState () { newlyAssignedFilters: { issueBoarding: [], issueKind: [], - projectTitle: [], + projectId: [], priority: [], phase: [] }, needEstimateFilters: { issueBoarding: [], issueKind: [], - projectTitle: [], + projectId: [], priority: [], phase: [], responseTime: [] @@ -144,7 +144,7 @@ function initialState () { startDate: [], endDate: [], hoursWorked: [], - projectTitle: [], + projectId: [], priority: [], phase: [] }, @@ -154,7 +154,7 @@ function initialState () { startDate: [], endDate: [], hoursWorked: [], - projectTitle: [], + projectId: [], priority: [], phase: [] }, @@ -364,8 +364,8 @@ export default new Vuex.Store({ if (state.newlyAssignedFilters.issueKind.length) { result.issueKind = `IN(${state.newlyAssignedFilters.issueKind.join(',')})` } - if (state.newlyAssignedFilters.projectTitle.length) { - result.projectTitle = `IN(${state.newlyAssignedFilters.projectTitle.join(',')})` + if (state.newlyAssignedFilters.projectId.length) { + result.projectId = `IN(${state.newlyAssignedFilters.projectId.join(',')})` } if (state.newlyAssignedFilters.priority.length) { result.priority = `IN(${state.newlyAssignedFilters.priority.join(',')})` @@ -384,8 +384,8 @@ export default new Vuex.Store({ if (state.needEstimateFilters.issueKind.length) { result.issueKind = `IN(${state.needEstimateFilters.issueKind.join(',')})` } - if (state.needEstimateFilters.projectTitle.length) { - result.projectTitle = `IN(${state.needEstimateFilters.projectTitle.join(',')})` + if (state.needEstimateFilters.projectId.length) { + result.projectId = `IN(${state.needEstimateFilters.projectId.join(',')})` } if (state.needEstimateFilters.priority.length) { result.priority = `IN(${state.needEstimateFilters.priority.join(',')})` @@ -431,8 +431,8 @@ export default new Vuex.Store({ ',' )})` } - if (state.inProgressNuggetsFilters.projectTitle.length) { - result.projectTitle = `IN(${state.inProgressNuggetsFilters.projectTitle.join( + if (state.inProgressNuggetsFilters.projectId.length) { + result.projectId = `IN(${state.inProgressNuggetsFilters.projectId.join( ',' )})` } @@ -470,8 +470,8 @@ export default new Vuex.Store({ ',' )})` } - if (state.upcomingNuggetsFilters.projectTitle.length) { - result.projectTitle = `IN(${state.upcomingNuggetsFilters.projectTitle.join(',')})` + if (state.upcomingNuggetsFilters.projectId.length) { + result.projectId = `IN(${state.upcomingNuggetsFilters.projectId.join(',')})` } if (state.upcomingNuggetsFilters.priority.length) { result.priority = `IN(${state.upcomingNuggetsFilters.priority.join(