X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fframework%2Fwidgets%2Fskyquake_container%2FskyquakeContainerSource.js;h=75cfec79fe967064ad94941b090c82e3b4b31867;hp=03bc7efe15b17d612418f2f9f294d292477e00a2;hb=80097691f3ed0adb4406906ef619c1042c2219ea;hpb=dfe972ff7c9f7b6b1d730e66b0b2aa8df2ce329b diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js index 03bc7efe1..75cfec79f 100644 --- a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js +++ b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js @@ -18,13 +18,14 @@ import Alt from './skyquakeAltInstance.js'; import $ from 'jquery'; import SkyquakeContainerActions from './skyquakeContainerActions' +import rw from 'utils/rw.js'; +import Utils from 'utils/utils.js'; -let Utils = require('utils/utils.js'); -let API_SERVER = require('utils/rw.js').getSearchParams(window.location).api_server; +let API_SERVER = rw.getSearchParams(window.location).api_server; let HOST = API_SERVER; -let NODE_PORT = require('utils/rw.js').getSearchParams(window.location).api_port || ((window.location.protocol == 'https:') ? 8443 : 8000); -let DEV_MODE = require('utils/rw.js').getSearchParams(window.location).dev_mode || false; -let RW_REST_API_PORT = require('utils/rw.js').getSearchParams(window.location).rw_rest_api_port || 8008; +let NODE_PORT = rw.getSearchParams(window.location).api_port || ((window.location.protocol == 'https:') ? 8443 : 8000); +let DEV_MODE = rw.getSearchParams(window.location).dev_mode || false; +let RW_REST_API_PORT = rw.getSearchParams(window.location).rw_rest_api_port || 8008; if (DEV_MODE) { HOST = window.location.protocol + '//' + window.location.hostname; @@ -40,6 +41,7 @@ export default { type: 'GET', // beforeSend: Utils.addAuthorizationStub, success: function(data) { + Utils.detectInactivity(); resolve(data); } }) @@ -54,7 +56,7 @@ export default { remote: function(state, recordID) { return new Promise(function(resolve, reject) { $.ajax({ - url: '//' + window.location.hostname + ':' + NODE_PORT + '/api/operational/restconf-state/streams?api_server=' + API_SERVER, + url: '//' + window.location.hostname + ':' + window.location.port + '/api/operational/restconf-state/streams?api_server=' + API_SERVER, type: 'GET', beforeSend: Utils.addAuthorizationStub, success: function(data) { @@ -77,7 +79,7 @@ export default { remote: function(state, location, streamSource) { return new Promise((resolve, reject) => { $.ajax({ - url: '//' + window.location.hostname + ':' + NODE_PORT + '/socket-polling?api_server=' + API_SERVER, + url: '//' + window.location.hostname + ':' + window.location.port + '/socket-polling', type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { @@ -112,6 +114,84 @@ export default { success: SkyquakeContainerActions.openNotificationsSocketSuccess, error: SkyquakeContainerActions.openNotificationsSocketError } + }, + openProjectSocket() { + return { + remote: function(state) { + return new Promise(function(resolve, reject) { + //If socket connection already exists, eat the request. + if(state.socket) { + return resolve(false); + } + $.ajax({ + url: '/socket-polling', + type: 'POST', + beforeSend: Utils.addAuthorizationStub, + data: { + url: '/project?api_server=' + API_SERVER + }, + success: function(data, textStatus, jqXHR) { + Utils.checkAndResolveSocketRequest(data, resolve, reject); + } + }) + .fail(function(xhr){ + //Authentication and the handling of fail states should be wrapped up into a connection class. + Utils.checkAuthentication(xhr.status); + });; + }); + }, + success: SkyquakeContainerActions.openProjectSocketSuccess + } + }, + + getUserProfile() { + return { + remote: function(state, recordID) { + return new Promise(function(resolve, reject) { + $.ajax({ + url: '/user-profile?api_server=' + API_SERVER, + type: 'GET', + beforeSend: Utils.addAuthorizationStub, + success: function(data) { + resolve(data); + } + }).fail(function(xhr) { + //Authentication and the handling of fail states should be wrapped up into a connection class. + Utils.checkAuthentication(xhr.status); + });; + }); + }, + loading: Alt.actions.global.showScreenLoader, + success: SkyquakeContainerActions.getUserProfileSuccess + } + }, + + selectActiveProject() { + return { + remote: function(state, event) { + let projectId; + try { + projectId = JSON.parse(JSON.parse(event.currentTarget.value)); + } catch(e) { + console.log('Something went wrong in the selectActiveProject source function', e); + } + + return new Promise(function(resolve, reject) { + $.ajax({ + url: `/session/${projectId}?api_server=${API_SERVER}`, + type: 'PUT', + beforeSend: Utils.addAuthorizationStub, + success: function(data) { + resolve(projectId); + } + }).fail(function(xhr) { + //Authentication and the handling of fail states should be wrapped up into a connection class. + Utils.checkAuthentication(xhr.status); + });; + }); + }, + success: SkyquakeContainerActions.selectActiveProjectSuccess + } } }