changed logging levels to be independent

fix for #6

Signed-off-by: Kendrick Coleman <[email protected]>

Author: kacole2

index.html

@@ -59,7 +59,7 @@ <h2>Create REX-Ray Configurations with Ease</h2>
 
     <div class="container">
         <div class="row">
-            <div ng-controller="GlobalLoggingLevelController">
+            <div ng-controller="RexrayLoggingLevelController">
                 <div ng-controller="AddServiceController">
                     <div ng-controller="AddServiceButtonController">
                         <div class="col-md-6">
@@ -70,9 +70,9 @@ <h2>Create REX-Ray Configurations with Ease</h2>
 
                                     <!-- GLOBAL LOGGING LEVEL DROPDOWN -->
                                     <div class="form-group">
-                                        <label class="col-md-4 control-label" for="global-logging-level">Global Logging Level</label>
+                                        <label class="col-md-4 control-label" for="Rexray-logging-level" uib-popover="The default level is 'Warn'" popover-trigger="mouseenter">REX-Ray Logging Level</label>
                                         <div class="col-md-8">
-                                            <select ng-options="loggingLevelOption.label for loggingLevelOption in loggingLevelsData.loggingLevelOptions track by loggingLevelOption.value" ng-model="loggingLevelsData.selectedLoggingLevel" id="global-logging-level" name="global-logging-level" class="form-control">
+                                            <select ng-options="loggingLevelOption.label for loggingLevelOption in loggingLevelsData.loggingLevelOptions track by loggingLevelOption.value" ng-model="loggingLevelsData.selectedLoggingLevel" id="Rexray-logging-level" name="Rexray-logging-level" class="form-control">
                                             </select>
                                         </div>
                                     </div>

js/formdata.js

@@ -1,6 +1,6 @@
 var mainForm = angular.module('mainForm', ['ui.bootstrap']);
 
-mainForm.controller('GlobalLoggingLevelController', ['$scope', function($scope){
+mainForm.controller('RexrayLoggingLevelController', ['$scope', function($scope){
 	$scope.loggingLevelsData = {
   		loggingLevelOptions: [
 			{value: 'error', label: 'Error'},
@@ -73,8 +73,9 @@ mainForm.filter('kvFilter', function(){
 		angular.forEach(objects, function (value, key) {
 				allKeys.push(key);
             })
-		return allKeys
-}})
+		return allKeys;
+	};
+});
 
 mainForm.filter('emptyKvFilter', function() {
   	return function (objects){
@@ -86,6 +87,18 @@ mainForm.filter('emptyKvFilter', function() {
   	};
 });
 
+mainForm.filter('noLoggingFilter', function(){
+	return function (arrays){
+		var allKeysArray = []
+		angular.forEach(arrays, function (x) {
+			if (x.substring(0, 4) == "libS" && x != 'libSmainLoggingLevel') {
+				allKeysArray.push(x);
+			}
+		})
+		return allKeysArray;
+	};
+});
+
 mainForm.filter('multiStringFilter', function(){
 	return function (input, searchText, AND_OR) {
         var returnArray = [],

output/yaml.html

@@ -1,13 +1,21 @@
 
 <p>
 rexray:<br>
-&nbsp logLevel: {{loggingLevelsData.selectedLoggingLevel.value}}<br>
+<span ng-if="loggingLevelsData.selectedLoggingLevel.value != 'warn'">
+	&nbsp logLevel: {{loggingLevelsData.selectedLoggingLevel.value}}<br>
+</span>
 libstorage:<br>
-&nbsp logging:<br>
-&nbsp&nbsp&nbsp level: {{loggingLevelsData.selectedLoggingLevel.value}}<br>
+<span ng-repeat="(k,v) in services[0] | emptyKvFilter" ng-if="k.substring(0,4) == 'libS' && v != 'warn'">
+	<span ng-if="k == 'libSmainLoggingLevel' && v != ''">
+		&nbsp logging:
+		<br>
+		&nbsp&nbsp&nbsp level: {{v}}
+		<br>
+	</span>
+</span>
+
 &nbsp service: {{services[0].type}}<br>
-<!--<span ng-repeat="(k,v) in services[0]" ng-if="k.substring(0,4) == 'libS'">-->
-<span ng-repeat="(k,v) in services[0] | emptyKvFilter | kvFilter | filter:'libS' | limitTo:1">
+<span ng-repeat="(k,v) in services[0] | emptyKvFilter | kvFilter | noLoggingFilter | limitTo:1">
 		&nbsp integration:
 		<br>
 		&nbsp&nbsp&nbsp volume:

services/libstorage.html

@@ -50,4 +50,16 @@ <h5 class="text-center">Permissions</h5>
     <div class="col-md-2">
         <input type="number" min="1" class="form-control" name="libStorageCreateSize" id="libStorageCreateSize" ng-model="service.libStorageCreateSize">
     </div>
+</div>
+<br>
+<div class="row">
+    <label for="libSmainLoggingLevel" class="col-md-2 control-label" uib-popover="The default level is 'Warn'" popover-trigger="mouseenter">Logging Level:</label>
+    <div class="col-md-4">
+        <select class="form-control" name="libSmainLoggingLevel" id="libSmainLoggingLevel" ng-model="service.libSmainLoggingLevel" ng-init="service.libSmainLoggingLevel = 'warn'" >
+            <option value="error">Error</option>
+            <option value="warn">Warn</option>
+            <option value="info">Info</option>
+            <option value="debug">Debug</option>
+        </select>
+    </div>
 </div>