Skip to content

Commit

Permalink
Merge pull request #1651 from ProcessMaker/bugfix/FOUR-16321
Browse files Browse the repository at this point in the history
FOUR-16321:The "Case Title" column is cut off in the "MY CASES" Dashboard
  • Loading branch information
ryancooley authored Jul 24, 2024
2 parents ccb2e98 + 4a5cbe6 commit cab9359
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 26 deletions.
35 changes: 11 additions & 24 deletions src/components/renderer/form-requests.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<template>
<div v-if="showTable">
<filter-table
table-name="form-cases"
:headers="tableHeaders"
:data="tableData"
:unread="unreadColumnName"
:loading="shouldShowLoader"
>
<template
v-for="(row, rowIndex) in data.data"
v-slot:[`row-${rowIndex}`]
>
<template v-for="(row, rowIndex) in data.data" #[`row-${rowIndex}`]>
<td
v-for="(header, colIndex) in tableHeaders"
:key="`${rowIndex}-${colIndex}`"
Expand Down Expand Up @@ -172,6 +170,7 @@ export default {
};
const tasksDropdown = [];
this.$emit("requestsCount", { dataControls, tasksDropdown });
this.$refs["form-case"].resetToOriginalWidths();
})
.catch(() => {
this.tableData = [];
Expand Down Expand Up @@ -249,24 +248,17 @@ export default {
this.fetch();
},
setupColumns() {
const columns = this.getColumns();
this.tableHeaders = this.getColumns();
const columnsCases = this.getColumnsCases();
this.tableHeaders = this.getColumnsCases();
columns.forEach((column) => {
columnsCases.forEach((column) => {
const field = {
title: () => this.$t(column.label),
title: () => this.$t(column.label)
};
switch (column.field) {
case "id":
field.name = "__slot:ids";
field.title = "#";
break;
case "participants":
field.name = "__slot:participants";
break;
case "name":
field.name = "__slot:name";
case "case_number":
field.name = "__slot:case_number";
break;
case "case_title":
field.name = "__slot:case_title";
Expand All @@ -293,13 +285,8 @@ export default {
this.fields.push(field);
});
this.fields.push({
name: "__slot:actions",
title: ""
});
},
getColumns() {
getColumnsCases() {
return [
{
label: "Case #",
Expand All @@ -325,7 +312,7 @@ export default {
sortable: true,
default: true,
width: 113,
fixed_width: 314,
fixed_width: 113,
resizable: false,
filter_subject: { type: "Status" }
},
Expand Down
6 changes: 4 additions & 2 deletions src/components/renderer/form-tasks.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<div v-if="showTable">
<filter-table
table-name="form-tasks"
:headers="tableHeaders"
:data="tableData"
:unread="unreadColumnName"
Expand Down Expand Up @@ -270,6 +271,7 @@ export default {
dropdownShow: "tasks"
};
this.$emit("tasksCount", { dataControls, tasksDropdown });
this.$refs["form-task"].resetToOriginalWidths();
})
.catch(() => {
this.tableData = [];
Expand Down Expand Up @@ -386,9 +388,9 @@ export default {
},
setupColumns() {
this.tableHeaders = this.getColumns();
const columns = this.getColumns();
const columnsTasks = this.getColumns();
columns.forEach((column) => {
columnsTasks.forEach((column) => {
const field = {
title: () => this.$t(column.label)
};
Expand Down

0 comments on commit cab9359

Please sign in to comment.