[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, 64 insertions, 0 deletions

diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/messagerouter/mr-topic-popup-controller.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/messagerouter/mr-topic-popup-controller.js
new file mode 100644
index 0000000..44e558f
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/messagerouter/mr-topic-popup-controller.js
@@ -0,0 +1,64 @@
+appDS2.controller('topicPopupCtrl', function($scope, $log, $modalInstance, modalService, message, MRTopicService) {
+	'use strict';
+	
+	// this object holds all app data and functions
+	$scope.dbcapp = {};
+	
+	// Set the label variable for the template
+	if (message.topic == null)
+		$scope.dbcapp.label = 'Add Topic';
+	else
+		$scope.dbcapp.label = 'Show Topic';
+	$scope.dbcapp.editTopic = message.topic;
+
+	/**
+	 * Validates content of user-editable fields.
+	 * Returns null if all is well, 
+	 * a descriptive error message otherwise.
+	 */
+	$scope.dbcapp.validateTopic = function(topic) {
+		if (topic == null)
+			return "No data found.\nPlease enter some values.";
+		if (topic.topicName == null || topic.topicName.trim() == '')
+			return "Name is required.\nPlease enter a value.";
+		if (topic.topicDescription == null || topic.topicDescription.trim() == '')
+			return "Description is required.\nPlease enter a value.";
+		return null;
+	}
+
+	$scope.dbcapp.saveTopic = function(topic) {
+		var validateMsg = $scope.dbcapp.validateTopic(topic);
+		if (validateMsg != null) {
+			alert('Invalid Content:\n' + validateMsg);
+			return;			
+		}
+		
+		if (topic.fqtn == null) {
+			// No fqtn, so create a new one
+			MRTopicService.addTopic(topic)
+				.then(function(response) {
+					$modalInstance.close(response);
+				},
+				function (error) {
+					$log.error('topicPopupCtrl.saveTopic: error while adding: ' + error);
+				}
+			);
+		}
+		else {
+			// Has fqtn, so update an existing one
+			MRTopicService.updateTopic(topic)
+				.then(function(response) {
+					$modalInstance.close(response);
+				},
+				function (error) {
+					$log.error('topicPopupCtrl.saveTopic: error while updating: ' + error);
+				}
+			);
+		}
+
+	}; // saveTopic
+
+	$scope.dbcapp.close = function() {
+		$modalInstance.close();
+	};
+});