홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bri Prebilic Cole
d3d7a320 1 parent 5d6153e9

ONOS-1936 - CORD-GUI -- Bundle race condition fixed with refactor. Nav buttons r… 

…efresh page when clicked.

Change-Id: Ie01ea77b1bf10b84b8bd8dadb02fa775e122b416
Inline Side-by-side
Showing 4 changed files with 45 additions and 77 deletions
......@@ -28,13 +28,13 @@
transition: background-color 0.4s;
}
.nav li:hover {
background-color: #CE5650;
background-color: #BD5643;
}
.nav li.selected {
font-weight: bold;
color: white;
background: linear-gradient(#CE5650, #ce3630);
background: linear-gradient(#A56151, #BD5643);
letter-spacing: 0.03em;
}
......
......@@ -17,13 +17,16 @@
<div class="nav">
<ul>
<a href="#/home">
<li ng-class="{selected: page === 'dashboard'}">Dashboard</li>
<li ng-class="{selected: page === 'dashboard'}"
ng-click="$route.reload()">Dashboard</li>
</a>
<a href="#/user">
<li ng-class="{selected: page === 'user'}">Users</li>
<li ng-class="{selected: page === 'user'}"
ng-click="$route.reload()">Users</li>
</a>
<a href="#/bundle">
<li ng-class="{selected: page === 'bundle'}">Bundles</li>
<li ng-class="{selected: page === 'bundle'}"
ng-click="$route.reload()">Bundles</li>
</a>
</ul>
</div>
......
<div id="available" ng-controller="CordAvailable as ctrl">
<div id="available">
<h3>{{available.name}}</h3>
<p>{{available.desc}}</p>
<button type="button">Apply</button>
<button ng-click="changeBundle(available.id)">Apply</button>
</div>
......
......@@ -17,91 +17,56 @@
(function () {
'use strict';
var $log, $resource;
var url = 'http://localhost:8080/rs/bundle';
var basic = 'basic',
family = 'family',
current,
bundleScope,
avScope,
avCb;
family = 'family';
function setAndRefresh(resource, scope) {
current = resource.bundle.id;
scope.name = resource.bundle.name;
scope.desc = resource.bundle.desc;
scope.funcs = resource.bundle.functions;
// emit event will say when avCb should be invoked
avCb(resource);
}
angular.module('cordBundle', [])
.controller('CordBundleCtrl', ['$log', '$scope', '$resource',
function ($log, $scope, $resource) {
var BundleData, resource,
getData;
$scope.page = 'bundle';
// TODO: figure out timing issues with bundle page
// available bundles sometimes is loaded before avCb and avScope is created?
// emit event that avCb can be called upon
getData = function (id) {
if (!id) { id = ''; }
angular.module('cordBundle', [])
.controller('CordAvailable', ['$scope',
function ($scope) {
avScope = $scope;
avCb = function (resource) {
$scope.id = (current === basic) ? family : basic;
$scope.bundles = resource.bundles;
BundleData = $resource(url + '/' + id);
resource = BundleData.get({},
// success
function () {
var current, availId;
current = resource.bundle.id;
$scope.name = resource.bundle.name;
$scope.desc = resource.bundle.desc;
$scope.funcs = resource.bundle.functions;
$scope.bundles.forEach(function (bundle) {
if (bundle.id === $scope.id) {
$scope.available = bundle;
}
});
availId = (current === basic) ? family : basic;
resource.bundles.forEach(function (bundle) {
if (bundle.id === availId) {
$scope.available = bundle;
}
});
},
// error
function () {
$log.error('Problem with resource', resource);
});
};
$log.debug('Cord Available Ctrl has been created.');
}])
getData();
.controller('CordBundleCtrl', ['$log', '$scope', '$resource',
function (_$log_, $scope, _$resource_) {
var BundleData, resource;
$scope.page = 'bundle';
bundleScope = $scope;
$log = _$log_;
$resource = _$resource_;
BundleData = $resource(url);
resource = BundleData.get({},
// success
function () {
setAndRefresh(resource, $scope);
},
// error
function () {
$log.error('Problem with resource', resource);
});
$scope.changeBundle = function (id) {
getData(id);
};
$log.debug('Cord Bundle Ctrl has been created.');
}])
.directive('bundleAvailable', ['$resource', function ($resource) {
.directive('bundleAvailable', [function () {
return {
templateUrl: 'app/view/bundle/available.html',
link: function (scope, elem) {
var button = $(elem).find('button'),
ApplyData, resource;
button.click(function () {
ApplyData = $resource(url + '/' + avScope.available.id);
resource = ApplyData.get({},
// success
function () {
setAndRefresh(resource, bundleScope);
},
// error
function () {
$log.error('Problem with resource', resource);
}
);
});
}
templateUrl: 'app/view/bundle/available.html'
};
}]);
}());
......