aboutsummaryrefslogtreecommitdiffstats
path: root/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter
diff options
context:
space:
mode:
Diffstat (limited to 'dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter')
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-list-controller.js275
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-popup-controller.js103
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-pub-sub-list-popup-controller.js19
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-service.js107
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-list-controller.js132
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-popup-controller.js65
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-service.js87
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-list-controller.js132
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-popup-controller.js70
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-service.js86
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_add_popup_template.html113
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_edit_popup_template.html87
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_list.html171
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_pub_sub_list_popup_template.html88
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_list.html126
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_popup_template.html64
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_list.html153
-rw-r--r--dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_popup_template.html86
18 files changed, 1964 insertions, 0 deletions
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-list-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-list-controller.js
new file mode 100644
index 0000000..64d4bae
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-list-controller.js
@@ -0,0 +1,275 @@
+appDS2.controller('drFeedListCtrl', function($rootScope, $scope, $log, $modal, modalService, DRFeedService) {
+
+ // populates the table of Data Router feeds
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+ // models for controls on screen
+ $scope.dbcapp.tableData = [];
+ $scope.dbcapp.currentPageNum = 1;
+ $scope.dbcapp.totalPages = 1;
+ $scope.dbcapp.viewPerPage = 100;
+ $scope.dbcapp.viewPerPageOptions = [
+ { index : 0, value : 50 },
+ { index : 1, value : 100 },
+ { index : 2, value : 500 },
+ { index : 3, value : 1000 },
+ { index : 4, value : 2500 }
+ ];
+ // other
+ $scope.dbcapp.errMsg = null;
+ $scope.dbcapp.isDataLoading = true;
+ $scope.dbcapp.isRequestFailed = false;
+
+ /**
+ * Answers an array of the specified size - makes Angular iteration easy.
+ */
+ $scope.dbcapp.buildArraySizeN = function(num) {
+ // $log.debug("buildArraySizeN: invoked with " + num);
+ return new Array(num);
+ }
+
+ /**
+ * Loads the table of data router feeds.
+ *
+ * Interprets the remote controller's response and copies to scope
+ * variables. The response is either list to be assigned to tableData, or an
+ * error to be shown.
+ */
+ $scope.dbcapp.loadTable = function() {
+ // $log.debug("drFeedListCtrl.loadTable begins");
+ $scope.dbcapp.isDataLoading = true;
+ DRFeedService.getFeedsByPage($scope.dbcapp.currentPageNum, $scope.dbcapp.viewPerPage)
+ .then(function(jsonObj) {
+ if (jsonObj.error) {
+ $log.error("drFeedListCtrl.loadTable failed: " + jsonObj.error);
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = jsonObj.error;
+ $scope.dbcapp.tableData = [];
+ } else {
+ // $log.debug("drFeedListCtrl.loadTable succeeded, size " + jsonObj.data.length);
+ $scope.dbcapp.isRequestFailed = false;
+ $scope.dbcapp.errMsg = null;
+ $scope.dbcapp.profileName = jsonObj.profileName;
+ $scope.dbcapp.dmaapName=jsonObj.dmaapName;
+ $scope.dbcapp.dcaeLocations=jsonObj.dcaeLocations;
+ $scope.dbcapp.totalPages = jsonObj.totalPages;
+ $scope.dbcapp.tableData = jsonObj.data;
+ }
+ $scope.dbcapp.isDataLoading = false;
+ }, function(error) {
+ $log.error("drFeedListCtrl.loadTable failed: " + error);
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = error;
+ $scope.dbcapp.tableData = [];
+ $scope.dbcapp.isDataLoading = false;
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to add a feed.
+ * Passes data in via an object named "message".
+ * On success, updates the table.
+ */
+ $scope.dbcapp.addFeedModalPopup = function() {
+ $scope.dbcapp.editFeed = null;
+ var modalInstance = $modal.open({
+ templateUrl : 'add_feed_popup.html',
+ controller : 'feedPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-medium',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ feed : $scope.dbcapp.editFeed,
+ feedList : $scope.dbcapp.tableData,
+ dcaeList: $scope.dbcapp.dcaeLocations
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ // $log.debug('addFeedModalPopup: response: ' + JSON.stringify(response));
+ if (response == null) {
+ // $log.debug('addFeedModalPopup: user closed dialog');
+ }
+ else {
+ if (response.error != null)
+ alert('Failed to add feed:\n' + response.error);
+ else
+ // success, get the updated list.
+ $scope.dbcapp.loadTable()
+ }
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to edit a feed.
+ * Passes data in via an object named "message".
+ * Always updates the table, even on failure, to discard
+ * user-entered changes that were not persisted.
+ */
+ $scope.dbcapp.editFeedModalPopup = function(feed) {
+ $scope.dbcapp.editFeed = feed;
+ var modalInstance = $modal.open({
+ templateUrl : 'edit_feed_popup.html',
+ controller : 'feedPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-small',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ feed : $scope.dbcapp.editFeed,
+ feedList : $scope.dbcapp.tableData
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ if (response == null) {
+ // $log.debug('editFeedModalPopup: user closed dialog');
+ }
+ else {
+ // $log.debug('editFeedModalPopup: response: ' + JSON.stringify(response));
+ if (response.error != null)
+ alert('Failed to edit feed ' + feed.feedName + '\n' + response.error);
+ // refresh in all cases
+ $scope.dbcapp.loadTable();
+ }
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to confirm deletion of a feed.
+ * On successful completion, updates the table.
+ */
+ $scope.dbcapp.deleteFeedModalPopup = function(feed) {
+ modalService.popupConfirmWin("Confirm", "Delete feed "
+ + feed.feedName, function() {
+ DRFeedService.deleteFeed(feed.feedId).then(
+ function(response) {
+ // $log.debug('deleteFeedModalPopup: response: ' + JSON.stringify(response));
+ if (response.error != null) {
+ $log.error('deleteFeedModalPopup: failed to delete: ' + response.error);
+ alert('Failed to delete feed ' + feed.feedName + '\n' + response.error);
+ }
+ else {
+ // success, get the updated list.
+ $scope.dbcapp.loadTable()
+ }
+ },
+ function(error) {
+ $log.error('deleteFeed failed');
+ alert('feedListCtrl failed to delete object: ' + JSON.stringify(error));
+ });
+ })
+ };
+
+ /**
+ * Shows a modal pop-up with all publishers and subscribers of a feed.
+ * Passes data in via an object named "message".
+ */
+ $scope.dbcapp.showFeedPubsSubsModalPopup = function(feed) {
+ var modalInstance = $modal.open({
+ templateUrl : 'feed_pub_sub_list_popup.html',
+ controller : 'feedPubSubListPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-jumbo',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ feed : feed
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ // No response expected.
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to add a feed publisher.
+ * Passes data in via an object named "message".
+ * On successful completion, updates the table.
+ */
+ $scope.dbcapp.addFeedPublisherModalPopup = function(feed) {
+ $scope.dbcapp.editPub = { feedId : feed.feedId }
+ var modalInstance = $modal.open({
+ templateUrl : 'edit_pub_popup.html',
+ controller : 'pubPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-small',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ pub : $scope.dbcapp.editPub,
+ pubList : [],
+ dcaeList: $scope.dbcapp.dcaeLocations
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ if (response == null) {
+ // $log.debug('addFeedPublisherModalPopup: user closed dialog');
+ }
+ else {
+ if (response.error != null)
+ alert('Failed to add publisher to feed:\n' + response.error);
+ else
+ // success, get the updated list.
+ $scope.dbcapp.loadTable();
+ }
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to add a feed subscriber.
+ * Passes data in via an object named "message".
+ * On successful completion, updates the table.
+ */
+ $scope.dbcapp.addFeedSubscriberModalPopup = function(feed) {
+ // Create a subscriber object with the feed ID
+ $scope.dbcapp.editSub = { feedId : feed.feedId }
+ var modalInstance = $modal.open({
+ templateUrl : 'edit_sub_popup.html',
+ controller : 'subPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-small',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ sub : $scope.dbcapp.editSub,
+ subList : [],
+ dcaeList: $scope.dbcapp.dcaeLocations
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ if (response == null) {
+ // $log.debug('addFeedSubscriberModalPopup: user closed dialog');
+ }
+ else {
+ if (response.error != null)
+ alert('Failed to add subscriber to feed:\n' + response.error);
+ else
+ // success, get the updated list.
+ $scope.dbcapp.loadTable();
+ }
+ });
+ };
+
+ // Populate the table on load. Note that the b2b selector code
+ // sets the page-number value, and the change event calls load table.
+ // Do not call this here to avoid double load:
+ // $scope.dbcapp.loadTable();
+
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-popup-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-popup-controller.js
new file mode 100644
index 0000000..6618f07
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-popup-controller.js
@@ -0,0 +1,103 @@
+appDS2.controller('feedPopupCtrl', function($scope, $log, $modalInstance, modalService, message, DRFeedService) {
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+
+ // Set the label variable for the template
+ if (message.feed == null) {
+ $scope.dbcapp.label = 'Add Feed';
+ // Must add publisher with a feed.
+ $scope.dbcapp.editFeed =
+ {
+ pubs: [
+ { username: null }
+ ]
+ };
+ }
+ else {
+ $scope.dbcapp.label = 'Edit Feed';
+ $scope.dbcapp.editFeed = message.feed;
+ }
+ $scope.dbcapp.dcaeList = message.dcaeList;
+
+ // for populating selection boxes on add and edit popup templates
+ $scope.dbcapp.asprClassificationList = [];
+
+ DRFeedService.getFeedPiiTypes().then(function(jsonObj) {
+ $scope.dbcapp.asprClassificationList = jsonObj;
+ }, function(error) {
+ $log.error("feedPopupCtrl.getFeedPiiTypes failed: " + error);
+ });
+
+ /**
+ * Validates content of user-editable fields.
+ * Uses the list in message.feedList
+ * Returns null if all is well,
+ * a descriptive error message otherwise.
+ */
+ $scope.dbcapp.validateFeed = function(feed) {
+ if (feed == null)
+ return "No data found.\nPlease enter some values.";
+ if (feed.feedName == null || feed.feedName.trim() == '')
+ return "Name is required.\nPlease enter a value.";
+ if (feed.feedVersion == null || feed.feedVersion.trim() == '')
+ return "Version is required.\nPlease enter a value.";
+ if (feed.feedDescription == null || feed.feedDescription.trim() == '')
+ return "Description is required.\nPlease enter a value.";
+ if (feed.asprClassification == null || feed.asprClassification.trim() == '')
+ return "ASPR Classification is required.\nPlease select a value.";
+ for (var x in message.feedList) {
+ // Ignore the one being edited.
+ if (message.feedList[x].feedId == feed.feedId)
+ continue;
+ if (message.feedList[x].feedName == feed.feedName)
+ return "Name " + feed.feedName + " exists.\n"
+ + "Please choose a different name.";
+ }
+ // Extra validation if adding a new feed - check first publisher
+ if (feed.feedId == null && feed.pubs != null && feed.pubs[0] != null) {
+ $log.info('validateFeed: pubs[0] is ' + JSON.stringify(feed.pubs[0]));
+ if (feed.pubs[0].dcaeLocationName == null)
+ return "DCAE Location is required.\nPlease select a value.";
+ // username, userpwd are optional
+ }
+ return null;
+ }
+
+ $scope.dbcapp.saveFeed = function(feed) {
+ var validateMsg = $scope.dbcapp.validateFeed(feed);
+ if (validateMsg != null) {
+ alert('Invalid Feed:\n' + validateMsg);
+ return;
+ }
+
+ if (feed.feedId == null) {
+ // No id, so create a new one
+ DRFeedService.addFeed(feed)
+ .then(function(response) {
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('feedPopupCtrl: error while adding: ' + error);
+ }
+ );
+ }
+ else {
+ // Has id, so update an existing one
+ DRFeedService.updateFeed(feed)
+ .then(function(response) {
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('feedPopupCtrl: error while updating: ' + error);
+ }
+ );
+ }
+
+ };
+
+ $scope.dbcapp.close = function() {
+ $modalInstance.close();
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-pub-sub-list-popup-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-pub-sub-list-popup-controller.js
new file mode 100644
index 0000000..042f857
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-pub-sub-list-popup-controller.js
@@ -0,0 +1,19 @@
+appDS2.controller('feedPubSubListPopupCtrl', function($scope, $log, $modalInstance, modalService, message) {
+
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+
+ // Set the label variable for the template
+ $scope.dbcapp.label = 'Pub/Sub of Feed ' + message.feed.feedName;
+
+ // Source of data table
+ $scope.dbcapp.showFeed = message.feed;
+
+ // $log.debug('feedPubSubListPopupCtrl: showFeed.pubs is ' + JSON.stringify($scope.dbcapp.showFeed.pubs));
+
+ $scope.dbcapp.close = function() {
+ $modalInstance.close();
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-service.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-service.js
new file mode 100644
index 0000000..b8dd706
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-feed-service.js
@@ -0,0 +1,107 @@
+appDS2.factory('DRFeedService', function ($http, $q, $log) {
+ return {
+ /**
+ * Gets one page of data router feed objects.
+ * @param {Number} pageNum - page number; e.g., 1
+ * @param {Number} viewPerPage - number of items per page; e.g., 25
+ * @return {JSON} Response object from remote side
+ */
+ getFeedsByPage: function(pageNum,viewPerPage) {
+ // cache control for IE
+ var cc = "&cc=" + new Date().getTime().toString();
+ return $http({
+ method: 'GET',
+ url: 'dr_feed?pageNum=' + pageNum + '&viewPerPage=' + viewPerPage + cc,
+ cache: false,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRFeedService.getFeedsByPage: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRFeedService.getFeedsByPage failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Creates a new feed.
+ addFeed: function(feed) {
+ return $http({
+ method: 'POST',
+ url: 'dr_feed',
+ data: feed,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRFeedService.addFeed: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRFeedService.addFeed failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Updates an existing feed.
+ updateFeed: function(feed) {
+ return $http({
+ method: 'PUT',
+ url: 'dr_feed/' + feed.feedId,
+ data: feed,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRFeedService.updateFeed: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRFeedService.updateFeed failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Deletes the feed with the specified ID.
+ deleteFeed: function(feedId) {
+ return $http({
+ method: 'DELETE',
+ url: 'dr_feed/' + feedId,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRFeedService.deleteFeed: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRFeedService.deleteFeed failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ /**
+ * Gets a list of string values that classify data sensitivity.
+ */
+ getFeedPiiTypes: function() {
+ return $http({
+ method: 'GET',
+ url: 'dr_feed_pii_types',
+ cache: false,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRFeedService.getFeedPiiTypes: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRFeedService.getFeedPiiTypes failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-list-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-list-controller.js
new file mode 100644
index 0000000..0365534
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-list-controller.js
@@ -0,0 +1,132 @@
+appDS2.controller('drPubListCtrl', function($scope, $log, $modal, modalService, DRPubService) {
+
+ // populates the list of Data Router publishers.
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+ // models for controls on screen
+ $scope.dbcapp.tableData=[];
+ $scope.dbcapp.currentPageNum=1;
+ $scope.dbcapp.totalPages=1;
+ $scope.dbcapp.viewPerPage = 100;
+ $scope.dbcapp.viewPerPageOptions = [
+ { index : 0, value : 50 },
+ { index : 1, value : 100 },
+ { index : 2, value : 500 },
+ { index : 3, value : 1000 },
+ { index : 4, value : 2500 }
+ ];
+ // other
+ $scope.dbcapp.errMsg=null;
+ $scope.dbcapp.isDataLoading=true;
+ $scope.dbcapp.isRequestFailed=false;
+
+ /**
+ * Answers an array of the specified size - makes Angular iteration easy.
+ */
+ $scope.dbcapp.buildArraySizeN = function(num) {
+ // $log.debug("buildArraySizeN: invoked with " + num);
+ return new Array(num);
+ }
+
+ /**
+ * Loads the table of data router publishers.
+ *
+ * Interprets the remote controller's response and copies to scope
+ * variables. The response is either list to be assigned to tableData, or an
+ * error to be shown.
+ */
+ $scope.dbcapp.loadTable = function() {
+ $scope.dbcapp.isDataLoading = true;
+ DRPubService.getPubsByPage($scope.dbcapp.currentPageNum,$scope.dbcapp.viewPerPage)
+ .then(function(jsonObj) {
+ if (jsonObj.error) {
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = jsonObj.error;
+ $scope.dbcapp.tableData = [];
+ }
+ else {
+ $scope.dbcapp.isRequestFailed = false;
+ $scope.dbcapp.errMsg = null;
+ $scope.dbcapp.profileName = jsonObj.profileName;
+ $scope.dbcapp.dmaapName = jsonObj.dmaapName;
+ $scope.dbcapp.dcaeLocations = jsonObj.dcaeLocations;
+ $scope.dbcapp.totalPages = jsonObj.totalPages;
+ $scope.dbcapp.tableData = jsonObj.data;
+ }
+ $scope.dbcapp.isDataLoading = false;
+ },function(error){
+ $log.error("drPubListCtrl.loadTable failed: " + error);
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = error;
+ $scope.dbcapp.tableData = [];
+ $scope.dbcapp.isDataLoading = false;
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to edit a publisher.
+ * Passes data in via an object named "message".
+ * Always updates the table, even on failure, to discard
+ * user-entered changes that were not persisted.
+ */
+ $scope.dbcapp.editPubModalPopup = function(pub) {
+ $scope.dbcapp.editPub = pub;
+ var modalInstance = $modal.open({
+ templateUrl : 'edit_pub_popup.html',
+ controller : 'pubPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-small',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ pub : $scope.dbcapp.editPub,
+ pubList : $scope.dbcapp.tableData,
+ dcaeList : $scope.dbcapp.dcaeLocations
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ if (response == null) {
+ // $log.debug('editPubModalPopup: user closed dialog');
+ }
+ else {
+ if (response.error != null)
+ alert('Failed to update publisher:\n' + response.error);
+ // refresh in all cases
+ $scope.dbcapp.loadTable();
+ }
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to confirm deletion of a publisher.
+ * On successful completion, updates the table.
+ */
+ $scope.dbcapp.deletePubModalPopup = function(pub) {
+ modalService.popupConfirmWin("Confirm", "Delete publisher "
+ + pub.pubId, function() {
+ DRPubService.deletePub(pub.pubId).then(
+ function(response) {
+ if (response.error != null)
+ alert('Failed to delete publisher ' + pub.pubId
+ + '\n' + response.error);
+ else
+ // success, get the updated list.
+ $scope.dbcapp.loadTable()
+ },
+ function(error) {
+ alert('pubListCtrl failed to delete: ' + JSON.stringify(error));
+ });
+ })
+ };
+
+ // Populate the table on load. Note that the b2b selector code
+ // sets the page-number value, and the change event calls load table.
+ // Do not call this here to avoid double load:
+ // $scope.dbcapp.loadTable();
+
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-popup-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-popup-controller.js
new file mode 100644
index 0000000..4be7f3d
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-popup-controller.js
@@ -0,0 +1,65 @@
+appDS2.controller('pubPopupCtrl', function($scope, $log, $modalInstance, modalService, message, DRPubService) {
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+
+ // Set the label variable for the template
+ if (message.pub == null || message.pub.pubId == null)
+ $scope.dbcapp.label = 'Add Publisher';
+ else
+ $scope.dbcapp.label = 'Edit Publisher';
+ $scope.dbcapp.editPub = message.pub;
+ $scope.dbcapp.dcaeList = message.dcaeList;
+
+ $log.info('pubPopupCtrl: dbcapp object: ', $scope.dbcapp);
+
+ /**
+ * Validates content of user-editable fields.
+ * Returns null if all is well,
+ * a descriptive error message otherwise.
+ */
+ $scope.dbcapp.validatePub = function(pub) {
+ if (pub == null)
+ return "No data found.\nPlease enter some values.";
+ if (pub.dcaeLocationName == null)
+ return "DCAE Location is required.\nPlease select a value.";
+ return null;
+ }
+
+ $scope.dbcapp.savePub = function(pub) {
+ var validateMsg = $scope.dbcapp.validatePub(pub);
+ if (validateMsg != null) {
+ alert("Invalid Content:\n" + validateMsg);
+ return;
+ }
+
+ if (pub.pubId == null) {
+ // No id, so create a new one
+ DRPubService.addPub(pub)
+ .then(function(response) {
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('pubPopupCtrl: error while adding: ' + error);
+ }
+ );
+ }
+ else {
+ // Has id, so update an existing one
+ DRPubService.updatePub(pub)
+ .then(function(response) {
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('pubPopupCtrl: error while updating: ' + error);
+ }
+ );
+ }
+
+ };
+
+ $scope.dbcapp.close = function() {
+ $modalInstance.close();
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-service.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-service.js
new file mode 100644
index 0000000..ac1a480
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-pub-service.js
@@ -0,0 +1,87 @@
+appDS2.factory('DRPubService', function ($http, $q, $log) {
+ return {
+ /**
+ * Gets one page of data router publisher objects.
+ * @param {Number} pageNum - page number; e.g., 1
+ * @param {Number} viewPerPage - number of items per page; e.g., 25
+ * @return {JSON} Response object from remote side
+ */
+ getPubsByPage: function(pageNum,viewPerPage) {
+ // cache control for IE
+ var cc = "&cc=" + new Date().getTime().toString();
+ return $http({
+ method: 'GET',
+ url: 'dr_pub?pageNum=' + pageNum + '&viewPerPage=' + viewPerPage + cc,
+ cache: false,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRPubService.getPubsByPage: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRPubService.getPubsByPage failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Creates a new publisher.
+ addPub: function(pub) {
+ return $http({
+ method: 'POST',
+ url: 'dr_pub',
+ data: pub,
+ responseType: 'json' })
+ .then(function(response) {
+ // $log.debug('DRPubService.addPub: response: ' + JSON.stringify(response));
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRPubService.addPub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRPubService.addPub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Updates an existing publisher.
+ updatePub: function(pub) {
+ return $http({
+ method: 'PUT',
+ url: 'dr_pub/' + pub.pubId,
+ data: pub,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRPubService.updatePub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRPubService.updatePub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Deletes the publisher with the specified ID.
+ deletePub: function(pubId) {
+ return $http({
+ method: 'DELETE',
+ url: 'dr_pub/' + pubId,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRPubService.deletePub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRPubService.deletePub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-list-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-list-controller.js
new file mode 100644
index 0000000..0c249ea
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-list-controller.js
@@ -0,0 +1,132 @@
+appDS2.controller('drSubListCtrl', function($scope, $log, $modal, modalService, DRSubService) {
+
+ // populates the list of Data Router subscribers.
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+ // models for controls on screen
+ $scope.dbcapp.tableData=[];
+ $scope.dbcapp.currentPageNum=1;
+ $scope.dbcapp.totalPages=1;
+ $scope.dbcapp.viewPerPage = 100;
+ $scope.dbcapp.viewPerPageOptions = [
+ { index : 0, value : 50 },
+ { index : 1, value : 100 },
+ { index : 2, value : 500 },
+ { index : 3, value : 1000 },
+ { index : 4, value : 2500 }
+ ];
+ // other
+ $scope.dbcapp.errMsg=null;
+ $scope.dbcapp.isDataLoading=true;
+ $scope.dbcapp.isRequestFailed=false;
+
+ /**
+ * Answers an array of the specified size - makes Angular iteration easy.
+ */
+ $scope.dbcapp.buildArraySizeN = function(num) {
+ // $log.debug("buildArraySizeN: invoked with " + num);
+ return new Array(num);
+ }
+
+ /**
+ * Loads the table of data router subscribers.
+ *
+ * Interprets the remote controller's response and copies to scope
+ * variables. The response is either list to be assigned to tableData, or an
+ * error to be shown.
+ */
+ $scope.dbcapp.loadTable = function() {
+ $scope.dbcapp.isDataLoading = true;
+ DRSubService.getSubsByPage($scope.dbcapp.currentPageNum,$scope.dbcapp.viewPerPage)
+ .then(function(jsonObj){
+ if (jsonObj.error) {
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = jsonObj.error;
+ $scope.dbcapp.tableData = [];
+ }
+ else {
+ $scope.dbcapp.isRequestFailed = false;
+ $scope.dbcapp.errMsg = null;
+ $scope.dbcapp.profileName = jsonObj.profileName;
+ $scope.dbcapp.dmaapName = jsonObj.dmaapName;
+ $scope.dbcapp.dcaeLocations = jsonObj.dcaeLocations;
+ $scope.dbcapp.totalPages = jsonObj.totalPages;
+ $scope.dbcapp.tableData = jsonObj.data;
+ }
+ $scope.dbcapp.isDataLoading = false;
+ },function(error){
+ $log.error("drSubListCtrl.loadTable failed: " + error);
+ $scope.dbcapp.isRequestFailed = true;
+ $scope.dbcapp.errMsg = error;
+ $scope.dbcapp.tableData = [];
+ $scope.dbcapp.isDataLoading = false;
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to edit a subscriber.
+ * Passes data in via an object named "message".
+ * Always updates the table, even on failure, to discard
+ * user-entered changes that were not persisted.
+ */
+ $scope.dbcapp.editSubModalPopup = function(sub) {
+ $scope.dbcapp.editSub = sub;
+ var modalInstance = $modal.open({
+ templateUrl : 'edit_sub_popup.html',
+ controller : 'subPopupCtrl',
+ windowClass: 'modal-docked',
+ sizeClass: 'modal-small',
+ resolve : {
+ message : function() {
+ var dataForPopup = {
+ sub : $scope.dbcapp.editSub,
+ subList : $scope.dbcapp.tableData,
+ dcaeList : $scope.dbcapp.dcaeLocations
+ };
+ return dataForPopup;
+ }
+ }
+ });
+ modalInstance.result.then(function(response) {
+ if (response == null) {
+ // $log.debug('editSubModalPopup: user closed dialog');
+ }
+ else {
+ if (response.error != null)
+ alert('Failed to update subscriber:\n' + response.error);
+ // refresh in all cases
+ $scope.dbcapp.loadTable();
+ }
+ });
+ };
+
+ /**
+ * Shows a modal pop-up to confirm deletion of a subscriber.
+ * On successful completion, updates the table.
+ */
+ $scope.dbcapp.deleteSubModalPopup = function(sub) {
+ modalService.popupConfirmWin("Confirm", "Delete subscriber "
+ + sub.subId, function() {
+ DRSubService.deleteSub(sub.subId).then(
+ function(response) {
+ if (response.error != null)
+ alert('Failed to delete subscriber ' + sub.subId
+ + '\n' + response.error);
+ else
+ // success, get the updated list.
+ $scope.dbcapp.loadTable()
+ },
+ function(error) {
+ alert('subListCtrl failed to delete: ' + JSON.stringify(error));
+ });
+ })
+ };
+
+ // Populate the table on load. Note that the b2b selector code
+ // sets the page-number value, and the change event calls load table.
+ // Do not call this here to avoid double load:
+ // $scope.dbcapp.loadTable();
+
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-popup-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-popup-controller.js
new file mode 100644
index 0000000..dcaae2b
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-popup-controller.js
@@ -0,0 +1,70 @@
+appDS2.controller('subPopupCtrl', function($scope, $log, $modalInstance, modalService, message, DRSubService) {
+ 'use strict';
+
+ // this object holds all app data and functions
+ $scope.dbcapp = {};
+
+ // Set the label variable for the template
+ if (message.sub == null || message.sub.subId == null)
+ $scope.dbcapp.label = 'Add Subscriber';
+ else
+ $scope.dbcapp.label = 'Edit Subscriber';
+ $scope.dbcapp.editSub = message.sub;
+ $scope.dbcapp.dcaeList = message.dcaeList;
+
+ /**
+ * Validates content of user-editable fields.
+ * Returns null if all is well,
+ * a descriptive error message otherwise.
+ */
+ $scope.dbcapp.validateSub = function(sub) {
+ if (sub == null)
+ return "No data found.\nPlease enter some values.";
+ if (sub.dcaeLocationName == null)
+ return "DCAE Location is required.\nPlease select a value.";
+ if (sub.deliveryURL == null || sub.deliveryURL.trim() == '')
+ return "Delivery URL is required.\nPlease enter a value.";
+ if (sub.username == null || sub.username.trim() == '')
+ return "User Name is required.\nPlease enter a value.";
+ if (sub.userpwd == null || sub.userpwd.trim() == '')
+ return "Password is required.\nPlease enter a value.";
+ return null;
+ }
+
+ $scope.dbcapp.saveSub = function(sub) {
+ var validateMsg = $scope.dbcapp.validateSub(sub);
+ if (validateMsg != null) {
+ alert("Invalid Content\n:" + validateMsg);
+ return;
+ }
+
+ if (sub.subId == null) {
+ // No id, so create a new one
+ DRSubService.addSub(sub)
+ .then(function(response) {
+ // $log.debug('subPopupCtrl.saveSub: ' + JSON.stringify(response));
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('subPopupCtrl: error while adding: ' + error);
+ }
+ );
+ }
+ else {
+ // Has id, so update an existing one
+ DRSubService.updateSub(sub)
+ .then(function(response) {
+ $modalInstance.close(response);
+ },
+ function (error) {
+ $log.error('subPopupCtrl: error while updating: ' + error);
+ }
+ );
+ }
+
+ };
+
+ $scope.dbcapp.close = function() {
+ $modalInstance.close();
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-service.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-service.js
new file mode 100644
index 0000000..c7c56df
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr-sub-service.js
@@ -0,0 +1,86 @@
+appDS2.factory('DRSubService', function ($http, $q, $log) {
+ return {
+ /**
+ * Gets one page of data router subscriber objects.
+ * @param {Number} pageNum - page number; e.g., 1
+ * @param {Number} viewPerPage - number of items per page; e.g., 25
+ * @return {JSON} Response object from remote side
+ */
+ getSubsByPage: function(pageNum,viewPerPage) {
+ // cache control for IE
+ var cc = "&cc=" + new Date().getTime().toString();
+ return $http({
+ method: 'GET',
+ url: 'dr_sub?pageNum=' + pageNum + '&viewPerPage=' + viewPerPage + cc,
+ cache: false,
+ responseType: 'json'})
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRSubService.getSubsByPage: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRSubService.getSubsByPage failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Creates a new subscriber.
+ addSub: function(sub) {
+ return $http({
+ method: 'POST',
+ url: 'dr_sub',
+ data: sub,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRSubService.addSub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRSubService.addSub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Updates an existing subscriber.
+ updateSub: function(sub) {
+ return $http({
+ method: 'PUT',
+ url: 'dr_sub/' + sub.subId,
+ data: sub,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRSubService.updateSub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRSubService.updateSub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ // Deletes the subscriber with the specified ID.
+ deleteSub: function(subId) {
+ return $http({
+ method: 'DELETE',
+ url: 'dr_sub/' + subId,
+ responseType: 'json' })
+ .then(function(response) {
+ if (response.data == null || typeof response.data != 'object')
+ return $q.reject('DRSubService.deleteSub: response.data null or not object');
+ else
+ return response.data;
+ },
+ function(error) {
+ $log.error('DRSubService.deleteSub failed: ' + JSON.stringify(error));
+ return $q.reject(error.statusText);
+ });
+ },
+
+ };
+});
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_add_popup_template.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_add_popup_template.html
new file mode 100644
index 0000000..448ff29
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_add_popup_template.html
@@ -0,0 +1,113 @@
+<script type="text/ng-template" id="add_feed_popup.html">
+
+ <div class="b2b-modal-header ng-scope">
+ <h2 id="myModalLabel" modal-title="">{{dbcapp.label}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
+ </div>
+ </div>
+
+ <div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+ role="region" aria-label="Modal body content">
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feedname">*Feed Name</label>
+ <div class="field-group">
+ <!--autofocus is HTML5 attribute; doesn't work in Firefox-->
+ <input id="feedname" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedName" autofocus>
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="dcaelocation">*DCAE Location</label>
+ <div class="field-group">
+ <select b2b-dropdown id="dcaeLocation" name="loc" ng-model="dbcapp.editFeed.pubs[0].dcaeLocationName">
+ <option b2b-dropdown-list option-repeat="d in dbcapp.dcaeList" value="{{d}}">{{d}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feedversion">*Feed Version</label>
+ <div class="field-group">
+ <input id="feedversion" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedVersion">
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="username">Publish User Name</label>
+ <div class="field-group">
+ <input id="username" class="span12" type="text" data-ng-model="dbcapp.editFeed.pubs[0].username">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feeddescription">*Description</label>
+ <div class="field-group">
+ <input id="feeddescription" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedDescription">
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="password">Publish Password</label>
+ <div class="field-group">
+ <input id="password" class="span12" type="text" data-ng-model="dbcapp.editFeed.pubs[0].userpwd">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="asprclass">*PII Classification</label>
+ <div class="field-group">
+ <select b2b-dropdown id="asprclass" name="asprclass" ng-model="dbcapp.editFeed.asprClassification">
+ <option b2b-dropdown-list option-repeat="d in dbcapp.asprClassificationList" value="{{d}}">{{d}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="suspended" class="checkbox">
+ <input id="suspended" type="checkbox" ng-model="dbcapp.editFeed.suspended" />
+ <i class="skin"></i><span>Suspended</span>
+ </label>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="b2b-modal-footer ng-scope ng-isolate-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="dbcapp.saveFeed(dbcapp.editFeed);">
+ Save
+ </button>
+ <button class="btn btn-small" type="button"
+ ng-click="$dismiss('cancel')">
+ Cancel
+ </button>
+ </div>
+ </div>
+
+</script>
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_edit_popup_template.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_edit_popup_template.html
new file mode 100644
index 0000000..37537a8
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_edit_popup_template.html
@@ -0,0 +1,87 @@
+<script type="text/ng-template" id="edit_feed_popup.html">
+
+ <!-- Shows fewer fields than the add-feed popup. -->
+ <div class="b2b-modal-header ng-scope">
+ <h2 id="myModalLabel" modal-title="">{{dbcapp.label}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
+ </div>
+ </div>
+
+ <div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+ role="region" aria-label="Modal body content">
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feedname">*Feed Name</label>
+ <div class="field-group">
+ <!--autofocus is HTML5 attribute; doesn't work in Firefox-->
+ <input id="feedname" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedName" autofocus>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feedversion">*Feed Version</label>
+ <div class="field-group">
+ <input id="feedversion" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedVersion">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feeddescription">*Description</label>
+ <div class="field-group">
+ <input id="feeddescription" class="span12" type="text" data-ng-model="dbcapp.editFeed.feedDescription">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="asprclass">*ASPR Classification</label>
+ <div class="field-group">
+ <select b2b-dropdown id="asprclass" name="asprclass" ng-model="dbcapp.editFeed.asprClassification">
+ <option b2b-dropdown-list option-repeat="d in dbcapp.asprClassificationList" value="{{d}}">{{d}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="checkbox1" class="checkbox">
+ <input id="checkbox1" type="checkbox" ng-model="dbcapp.editFeed.suspended" />
+ <i class="skin"></i><span>Suspended</span>
+ </label>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="b2b-modal-footer ng-scope ng-isolate-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="dbcapp.saveFeed(dbcapp.editFeed);">
+ Save
+ </button>
+ <button class="btn btn-small" type="button"
+ ng-click="$dismiss('cancel')">
+ Cancel
+ </button>
+ </div>
+ </div>
+
+</script>
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_list.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_list.html
new file mode 100644
index 0000000..930cd50
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_list.html
@@ -0,0 +1,171 @@
+<!-- Feed list. Controller is specified by route provider. -->
+<div id="page-content">
+
+ <h1 class="heading-page" id="dataRouterFeeds">Data Router Feeds</h1>
+
+ <!-- show progress indicator -->
+ <div ng-show="dbcapp.isDataLoading">
+ <div class="span" style="margin-bottom:20px;">
+ <i class="icon-primary-spinner small" role="img" aria-label="Please wait while the content loads"></i>
+ Please wait while the content loads.
+ </div>
+ </div>
+
+ <div ng-hide="dbcapp.isDataLoading">
+
+ <div id="button-search-row">
+ <button class="btn btn-alt btn-small"
+ type="submit"
+ ng-click="dbcapp.addFeedModalPopup();">
+ Add Feed...
+ </button>
+
+ <div style="float:right;">
+ <div class="form-field form-field__small">
+ <input
+ type="text"
+ placeholder="Search feeds"
+ ng-model="dbcapp.searchString"/>
+ <!-- <i class="icon-primary-questionmark"></i> -->
+ </div>
+ </div>
+ </div>
+
+ <div ng-show="dbcapp.isRequestFailed">
+ <span class="errorMessageText">{{dbcapp.errMsg}}</span>
+ </div>
+
+ <div ng-hide="dbcapp.isRequestFailed">
+ <h4 class="heading-small-emphasis">
+ Access Profile {{dbcapp.profileName}}, DMaaP Name {{dbcapp.dmaapName}}
+ </h4>
+ </div>
+
+ <div
+ b2b-table
+ id="dr-feeds-table"
+ class="b2b-table-div"
+ table-data="dbcapp.tableData"
+ search-string="dbcapp.searchString"
+ current-page="dbcapp.currentPageIgnored"
+ next-sort="dbcapp.nextSortIgnored">
+
+ <table>
+
+ <thead b2b-table-row type="header">
+ <tr id="th-header-row">
+ <th b2b-table-header key="feedId">ID</th>
+ <th b2b-table-header key="feedName">Name</th>
+ <th b2b-table-header key="feedVersion">Ver</th>
+ <th b2b-table-header key="feedDescription">Description</th>
+ <th b2b-table-header key="asprClassification">Classification</th>
+ <th b2b-table-header key="publishURL">Publish URL</th>
+ <th b2b-table-header key="logURL">Log URL</th>
+ <th b2b-table-header key="owner">Owner</th>
+ <th b2b-table-header key="status">Status</th>
+ <th b2b-table-header key="suspended">Susp</th>
+ <th b2b-table-header sortable="false">P+S</th>
+ <th b2b-table-header sortable="false">Pub</th>
+ <th b2b-table-header sortable="false">Sub</th>
+ <th b2b-table-header sortable="false">Del</th>
+ </tr>
+ </thead>
+
+ <tbody b2b-table-row type="body" row-repeat="rowData in dbcapp.tableData">
+ <tr id="tr-rowData">
+ <td b2b-table-body
+ ng-bind="rowData.feedId"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.feedName"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.feedVersion"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.feedDescription"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.asprClassification"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.publishURL"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.logURL"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.owner"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.status"
+ ng-click="dbcapp.editFeedModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-click="dbcapp.editFeedModalPopup(rowData)">
+ {{rowData.suspended | dbcYesNoFilter}}
+ </td>
+ <td b2b-table-body
+ ng-bind="rowData.pubs.length + rowData.subs.length"
+ ng-click="dbcapp.showFeedPubsSubsModalPopup(rowData)">
+ </td>
+ <td b2b-table-body>
+ <div ng-click="dbcapp.addFeedPublisherModalPopup(rowData);" style="font-size:20px;">
+ <a href="">+P</a>
+ </div>
+ </td>
+ <td b2b-table-body>
+ <div ng-click="dbcapp.addFeedSubscriberModalPopup(rowData);" style="font-size:20px;">
+ <a href="">+S</a>
+ </div>
+ </td>
+ <td b2b-table-body>
+ <div ng-click="dbcapp.deleteFeedModalPopup(rowData);">
+ <a href="" class="icon-misc-trash"></a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageNumber">Page Number:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="pageNumber" name="currentPageNumSelector" ng-model="dbcapp.currentPageNum" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="p in dbcapp.buildArraySizeN(dbcapp.totalPages) track by $index"
+ value="{{$index+1}}">{{$index+1}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageCount">Page Count:</label>
+ <div class="field-group">
+ <input id="pageCount" class="span12" type="text" data-ng-model="dbcapp.totalPages" readonly="true">
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="rowsPerPage">Rows per Page:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="rowsPerPage" name="rowsPerPage" ng-model="dbcapp.viewPerPage" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="v in dbcapp.viewPerPageOptions"
+ value="{{v.value}}">{{v.value}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="height: 10px;">
+ <!-- space between page number and black footer -->
+ </div>
+
+ </div><!-- loading -->
+
+</div><!-- page content -->
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_pub_sub_list_popup_template.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_pub_sub_list_popup_template.html
new file mode 100644
index 0000000..091c751
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_feed_pub_sub_list_popup_template.html
@@ -0,0 +1,88 @@
+<script type="text/ng-template" id="feed_pub_sub_list_popup.html">
+
+ <div class="b2b-modal-header ng-scope">
+ <h2 id="myModalLabel" modal-title="">{{dbcapp.label}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
+ </div>
+ </div>
+
+ <div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+ role="region" aria-label="Modal body content">
+
+ <h4>Publishers</h4>
+
+ <table
+ id="pubs-table"
+ table-data="dbcapp.showFeed.pubs"
+ current-page="dbcapp.currentPageIgnored"
+ next-sort="dbcapp.nextSortIgnored">
+
+ <thead type="header">
+ <tr>
+ <th sortable="false" key="pubId">Pub ID</th>
+ <th sortable="false" key="dcaeLocationName">DCAE Location Name</th>
+ <th sortable="false" key="status">Status</th>
+ <th sortable="false" key="username">User Name</th>
+ </tr>
+ </thead>
+ <tbody type="body" ng-repeat="rowData in dbcapp.showFeed.pubs">
+ <tr>
+ <td ng-bind="rowData.pubId"/>
+ <td ng-bind="rowData.dcaeLocationName"/>
+ <td ng-bind="rowData.status"/>
+ <td ng-bind="rowData.username"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ </tr>
+ </tbody>
+ </table>
+
+ <h4>Subscribers</h4>
+
+ <table
+ id="subs-table"
+ table-data="dbcapp.showFeed.subs"
+ current-page="dbcapp.currentPageIgnored"
+ next-sort="dbcapp.nextSortIgnored">
+
+ <thead type="header">
+ <tr>
+ <th sortable="false">Sub ID</th>
+ <th sortable="false">DCAE Location Name</th>
+ <th sortable="false">Delivery URL</th>
+ <th sortable="false">Log URL</th>
+ <th sortable="false">Owner</th>
+ <th sortable="false">Status</th>
+ <th sortable="false">Susp</th>
+ <th sortable="false">User Name</th>
+ </tr>
+ </thead>
+ <tbody type="body" ng-repeat="rowData in dbcapp.showFeed.subs">
+ <tr>
+ <td ng-bind="rowData.subId"/>
+ <td ng-bind="rowData.dcaeLocationName"/>
+ <td ng-bind="rowData.deliveryURL"/>
+ <td ng-bind="rowData.logURL"/>
+ <td ng-bind="rowData.owner"/>
+ <td ng-bind="rowData.status"/>
+ <td>
+ {{rowData.suspended | dbcYesNoFilter}}
+ </td>
+ <td ng-bind="rowData.username"/>
+ </tr>
+ </tbody>
+ </table>
+
+ </div>
+
+ <div class="b2b-modal-footer ng-scope ng-isolate-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="$dismiss('cancel')">
+ Close
+ </button>
+ </div>
+ </div>
+
+</script>
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_list.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_list.html
new file mode 100644
index 0000000..23c0099
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_list.html
@@ -0,0 +1,126 @@
+<!-- Pub list. Controller is specified by route provider. -->
+<div id="page-content">
+
+ <h1 class="heading-page" id="feedPublishers">Feed Publishers</h1>
+
+ <!-- show progress indicator -->
+ <div ng-show="dbcapp.isDataLoading">
+ <div class="span" style="margin-bottom:20px;">
+ <i class="icon-primary-spinner small" role="img" aria-label="Please wait while the content loads"></i>
+ Please wait while the content loads.
+ </div>
+ </div>
+
+ <div ng-hide="dbcapp.isDataLoading">
+
+ <div id="button-search-row">
+ <!-- NO "add" button on this page -->
+ <div style="float:right;">
+ <div class="form-field form-field__small">
+ <input
+ type="text"
+ placeholder="Search publishers"
+ ng-model="dbcapp.searchString"/>
+ <!-- <i class="icon-primary-questionmark"></i> -->
+ </div>
+ </div>
+ </div>
+
+ <div ng-show="dbcapp.isRequestFailed">
+ <span class="errorMessageText">{{dbcapp.errMsg}}</span>
+ </div>
+
+ <div ng-hide="dbcapp.isRequestFailed">
+ <h4 class="heading-small-emphasis">
+ Access Profile {{dbcapp.profileName}}, DMaaP Name {{dbcapp.dmaapName}}
+ </div>
+
+ <div
+ b2b-table
+ id="dr-pubs-table"
+ class="b2b-table-div"
+ table-data="dbcapp.tableData"
+ search-string="dbcapp.searchString"
+ current-page="dbcapp.currentPageIgnored"
+ next-sort="dbcapp.nextSortIgnored">
+
+ <table>
+
+ <thead b2b-table-row type="header">
+ <tr>
+ <th b2b-table-header key="pubId">Pub ID</th>
+ <th b2b-table-header key="feedId">Feed ID</th>
+ <th b2b-table-header key="dcaeLocationName">DCAE Location Name</th>
+ <th b2b-table-header key="status">Status</th>
+ <th b2b-table-header key="username">User Name</th>
+ <th b2b-table-header sortable="false">Delete</th>
+ </tr>
+ </thead>
+
+ <tbody b2b-table-row type="body" row-repeat="rowData in dbcapp.tableData">
+ <tr id="tr-rowData">
+ <td b2b-table-body
+ ng-bind="rowData.pubId"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.feedId"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.dcaeLocationName"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.status"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.username"
+ ng-click="dbcapp.editPubModalPopup(rowData)"/>
+ <td b2b-table-body>
+ <div ng-click="dbcapp.deletePubModalPopup(rowData);">
+ <a href="" class="icon-misc-trash"></a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageNumber">Page Number:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="pageNumber" name="currentPageNumSelector" ng-model="dbcapp.currentPageNum" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="p in dbcapp.buildArraySizeN(dbcapp.totalPages) track by $index"
+ value="{{$index+1}}">{{$index+1}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageCount">Page Count:</label>
+ <div class="field-group">
+ <input id="pageCount" class="span12" type="text" data-ng-model="dbcapp.totalPages" readonly="true">
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="rowsPerPage">Rows per Page:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="rowsPerPage" name="rowsPerPage" ng-model="dbcapp.viewPerPage" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="v in dbcapp.viewPerPageOptions"
+ value="{{v.value}}">{{v.value}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="height: 10px;">
+ <!-- space between page number and black footer -->
+ </div>
+ </div><!-- loading -->
+
+</div><!-- page content -->
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_popup_template.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_popup_template.html
new file mode 100644
index 0000000..970a25e
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_pub_popup_template.html
@@ -0,0 +1,64 @@
+<script type="text/ng-template" id="edit_pub_popup.html">
+
+ <div class="b2b-modal-header ng-scope">
+ <h2 id="myModalLabel" modal-title="">{{dbcapp.label}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
+ </div>
+ </div>
+
+ <div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+ role="region" aria-label="Modal body content">
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="dcaelocation">*DCAE Location</label>
+ <div class="field-group">
+ <select b2b-dropdown id="dcaeLocation" name="loc" ng-model="dbcapp.editPub.dcaeLocationName">
+ <option b2b-dropdown-list option-repeat="d in dbcapp.dcaeList" value="{{d}}">{{d}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="feedname">User Name</label>
+ <div class="field-group">
+ <input id="username" class="span12" type="text" data-ng-model="dbcapp.editPub.username">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="password">Password</label>
+ <div class="field-group">
+ <input id="password" class="span12" type="password" data-ng-model="dbcapp.editPub.userpwd">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="b2b-modal-footer ng-scope ng-isolate-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="dbcapp.savePub(dbcapp.editPub);">
+ Save
+ </button>
+ <button class="btn btn-small" type="button"
+ ng-click="$dismiss('cancel')">
+ Cancel
+ </button>
+ </div>
+ </div>
+
+</script>
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_list.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_list.html
new file mode 100644
index 0000000..8dfab16
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_list.html
@@ -0,0 +1,153 @@
+<!-- Sub list. Controller is specified by route provider. -->
+<div id="page-content">
+
+ <h1 class="heading-page" id="feedSubscribers">Feed Subscribers</h1>
+
+ <!-- show progress indicator -->
+ <div ng-show="dbcapp.isDataLoading">
+ <div class="span" style="margin-bottom:20px;">
+ <i class="icon-primary-spinner small" role="img" aria-label="Please wait while the content loads"></i>
+ Please wait while the content loads.
+ </div>
+ </div>
+
+ <div ng-hide="dbcapp.isDataLoading">
+
+ <div id="button-search-row">
+ <!-- NO "add" button on this page -->
+ <div style="float:right;">
+ <div class="form-field form-field__small">
+ <input
+ type="text"
+ placeholder="Search subscribers"
+ ng-model="dbcapp.searchString"/>
+ <!-- <i class="icon-primary-questionmark"></i> -->
+ </div>
+ </div>
+ </div>
+
+ <div ng-show="dbcapp.isRequestFailed">
+ <span class="errorMessageText">{{dbcapp.errMsg}}</span>
+ </div>
+
+ <div ng-hide="dbcapp.isRequestFailed">
+ <h4 class="heading-small-emphasis">
+ Access Profile {{dbcapp.profileName}}, DMaaP Name {{dbcapp.dmaapName}}
+ </div>
+
+ <div
+ b2b-table
+ id="dr-subs-table"
+ class="b2b-table-div"
+ table-data="dbcapp.tableData"
+ search-string="dbcapp.searchString"
+ current-page="dbcapp.currentPageIgnored"
+ next-sort="dbcapp.nextSortIgnored">
+
+ <table>
+
+ <thead b2b-table-row type="header">
+ <tr>
+ <th b2b-table-header key="subId">Sub ID</th>
+ <th b2b-table-header key="feedId">Feed ID</th>
+ <th b2b-table-header key="dcaeLocationName">DCAE Location Name</th>
+ <th b2b-table-header key="deliveryURL">Delivery URL</th>
+ <th b2b-table-header key="logURL">Log URL</th>
+ <th b2b-table-header key="owner">Owner</th>
+ <th b2b-table-header key="status">Status</th>
+ <th b2b-table-header key="suspended">Susp</th>
+ <!-- Ignore until someone explains this field
+ <th key="use100">Use 100</th>
+ -->
+ <th b2b-table-header key="username">User Name</th>
+ <th b2b-table-header sortable="false">Delete</th>
+ </tr>
+ </thead>
+
+ <tbody b2b-table-row type="body" row-repeat="rowData in dbcapp.tableData">
+ <tr id="tr-rowData">
+ <td b2b-table-body
+ ng-bind="rowData.subId"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.feedId"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.dcaeLocationName"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.deliveryURL"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.logURL"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.owner"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-bind="rowData.status"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body
+ ng-click="dbcapp.editSubModalPopup(rowData)">
+ {{rowData.suspended | dbcYesNoFilter}}
+ </td>
+ <!-- Ignore until someone explains this field
+ <td b2b-table-body
+ ng-click="dbcapp.editSubModalPopup(rowData)">
+ {{rowData.use100 | dbcYesNoFilter}}
+ </td>
+ -->
+ <td b2b-table-body
+ ng-bind="rowData.username"
+ ng-click="dbcapp.editSubModalPopup(rowData)"/>
+ <td b2b-table-body>
+ <div ng-click="dbcapp.deleteSubModalPopup(rowData);">
+ <a href="" class="icon-misc-trash"></a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageNumber">Page Number:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="pageNumber" name="currentPageNumSelector" ng-model="dbcapp.currentPageNum" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="p in dbcapp.buildArraySizeN(dbcapp.totalPages) track by $index"
+ value="{{$index+1}}">{{$index+1}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="pageCount">Page Count:</label>
+ <div class="field-group">
+ <input id="pageCount" class="span12" type="text" data-ng-model="dbcapp.totalPages" readonly="true">
+ </div>
+ </div>
+ </div>
+ <div class="span12">
+ <div class="form-row">
+ <label for="rowsPerPage">Rows per Page:</label>
+ <div class="field-group">
+ <select b2b-dropdown id="rowsPerPage" name="rowsPerPage" ng-model="dbcapp.viewPerPage" ng-change="dbcapp.loadTable()">
+ <option b2b-dropdown-list
+ option-repeat="v in dbcapp.viewPerPageOptions"
+ value="{{v.value}}">{{v.value}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="height: 10px;">
+ <!-- space between page number and black footer -->
+ </div>
+
+ </div><!-- loading -->
+
+</div><!-- page content -->
diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_popup_template.html b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_popup_template.html
new file mode 100644
index 0000000..b1447e4
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/datarouter/dr_sub_popup_template.html
@@ -0,0 +1,86 @@
+<script type="text/ng-template" id="edit_sub_popup.html">
+
+ <div class="b2b-modal-header ng-scope">
+ <h2 id="myModalLabel" modal-title="">{{dbcapp.label}}</h2>
+ <div class="corner-button in">
+ <button type="button" class="close" aria-label="Close"
+ ng-click="$dismiss('cancel')"></button>
+ </div>
+ </div>
+
+ <div class="b2b-modal-body ng-scope ng-isolate-scope" tabindex="0"
+ role="region" aria-label="Modal body content">
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="dcaelocation">*DCAE Location</label>
+ <div class="field-group">
+ <select b2b-dropdown id="dcaeLocation" name="loc" ng-model="dbcapp.editSub.dcaeLocationName">
+ <option b2b-dropdown-list option-repeat="d in dbcapp.dcaeList" value="{{d}}">{{d}}</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="deliveryurl">*Delivery URL</label>
+ <div class="field-group">
+ <input id="deliveryurl" class="span12" type="text" data-ng-model="dbcapp.editSub.deliveryURL">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="username">*User Name</label>
+ <div class="field-group">
+ <input id="username" class="span12" type="text" data-ng-model="dbcapp.editSub.username">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="password">*Password</label>
+ <div class="field-group">
+ <input id="password" class="span12" type="text" data-ng-model="dbcapp.editSub.userpwd">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row-nowrap">
+ <div class="span12">
+ <div class="form-row">
+ <label for="suspended" class="checkbox">
+ <input id="suspended" type="checkbox" ng-model="dbcapp.editSub.suspended" />
+ <i class="skin"></i><span>Suspended</span>
+ </label>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="b2b-modal-footer ng-scope ng-isolate-scope">
+ <div class="cta-button-group in">
+ <button class="btn btn-alt btn-small" type="button"
+ ng-click="dbcapp.saveSub(dbcapp.editSub);">
+ Save
+ </button>
+ <button class="btn btn-small" type="button"
+ ng-click="$dismiss('cancel')">
+ Cancel
+ </button>
+ </div>
+ </div>
+
+</script>