Fixed ui routing conflict with syncNotification
Change-Id: I94e0f91ee35ed90ad73798de5d635abc4addbd4b
diff --git a/views/ngXosViews/synchronizerNotifier/gulp/build.js b/views/ngXosViews/synchronizerNotifier/gulp/build.js
index 47cb69c..ee4bbe9 100644
--- a/views/ngXosViews/synchronizerNotifier/gulp/build.js
+++ b/views/ngXosViews/synchronizerNotifier/gulp/build.js
@@ -27,12 +27,7 @@
var mqpacker = require('css-mqpacker');
var csswring = require('csswring');
-const TEMPLATE_FOOTER = `
-angular.module('xos.synchronizerNotifier')
-.run(['$location', function(a){
- a.path('/');
-}])
-`
+const TEMPLATE_FOOTER = ``;
module.exports = function(options){
diff --git a/views/ngXosViews/synchronizerNotifier/src/js/main.js b/views/ngXosViews/synchronizerNotifier/src/js/main.js
index f65c4d1..499d474 100644
--- a/views/ngXosViews/synchronizerNotifier/src/js/main.js
+++ b/views/ngXosViews/synchronizerNotifier/src/js/main.js
@@ -5,11 +5,6 @@
'ngCookies',
'xos.helpers'
])
-.run(function($rootScope){
- $rootScope.$on('$locationChangeStart', function(event) {
- event.preventDefault();
- });
-})
.service('Diag', function($rootScope, $http, $q, $interval){
let isRunning = false;
@@ -74,7 +69,7 @@
else{
return true;
}
- }
+ };
$interval(() => {
if(isRunning){
diff --git a/views/ngXosViews/tenant/env/default.js b/views/ngXosViews/tenant/env/default.js
deleted file mode 100644
index e8b1522..0000000
--- a/views/ngXosViews/tenant/env/default.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// This is a default configuration for your development environment.
-// You can duplicate this configuration for any of your Backend Environments.
-// Different configurations are loaded setting a NODE_ENV variable that contain the config file name.
-// `NODE_ENV=local npm start`
-//
-// If xoscsrftoken or xossessionid are not specified the browser value are used
-// (works only for local environment as both application are served on the same domain)
-
-module.exports = {
- host: 'http://xos.dev:9999',
- xoscsrftoken: 'FIdWwEI8XNESlpH3Wr6Hu5ORJs2EkIYl',
- xossessionid: 'six66atpd31hh0b131zh9bc05t6f77d4'
-};
diff --git a/views/ngXosViews/tenant/gulp/server.js b/views/ngXosViews/tenant/gulp/server.js
index c1f7608..4d64442 100644
--- a/views/ngXosViews/tenant/gulp/server.js
+++ b/views/ngXosViews/tenant/gulp/server.js
@@ -10,18 +10,24 @@
var httpProxy = require('http-proxy');
var del = require('del');
var sass = require('gulp-sass');
+var fs = require('fs');
+var path = require('path');
const environment = process.env.NODE_ENV;
-if (environment){
- var conf = require(`../env/${environment}.js`);
-}
-else{
- var conf = require('../env/default.js')
+if(!fs.existsSync(path.join(__dirname, `../../../env/${environment || 'default'}.js`))){
+ if(!environment){
+ throw new Error('You should define a default.js config in /views/env folder.');
+ }
+ else{
+ throw new Error(`Since you are loading a custom environment, you should define a ${environment}.js config in /views/env folder.`);
+ }
}
+var conf = require(path.join(__dirname, `../../../env/${environment || 'default'}.js`));
+
var proxy = httpProxy.createProxyServer({
- target: conf.host || 'http://0.0.0.0:9999'
+ target: conf.host
});
diff --git a/views/ngXosViews/tenant/src/js/main.js b/views/ngXosViews/tenant/src/js/main.js
index 65fc90d..7ed4af6 100644
--- a/views/ngXosViews/tenant/src/js/main.js
+++ b/views/ngXosViews/tenant/src/js/main.js
@@ -43,7 +43,7 @@
{
label: 'Site1',
prop: 'name',
- link: item => `/#/site/${item.id}`
+ link: item => `#/site/${item.id}`
},
{
label: 'Allocated',
@@ -111,7 +111,7 @@
{
label: 'Slice List',
prop: 'name',
- link: item => `/#/site/${item.site}/slice/${item.id}`
+ link: item => `#/site/${item.site}/slice/${item.id}`
},
{
label: 'Allocated',