YANG GUI - fixed incorrect event/variable naming.
- also added custom glyph for YANG.
- also implemented details panel structure.
Change-Id: Ifdbf358acfa724591afd3b865da7e9d1dab5d429
diff --git a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.css b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.css
index 2564c37..f8e9d01 100644
--- a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.css
+++ b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.css
@@ -21,3 +21,32 @@
#ov-yang-model div.ctrl-btns {
}
+
+
+
+#yang-model-details-panel.floatpanel {
+ z-index: 0;
+}
+
+
+#yang-model-details-panel .container {
+ padding: 8px 12px;
+}
+
+#yang-model-details-panel .close-btn {
+ position: absolute;
+ right: 12px;
+ top: 12px;
+ cursor: pointer;
+}
+
+#yang-model-details-panel h2 {
+ display: inline-block;
+ margin: 8px 0;
+}
+
+
+#yang-model-details-panel .data {
+ font-size: 12pt;
+}
+
diff --git a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.html b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.html
index 3860644..2e1171d 100644
--- a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.html
+++ b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.html
@@ -35,9 +35,9 @@
ng-click="selectCallback($event, ymodel)"
ng-class="{selected: ymodel.id === selId}"
ng-repeat-complete row-id="{{ymodel.id}}">
- <td>{{dev.id}}</td>
- <td>{{dev.type}}</td>
- <!-- TODO: add more colums here -->
+ <td>{{ymodel.id}}</td>
+ <td>{{ymodel.type}}</td>
+ <!-- TODO: add more columns here -->
</tr>
</table>
</div>
diff --git a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.js b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.js
index 226041c..930dc6d 100644
--- a/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.js
+++ b/apps/yms/gui/src/main/resources/app/view/yangModel/yangModel.js
@@ -22,17 +22,85 @@
'use strict';
// injected refs
- var $log, $scope, fs, ps, wss;
+ var $log, $scope, fs, mast, ps, wss, is;
+
+ // constants
+ var topPdg = 28,
+ pWidth = 800;
// internal state
var detailsPanel,
- ymodel;
+ ymodel,
+ pStartY,
+ pHeight,
+ wSize,
+ top,
+ iconDiv;
// constants
var pName = 'yang-model-details-panel',
detailsReq = 'yangModelDetailsRequest',
detailsResp = 'yangModelDetailsResponse';
+
+
+ function createDetailsPanel() {
+ detailsPanel = ps.createPanel(pName, {
+ width: pWidth,
+ margin: 0,
+ hideMargin: 0
+ });
+ $scope.hidePanel = function () { detailsPanel.hide(); };
+ detailsPanel.hide();
+ }
+
+ function populateDetails(details) {
+ var topData;
+
+ setUpPanel();
+ topData = top.select('.top-data');
+ populateTop(topData, details);
+ detailsPanel.height(pHeight);
+ }
+
+ function setUpPanel() {
+ var container, closeBtn, dataDiv;
+ detailsPanel.empty();
+
+ container = detailsPanel.append('div').classed('container', true);
+
+ top = container.append('div').classed('top', true);
+ closeBtn = top.append('div').classed('close-btn', true);
+ addCloseBtn(closeBtn);
+ iconDiv = top.append('div').classed('dev-icon', true);
+ top.append('h2');
+
+ dataDiv = top.append('div').classed('top-data', true);
+ dataDiv.append('p').text('fill out properties here');
+ }
+
+ function populateTop(dataDiv, details) {
+ top.select('h2').html('ID:' + details.id);
+ // TODO: format data from 'details' into the dataDiv
+ dataDiv.append('p').html('type: ' + details.type);
+
+ }
+
+ function closePanel() {
+ if (detailsPanel.isVisible()) {
+ $scope.selId = null;
+ detailsPanel.hide();
+ return true;
+ }
+ return false;
+ }
+
+ function addCloseBtn(div) {
+ is.loadEmbeddedIcon(div, 'close', 20);
+ div.on('click', closePanel);
+ }
+
+
// callback invoked when data from a details request returns from server
function respDetailsCb(data) {
$scope.panelData = data.details;
@@ -42,57 +110,125 @@
$log.debug('YANG_MODEL>', detailsResp, data);
}
+ function handleEscape() {
+ return closePanel();
+ }
+
+
+ // defines view controller
angular.module('ovYangModel', [])
- .controller('OvYangModelCtrl', [
- '$log', '$scope', 'TableBuilderService', 'TableDetailService',
- 'FnService', 'PanelService', 'WebSocketService',
+ .controller('OvYangModelCtrl', [
+ '$log', '$scope', 'TableBuilderService', 'TableDetailService',
+ 'FnService', 'MastService', 'PanelService', 'WebSocketService',
+ 'IconService',
- function (_$log_, _$scope_, tbs, tds, _fs_, _ps_, _wss_) {
- var handlers = {};
+ function (_$log_, _$scope_, tbs, tds, _fs_, _mast_, _ps_, _wss_, _is_) {
+ var handlers = {};
- $log = _$log_;
- $scope = _$scope_;
- fs = _fs_;
- ps = _ps_;
- wss = _wss_;
+ $log = _$log_;
+ $scope = _$scope_;
+ fs = _fs_;
+ mast = _mast_;
+ ps = _ps_;
+ wss = _wss_;
+ is = _is_;
- $scope.panelData = {};
+ $scope.panelData = {};
- // register response handler
- handlers[detailsResp] = respDetailsCb;
- wss.bindHandlers(handlers);
+ // register response handler
+ handlers[detailsResp] = respDetailsCb;
+ wss.bindHandlers(handlers);
- // row selection callback
- function selCb($event, row) {
- if ($scope.selId) {
- wss.sendEvent(detailsReq, { id: row.id });
- } else {
- $scope.hidePanel();
- }
- $log.debug('Got a click on:', row);
+ // row selection callback
+ function selCb($event, row) {
+ if ($scope.selId) {
+ wss.sendEvent(detailsReq, { id: row.id });
+ } else {
+ $scope.hidePanel();
}
-
- tbs.buildTable({
- scope: $scope,
- tag: 'yangModel',
- selCb: selCb
- });
-
- $scope.$on('$destroy', function () {
- wss.unbindHandlers(handlers);
- });
-
- $log.log('OvYangModelCtrl has been created');
+ $log.debug('Got a click on:', row);
}
- ]);
- // .directive('yangModelDetailsPanel', [
- // '$rootScope', '$window',
- // function ($rootScope, $window) {
- // return function (scope) {
- // // TODO: details panel internals (see device.js as example
- // }
- // }
- // ]);
+ tbs.buildTable({
+ scope: $scope,
+ tag: 'yangModel',
+ selCb: selCb
+ });
+
+ $scope.$on('$destroy', function () {
+ wss.unbindHandlers(handlers);
+ });
+
+ $log.log('OvYangModelCtrl has been created');
+ }
+ ])
+
+ .directive('yangModelDetailsPanel', [
+ '$rootScope', '$window', '$timeout', 'KeyService',
+
+ function ($rootScope, $window, $timeout, ks) {
+ return function (scope) {
+ var unbindWatch;
+
+ function heightCalc() {
+ pStartY = fs.noPxStyle(d3.select('.tabular-header'), 'height')
+ + mast.mastHeight() + topPdg;
+ wSize = fs.windowSize(pStartY);
+ pHeight = wSize.height;
+ }
+
+ function initPanel() {
+ heightCalc();
+ createDetailsPanel();
+ }
+
+ // Safari has a bug where it renders the fixed-layout table wrong
+ // if you ask for the window's size too early
+ if (scope.onos.browser === 'safari') {
+ $timeout(initPanel);
+ } else {
+ initPanel();
+ }
+
+ // create key bindings to handle panel
+ ks.keyBindings({
+ esc: [handleEscape, 'Close the details panel'],
+ _helpFormat: ['esc']
+ });
+ ks.gestureNotes([
+ ['click', 'Select a row to show YANG model details'],
+ ['scroll down', 'See more models']
+ ]);
+
+ // if the panelData changes
+ scope.$watch('panelData', function () {
+ if (!fs.isEmptyObject(scope.panelData)) {
+ populateDetails(scope.panelData);
+ detailsPanel.show();
+ }
+ });
+
+ // if the window size changes
+ unbindWatch = $rootScope.$watchCollection(
+ function () {
+ return {
+ h: $window.innerHeight,
+ w: $window.innerWidth
+ };
+ }, function () {
+ if (!fs.isEmptyObject(scope.panelData)) {
+ heightCalc();
+ populateDetails(scope.panelData);
+ }
+ }
+ );
+
+ scope.$on('$destroy', function () {
+ unbindWatch();
+ ks.unbindKeys();
+ ps.destroyPanel(pName);
+ });
+ };
+ }]);
}());
\ No newline at end of file