From 557937349ac8ac62415776f5a74b7f72272cf60c Mon Sep 17 00:00:00 2001 From: elsiosanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Sun, 23 Feb 2020 00:06:34 -0400 Subject: [PATCH] Duplicate Processes (#354) --- src/store/modules/ADempiere/processControl.js | 85 +++++-------------- src/views/ADempiere/ProcessActivity/index.vue | 14 ++- 2 files changed, 31 insertions(+), 68 deletions(-) diff --git a/src/store/modules/ADempiere/processControl.js b/src/store/modules/ADempiere/processControl.js index 7721e19f..6a8679da 100644 --- a/src/store/modules/ADempiere/processControl.js +++ b/src/store/modules/ADempiere/processControl.js @@ -581,12 +581,6 @@ const processControl = { output }) dispatch('setReportTypeToShareLink', processResult.output.reportType) - dispatch('getDataListTab', { - parentUuid: params.parentUuid, - containerUuid: params.containerUuid, - isRefreshPanel: true, - recordUuid: params.recordUuid - }) resolve(processResult) }) .catch(error => { @@ -715,76 +709,37 @@ const processControl = { outputStream: '', reportType: '' } - if (response.getOutput()) { - const responseOutput = response.getOutput() + if (isEmptyValue(response.output)) { + const responseOutput = response.output output = { - uuid: responseOutput.getUuid(), - name: responseOutput.getName(), - description: responseOutput.getDescription(), - fileName: responseOutput.getFilename(), - mimeType: responseOutput.getMimetype(), - output: responseOutput.getOutput(), - outputStream: responseOutput.getOutputstream(), - reportType: responseOutput.getReporttype() + uuid: responseOutput.uuid, + name: responseOutput.name, + description: responseOutput.description, + fileName: responseOutput.filename, + mimeType: responseOutput.mimeType, + output: responseOutput.output, + outputStream: responseOutput.outputstream, + reportType: responseOutput.reporttype } } var logList = [] - if (response.getLogsList()) { - logList = response.getLogsList().map(itemLog => { + if (response.getLogsList) { + logList = response.getLogsList.map(itemLog => { return { - log: itemLog.getLog(), - recordId: itemLog.getRecordid() + log: itemLog.log, + recordId: itemLog.recordid } }) } - var link = { - href: undefined, - download: undefined - } - if (processDefinition.isReport) { - const blob = new Blob( - [output.outputStream], - { type: output.mimeType } - ) - link = document.createElement('a') - link.href = window.URL.createObjectURL(blob) - link.download = output.fileName - if (reportType !== 'pdf' && reportType !== 'html') { - link.click() - } - - // Report views List to context menu - var reportViewList = { - name: language.t('views.reportView'), - type: 'summary', - action: '', - childs: [], - option: 'reportView' - } - reportViewList.childs = getters.getReportViewList(processResult.processUuid) - if (!reportViewList.childs.length) { - dispatch('requestReportViews', { - processUuid: processResult.processUuid - }) - .then(response => { - reportViewList.childs = response - // Get contextMenu metadata and concat print report views with contextMenu actions - var contextMenuMetadata = rootGetters.getContextMenu(processResult.processUuid) - contextMenuMetadata.actions.push(reportViewList) - }) - } - } // assign new attributes Object.assign(processResult, { - instanceUuid: response.getInstanceuuid(), - url: link.href, - download: link.download, - isError: response.getIserror(), - isProcessing: response.getIsprocessing(), - summary: response.getSummary(), - ResultTableName: response.getResulttablename(), - lastRun: response.getLastrun(), + instanceUuid: response.instanceUuid, + isError: response.isError, + isProcessing: response.isProcessing, + summary: response.summary, + ResultTableName: response.resulttablename, + lastRun: response.lastRun, logs: logList, output: output }) diff --git a/src/views/ADempiere/ProcessActivity/index.vue b/src/views/ADempiere/ProcessActivity/index.vue index a9f3b305..ef7adaa4 100644 --- a/src/views/ADempiere/ProcessActivity/index.vue +++ b/src/views/ADempiere/ProcessActivity/index.vue @@ -1,8 +1,8 @@