From c3d325f1737e5a1efd66290ef74aa3119c05eaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Thu, 13 Jun 2024 12:09:48 -0400 Subject: [PATCH 1/8] Added badges for Alternatives column in the request lists --- .../js/components/shared/FilterTable.vue | 12 +++++++++++ .../requests/components/RequestsListing.vue | 21 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue index e982e14da5..fcb90c46e5 100644 --- a/resources/js/components/shared/FilterTable.vue +++ b/resources/js/components/shared/FilterTable.vue @@ -462,6 +462,18 @@ export default { border-radius: 5px; padding: 7px; } +.status-alternative-a { + background: rgba(224, 229, 232, 1); + color: rgba(0, 0, 0, 0.75); + border-radius: 5px; + padding: 7px; +} +.status-alternative-b { + background: rgba(249, 232, 195, 1); + color: rgba(0, 0, 0, 0.75); + border-radius: 5px; + padding: 7px; +} @-moz-document url-prefix() { .pm-table-truncate { overflow: hidden; diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index 10e93be2f8..23d3478c76 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -124,6 +124,7 @@ import paginationTable from "../../components/shared/PaginationTable.vue"; import PMColumnFilterIconAsc from "../../components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue"; import PMColumnFilterIconDesc from "../../components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue"; import FilterTableBodyMixin from "../../components/shared/FilterTableBodyMixin"; +import { BadgePlugin } from "bootstrap-vue"; const uniqIdsMixin = createUniqIdsMixin(); @@ -397,7 +398,25 @@ export default { }; }, formatProcessVersionAlternative(value) { - return `Alternative ${value}`; + let color = "primary"; + let badge = "alternative-a"; + + if (value === "A") { + color = "primary"; + badge = "alternative-a"; + } else if (value === "B") { + color = "secondary"; + badge = "alternative-b"; + } else if (value === null) { + return "-"; + } + + return ` + + Alternative ${value} + `; }, transform(dataInput) { const data = _.cloneDeep(dataInput); From cfa2a2c7eb39d60819a4b2c00c21081e54cf80c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Fri, 14 Jun 2024 10:42:09 -0400 Subject: [PATCH 2/8] Added an overdue tag in the tasks list --- resources/js/tasks/components/TasksList.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index 955e406d6e..24135e1f6b 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -630,9 +630,12 @@ export default { if (props.status === "ACTIVE" && isSelfService) { color = "danger"; label = "Self Service"; - } else if (props.status === "ACTIVE") { + } else if (props.status === "ACTIVE" && props.advanceStatus === "open") { color = "success"; label = "In Progress"; + } else if (props.status === "ACTIVE" && props.advanceStatus === "overdue") { + color = "danger"; + label = "Overdue"; } else if (props.status === "CLOSED") { color = "primary"; label = "Completed"; From 643dec3fcf2666d045d0925f1c9b62aff6e0712c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Fri, 14 Jun 2024 11:03:51 -0400 Subject: [PATCH 3/8] remove unused library --- resources/js/requests/components/RequestsListing.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index 23d3478c76..e70423897f 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -124,7 +124,6 @@ import paginationTable from "../../components/shared/PaginationTable.vue"; import PMColumnFilterIconAsc from "../../components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue"; import PMColumnFilterIconDesc from "../../components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue"; import FilterTableBodyMixin from "../../components/shared/FilterTableBodyMixin"; -import { BadgePlugin } from "bootstrap-vue"; const uniqIdsMixin = createUniqIdsMixin(); From 44c959f551de04d6046dcc742a694a91a1232452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Fri, 14 Jun 2024 11:16:08 -0400 Subject: [PATCH 4/8] SonarQube fixes --- resources/js/requests/components/RequestsListing.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index e70423897f..d1b24c6ea2 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -397,8 +397,8 @@ export default { }; }, formatProcessVersionAlternative(value) { - let color = "primary"; - let badge = "alternative-a"; + let color; + let badge; if (value === "A") { color = "primary"; @@ -408,6 +408,9 @@ export default { badge = "alternative-b"; } else if (value === null) { return "-"; + } else { + color = "primary"; + badge = "alternative-a"; } return ` From c706df7cedc93a111b7b981d990ee1586c8b1d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Fri, 14 Jun 2024 11:28:44 -0400 Subject: [PATCH 5/8] SonarQube fixes --- resources/js/requests/components/RequestsListing.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index d1b24c6ea2..c61d7e18df 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -397,20 +397,14 @@ export default { }; }, formatProcessVersionAlternative(value) { - let color; - let badge; + let color = "primary"; + let badge = "alternative-a"; - if (value === "A") { - color = "primary"; - badge = "alternative-a"; - } else if (value === "B") { + if (value === "B") { color = "secondary"; badge = "alternative-b"; } else if (value === null) { return "-"; - } else { - color = "primary"; - badge = "alternative-a"; } return ` From eaceba016079bf987d7e7845680c04756482cc6e Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Mon, 17 Jun 2024 16:36:30 -0700 Subject: [PATCH 6/8] Start on launchpad search refactoring --- .../components/ProcessesCatalogue.vue | 7 +- .../components/menuCatologue.vue | 5 - .../components/utils/SearchCards.vue | 147 +++++++++++------- resources/js/processes-catalogue/index.js | 1 + resources/lang/en.json | 3 +- 5 files changed, 101 insertions(+), 62 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 82886ba2d8..5504b4a2c0 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -87,7 +87,7 @@ export default { category: null, selectedProcess: null, guidedTemplates: false, - numCategories: 15, + numCategories: 100, page: 1, key: 0, totalPages: 1, @@ -115,7 +115,10 @@ export default { this.showMenu = false; } } - } + }, + listCategories() { + this.$root.categories = this.listCategories; + }, }, computed: { showMobileMenuControl() { diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue index 0d13c72409..4e0adc6b32 100644 --- a/resources/js/processes-catalogue/components/menuCatologue.vue +++ b/resources/js/processes-catalogue/components/menuCatologue.vue @@ -1,10 +1,5 @@ @@ -31,55 +53,72 @@ export default { data() { return { filter: "", + filteredCategories: null, }; }, methods: { fetch() { this.filterPmql(this.filter, true); + this.filterCategories(); }, clearSearch() { this.filter = ""; + this.filterCategories(); this.fetch(); }, + selectCategory(category) { + this.$router.push({ name: "index", query: { categoryId: category.id } }); + this.clearSearch(); + }, + filterCategories() { + if (!this.filter) { + this.filteredCategories = null; + return; + } + this.filteredCategories = this.$root.categories.filter((category) => { + return category.name + .toLowerCase() + .includes(this.filter.toLowerCase()); + }); + }, }, }; - diff --git a/resources/js/processes-catalogue/index.js b/resources/js/processes-catalogue/index.js index 3e42fb8151..e77edb77d8 100644 --- a/resources/js/processes-catalogue/index.js +++ b/resources/js/processes-catalogue/index.js @@ -42,6 +42,7 @@ new Vue({ return { permission: window.ProcessMaker.permission, isDocumenterInstalled: window.ProcessMaker.isDocumenterInstalled, + categories: [], }; }, methods: { diff --git a/resources/lang/en.json b/resources/lang/en.json index a2c0f917ce..9b6261b4f2 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -2264,5 +2264,6 @@ "Choose a saved search to see the tasks that you can use with an Inbox Rule.": "Choose a saved search to see the tasks that you can use with an Inbox Rule.", "No tasks to show.": "No tasks to show.", "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters.": "But that's OK. You can still create this this Inbox Rule to apply to future tasks that match the above filters.", - "Recent Cases": "Recent Cases" + "Recent Cases": "Recent Cases", + "No matching categories were found.": "No matching categories were found." } From d726fb26a8e59ef84207b97d58c4290465ff9220 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Wed, 19 Jun 2024 16:49:03 -0400 Subject: [PATCH 7/8] FOUR-14245 Container behavior was updated in the process catalog. --- .../components/ProcessesCatalogue.vue | 7 ++++--- .../components/utils/SearchCards.vue | 15 ++++++++++++--- resources/lang/en.json | 3 ++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue index 5504b4a2c0..acd9d09977 100644 --- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue +++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue @@ -268,6 +268,8 @@ export default { background-color: #F7F9FB; flex: 1; width: 315px; + height: 100%; + overflow-y: scroll; } @media (max-width: $lp-breakpoint) { @@ -385,10 +387,9 @@ export default { } .processes-info { width: 100%; - margin-right: 16px; + margin-right: -16px; height: calc(100vh - 145px); - padding-left: 32px; - + overflow-x: hidden; @media (max-width: $lp-breakpoint) { padding-left: 0; } diff --git a/resources/js/processes-catalogue/components/utils/SearchCards.vue b/resources/js/processes-catalogue/components/utils/SearchCards.vue index 07fce3e3e1..0aad8fbbd2 100644 --- a/resources/js/processes-catalogue/components/utils/SearchCards.vue +++ b/resources/js/processes-catalogue/components/utils/SearchCards.vue @@ -13,7 +13,7 @@ @@ -27,7 +27,8 @@ -
+