From 35225a0b0349f1add4502f23223107ee084532a6 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 29 Sep 2016 10:40:31 +0530 Subject: [PATCH 1/4] Add category and short description for creating a orchestation job --- .../orchestration/popups/newTask.html | 34 +++++++++++++++++-- .../orchestration/popups/newTaskCtrl.js | 2 ++ server/app/model/classes/tasks/tasks.js | 8 +++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 89499be44..4c4f5c103 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -15,7 +15,7 @@

-
+
Job Details
@@ -49,6 +49,34 @@
Job Details
+
+ +
+ + + +
+
+ +
+ + + +
-
+
@@ -114,7 +142,7 @@
Job Details
-
+
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js index 08e4bf308..20447febe 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js @@ -249,6 +249,8 @@ var taskJSON = { taskType: $scope.taskType, name: $scope.name, + category: $scope.category, + shortDesc: $scope.shortDesc, description: $scope.description, }; //checking for name of the task diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index d10402538..2e99a3cac 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -82,6 +82,12 @@ var taskSchema = new Schema({ required: true, trim: true }, + shortDesc: { + type: String + }, + category: { + type: String + }, description: { type: String }, @@ -650,6 +656,8 @@ taskSchema.statics.updateTaskById = function(taskId, taskData, callback) { name: taskData.name, taskConfig: taskConfig, taskType: taskData.taskType, + shortDesc: taskData.shortDesc, + category: taskData.category, description: taskData.description, jobResultURLPattern: taskData.jobResultURL, blueprintIds: taskData.blueprintIds From 1ed268021937d93e55720c4f4b70b5cae46637d3 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 29 Sep 2016 12:39:30 +0530 Subject: [PATCH 2/4] Add category and short description for creating a orchestation job --- .../workzone/orchestration/popups/newTask.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 4c4f5c103..29ec4166d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -58,11 +58,11 @@
Job Details

From b5c6f082bded4b627fee359de8eb6cb11125f2fd Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 30 Sep 2016 12:21:14 +0530 Subject: [PATCH 3/4] Task Model Implementation for BOTS --- .../workzone/orchestration/popups/newTask.html | 10 +++++----- .../workzone/orchestration/popups/newTaskCtrl.js | 12 ++++++++++-- server/app/model/classes/tasks/tasks.js | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 29ec4166d..80fb06d1d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -52,12 +52,12 @@
Job Details

- @@ -74,7 +74,7 @@
Job Details

- +
@@ -150,7 +150,7 @@
Chef Server Details for - RLChefServer
-
+
@@ -211,7 +211,7 @@
Chef Server Details for - RLChefServer
-
+
-
+
+ + +
+

- @@ -66,7 +70,7 @@
Job Details
-
+

- +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js index 721c2b7b9..2c1b5ddec 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTaskCtrl.js @@ -26,6 +26,14 @@ var toggleStatus = $scope.isAllSelected; angular.forEach($scope.chefInstanceList, function(itm){ itm._isNodeSelected = toggleStatus;}); }; + $scope.botStatus = function() { + if($scope.checkBotType){ + $scope.checkBotStatus = true; + }else{ + $scope.checkBotStatus = false; + } + + }; $scope.optionToggled = function(){ $scope.isAllSelected = $scope.chefInstanceList.every(function(itm){ return itm._isNodeSelected; }) }; @@ -244,26 +252,27 @@ } }, ok: function () { - $scope.taskSaving = true; //these values are common across all task types var taskJSON = { taskType: $scope.taskType, name: $scope.name, botType: $scope.botType, shortDesc: $scope.shortDesc, - description: $scope.description, + description: $scope.description }; + if($scope.checkBotType){ + taskJSON.botType = $scope.botType; + taskJSON.shortDesc= $scope.shortDesc; + $scope.taskSaving = true; + }else{ + $scope.taskSaving = true; + } //checking for name of the task if (!taskJSON.name.trim()) { $scope.inputValidationMsg='Please enter the name of the task.'; $scope.taskSaving = false; return false; } - if (!taskJSON.shortDesc.trim()) { - $scope.inputValidationMsg='Please enter the short Description of the task.'; - $scope.taskSaving = false; - return false; - } //validating the task selections values and taking selected values from chef components if ($scope.taskType === "composite") { taskJSON.assignTasks = []; @@ -571,6 +580,10 @@ $scope.description = items.description; $scope.taskType = items.taskType; $scope.name = items.name; + if(items.shortDesc && (items.shortDesc !== '' || items.shortDesc !== null)){ + $scope.checkBotStatus = true; + $scope.checkBotType = true; + } $scope.botType = items.botType; $scope.shortDesc = items.shortDesc; //properties specific to jenkins