diff --git a/src/adonisjs/app/Controllers/Http/CaseController.js b/src/adonisjs/app/Controllers/Http/CaseController.js index 4e5d1ee34..de25d53c3 100644 --- a/src/adonisjs/app/Controllers/Http/CaseController.js +++ b/src/adonisjs/app/Controllers/Http/CaseController.js @@ -87,7 +87,7 @@ class CaseController { async update ({ request, session, response }) { try { const params = request.all() - + console.log('UPDATE STARTING........'); const endpointUrl = Env.get('HARENA_MANAGER_URL') + '/api/v1/case/' + params.case_id diff --git a/src/adonisjs/public/author/js/author.js b/src/adonisjs/public/author/js/author.js index 80e48224d..a1dab379e 100644 --- a/src/adonisjs/public/author/js/author.js +++ b/src/adonisjs/public/author/js/author.js @@ -132,7 +132,7 @@ class AuthorManager { .addEventListener("shown.bs.modal", this.updateSourceField); */ $('#settings-modal').on('shown.bs.modal', this.updateSourceField) - + $('#btn-save-settings').on('click', await this.caseSave) // this.caseLoadSelect(); } diff --git a/src/adonisjs/public/author/js/dcc-author-server-proxy.js b/src/adonisjs/public/author/js/dcc-author-server-proxy.js index 6dacdcfaa..208733384 100644 --- a/src/adonisjs/public/author/js/dcc-author-server-proxy.js +++ b/src/adonisjs/public/author/js/dcc-author-server-proxy.js @@ -4,7 +4,7 @@ * Component following the Digital Content Component (DCC) model responsible for acting * as a proxy between the authoring environment and the server. */ - +// const axios = require('axios'); class DCCAuthorServer { constructor () { this.loadModule = this.loadModule.bind(this) @@ -131,51 +131,79 @@ class DCCAuthorServer { * by the authoring environment. ********************************************************************/ - const headerRead = { - async: true, - crossDomain: true, - method: 'GET', - headers: { - 'Content-Type': 'application/json', - Authorization: 'Bearer ' + DCCCommonServer.token - } - } - - const responseRead = - await fetch(DCCCommonServer.managerAddressAPI + 'case/' + caseId, - headerRead) - - const jsonRead = await responseRead.json() + // const headerRead = { + // async: true, + // crossDomain: true, + // method: 'GET', + // headers: { + // 'Content-Type': 'application/json', + // Authorization: 'Bearer ' + DCCCommonServer.token + // } + // } + // + // const responseRead = + // await fetch(DCCCommonServer.managerAddressAPI + 'case/' + caseId, + // headerRead) + // + // const jsonRead = await responseRead.json() // write the case - const header = { - async: true, - crossDomain: true, + // const header = { + // async: true, + // crossDomain: true, + // method: 'PUT', + // headers: { + // 'Content-Type': 'application/json', + // Authorization: 'Bearer ' + DCCCommonServer.token + // }, + // body: JSON.stringify({ + // title: document.getElementById('case_title').value, + // description: document.getElementById('description').value, + // language: document.getElementById('language').value, + // domain: document.getElementById('domain').value, + // specialty: document.getElementById('specialty').value, + // keywords: document.getElementById('keywords').value, + // source: message.source + // }) + // } + + const config = { method: 'PUT', + url: DCCCommonServer.managerAddressAPI + 'case/' + caseId, + data: { + title: document.getElementById('case_title').value, + description: document.getElementById('description').value, + language: document.getElementById('language').value, + domain: document.getElementById('domain').value, + specialty: document.getElementById('specialty').value, + keywords: document.getElementById('keywords').value, + source: message.source + }, headers: { - 'Content-Type': 'application/json', Authorization: 'Bearer ' + DCCCommonServer.token - }, - body: JSON.stringify({ - title: jsonRead.title, - description: jsonRead.description, - language: jsonRead.language, - domain: jsonRead.domain, - specialty: jsonRead.specialty, - keywords: jsonRead.keywords, - source: message.source - }) + } } console.log('=== save request') console.log(DCCCommonServer.managerAddressAPI + 'case/' + caseId) - const response = - await fetch(DCCCommonServer.managerAddressAPI + 'case/' + caseId, header) - console.log('=== save response') - console.log(response) - const jsonResponse = await response.json() - MessageBus.ext.publish(MessageBus.buildResponseTopic(topic, message), - jsonResponse.source) + axios(config) + .then(function (response) { + // return response.redirect('/') + console.log('=== save response') + console.log(response); + MessageBus.ext.publish(MessageBus.buildResponseTopic(topic, message), + response.data.source) + }) + .catch(function (error) { + console.log('=== save error') + console.log(error) + }) + // const response = + // await fetch(DCCCommonServer.managerAddressAPI + 'case/' + caseId, header) + // console.log(response) + // const jsonResponse = await response.json() + }else { + console.log('save failed else'); } } diff --git a/src/adonisjs/resources/views/author/author.edge b/src/adonisjs/resources/views/author/author.edge index 6017625ce..809c83062 100644 --- a/src/adonisjs/resources/views/author/author.edge +++ b/src/adonisjs/resources/views/author/author.edge @@ -72,6 +72,8 @@ + + diff --git a/src/adonisjs/resources/views/layout/partials/settings-modal.edge b/src/adonisjs/resources/views/layout/partials/settings-modal.edge index 99611a20a..5daef48c9 100644 --- a/src/adonisjs/resources/views/layout/partials/settings-modal.edge +++ b/src/adonisjs/resources/views/layout/partials/settings-modal.edge @@ -4,9 +4,7 @@