diff --git a/resources/js/components/shared/EllipsisMenu.vue b/resources/js/components/shared/EllipsisMenu.vue index 49b8d57f22..1329138430 100644 --- a/resources/js/components/shared/EllipsisMenu.vue +++ b/resources/js/components/shared/EllipsisMenu.vue @@ -2,6 +2,7 @@ + diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue index c2530dc68b..9ad466a300 100644 --- a/resources/js/components/shared/FilterTable.vue +++ b/resources/js/components/shared/FilterTable.vue @@ -49,6 +49,7 @@ + @@ -133,6 +135,12 @@ export default { return ""; } }, + loading: { + type: Boolean, + default: function () { + return false; + } + }, }, data() { return { @@ -252,8 +260,7 @@ export default { border-radius: 5px; scrollbar-width: 8px; scrollbar-color: #6C757D; - height: calc(100vh - 150px); - min-height: 400px; + max-height: calc(100vh - 150px); } .pm-table-container th { diff --git a/resources/js/processes/components/ProcessMixin.js b/resources/js/processes/components/ProcessMixin.js index 38e5989276..249e20a538 100644 --- a/resources/js/processes/components/ProcessMixin.js +++ b/resources/js/processes/components/ProcessMixin.js @@ -156,5 +156,8 @@ export default { this.fetch(); } }, + openModeler(data) { + return `/modeler/${data.id}`; + }, }, }; diff --git a/resources/js/processes/components/ProcessesListing.vue b/resources/js/processes/components/ProcessesListing.vue index 92ebc8435d..ff612d4190 100644 --- a/resources/js/processes/components/ProcessesListing.vue +++ b/resources/js/processes/components/ProcessesListing.vue @@ -86,9 +86,9 @@ class="mr-2" :class="{ 'fas fa-check-circle text-success': row.status == 'ACTIVE', 'far fa-circle': row.status == 'INACTIVE' }" /> - + {{ row[header.field] }} - + diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index 1586c17c33..5535ab5178 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -8,6 +8,7 @@ :headers="tableHeaders" :data="data" :unread="unreadColumnName" + :loading="shouldShowLoader" @table-row-click="handleRowClick" @table-row-mouseover="handleRowMouseover" @table-row-mouseleave="handleRowMouseleave" @@ -48,7 +49,7 @@ :id="`element-${rowIndex}-${colIndex}`" :class="{ 'pm-table-truncate': header.truncate }" :style="{ maxWidth: header.width + 'px' }" - > + >