[ONAP-rebase] Rebase as 1.1.0-SNAPSHOT

Consolidate into a single maven project; no more separate model and client jars.

Change-Id: Ibbba982250b74c0dfd09ee1c65c0fb6c158dd632
Signed-off-by: Christopher Lott <cl778h@att.com>
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 65 insertions, 0 deletions

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();
+	};
+});