Skip to content
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

Fixed custom event submission : back to form list #298

Merged
merged 3 commits into from
Feb 5, 2024
+22 −14
Merged

Fixed custom event submission : back to form list #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
249940f
Fixed custom event submission : back to form list
shuhaib-aot Jan 18, 2024
bc94bf8
Update package.json
shuhaib-aot Jan 19, 2024
337fb59
socket issue quick fix
shuhaib-aot Feb 5, 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
2 changes: 1 addition & 1 deletion camunda-formio-tasklist-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camunda-formio-tasklist-vue",
"version": "1.1.7-rc",
"version": "1.1.8-rc",
"description": "Vue components to integrate formsflow.ai",
"private": false,
"main": "./dist/camunda-formio-tasklist-vue.common.js",
Expand Down
5 changes: 5 additions & 0 deletions camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
this.totalrows=response.data.totalCount;
this.isFormloading=false;
}).catch(err=>{
console.log(err);

Check warning on line 303 in camunda-formio-tasklist-vue/src/components/form/FormListModal.vue

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement

Check warning on line 303 in camunda-formio-tasklist-vue/src/components/form/FormListModal.vue

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement
this.isFormloading=false;
});
}
Expand Down Expand Up @@ -399,7 +399,7 @@
if(err.response?.data){
this.submissionError= err.response.data;
}
console.error(err);

Check warning on line 402 in camunda-formio-tasklist-vue/src/components/form/FormListModal.vue

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement

Check warning on line 402 in camunda-formio-tasklist-vue/src/components/form/FormListModal.vue

View workflow job for this annotation

GitHub Actions / build 

Unexpected console statement
});


Expand All @@ -420,12 +420,17 @@
oncustomEventCallback = (customEvent: CustomEventPayload) => {
switch (customEvent.type) {
case "customSubmitDone":
this.backToFormList();
this.$emit("update-task");
break;
case "cancelSubmission":
this.backToFormList();
break;
default:
break;
}
};


}
</script>
Expand Down
29 changes: 16 additions & 13 deletions camunda-formio-tasklist-vue/src/components/layout/RightSider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
import {
CamundaRest,
SEARCH_USERS_BY,
SocketIOService,
// SocketIOService,
getISODateTime,
reviewerGroup,
} from "../../services";
Expand Down Expand Up @@ -571,9 +571,10 @@ async onSetassignee() {
this.bpmApiUrl
);
await this.toggleassignee();
if (!SocketIOService.isConnected()) {
this.getBPMTaskandReload();
}
// if (!SocketIOService.isConnected()) {
// this.getBPMTaskandReload();
// }
this.getBPMTaskandReload();
}

// toggle assignee
Expand Down Expand Up @@ -668,9 +669,10 @@ async onClaim() {
this.bpmApiUrl
);

if (!SocketIOService.isConnected()) {
this.getBPMTaskandReload();
}
// if (!SocketIOService.isConnected()) {
// this.getBPMTaskandReload();
// }
this.getBPMTaskandReload();
this.loadingClaimAndUnclaim= false;

}
Expand All @@ -681,9 +683,10 @@ async onUnClaim() {
this.loadingClaimAndUnclaim= true;
await CamundaRest.unclaim(this.token, this.task.id!, this.bpmApiUrl);

if (!SocketIOService.isConnected()) {
this.getBPMTaskandReload();
}
// if (!SocketIOService.isConnected()) {
// this.getBPMTaskandReload();
// }
this.getBPMTaskandReload();
this.loadingClaimAndUnclaim= false;
}

Expand Down Expand Up @@ -748,9 +751,9 @@ async deleteGroup(groupid: string) {
// update data
async updateTaskDatedetails(taskId: string, task: TaskPayload) {
await CamundaRest.updateTasksByID(this.token, taskId, this.bpmApiUrl, task);
if (!SocketIOService.isConnected()) {
await this.reloadCurrentTask();
}
// if (!SocketIOService.isConnected()) {
await this.reloadCurrentTask();
// }
}


Expand Down
Loading