Skip to content

QA Observation Bugfix/FOUR-14155: You cannot filter using "between" from the second page #6227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 4 commits into from
Feb 16, 2024
Merged

QA Observation Bugfix/FOUR-14155: You cannot filter using "between" from the second page #6227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cd0322
solving bugfix/FOUR-14155
CarliPinell Feb 15, 2024
04041d8
solving issue with filters with pagination
CarliPinell Feb 15, 2024
65924e2
Merge branch 'next' of https://github.com/ProcessMaker/processmaker i…
CarliPinell Feb 15, 2024
d699e94
FOUR-14155 add previousAdvancedFilter to resources/js/tasks/component…
gproly Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions resources/js/requests/components/RequestsListing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export default {
fields: [],
previousFilter: "",
previousPmql: "",
previousAdvancedFilter: "",
tableHeaders: [],
unreadColumnName: "user_viewed_at",
};
Expand Down Expand Up @@ -399,7 +400,7 @@ export default {

const CancelToken = ProcessMaker.apiClient.CancelToken;

const { pmql, filter } = this.buildPmqlAndFilter();
const { pmql, filter, advancedFilter } = this.buildPmqlAndFilter();

// Load from our api client
ProcessMaker.apiClient
Expand All @@ -418,7 +419,7 @@ export default {
"&order_direction=" +
this.orderDirection +
this.additionalParams +
this.getAdvancedFilter(),
advancedFilter,
{
cancelToken: new CancelToken((c) => {
this.cancelToken = c;
Expand Down Expand Up @@ -470,7 +471,12 @@ export default {

this.previousPmql = pmql;

return { pmql, filter };
const advancedFilter = this.getAdvancedFilter();
if (this.previousAdvancedFilter !== advancedFilter) {
this.page = 1;
}

return { pmql, filter, advancedFilter };

},
handleRowClick(row) {
Expand Down
4 changes: 4 additions & 0 deletions resources/js/tasks/components/ListMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ const ListMixin = {
this.previousPmql = pmql;

let advancedFilter = this.getAdvancedFilter ? this.getAdvancedFilter(): "";
if (this.previousAdvancedFilter !== advancedFilter) {
this.page = 1;
}
this.previousAdvancedFilter = advancedFilter;

// Load from our api client
ProcessMaker.apiClient
Expand Down
1 change: 1 addition & 0 deletions resources/js/tasks/components/TasksList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ export default {
fields: [],
previousFilter: "",
previousPmql: "",
previousAdvancedFilter: "",
tableHeaders: [],
unreadColumnName: "user_viewed_at",
rowPosition: {},
Expand Down