Skip to content

[SUMMER] feature/FOUR-15725 Improve Tables View for tasks and cases #6879

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
nolanpro merged 15 commits into from
Jun 6, 2024
Merged

[SUMMER] feature/FOUR-15725 Improve Tables View for tasks and cases #6879

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8e95e90
Change style for status, case title and links on tasks listing
gustavobascope May 20, 2024
8b0140c
adjust the size of the priority column
gustavobascope May 22, 2024
3f417eb
changed task list hoover options style
May 23, 2024
32948b4
Added new tooltips for task hover options
May 24, 2024
ba590a8
Merge branch 'next' of github.com:ProcessMaker/processmaker into feat…
gustavobascope May 24, 2024
0e13fc4
changed the filter and sort styles
gustavobascope May 24, 2024
77e85fb
change filter icons style when filter is applied
gustavobascope May 27, 2024
3ccc149
change filter icons style on cases list
gustavobascope May 27, 2024
2b9a5d6
Fix browser back behaviour for new tasks
gustavobascope May 28, 2024
06cc244
hide the draft tag when the task is completed
gustavobascope May 28, 2024
2d15247
Fix column filter styles
gustavobascope May 29, 2024
bfe3321
Do not cache task and request results
nolanpro May 29, 2024
cbc32f6
Fixed hover task menu on saved search
gustavobascope May 31, 2024
20b0116
Merge branch 'feature/FOUR-15725' of github.com:ProcessMaker/processm…
gustavobascope May 31, 2024
0bc7033
fix new option column style
gustavobascope May 31, 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
3 changes: 1 addition & 2 deletions resources/js/common/PMColumnFilterPopoverCommonMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,10 @@ const PMColumnFilterCommonMixin = {
this.tableHeaders[i].sortDesc = false;
}
for (let i in this.tableHeaders) {
if (this.tableHeaders[i].field === this.orderBy) {
if (this.orderBy.endsWith(this.tableHeaders[i].field)) {
let sort = this.sortOrder[0].direction;
this.tableHeaders[i].sortAsc = (sort.toLowerCase() === "asc");
this.tableHeaders[i].sortDesc = (sort.toLowerCase() === "desc");
this.tableHeaders[i].filterApplied = true;
}
}
for (let i in this.tableHeaders) {
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
export default {
components: {
PMColumnFilterForm,
PMColumnFilterIconThreeDots
PMColumnFilterIconThreeDots,
},
props: [
"container",
Expand All @@ -60,7 +60,7 @@
"hideSortingButtons",
"columnSortAsc",
"columnSortDesc",
"filterApplied"
"filterApplied",
],
data() {
return {
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/shared/FilterTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:id="`${tableName}-column-${index}`"
:key="index"
class="pm-table-ellipsis-column"
:class="{ 'pm-table-filter-applied': column.filterApplied }"
:class="{ 'pm-table-filter-applied': column.filterApplied || column.sortAsc || column.sortDesc }"
:style="{ width: column.fixed_width + 'px' }"
>
<div
Expand Down Expand Up @@ -76,7 +76,7 @@
<slot :name="`row-${rowIndex}`">
<td
v-for="(header, index) in visibleHeaders"
:class="{ 'pm-table-filter-applied-tbody': column.filterApplied }"
:class="{ 'pm-table-filter-applied-tbody': column.sortAsc || column.sortDesc }"
:key="index"
>
<template v-if="containsHTML(getNestedPropertyValue(row, header))">
Expand Down
3 changes: 3 additions & 0 deletions resources/js/requests/components/RequestsListing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,9 @@ export default {
cancelToken: new CancelToken((c) => {
this.cancelToken = c;
}),
headers: {
'Cache-Control': 'no-cache',
}
},
)
.then((response) => {
Expand Down
5 changes: 4 additions & 1 deletion resources/js/tasks/components/ListMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ const ListMixin = {
advancedFilter +
this.columnsQuery,

{ dataLoadingId: this.dataLoadingId }
{
dataLoadingId: this.dataLoadingId,
headers: { 'Cache-Control': 'no-cache'}
},
)
.then((response) => {
this.data = this.transform(response.data);
Expand Down
4 changes: 2 additions & 2 deletions resources/js/tasks/components/TasksList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
>
<td
v-for="(header, colIndex) in visibleHeaders"
:class="{ 'pm-table-filter-applied-tbody': header.filterApplied }"
:class="{ 'pm-table-filter-applied-tbody': header.sortAsc || header.sortDesc }"
:key="colIndex"
>
<template v-if="containsHTML(getNestedPropertyValue(row, header))">
Expand Down Expand Up @@ -477,7 +477,7 @@ export default {
},
formatCaseTitle(processRequest, record) {
let draftBadge = "";
if (record.draft) {
if (record.draft && record.status !== "CLOSED") {
draftBadge = `<span class="badge badge-warning status-warning">
${this.$t("Draft")}
</span>`;
Expand Down