Merge remote-tracking branch 'core/dev' into dev

src/ibiz-core/service/entity-service-base.ts

@@ -713,11 +713,17 @@ export class EntityServiceBase {
      * @memberof EntityServiceBase
      */
     public async WFSubmit(context: any = {}, data: any = {}, wfdata?: any): Promise<HttpResponse> {
-        if (wfdata && Object.keys(wfdata).length !== 0) {
-            const _data: any = { ...{ activedata: data }, wfdata };
-            return Http.getInstance().post(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${data[this.key]}/tasks/${wfdata['taskId']}`, _data);
+        try {
+            let res: any;
+            if (wfdata && Object.keys(wfdata).length !== 0) {
+                const _data: any = { ...{ activedata: data }, wfdata };
+                res = await this.http.post(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${data[this.key]}/tasks/${wfdata['taskId']}`, _data);
+            }
+            res = await this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
+            return res;
+        } catch (res) {
+            return new HttpResponse(res.status, null);
         }
-        return this.http.post(`/${this.dePath}/${context[this.key]}/wfsubmit`, data);
     }
 
     /**
@@ -725,11 +731,16 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
-     * @returns {Promise<any>}
+     * @returns {Promise<HttpResponse>}
      * @memberof EntityServiceBase
      */
-    public async WFGetWFStep(context: any = {}, data: any = {}): Promise<any> {
-        return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/process-definitions-nodes`);
+    public async WFGetWFStep(context: any = {}, data: any = {}): Promise<HttpResponse> {
+        try {
+            const res = await this.http.get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/process-definitions-nodes`);
+            return res;
+        } catch (res) {
+            return new HttpResponse(res.status, null);
+        }
     }
 
     /**
@@ -737,11 +748,16 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
-     * @returns {Promise<any>}
+     * @returns {Promise<HttpResponse>}
      * @memberof EntityServiceBase
      */
-    public async GetWFLink(context: any = {}, data: any = {}): Promise<any> {
-        return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/usertasks/${data['taskDefinitionKey']}/ways`);
+    public async GetWFLink(context: any = {}, data: any = {}): Promise<HttpResponse> {
+        try {
+            const res = await this.http.get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/usertasks/${data['taskDefinitionKey']}/ways`);
+            return res;
+        } catch (res) {
+            return new HttpResponse(res.status, null);
+        }
     }
 
     /**
@@ -749,11 +765,16 @@ export class EntityServiceBase {
      *
      * @param {*} [context={}]
      * @param {*} [data={}]
-     * @returns {Promise<any>}
+     * @returns {Promise<HttpResponse>}
      * @memberof EntityServiceBase
      */
-    public async GetWFHistory(context: any = {}, data: any = {}): Promise<any> {
-        return Http.getInstance().get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/process-instances/alls/history`);
+    public async GetWFHistory(context: any = {}, data: any = {}): Promise<HttpResponse> {
+        try {
+            const res = await this.http.get(`/wfcore/${this.systemName}-app-${this.appName}/${this.dePath}/${context[this.deName]}/process-instances/alls/history`);
+            return res;
+        } catch (res) {
+            return new HttpResponse(res.status, null);
+        }
     }
 
     /**