Skip to content

FOUR-18631: Review the comments Component #7431

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
pmPaulis merged 3 commits into from
Oct 1, 2024
Merged

FOUR-18631: Review the comments Component #7431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a51fe26
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 27, 2024
0cce034
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 27, 2024
a40ba16
FOUR-18631: SPIKE: Review the comments Component
hjonathan Sep 30, 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
Prev Previous commit
FOUR-18631: SPIKE: Review the comments Component
  • Loading branch information
@hjonathan
hjonathan committed Sep 30, 2024
commit a40ba16c4cca7dd0dad3b26f017f5a0b330bf5c7
2 changes: 1 addition & 1 deletion resources/jscomposition/base/ui/CollapsableContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="tw-flex tw-transition-all tw-duration-500"
:class="{ 'tw-w-0' : collapse}">
:class="{ '!tw-w-0' : collapse}">
<slot name="left">
<div class="tw-relative tw-group tw-w-3">
<div class="tw-transition tw-duration-250 tw-w-[2px] tw-h-full">
Expand Down
42 changes: 21 additions & 21 deletions resources/jscomposition/cases/casesDetail/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Vue.component("Timeline", Timeline);

new Vue({
el: "#case-detail",
components: { CaseDetail, Tabs, CollapsableContainer},
components: { CaseDetail, Tabs, CollapsableContainer },
data() {
return {
activeTab: "pending",
Expand All @@ -20,37 +20,35 @@ new Vue({
automaticLayout: true,
},
showJSONEditor: false,
data: data,
requestId: requestId,
request: request,
files: files,
data,
requestId,
request,
files,
refreshTasks: 0,
canCancel: canCancel,
canViewPrint: canViewPrint,
canCancel,
canViewPrint,
status: "ACTIVE",
userRequested: [],
errorLogs: errorLogs,
errorLogs,
disabled: false,
retryDisabled: false,
packages: [],
processId: processId,
canViewComments: canViewComments,
processId,
canViewComments,
isObjectLoading: false,
showTree: false,
showTabs: true,
showInfo: true,

tabDefault: 'details',
tabs : [
tabDefault: "details",
tabs: [
{
name: "Details", href: "#tasks", current: "details", show: true, content: null,
name: "Details", href: "#details", current: "details", show: true, content: null,
},
{
name: "Comments", href: "#comments", current: "comments", show: true, content: null,
},
],
headerModel: false

headerModel: false,
};
},
computed: {
Expand Down Expand Up @@ -216,7 +214,7 @@ new Vue({
updateRequestData() {
const data = JSON.parse(this.jsonData);
ProcessMaker.apiClient.put(`requests/${this.requestId}`, {
data: data,
data,
}).then(() => {
this.fieldsToUpdate.splice(0);
ProcessMaker.alert(this.$t("The request data was saved."), "success");
Expand Down Expand Up @@ -292,7 +290,7 @@ new Vue({
}
},
okCancel() {
//single click
// single click
if (this.disabled) {
return;
}
Expand Down Expand Up @@ -328,7 +326,8 @@ new Vue({
ProcessMaker.alert(this.$t("Request Completed"), "success");
window.location.reload();
});
});
},
);
},
retryRequest() {
const apiRequest = () => {
Expand Down Expand Up @@ -365,12 +364,13 @@ new Vue({
rollback(errorTaskId, rollbackToName) {
ProcessMaker.confirmModal(
this.$t("Confirm"),
this.$t("Are you sure you want to rollback to the task @{{name}}? Warning! This request will continue as the current published process version.",
this.$t(
"Are you sure you want to rollback to the task @{{name}}? Warning! This request will continue as the current published process version.",
{ name: rollbackToName },
),
"default",
() => {
ProcessMaker.apiClient.post(`tasks/${errorTaskId}/rollback`).then(response => {
ProcessMaker.apiClient.post(`tasks/${errorTaskId}/rollback`).then((response) => {
window.location.reload();
});
},
Expand Down