From 61e99a5f57497762076d0f36c59abdff4b625076 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 14:47:05 +0530 Subject: [PATCH 01/66] GIT Hub Implementation --- .../catalyst-scheduler/catalystScheduler.js | 2 +- server/app/lib/utils/apiUtil.js | 4 +- server/app/model/bots/{ => 1.0}/bots.js | 0 server/app/model/bots/1.1/bots.js | 296 ++++++++++++++++++ server/app/model/classes/tasks/tasks.js | 2 +- server/app/routes/v1.0/routes_blueprints.js | 2 +- server/app/services/auditTrailService.js | 2 +- server/app/services/blueprintService.js | 2 +- server/app/services/botsService.js | 2 +- server/app/services/schedulerService.js | 2 +- server/app/services/taskService.js | 2 +- 11 files changed, 306 insertions(+), 10 deletions(-) rename server/app/model/bots/{ => 1.0}/bots.js (100%) create mode 100644 server/app/model/bots/1.1/bots.js diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js index d05439767..1165a3906 100644 --- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js +++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js @@ -1,7 +1,7 @@ var logger = require('_pr/logger')(module); var instancesDao = require('_pr/model/classes/instance/instance'); var taskDao = require('_pr/model/classes/tasks/tasks.js'); -var botsDao = require('_pr/model/bots/bots.js'); +var botsDao = require('_pr/model/bots/1.0/bots.js'); var schedulerService = require('_pr/services/schedulerService'); var async = require('async'); var cronTab = require('node-crontab'); diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 24326b86e..de6590ec7 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -231,10 +231,10 @@ var ApiUtil = function() { }; var filterBy={}; if(data.filterBy) { - var a = data.filterBy.split(" "); + var a = data.filterBy.split(","); for (var i = 0; i < a.length; i++) { var b = a[i].split(":"); - var c = b[1].split(","); + var c = b[1].split(" "); if (c.length > 1) { filterBy[b[0]] = {'$in': c}; } else { diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/1.0/bots.js similarity index 100% rename from server/app/model/bots/bots.js rename to server/app/model/bots/1.0/bots.js diff --git a/server/app/model/bots/1.1/bots.js b/server/app/model/bots/1.1/bots.js new file mode 100644 index 000000000..49d2a79eb --- /dev/null +++ b/server/app/model/bots/1.1/bots.js @@ -0,0 +1,296 @@ +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var mongoose = require('mongoose'); +var logger = require('_pr/logger')(module); +var ObjectId = require('mongoose').Types.ObjectId; +var mongoosePaginate = require('mongoose-paginate'); +var Schema = mongoose.Schema; + +var BotsSchema = new Schema ({ + name: { + type: String, + trim: true, + required: true + }, + type: { + type: String, + trim: true, + required: true + }, + category: { + type: String, + trim: true, + required: true + }, + description: { + type: String, + trim: true, + required: true + }, + orgId:{ + type: String, + trim: true, + required: true + }, + yamlDocId:{ + type: String, + trim: true, + required: false + }, + manualExecutionTime: { + type: Number, + default: 10 + }, + executionCount: { + type: Number, + default: 0 + }, + isScheduled: { + type: Boolean, + default: false + }, + scheduler:{ + cronStartOn: { + type: String, + required: false, + trim: true + }, + cronEndOn: { + type: String, + required: false, + trim: true + }, + cronPattern: { + type: String, + required: false, + trim: true + }, + cronRepeatEvery: { + type: Number, + required: false + }, + cronFrequency: { + type: String, + required: false, + trim: true + }, + cronMinute:{ + type: Number, + required: false, + trim: true + }, + cronHour:{ + type: Number, + required: false + }, + cronWeekDay:{ + type: Number, + required: false + }, + cronDate:{ + type: Number, + required: false + }, + cronMonth:{ + type: String, + required: false, + trim: true + }, + cronYear:{ + type: Number, + required: false + } + }, + cronJobId:{ + type: String, + required: false, + trim: true + }, + createdOn:{ + type: Number, + default: Date.now() + }, + isDeleted: { + type: Boolean, + default: false + } +}); +BotsSchema.plugin(mongoosePaginate); + + +BotsSchema.statics.createNew = function(botsDetail,callback){ + var botsData = new Bots(botsDetail); + botsData.save(function(err, data) { + if (err) { + logger.error("createNew Failed", err, data); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} +BotsSchema.statics.updateBotsDetail = function(botId,botsDetail,callback){ + Bots.update({botId:botId},{$set:botsDetail},{upsert:false}, function(err, updateBotDetail) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, updateBotDetail); + }); +}; + +BotsSchema.statics.getBotsList = function(botsQuery,callback){ + botsQuery.queryObj.isDeleted = false; + Bots.paginate(botsQuery.queryObj, botsQuery.options, function(err, botsList) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + } + return callback(null, botsList); + }); +}; + +BotsSchema.statics.getBotsById = function(botId,callback){ + Bots.find({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.getAllBots = function(callback){ + Bots.find({isDeleted:false}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + +BotsSchema.statics.removeBotsById = function(botId,callback){ + Bots.remove({botId:botId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.removeSoftBotsById = function(botId,callback){ + Bots.update({botId:botId},{$set:{isDeleted:true}}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + +BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount(botId,count,callback) { + Bots.update({ + botId: botId, + }, { + $set: { + executionCount: count + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { + Bots.find({ + isBotScheduled: true, + isDeleted:false + }, function (err, bots) { + if (err) { + logger.error(err); + return callback(err, null); + } + return callback(null, bots); + }) +} + +BotsSchema.statics.updateCronJobIdByBotId = function updateCronJobIdByBotId(botId, cronJobId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + cronJobId: cronJobId + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, callback) { + Bots.update({ + "_id": new ObjectId(botId), + }, { + $set: { + isBotScheduled: false + } + }, { + upsert: false + }, function (err, data) { + if (err) { + callback(err, null); + return; + } + callback(null, data); + }); +}; + +var Bots = mongoose.model('bots', BotsSchema); +module.exports = Bots; diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index 9b87b7a7f..b168536a4 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -30,7 +30,7 @@ var mongoosePaginate = require('mongoose-paginate'); var ApiUtils = require('_pr/lib/utils/apiUtil.js'); var Schema = mongoose.Schema; var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var appConfig = require('_pr/config'); diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 7198da90b..c4860b5d5 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -24,7 +24,7 @@ var credentialcryptography = require('_pr/lib/credentialcryptography'); var fs = require('fs'); var blueprintService = require('_pr/services/blueprintService.js'); var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var botsService = require('_pr/services/botsService.js'); module.exports.setRoutes = function(app, sessionVerificationFunc) { diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index c6c3930c5..7f255f007 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -19,7 +19,7 @@ var instanceAuditTrail = require('_pr/model/audit-trail/instance-audit-trail.js' var botAuditTrail = require('_pr/model/audit-trail/bot-audit-trail.js'); var containerAuditTrail = require('_pr/model/audit-trail/container-audit-trail.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); -var bots = require('_pr/model/bots/bots.js');; +var bots = require('_pr/model/bots/1.0/bots.js');; const errorType = 'auditTrailService'; diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index 88b74aa22..5e8c7055a 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -33,7 +33,7 @@ var AWSKeyPair = require('_pr/model/classes/masters/cloudprovider/keyPair.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var usersDao = require('_pr/model/users.js'); var auditTrailService = require('_pr/services/auditTrailService'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var botsService = require('_pr/services/botsService.js'); var ObjectId = require('mongoose').Types.ObjectId; var uuid = require('node-uuid'); diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 4dc732a6b..4ef646c3c 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -16,7 +16,7 @@ */ var logger = require('_pr/logger')(module); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var taskService = require('_pr/services/taskService.js'); diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index e4d0c5801..f4492bb91 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -41,7 +41,7 @@ var botsService = require('_pr/services/botsService.js'); var gcpProviderModel = require('_pr/model/v2.0/providers/gcp-providers'); var GCP = require('_pr/lib/gcp.js'); var crontab = require('node-crontab'); -var botsDao = require('_pr/model/bots/bots.js'); +var botsDao = require('_pr/model/bots/1.0/bots.js'); schedulerService.executeSchedulerForInstances = function executeSchedulerForInstances(instance,callback) { logger.debug("Instance Scheduler is started for Instance. "+instance.platformId); diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 106c8d95d..3b31241fb 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -16,7 +16,7 @@ var logger = require('_pr/logger')(module); var taskDao = require('_pr/model/classes/tasks/tasks.js'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var masterUtil = require('_pr/lib/utils/masterUtil.js'); var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js'); var TaskHistory = require('_pr/model/classes/tasks/taskHistory'); From 014611168ef872213e4b4158d675e3d27bdd8ffb Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 15:08:29 +0530 Subject: [PATCH 02/66] GIT Hub Implementation --- .../private/ajax/Settings/githubList.html | 521 ++---------------- client/htmls/private/css/catalyst.css | 36 +- client/htmls/private/js/githubList.js | 497 +++++++++++++++++ server/app/model/github/github.js | 77 ++- server/app/routes/v1.0/routes_d4dMasters.js | 42 +- server/app/routes/v1.0/routes_github.js | 313 ++++++++++- server/app/services/auditTrailService.js | 61 +- server/app/services/botsService.js | 3 +- server/app/services/gitHubService.js | 244 ++++++-- server/app/services/instanceService.js | 2 +- server/app/validators/gitHubValidator.js | 10 +- server/install.js | 3 +- server/package.json | 4 +- 13 files changed, 1225 insertions(+), 588 deletions(-) create mode 100644 client/htmls/private/js/githubList.js diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index bf46d1d9b..b60d04e7e 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -1,9 +1,12 @@ +
@@ -26,12 +29,12 @@
- + - - - + + + @@ -62,13 +65,13 @@

- +
- +
@@ -80,54 +83,68 @@

- +
- +
- - + +
+
+ +
+
+ +
+
- + + @@ -144,442 +161,4 @@

- - \ No newline at end of file + \ No newline at end of file diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css index c79ca3de3..e9a6c2abb 100644 --- a/client/htmls/private/css/catalyst.css +++ b/client/htmls/private/css/catalyst.css @@ -2451,15 +2451,15 @@ hr { padding: 8px 17px 8px 54px !important; } .smart-style-1 nav ul ul li > span {} .smart-style-1 nav ul ul li > span { - color: #E1EAF1; - display: block; - font-size: 13px; - font-weight: 300; - padding-bottom: 6px !important; - padding-left: 43px; - padding-top: 6px !important; - text-shadow: 0 1px 1px #000000; -} + color: #E1EAF1; + display: block; + font-size: 13px; + font-weight: 300; + padding-bottom: 6px !important; + padding-left: 43px; + padding-top: 6px !important; + text-shadow: 0 1px 1px #000000; + } .domain-roles-heading { font-size: 12px; height: 25px; @@ -4664,7 +4664,7 @@ input:focus, select:focus, textarea:focus { } .scriptContainerRead { height:400px; - overflow-y:auto; + overflow-y:auto; background: #333; color:#fff; font-size: 12px; @@ -4675,3 +4675,19 @@ input:focus, select:focus, textarea:focus { .blueprintdiv-aws { width:77%!important; } + +.radioInline { + display: inline-block; +} + +.marginTop8 { + margin-top: 8px!important; +} + +#gitHubListLoader { + opacity: 0.6; + height: 100%; + width: 100%; + position: absolute; + background: #ddd; +} diff --git a/client/htmls/private/js/githubList.js b/client/htmls/private/js/githubList.js new file mode 100644 index 000000000..26b33fbe6 --- /dev/null +++ b/client/htmls/private/js/githubList.js @@ -0,0 +1,497 @@ + +//initialising the datatable... +if (!$.fn.dataTable.isDataTable('#gitTable')) { + var $gitDatatable = $('#gitTable').DataTable({ + "pagingType": "full_numbers", + "bInfo": false, + "bLengthChange": false, + "paging": true, + "bFilter": false, + "aoColumns": [{ + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }, { + "bSortable": false + }] + + }); +} + +//calling the global track functionality when track params are available.. +$(document).ready(function(e) { + getGlobalGitServers(); +}); + +function setFileNameCertificate(val) { + $('#certificateFileNameDisplay').empty(); + var fileNamePublic = val.substr(val.lastIndexOf("\\") + 1, val.length); + $("#certificateFileNameDisplay").append(fileNamePublic); +} + +function setFileNamePrivate(val) { + $('#privateFileNameDisplay').empty(); + var fileNamePrivate = val.substr(val.lastIndexOf("\\") + 1, val.length); + $("#privateFileNameDisplay").append(fileNamePrivate); +} + + +$("input[name='isAuthenticated']:radio").change(function(){ + if($(this).val() === 'Private') { + $('.isAunthenticatedSection').removeClass('hidden'); + } else { + $("#authenticationType").val($("#authenticationType option:first").val()); + $('.isAunthenticatedSection').addClass('hidden'); + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } +}); + +$('#authenticationType').change(function(e) { + var val = $(this).val(); + if (val === 'userName') { + $('.showForUser').removeClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } else if(val === 'sshKey') { + $('.showForUser').addClass('hidden'); + $('.showForSSH').removeClass('hidden'); + $('.showForToken').addClass('hidden'); + } else if(val === 'token') { + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').removeClass('hidden'); + } else { + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } +}); + +//when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item.. +$('.addGitHub').click(function(e) { + $('#gitHubRepoForn').trigger('reset'); + $('.modal-header').find('.modal-title').html('Create New GitHub Repository'); + $('#gitEditHiddenInput').val('new'); + getOrganizationList(); + $('#orgName,#authenticationType').removeAttr('disabled'); + $('.isAunthenticatedSection').addClass('hidden'); + $('#authenticationType').change(); + $('#gitEditHiddenInputId,#gitHiddenPublicFile,#gitHiddenPrivateFile').val(''); + $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled'); + $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled'); + $('#certificateFileNameDisplay').empty(); + $('#privateFileNameDisplay').empty(); +}); + +//to list down the organization for creating the gitHub repo item. +function getOrganizationList() { + $.get('/d4dMasters/readmasterjsonnew/1', function(data) { + var str = ' ', + len = data.length; + for (var i = 0; i < data.length; i++) { + str = str + ''; + } + $('#orgName').html(str); + }) +} + +//to show the focus on first input .... +$(document).on('shown.bs.modal', function(e) { + $('[autofocus]', e.target).focus(); +}); + +//form validation for dashboard save +var validator = $('#gitHubRepoForn').validate({ + ignore: [], + rules: { + certificateFile: { + extension: "pem|txt|sh" + }, + privateFile: { + extension: "pem|txt|sh" + }, + gitName: { + maxlength: 15 + }, + token: { + number: true + } + }, + messages: { + certificateFile: { + extension: "Only .pem/.txt/.sh files" + }, + privateFile: { + extension: "Only .pem/.txt/.sh files" + }, + gitName: { + maxlength: "Limited to 15 chars" + } + }, + onkeyup: false, + errorClass: "error", + + //put error message behind each form element + errorPlacement: function(error, element) { + console.log(error, element); + var elem = $(element); + if (element.parent('.input-groups').length) { + error.insertBefore(element.parent()); + } else { + if (element.parent('div.inputGroups')) { + error.insertBefore('div.inputGroups'); + } + } + } +}); +$('a.addGitHub[type="reset"]').on('click', function(e) { + validator.resetForm(); +}); + +function getGlobalGitServers() { + $('#gitTable').DataTable( { + "processing": true, + "serverSide": true, + "destroy":true, + "createdRow": function( row, data ) { + $( row ).attr({"githubName": data.repositoryName,"githubId" : data._id,"repositoryOwner":data.repositoryOwner, + "repositoryType":data.repositoryType,"authenticationType":data.authenticationType,"repositoryToken":data.repositoryToken, + "githubDescription" : data.repositoryDesc, "orgId" : data.orgId ,"orgName" : data.orgName, + "repositoryUserName" : data.repositoryUserName,"repositoryPassword" : data.repositoryPassword, + "repositorySSHPublicKeyFileId" : data.repositorySSHPublicKeyFileId,"repositorySSHPrivateKeyFileId":data.repositorySSHPrivateKeyFileId, + "repositorySSHPublicKeyFileName": data.repositorySSHPublicKeyFileName,"repositorySSHPrivateKeyFileName": data.repositorySSHPrivateKeyFileName + }); + }, + "ajax": '/git-hub', + "columns": [ + {"data": "repositoryName", "orderable" : true}, + {"data": "repositoryDesc" ,"orderable" : false }, + {"data": "orgName","orderable" : false }, + {"data": "repositoryOwner" ,"orderable" : false }, + {"data": "repositoryType" ,"orderable" : false}, + {"data": "","orderable" : true, + "render": function (data) { + var $tdAction = '
'; + $tdAction = $tdAction + '
'; + return $tdAction; + } + } + ] + } ); +}; + +$('#gitTable tbody').on( 'click', 'button.editGitRepo', function(){ + validator.resetForm(); + var $this = $(this); + var $this = $(this); + var $editModal = $('#modalForGitEdit'); + $editModal.modal('show'); + $editModal.find('#gitEditHiddenInput').val('edit'); + $editModal.find('h4.modal-title').html('Edit GitHub Repo  -  ' + $this.parents('tr').attr('githubName')); + $editModal.find('#gitName').val($this.parents('tr').attr('githubName')); + $editModal.find('#gitDescription').val($this.parents('tr').attr('githubDescription')); + $editModal.find('#orgName').empty().append('').attr('disabled','disabled'); + $editModal.find('#gitRepoOwner').val($this.parents('tr').attr('repositoryOwner')); + $editModal.find('#gitEditHiddenInputId').val($this.parents('tr').attr('githubId')); + var repoType = $this.parents('tr').attr('repositoryType'); + var authType = $this.parents('tr').attr('authenticationType'); + + if(repoType === 'Private'){ + $('input:radio[name="isAuthenticated"][value="Public"]').attr('disabled', true); + $('input:radio[name="isAuthenticated"][value="Private"]').removeAttr('disabled').prop('checked', true); + $('.isAunthenticatedSection').removeClass('hidden'); + if(authType === 'userName') { + $editModal.find('#authenticationType').val('userName').change().attr('disabled','disabled'); + $editModal.find('#protocolUser').val($this.parents('tr').attr('repositoryUserName')); + $editModal.find('#protocolPassword').val($this.parents('tr').attr('repositoryPassword')); + }else if(authType === 'sshKey'){ + $('#privateFile').val(''); + $('#privateFile').removeClass('required'); + $('#certificateFile').val(''); + $('#certificateFile').removeClass('required'); + $editModal.find('#certificateFileNameDisplay').empty(); + $editModal.find('#privateFileNameDisplay').empty(); + $editModal.find('#authenticationType').val('sshKey').change().attr('disabled','disabled'); + $editModal.find('#gitHiddenPublicFile').val($this.parents('tr').attr('repositorySSHPublicKeyFileId')); + $editModal.find('#gitHiddenPrivateFile').val($this.parents('tr').attr('repositorySSHPrivateKeyFileId')); + $editModal.find('#certificateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPublicKeyFileName')); + $editModal.find('#privateFileNameDisplay').append($this.parents('tr').attr('repositorySSHPrivateKeyFileName')); + } else { + $editModal.find('#authenticationType').val('token').change().attr('disabled','disabled'); + $editModal.find('#token').val($this.parents('tr').attr('repositoryToken')); + } + }else{ + $('input:radio[name="isAuthenticated"][value="Private"]').attr('disabled', true); + $('input:radio[name="isAuthenticated"][value="Public"]').removeAttr('disabled').prop('checked', true); + $('.isAunthenticatedSection').addClass('hidden'); + $("#authenticationType").val($("#authenticationType option:first").val()); + $editModal.find('#protocolUser').val(''); + $editModal.find('#protocolPassword').val(''); + $('.showForUser').addClass('hidden'); + $('.showForSSH').addClass('hidden'); + $('.showForToken').addClass('hidden'); + } + + return false; +}); + +$('#gitTable tbody').on( 'click', 'button.deleteGitRepo', function(){ + var $this = $(this); + bootbox.confirm({ + message: 'Are you sure you want to Delete GitHub Repo - ' + $this.parents('tr').attr('githubName'), + title: "Warning", + callback: function(result) { + if (result) { + $.ajax({ + url: '../git-hub/' + $this.parents('tr').attr('githubId'), + method: 'DELETE', + success: function() { + getGlobalGitServers(); + }, + error: function(jxhr) { + var msg = "Unable to Delete GitHub Repo please try again later"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + bootbox.alert(msg); + } + }); + } else { + return; + } + } + }); + return false; +}); + +$('#gitTable tbody').on( 'click', 'button.syncGitRepo', function(){ + $('#gitHubListLoader').show(); + var $this = $(this); + $.ajax({ + url: '../git-hub/' + $this.parents('tr').attr('githubId') + '/sync', + method: 'GET', + success: function() { + bootbox.alert('Sucessfully cloned'); + $('#gitHubListLoader').hide(); + }, + error: function(jxhr) { + console.log(jxhr); + var msg = "Unable to Fetch GitRepo please try again later"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + var msgCheck = JSON.parse(jxhr.responseText); + msg = msgCheck.msg; + } + bootbox.alert(msg); + $('#gitHubListLoader').hide(); + } + }); + return false; +}); + + +function saveForm(methodName,url,reqBody) { + $.ajax({ + method: methodName, + url: url, + async:false, + data: reqBody, + success: function(data, success) { + $('#modalForGitEdit').modal('hide'); + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + getGlobalGitServers(); + $('#saveBtnTrack').removeAttr('disabled'); + }, + error: function(jxhr) { + console.log(jxhr); + var msg = "Server Behaved Unexpectedly"; + if (jxhr.responseJSON && jxhr.responseJSON.message) { + msg = jxhr.responseJSON.message; + } else if (jxhr.responseText) { + msg = jxhr.responseText; + } + bootbox.alert(msg); + + $('#saveItemSpinner').addClass('hidden'); + $('#saveBtnTrack').removeAttr('disabled'); + } + }); +} + +//save form for creating a new gitHub item and updation of the gitHub details. +$('#gitHubRepoForn').submit(function(e) { + var isValidator = $('#gitHubRepoForn').valid(); + if (!isValidator) { + e.preventDefault(); + return false; + } else { + e.preventDefault(); + $('#saveItemSpinner').removeClass('hidden'); + var $form = $('#gitHubRepoForn'); + $this = $(this); + var repositoryName, orgValue, description, authenticationType, repositoryOwner, repositoryType, + passwordName, userName, certChainFileId, privateKeyFileId, certChainFileName, privateKeyFileName, repositoryToken; + + repositoryName = $this.find('.gitName').val().trim(); + orgValue = $this.find('#orgName').val(); + description = $this.find('#gitDescription').val(); + repositoryOwner = $this.find('#gitRepoOwner').val(); + repositoryType= $('input[name=isAuthenticated]:checked').val(); + authenticationType = $this.find('#authenticationType').val(); + userName = $this.find('#protocolUser').val().trim(); + repositoryToken = $this.find('#token').val().trim(); + passwordName = $this.find('#protocolPassword').val().trim(); + certChainFileId = $this.find('#gitHiddenPublicFile').val(); + privateKeyFileId = $this.find('#gitHiddenPrivateFile').val(); + var dashboardEditNew = $this.find('#gitEditHiddenInput').val(); + var gitHubId = $form.find('input#gitEditHiddenInputId').val(); + var url; + var reqBody = {}; + var methodName; + //for edit of form. + var fileCertificate = $('#certificateFile').get(0).files[0]; + var filePrivate = $('#privateFile').get(0).files[0]; + var formData = new FormData(); + formData.append('file', fileCertificate); + var newFormData = new FormData(); + newFormData.append('file', filePrivate); + if (dashboardEditNew === 'edit') { + url = '../git-hub/' + gitHubId; + methodName = 'PUT'; + } else { + methodName = 'POST'; + url = '../git-hub'; + } + if (authenticationType === 'sshKey') { + if(certChainFileId === '' && privateKeyFileId === ''){ + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + certChainFileId, + data: formData, + cache: false, + contentType: false, + processData: false, + success: function(dataCertificate, success) { + $.ajax({ + method: "POST", + url: '../fileUpload?fileId=' + privateKeyFileId, + data: newFormData, + cache: false, + contentType: false, + processData: false, + success: function(dataPrivate, success) { + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositorySSHPublicKeyFileId": dataCertificate.fileId, + "repositorySSHPrivateKeyFileId": dataPrivate.fileId + } + saveForm(methodName,url,reqBody); + } + }); + } + }); + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositorySSHPublicKeyFileId": certChainFileId, + "repositorySSHPrivateKeyFileId": privateKeyFileId + } + saveForm(methodName,url,reqBody); + } + } else if (authenticationType === 'userName') { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryUserName": userName, + "repositoryPassword": passwordName + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryUserName": userName, + "repositoryPassword": passwordName + } + } + saveForm(methodName,url,reqBody); + } else if (authenticationType === 'token') { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryToken": repositoryToken + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType, + "authenticationType": authenticationType, + "repositoryToken": repositoryToken + } + } + saveForm(methodName,url,reqBody); + } else { + if(dashboardEditNew === 'new'){ + reqBody = { + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType + } + } else { + reqBody = { + "_id": gitHubId, + "repositoryName": repositoryName, + "orgId": orgValue, + "repositoryDesc": description, + "repositoryOwner": repositoryOwner, + "repositoryType": repositoryType + } + } + saveForm(methodName,url,reqBody); + } + return false; + } +}); \ No newline at end of file diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index d59a18fc7..daddf37e5 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -18,27 +18,37 @@ var mongoose = require('mongoose'); var ObjectId = require('mongoose').Types.ObjectId; var logger = require('_pr/logger')(module); var Schema = mongoose.Schema; +var mongoosePaginate = require('mongoose-paginate'); var GitHubSchema = new Schema({ orgId: { type: String, required: true, trim: true }, - name: { + repositoryName: { type: String, required: true, trim: true }, - description: { + repositoryDesc: { type: String, required: false, trim: true }, - repositoryName: { + repositoryOwner: { type: String, trim: true, required: true }, + repositoryType: { + type: String, + required: true + }, + repositoryToken: { + type: String, + trim: true, + required: false + }, repositoryUserName: { type: String, trim: true, @@ -49,11 +59,6 @@ var GitHubSchema = new Schema({ trim: true, required: false }, - isAuthenticated: { - type: Boolean, - required: false, - default: false - }, authenticationType: { type: String, required: false, @@ -68,9 +73,21 @@ var GitHubSchema = new Schema({ type: String, trim: true, required: false + }, + isRepoCloned:{ + type: Boolean, + required: false, + default:false + }, + createdOn:{ + type: Number, + required: false, + default:Date.now() } }); +GitHubSchema.plugin(mongoosePaginate); + GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { var self = this; var gitHub = new self(gitHubObj); @@ -85,23 +102,37 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { - this.aggregate([{ - $lookup: { - from: "d4dmastersnew", - localField: "orgId", - foreignField: "rowid", - as: "organization" - } - }], function (err, gitHubList) { + console.log(params); + GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { if (err) { - callback(err, null); - return; - } else if (gitHubList.length === 0) { - callback(null, gitHubList); - return; - } else { - return callback(null, gitHubList); + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); } + GitHub.aggregate([ + {$match: params.queryObj}, + { + $lookup: { + from: "d4dmastersnew", + localField: "orgId", + foreignField: "rowid", + as: "organization" + } + }, + {$skip: (params.options.page - 1) * params.options.limit}, + {$limit: params.options.limit}, + {$sort: params.options.sort} + ], function (err, gitHubList) { + if (err) { + callback(err, null); + return; + } else { + gitRepoList.docs = gitHubList; + callback(null, gitRepoList); + return; + } + }); }); }; diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index 0faf7e75b..6dc2f22ca 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -1,12 +1,12 @@ /* Copyright [2016] [Relevance Lab] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -216,10 +216,10 @@ module.exports.setRoutes = function (app, sessionVerification) { app.get('/d4dMasters/mastersjson', function (req, res) { logger.debug("Enter get() for /d4dMasters/mastersjson"); res.send([{ - name: 'master' - }, { - name: 'master2' - }]); + name: 'master' + }, { + name: 'master2' + }]); logger.debug("Exit get() for /d4dMasters/mastersjson"); }); //getAccessFilesForRole @@ -253,10 +253,10 @@ module.exports.setRoutes = function (app, sessionVerification) { logger.debug("Enter get() for /d4dMasters/getuser : " + JSON.stringify(req.session.user)); res.send({ "user": [{ - username: req.session.user - }, { - role: '[' + req.session.user.roleId + ']' - }] + username: req.session.user + }, { + role: '[' + req.session.user.roleId + ']' + }] }); logger.debug("Exit get() for /d4dMasters/getuser"); }); @@ -2520,7 +2520,8 @@ module.exports.setRoutes = function (app, sessionVerification) { // Start Auto create Team if (req.params.id === '1') { d4dModelNew.d4dModelMastersOrg.find({ - orgname: bodyJson["orgname"] + orgname: bodyJson["orgname"], + id: '1' }, function (err, orgs) { if (err) { logger.error('Hit error while check org is exist with Org Name', err); @@ -2701,7 +2702,8 @@ module.exports.setRoutes = function (app, sessionVerification) { } bodyJson["password"] = hashedPassword; d4dModelNew.d4dModelMastersUsers.find({ - loginname: bodyJson["loginname"] + loginname: bodyJson["loginname"], + id: '7' }, function (err, users) { if (err) { logger.error('Hit error while check user is exist with Login Name', err); @@ -2713,8 +2715,9 @@ module.exports.setRoutes = function (app, sessionVerification) { return; } else { d4dModelNew.d4dModelMastersUsers.find({ - email: bodyJson["email"] - },function(err,usersList){ + email: bodyJson["email"], + id: '7' + },function(err,usersList){ if (err) { logger.error('Hit error while check user is exist with email', err); res.send(500); @@ -2806,7 +2809,6 @@ module.exports.setRoutes = function (app, sessionVerification) { }); }); } else if (req.params.id === '4') { - // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson); projectModel.save(function (err, data) { if (err) { @@ -4018,10 +4020,10 @@ module.exports.setRoutes = function (app, sessionVerification) { dockerId: '18' }; async.parallel({ - server: function (callback) { - masterUtil.getServerDetails(jsonData, callback) - } - }, + server: function (callback) { + masterUtil.getServerDetails(jsonData, callback) + } + }, function (err, results) { if (err) res.status(500).send("Internal Server Error"); diff --git a/server/app/routes/v1.0/routes_github.js b/server/app/routes/v1.0/routes_github.js index 24d99f744..af19489de 100644 --- a/server/app/routes/v1.0/routes_github.js +++ b/server/app/routes/v1.0/routes_github.js @@ -18,7 +18,78 @@ var gitHubValidator = require('_pr/validators/gitHubValidator'); module.exports.setRoutes = function(app, sessionVerificationFunc) { app.all('/git-hub/*', sessionVerificationFunc); - + + /** + * @api {get} /git-hub/ List all Git-Hub Repository + * @apiName /git-hub + * @apiGroup List all the Git-Hub Repository with Pagination + * + * @apiQueryParam {Number} page Page Number + * @apiQueryParam {Number} pageSize Number of Records per page + * @apiQueryParam {String} sortBy All the records are sorted By one common field + * @apiQueryParam {String} filterBy All the records are filter By selected values + * @apiQueryParam {String} search All the records are search By input text + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "gitHub": [{ + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * }], + * "metaData": { + * "totalRecords": 1, + * "pageSize": 50, + * "page": 1, + * "totalPages": 1, + * "sortBy": "createdOn", + * "sortOrder": "asc" + * } + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} + * }; + */ + app.get("/git-hub", getGitHubList); function getGitHubList(req, res) { @@ -35,6 +106,63 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); } + /** + * @api {get} /git-hub/:gitHubId Git-Hub Repository Details + * @apiName /git-hub + * @apiGroup Particular Git-Hub Repository Details + * + * @apiParam {String} gitHubId Git Hub ID + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub List'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub List'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub List'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub List'} + * }; + */ + app.get('/git-hub/:gitHubId', getGitHubById); function getGitHubById(req, res) { async.waterfall( @@ -56,6 +184,56 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {get} /git-hub/:gitHubId/sync Git-Hub Repository Sync + * @apiName /git-hub + * @apiGroup Sync Git-Hub Repository + * + * @apiParam {String} gitHubId Git Hub ID + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully Synced.', + * fields:{successMessage:'Git Hub Repository Successfully Synced',attribute:'Git-Hub Sync'} + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Sync'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Sync'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Sync'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Sync'} + * }; + */ + app.get('/git-hub/:gitHubId/sync', getGitHubSync); function getGitHubSync(req, res) { async.waterfall( @@ -77,6 +255,73 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {post} /git-hub/ Create a Git-Hub Repository + * @apiName /git-hub + * @apiGroup Create a Git-Hub Repository + * + * @apiParamExample {json} Request-Example: + * { + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * "_id": "586f58a417c109866b1067ba", + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "orgName": "Phoenix", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Creation'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Creation'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Creation'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Creation'} + * }; + */ + app.post('/git-hub', validate(gitHubValidator.create), createGitHub); function createGitHub(req, res) { @@ -96,6 +341,67 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { ); } + /** + * @api {put} /git-hub/:gitHubId Update a Git-Hub Repository + * @apiName /git-hub + * @apiGroup Update a Git-Hub Repository + * + * @apiParamExample {json} Request-Example: + * { + * "_id": "586f58a417c109866b1067ba" + * "name": "Durgesh-Bots", + * "description": "BOT Factory", + * "repositoryURL": "https://github.com/RLIndia/botsfactory.git", + * "repositoryType": "Private", + * "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927537", + * "repositoryUserName": "Durgesh1988", + * "authenticationType": "userName", + * "repositoryPassword": "Durgesh@12356" + * } + * + * @apiSuccess [JSONObject] + * + * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully updated.', + * fields:{successMessage:'Git Hub Repository Successfully updated',attribute:'Git-Hub Updating'} + * } + * + * @apiError 400 Bad Request. + * + * @apiErrorExample Error-Response: + * { + * code:400, + * message:'Bad Request', + * fields:{errorMessage:'Bad Request',attribute:'Git-Hub Updating'} + * }; + * @apiError 403 Forbidden. + * + * @apiErrorExample Error-Response: + * { + * code:403, + * message:'Forbidden', + * fields:{errorMessage:'The request was a valid request, but the server is refusing to respond to it',attribute:'Git-Hub Updating'} + * }; + * @apiError 404 Not Found. + * + * @apiErrorExample Error-Response: + * { + * code:404, + * message:'Not Found', + * fields:{errorMessage:'The requested resource could not be found but may be available in the future',attribute:'Git-Hub Updating'} + * }; + * @apiError 500 InternalServerError. + * + * @apiErrorExample Error-Response: + * { + * code:500, + * message:'Internal Server Error', + * fields:{errorMessage:'Server Behaved Unexpectedly',attribute:'Git-Hub Updating'} + * }; + */ + app.put('/git-hub/:gitHubId', validate(gitHubValidator.update), updateGitHub); @@ -128,6 +434,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { * @apiSuccess [JSONObject] * * @apiSuccessExample Success-Response: + * { + * code:200, + * message:'Git Hub Repository Successfully deleted.', + * fields:{successMessage:'Git Hub Repository Successfully deleted',attribute:'Git-Hub Deletion'} + * } * * @apiError 400 Bad Request. * diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 7f255f007..2fb5c2386 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -189,11 +189,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'success', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); @@ -213,14 +227,27 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'running', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); - }, totalSavedTimeForBots: function(callback){ var query={ @@ -257,11 +284,25 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ actionStatus:'failed', isDeleted:false }; - auditTrail.getAuditTrails(query,function(err,data){ + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ if(err){ callback(err,null); - }else { - callback(null, data.length); + }else if (botsAudits.length > 0) { + var results = []; + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) === -1) { + botsIds.push(botsAudits[i].auditId); + results.push(botsAudits[i].auditId); + } else { + results.push(botsAudits[i].auditId); + } + } + if (results.length === botsAudits.length) { + callback(null,botsIds.length); + } + } else { + callback(null,botsIds.length); } }); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 4ef646c3c..72ae9647d 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -174,7 +174,8 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(actionStatus !== null){ var query = { auditType: 'BOTs', - actionStatus: actionStatus + actionStatus: actionStatus, + isDeleted:false }; var botsIds = []; auditTrail.getAuditTrails(query, function(err,botsAudits){ diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index 4c454fa27..e3854144a 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -1,12 +1,12 @@ /* Copyright [2016] [Relevance Lab] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,12 @@ var logger = require('_pr/logger')(module); var gitHubModel = require('_pr/model/github/github.js'); var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); +var fileUpload = require('_pr/model/file-upload/file-upload'); +var nodeGit = require('nodegit'); +var async = require('async'); +var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var promisify = require("promisify-node"); +var fse = promisify(require("fs-extra")); var gitGubService = module.exports = {}; @@ -39,7 +45,7 @@ gitGubService.checkIfGitHubExists = function checkIfGitHubExists(gitHubId, callb gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { - if(gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true'){ + if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -61,7 +67,7 @@ gitGubService.createGitHub = function createGitHub(gitHubObj, callback) { }; gitGubService.updateGitHub = function updateGitHub(gitHubId, gitHubObj, callback) { - if((gitHubObj.isAuthenticated === true || gitHubObj.isAuthenticated === 'true') && gitHubObj.authenticationType === 'UserName'){ + if(gitHubObj.repositoryType === 'Private' && gitHubObj.authenticationType === 'userName'){ var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); gitHubObj.repositoryPassword = cryptography.encryptText(gitHubObj.repositoryPassword, cryptoConfig.encryptionEncoding, @@ -105,36 +111,144 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { err.status = 404; return callback(err); } else{ - + formatGitHubResponse(gitHub,function(formattedGitHub){ + if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'token') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryToken, "x-oauth-basic"); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + } else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'userName') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.userpassPlaintextNew(formattedGitHub.repositoryUserName, formattedGitHub.repositoryPassword); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + }else if(formattedGitHub.repositoryType === 'Private' && formattedGitHub.authenticationType === 'sshKey') { + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function () { + var cred = nodeGit.Cred.sshKeyNew(formattedGitHub.repositoryUserName, formattedGitHub.repositorySSHPublicKeyFileData,formattedGitHub.repositorySSHPrivateKeyFileData,''); + return cred; + }, + certificateCheck: function() { + return 1; + } + } + } + } + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + }else{ + var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; + gitRepoCloning(repoUrl,localClonePath,{},gitHubId,function(err,cloneStatus){ + if(err){ + callback(err,null); + return; + }else{ + callback(null,cloneStatus); + return; + } + }); + } + }) } }); }; gitGubService.getGitHubList = function getGitHubList(query, callback) { - var params = {}; - logger.debug('get GitHub'); - if ('filterBy' in query) { - params = parseFilterBy(query.filterBy); - } - gitHubModel.getGitHubList(params, function (err, gitHubList) { - if (err) { - logger.error(err); - var err = new Error('Internal Server Error'); - err.status = 500; - return callback(err); - } else { - var response = []; - if (gitHubList.length > 0) { - for (var i = 0; i < gitHubList.length; i++) { - response.push(formatGitHubResponse(gitHubList[i])); - if (response.length === gitHubList.length) { - return callback(null, response); - } + var reqData = {}; + async.waterfall([ + function(next) { + apiUtil.changeRequestForJqueryPagination(query, next); + }, + function(filterQuery,next) { + reqData = filterQuery; + apiUtil.paginationRequest(filterQuery, 'gitHub', next); + }, + function(paginationReq, next) { + paginationReq['searchColumns'] = ['name', 'repositoryType', 'repositoryURL']; + apiUtil.databaseUtil(paginationReq, next); + }, + function(queryObj, next) { + gitHubModel.getGitHubList(queryObj, next); + }, + function(gitHubList, next) { + if (gitHubList.docs.length > 0) { + var formattedResponseList = []; + for (var i = 0; i < gitHubList.docs.length; i++) { + formatGitHubResponse(gitHubList.docs[i],function(formattedData){ + formattedResponseList.push(formattedData); + if (formattedResponseList.length === gitHubList.docs.length) { + gitHubList.docs = formattedResponseList; + next(null,gitHubList); + } + }); } } else { - return callback(null, response); + next(null,gitHubList); } + }, + function(formattedGitHubResponseList, next) { + apiUtil.changeResponseForJqueryPagination(formattedGitHubResponseList, reqData, next); + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; } + callback(null,results) + return; }); }; @@ -149,41 +263,81 @@ gitGubService.getGitHubById = function getGitHubById(gitHubId, callback) { err.status = 404; return callback(err); } else{ - callback(null,formatGitHubResponse(gitHub)); + formatGitHubResponse(gitHub,function(err,formattedData){ + callback(null,formattedData); + }); } }); }; - -function parseFilterBy(filterByString) { - var filterQuery = {}; - var filters = filterByString.split('+'); - for (var i = 0; i < filters.length; i++) { - var filter = filters[i].split(':'); - var filterQueryValues = filter[1].split(","); - filterQuery[filter[0]] = {'$in': filterQueryValues}; - } - return filterQuery; -}; - -function formatGitHubResponse(gitHub) { +function formatGitHubResponse(gitHub,callback) { var formatted = { _id:gitHub._id, - name:gitHub.name, - description:gitHub.description, repositoryName:gitHub.repositoryName, - isAuthenticated:gitHub.isAuthenticated + repositoryDesc:gitHub.repositoryDesc, + repositoryOwner:gitHub.repositoryOwner, + repositoryType:gitHub.repositoryType }; if (gitHub.organization.length) { formatted.orgId = gitHub.organization[0].rowid; formatted.orgName=gitHub.organization[0].orgname; } - if (gitHub.isAuthenticated === true) { + if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'userName') { formatted.repositoryUserName = gitHub.repositoryUserName; + formatted.authenticationType = gitHub.authenticationType; var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); formatted.repositoryPassword = cryptography.decryptText(gitHub.repositoryPassword, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + callback(formatted); + }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'sshKey') { + formatted.authenticationType = gitHub.authenticationType; + fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPublicKeyFileId,function(err,publicKeyFile){ + if(err){ + var err = new Error('Internal server error'); + err.status = 500; + logger.error(err); + } + formatted.repositorySSHPublicKeyFileId = gitHub.repositorySSHPublicKeyFileId; + formatted.repositorySSHPublicKeyFileName = publicKeyFile.fileName; + formatted.repositorySSHPublicKeyFileData = publicKeyFile.fileData; + fileUpload.getReadStreamFileByFileId(gitHub.repositorySSHPrivateKeyFileId,function(err,privateKeyFile){ + if(err){ + var err = new Error('Internal server error'); + err.status = 500; + logger.error(err); + } + formatted.repositorySSHPrivateKeyFileId = gitHub.repositorySSHPrivateKeyFileId; + formatted.repositorySSHPrivateKeyFileName = privateKeyFile.fileName; + formatted.repositorySSHPrivateKeyFileData = privateKeyFile.fileData; + callback(formatted); + }); + }); + }else if (gitHub.repositoryType === 'Private' && gitHub.authenticationType === 'token') { + formatted.authenticationType = gitHub.authenticationType; + formatted.repositoryToken = gitHub.repositoryToken; + callback(formatted); + }else { + formatted.authenticationType = gitHub.authenticationType; + callback(formatted); } - return formatted; +} + +function gitRepoCloning(url,path,options,gitHubId,callback){ + fse.remove(path).then(function() { + nodeGit.Clone(url, path, options).then(function(repo){ + gitHubModel.updateGitHub(gitHubId, {isRepoCloned:true}, function (err, gitHub) { + if (err) { + logger.error(err); + } + logger.debug("GIT Repository Clone is Done."); + callback(null, repo); + }); + }).catch(function(err){ + var err = new Error('Invalid Git-Hub Details'); + err.status = 400; + err.msg = 'Invalid Git-Hub Details'; + callback(err, null); + }) + }); } diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index 2a3b24681..13b232adb 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -46,7 +46,6 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); -var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); var instanceService = module.exports = {}; @@ -1485,6 +1484,7 @@ function updateScheduler(instanceScheduler, callback) { return callback(err, null); } else { callback(null, {"message": "Scheduler Updated."}); + var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledInstances(); return; } diff --git a/server/app/validators/gitHubValidator.js b/server/app/validators/gitHubValidator.js index 75e1beb9a..dd1c3027b 100644 --- a/server/app/validators/gitHubValidator.js +++ b/server/app/validators/gitHubValidator.js @@ -21,15 +21,17 @@ var monitorsValidator = module.exports = {}; monitorsValidator.create = { body: { "orgId": Joi.string().max(40).required(), - "name": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required() + "repositoryName": Joi.string().max(40).required(), + "repositoryOwner": Joi.string().max(100).required(), + "repositoryType": Joi.string().max(40).required() } }; monitorsValidator.update = { body: { "orgId": Joi.string().max(40).required(), - "name": Joi.string().max(40).required(), - "repositoryName": Joi.string().max(40).required() + "repositoryName": Joi.string().max(40).required(), + "repositoryOwner": Joi.string().max(100).required(), + "repositoryType": Joi.string().max(40).required() } }; diff --git a/server/install.js b/server/install.js index 4e15ebef8..e8296e38a 100755 --- a/server/install.js +++ b/server/install.js @@ -116,7 +116,8 @@ function getDefaultsConfig() { "blueprints":"name", "compositeBlueprints":"name", "containerLogs":"createdOn", - "bots":"createdOn" + "bots":"createdOn", + "gitHub":"createdOn" }, skip_Records : 1, max_record_limit : 200, diff --git a/server/package.json b/server/package.json index 1a23f28dd..99e0c3794 100644 --- a/server/package.json +++ b/server/package.json @@ -74,7 +74,9 @@ "moment": "2.14.1", "json2csv": "3.6.3", "gridfs-stream":"1.1.1", - "mongoose-double": "0.0.1" + "mongoose-double": "0.0.1", + "nodegit": "0.16.0", + "promisify":"0.0.3" }, "devDependencies": { "grunt": "0.4.5", From 336947de55fcb5d6617de6786d4fb6f695d08030 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 13 Jan 2017 15:20:39 +0530 Subject: [PATCH 03/66] GIT Hub Implementation --- client/htmls/private/ajax/Settings/githubList.html | 9 ++++----- client/htmls/private/js/{githubList.js => gitHubList.js} | 3 --- server/app/model/github/github.js | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) rename client/htmls/private/js/{githubList.js => gitHubList.js} (99%) diff --git a/client/htmls/private/ajax/Settings/githubList.html b/client/htmls/private/ajax/Settings/githubList.html index b60d04e7e..476adde66 100644 --- a/client/htmls/private/ajax/Settings/githubList.html +++ b/client/htmls/private/ajax/Settings/githubList.html @@ -30,9 +30,8 @@

- - - + + @@ -77,13 +76,13 @@

- +
- +
diff --git a/client/htmls/private/js/githubList.js b/client/htmls/private/js/gitHubList.js similarity index 99% rename from client/htmls/private/js/githubList.js rename to client/htmls/private/js/gitHubList.js index 26b33fbe6..45aa0d276 100644 --- a/client/htmls/private/js/githubList.js +++ b/client/htmls/private/js/gitHubList.js @@ -17,8 +17,6 @@ if (!$.fn.dataTable.isDataTable('#gitTable')) { "bSortable": false }, { "bSortable": false - }, { - "bSortable": false }] }); @@ -173,7 +171,6 @@ function getGlobalGitServers() { "ajax": '/git-hub', "columns": [ {"data": "repositoryName", "orderable" : true}, - {"data": "repositoryDesc" ,"orderable" : false }, {"data": "orgName","orderable" : false }, {"data": "repositoryOwner" ,"orderable" : false }, {"data": "repositoryType" ,"orderable" : false}, diff --git a/server/app/model/github/github.js b/server/app/model/github/github.js index daddf37e5..141ed5ee4 100644 --- a/server/app/model/github/github.js +++ b/server/app/model/github/github.js @@ -102,7 +102,6 @@ GitHubSchema.statics.createNew = function createNew(gitHubObj, callback) { }; GitHubSchema.statics.getGitHubList = function (params, callback) { - console.log(params); GitHub.paginate(params.queryObj, params.options, function(err, gitRepoList) { if (err) { logger.error(err); From ab1441b83c3a960c74887b7018b2776d1f48b8c7 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 16 Jan 2017 13:12:44 +0530 Subject: [PATCH 04/66] GIT Hub Implementation --- .../app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js | 2 +- server/app/model/bots/1.1/{bots.js => botsDao.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename server/app/model/bots/1.1/{bots.js => botsDao.js} (100%) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index f74a011c5..c127eef6c 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -312,7 +312,7 @@ function deleteRDSResourceData(rdsInfo,providerId, callback) { })(rdsData[i]); } } else { - next(null, dbNames); + next(null, rdsData); } }], function (err, results) { if (err) { diff --git a/server/app/model/bots/1.1/bots.js b/server/app/model/bots/1.1/botsDao.js similarity index 100% rename from server/app/model/bots/1.1/bots.js rename to server/app/model/bots/1.1/botsDao.js From e77d03fb36754ad0d4d89777348a67d89689ee55 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 16 Jan 2017 13:20:02 +0530 Subject: [PATCH 05/66] GIT Hub Implementation --- server/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/package.json b/server/package.json index 99e0c3794..4aaf98450 100644 --- a/server/package.json +++ b/server/package.json @@ -76,7 +76,9 @@ "gridfs-stream":"1.1.1", "mongoose-double": "0.0.1", "nodegit": "0.16.0", - "promisify":"0.0.3" + "promisify":"0.0.3", + "filehound":"1.13.0", + "yamljs":"0.2.8" }, "devDependencies": { "grunt": "0.4.5", From 6e3ac76cd4b0440a89eacc461063e00a5953fdc9 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 16 Jan 2017 16:01:14 +0530 Subject: [PATCH 06/66] GIT Hub Implementation --- server/app/services/botsService.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 72ae9647d..48ea5ce4d 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -26,6 +26,7 @@ var blueprintService = require('_pr/services/blueprintService.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var appConfig = require('_pr/config'); +const gitHubService = require('_pr/services/gitHubService.js'); const errorType = 'botsService'; @@ -481,6 +482,30 @@ function encryptedParam(paramDetails, callback) { } } +botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ + async.waterfall([ + function(next) { + gitHubService.getGitHubById(gitHubId,next); + }, + function(gitHubDetails,next){ + if(gitHubDetails !== null){ + + }else{ + next(null,gitHubDetails); + } + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; + }else { + callback(null, results) + return; + } + }); +} + From e9f4e1c04342110c7173e87a1c33459f5283d3cd Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 18 Jan 2017 11:27:43 +0530 Subject: [PATCH 07/66] Bots Audit Trail Implementation for CFT --- server/app/services/auditTrailService.js | 23 ++---------- server/app/services/botsService.js | 46 ++++++++++++++++++++++++ server/app/services/gitHubService.js | 13 +++---- server/install.js | 1 + 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index 2fb5c2386..e8f321ead 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -194,18 +194,12 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ if(err){ callback(err,null); }else if (botsAudits.length > 0) { - var results = []; for (var i = 0; i < botsAudits.length; i++) { if (botsIds.indexOf(botsAudits[i].auditId) === -1) { botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); } } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } + callback(null,botsIds.length); } else { callback(null,botsIds.length); } @@ -232,18 +226,12 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ if(err){ callback(err,null); }else if (botsAudits.length > 0) { - var results = []; for (var i = 0; i < botsAudits.length; i++) { if (botsIds.indexOf(botsAudits[i].auditId) === -1) { botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); } } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } + callback(null,botsIds.length); } else { callback(null,botsIds.length); } @@ -293,14 +281,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ for (var i = 0; i < botsAudits.length; i++) { if (botsIds.indexOf(botsAudits[i].auditId) === -1) { botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); } } - if (results.length === botsAudits.length) { - callback(null,botsIds.length); - } + callback(null,botsIds.length); } else { callback(null,botsIds.length); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 48ea5ce4d..341132079 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -26,6 +26,8 @@ var blueprintService = require('_pr/services/blueprintService.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); var Cryptography = require('_pr/lib/utils/cryptography'); var appConfig = require('_pr/config'); +const fileHound= require('filehound'); +const yamlJs= require('yamljs'); const gitHubService = require('_pr/services/gitHubService.js'); const errorType = 'botsService'; @@ -489,10 +491,54 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ }, function(gitHubDetails,next){ if(gitHubDetails !== null){ + console.log(JSON.stringify(gitHubDetails)); + var gitHubDirPath = appConfig.gitHubDir + gitHubDetails.repositoryName; + fileHound.create() + .paths(gitHubDirPath) + .ext('yaml') + .find().then(function(files){ + if(files.length > 0){ + var count = 0; + var botObjList = []; + for(var i = 0; i < files.length; i++){ + (function(ymlFile){ + yamlJs.load(ymlFile, function(result) { + if(result !== null){ + count++; + var botsObj={ + name:result.name, + botId:result.id, + desc:result.desc, + category:result.category, + type:result.type, + inputFormFields:result.input.form, + outputOptions:result.output + } + botObjList.push(botsObj); + }else{ + count++; + } + if(count === files.length){ + next(null,botObjList); + } + }); + })(files[i]); + } + + }else{ + logger.info("There is no YAML files in this directory.",gitHubDirPath); + } + }).catch(function(err){ + next(err,null); + }); }else{ next(null,gitHubDetails); } + }, + function(botsObjList,next){ + console.log(JSON.stringify(botsObjList)); + next(null,botsObjList); } ],function(err, results) { if (err){ diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index e3854144a..095ab3506 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -126,13 +126,14 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } } } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var localClonePath = appConfig.gitHubDir + formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ callback(err,null); return; }else{ + callback(null,cloneStatus); callback(null,cloneStatus); return; } @@ -151,7 +152,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } } } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var localClonePath = appConfig.gitHubDir + formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ @@ -176,7 +177,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } } } - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var localClonePath = appConfig.gitHubDir + formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; gitRepoCloning(repoUrl,localClonePath,cloneOpts,gitHubId,function(err,cloneStatus){ if(err){ @@ -188,7 +189,7 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { } }); }else{ - var localClonePath = "/tmp/"+ formattedGitHub.repositoryName; + var localClonePath = appConfig.gitHubDir + formattedGitHub.repositoryName; var repoUrl = "https://github.com/" + formattedGitHub.repositoryOwner + "/" + formattedGitHub.repositoryName + ".git"; gitRepoCloning(repoUrl,localClonePath,{},gitHubId,function(err,cloneStatus){ if(err){ @@ -263,8 +264,8 @@ gitGubService.getGitHubById = function getGitHubById(gitHubId, callback) { err.status = 404; return callback(err); } else{ - formatGitHubResponse(gitHub,function(err,formattedData){ - callback(null,formattedData); + formatGitHubResponse(gitHub,function(formattedData){ + callback(null, formattedData); }); } }); diff --git a/server/install.js b/server/install.js index e8296e38a..9525923ac 100755 --- a/server/install.js +++ b/server/install.js @@ -37,6 +37,7 @@ function getDefaultsConfig() { app_run_port: 3001, catalystDataDir: currentDirectory + '/catdata', javaLibDir: currentDirectory + '/app', + gitHubDir: currentDirectory + '/gitHub/', catalysHomeDirName: 'catalyst', instancePemFilesDirName: 'instance-pemfiles', tempDirName: 'temp', From 2d2da30543d2e18adeb48024a53aa0e5292cd2a0 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 18 Jan 2017 12:48:36 +0530 Subject: [PATCH 08/66] Update code accordining to Review Comments --- server/app/services/auditTrailService.js | 7 ++----- server/app/services/botsService.js | 11 ++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js index e8f321ead..cc7ea0cc6 100644 --- a/server/app/services/auditTrailService.js +++ b/server/app/services/auditTrailService.js @@ -247,10 +247,9 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ if(err){ callback(err,null); } else if(botAuditTrail.length > 0){ - var totalTimeInSeconds = 0,count =0 + var totalTimeInSeconds = 0; for(var i = 0; i < botAuditTrail.length; i++){ (function(auditTrail){ - count++; if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.auditTrailConfig.manualExecutionTime && auditTrail.auditTrailConfig.manualExecutionTime !== null) { var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn); @@ -258,9 +257,7 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){ } })(botAuditTrail[i]); } - if(count === botAuditTrail.length){ - callback(null,(totalTimeInSeconds/60).toFixed(2)); - } + callback(null,(totalTimeInSeconds/60).toFixed(2)); } else{ callback(null,botAuditTrail.length); } diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 341132079..71291e591 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -185,19 +185,13 @@ botsService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) if(err){ next(err,null); }else if (botsAudits.length > 0) { - var results = []; for (var i = 0; i < botsAudits.length; i++) { if (botsIds.indexOf(botsAudits[i].auditId) < 0) { botsIds.push(botsAudits[i].auditId); - results.push(botsAudits[i].auditId); - } else { - results.push(botsAudits[i].auditId); } } - if (results.length === botsAudits.length) { - queryObj.queryObj.botId = {$in:botsIds}; - bots.getBotsList(queryObj, next); - } + queryObj.queryObj.botId = {$in:botsIds}; + bots.getBotsList(queryObj, next); } else { queryObj.queryObj.botId = null; bots.getBotsList(queryObj, next); @@ -537,7 +531,6 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ } }, function(botsObjList,next){ - console.log(JSON.stringify(botsObjList)); next(null,botsObjList); } ],function(err, results) { From b158b678b5d301de10a239512f9595c4b8c394e5 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 18 Jan 2017 15:15:01 +0530 Subject: [PATCH 09/66] Create New Schema for Bots for New Requirement --- server/app/model/bots/1.1/botsDao.js | 45 +++++++++++++++++++--------- server/app/services/botsService.js | 21 ++++++++----- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/server/app/model/bots/1.1/botsDao.js b/server/app/model/bots/1.1/botsDao.js index 49d2a79eb..73d4c6d6b 100644 --- a/server/app/model/bots/1.1/botsDao.js +++ b/server/app/model/bots/1.1/botsDao.js @@ -26,6 +26,11 @@ var BotsSchema = new Schema ({ trim: true, required: true }, + id: { + type: String, + trim: true, + required: true + }, type: { type: String, trim: true, @@ -36,7 +41,7 @@ var BotsSchema = new Schema ({ trim: true, required: true }, - description: { + desc: { type: String, trim: true, required: true @@ -46,7 +51,19 @@ var BotsSchema = new Schema ({ trim: true, required: true }, - yamlDocId:{ + orgName:{ + type: String, + trim: true, + required: true + }, + inputFormFields:Schema.Types.Mixed, + outputOptions:Schema.Types.Mixed, + ymlDocFilePath:{ + type: String, + trim: true, + required: false + }, + scriptDocFilePath:{ type: String, trim: true, required: false @@ -145,7 +162,7 @@ BotsSchema.statics.createNew = function(botsDetail,callback){ }); } BotsSchema.statics.updateBotsDetail = function(botId,botsDetail,callback){ - Bots.update({botId:botId},{$set:botsDetail},{upsert:false}, function(err, updateBotDetail) { + Bots.update({_id:ObjectId(botId)},{$set:botsDetail},{upsert:false}, function(err, updateBotDetail) { if (err) { logger.error(err); var error = new Error('Internal server error'); @@ -170,7 +187,7 @@ BotsSchema.statics.getBotsList = function(botsQuery,callback){ }; BotsSchema.statics.getBotsById = function(botId,callback){ - Bots.find({botId:botId}, function(err, bots) { + Bots.find({_id:ObjectId(botId)}, function(err, bots) { if (err) { logger.error(err); var error = new Error('Internal server error'); @@ -184,8 +201,8 @@ BotsSchema.statics.getBotsById = function(botId,callback){ }); }; -BotsSchema.statics.getAllBots = function(callback){ - Bots.find({isDeleted:false}, function(err, bots) { +BotsSchema.statics.getAllBots = function(queryParam,callback){ + Bots.find(queryParam, function(err, bots) { if (err) { logger.error(err); var error = new Error('Internal server error'); @@ -200,7 +217,7 @@ BotsSchema.statics.getAllBots = function(callback){ }; BotsSchema.statics.removeBotsById = function(botId,callback){ - Bots.remove({botId:botId}, function(err, bots) { + Bots.remove({_id:ObjectId(botId)}, function(err, bots) { if (err) { logger.error(err); var error = new Error('Internal server error'); @@ -213,7 +230,7 @@ BotsSchema.statics.removeBotsById = function(botId,callback){ }; BotsSchema.statics.removeSoftBotsById = function(botId,callback){ - Bots.update({botId:botId},{$set:{isDeleted:true}}, function(err, bots) { + Bots.update({_id:ObjectId(botId)},{$set:{isDeleted:true}}, function(err, bots) { if (err) { logger.error(err); var error = new Error('Internal server error'); @@ -227,7 +244,7 @@ BotsSchema.statics.removeSoftBotsById = function(botId,callback){ BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount(botId,count,callback) { Bots.update({ - botId: botId, + _id:ObjectId(botId), }, { $set: { executionCount: count @@ -245,7 +262,7 @@ BotsSchema.statics.updateBotsExecutionCount = function updateBotsExecutionCount( BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { Bots.find({ - isBotScheduled: true, + isScheduled: true, isDeleted:false }, function (err, bots) { if (err) { @@ -258,7 +275,7 @@ BotsSchema.statics.getScheduledBots = function getScheduledBots(callback) { BotsSchema.statics.updateCronJobIdByBotId = function updateCronJobIdByBotId(botId, cronJobId, callback) { Bots.update({ - "_id": new ObjectId(botId), + "_id": ObjectId(botId), }, { $set: { cronJobId: cronJobId @@ -276,10 +293,10 @@ BotsSchema.statics.updateCronJobIdByBotId = function updateCronJobIdByBotId(botI BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, callback) { Bots.update({ - "_id": new ObjectId(botId), + "_id": ObjectId(botId), }, { $set: { - isBotScheduled: false + isScheduled: false } }, { upsert: false @@ -292,5 +309,5 @@ BotsSchema.statics.updateBotsScheduler = function updateBotsScheduler(botId, cal }); }; -var Bots = mongoose.model('bots', BotsSchema); +var Bots = mongoose.model('botsnew', BotsSchema); module.exports = Bots; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 71291e591..44185f403 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -17,6 +17,7 @@ var logger = require('_pr/logger')(module); var bots = require('_pr/model/bots/1.0/bots.js'); +var botsDao = require('_pr/model/bots/1.1/botsDao.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var taskService = require('_pr/services/taskService.js'); @@ -485,7 +486,6 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ }, function(gitHubDetails,next){ if(gitHubDetails !== null){ - console.log(JSON.stringify(gitHubDetails)); var gitHubDirPath = appConfig.gitHubDir + gitHubDetails.repositoryName; fileHound.create() .paths(gitHubDirPath) @@ -501,14 +501,22 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ count++; var botsObj={ name:result.name, - botId:result.id, + id:result.id, desc:result.desc, category:result.category, type:result.type, inputFormFields:result.input.form, - outputOptions:result.output + outputOptions:result.output, + ymlDocFilePath:ymlFile, + orgId:gitHubDetails.orgId, + orgName:gitHubDetails.orgName } - botObjList.push(botsObj); + botsDao.createNew(botsObj,function(err,data){ + if(err){ + logger.error(err); + } + botObjList.push(botsObj); + }) }else{ count++; } @@ -520,7 +528,7 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ } }else{ - logger.info("There is no YAML files in this directory.",gitHubDirPath); + logger.info("There is no YML files in this directory.",gitHubDirPath); } }).catch(function(err){ next(err,null); @@ -529,9 +537,6 @@ botsService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ }else{ next(null,gitHubDetails); } - }, - function(botsObjList,next){ - next(null,botsObjList); } ],function(err, results) { if (err){ From f5512ca903b54251c9c0c9ece98a222c1436c0e5 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 19 Jan 2017 14:48:38 +0530 Subject: [PATCH 10/66] New Implementation for BOTs --- server/app/routes/v1.0/routes_botsNew.js | 88 +++++++++++++ server/app/services/botsNewService.js | 150 +++++++++++++++++++++++ 2 files changed, 238 insertions(+) create mode 100644 server/app/routes/v1.0/routes_botsNew.js create mode 100644 server/app/services/botsNewService.js diff --git a/server/app/routes/v1.0/routes_botsNew.js b/server/app/routes/v1.0/routes_botsNew.js new file mode 100644 index 000000000..7cc4be1db --- /dev/null +++ b/server/app/routes/v1.0/routes_botsNew.js @@ -0,0 +1,88 @@ +/* + Copyright [2016] [Relevance Lab] + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +// The file contains all the end points for AppDeploy + +var logger = require('_pr/logger')(module); +var botsNewService = require('_pr/services/botsNewService.js'); + + +module.exports.setRoutes = function(app, sessionVerificationFunc) { + app.all('/botsNew/*', sessionVerificationFunc); + + app.get('/botsNew',function(req,res){ + var actionStatus = null; + if(req.query.actionStatus && req.query.actionStatus !== null){ + actionStatus = req.query.actionStatus; + } + botsNewService.getBotsList(req.query,actionStatus, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + + app.delete('/botsNew/:botId',function(req,res){ + botsNewService.removeSoftBotsById(req.params.botId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + app.get('/botsNew/:botId/bots-history',function(req,res){ + botsNewService.getBotsHistory(req.params.botId,req.query, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + + app.get('/botsNew/:botId/bots-history/:historyId',function(req,res){ + botsNewService.getPerticularBotsHistory(req.params.botId,req.params.historyId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data[0]); + } + }) + }); + + app.post('/botsNew/:botId/execute',function(req,res){ + botsNewService.executeBots(req.params.botId, req.body, function (err, data) { + if (err) { + return res.status(500).send(err); + } else { + data.botId=req.params.botId; + return res.status(200).send(data); + } + }) + }); + + app.put('/botsNew/:botId/scheduler',function(req,res){ + botsNewService.updateBotsScheduler(req.params.botId,req.body, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); +}; \ No newline at end of file diff --git a/server/app/services/botsNewService.js b/server/app/services/botsNewService.js new file mode 100644 index 000000000..39878c7dd --- /dev/null +++ b/server/app/services/botsNewService.js @@ -0,0 +1,150 @@ + +/* + Copyright [2016] [Relevance Lab] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +var logger = require('_pr/logger')(module); +var botsDao = require('_pr/model/bots/1.1/botsDao.js'); +var async = require("async"); +var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var appConfig = require('_pr/config'); +const fileHound= require('filehound'); +const yamlJs= require('yamljs'); +const gitHubService = require('_pr/services/gitHubService.js'); + +const errorType = 'botsNewService'; + +var botsNewService = module.exports = {}; + +botsNewService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,callback) { + if(botObj.scheduler && botObj.scheduler !== null && Object.keys(botObj.scheduler).length !== 0) { + botObj.scheduler = apiUtil.createCronJobPattern(botObj.scheduler); + botObj.isScheduled =true; + }else{ + botObj.scheduler ={}; + botObj.isScheduled =false; + } + botsDao.updateBotsDetail(botId,botObj,function(err,data){ + if(err){ + logger.error(err); + callback(err,null); + return; + }else { + botsDao.getBotsById(botId, function (err, botsData) { + if (err) { + logger.error(err); + }else if(botsData.length > 0){ + var schedulerService = require('_pr/services/schedulerService.js'); + schedulerService.executeScheduledBots(botsData[0],function(err,data){ + if(err){ + logger.error("Error in executing BOTs Scheduler"); + } + }); + } else{ + logger.debug("There is no Bots "); + } + }); + callback(null, data); + return; + } + }); +} + +botsNewService.removeBotsById = function removeBotsById(botId,callback){ + botsDao.removeBotsById(botId,function(err,data){ + if(err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,data); + return; + }); +} + +botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ + async.waterfall([ + function(next) { + gitHubService.getGitHubById(gitHubId,next); + }, + function(gitHubDetails,next){ + if(gitHubDetails !== null){ + var gitHubDirPath = appConfig.gitHubDir + gitHubDetails.repositoryName; + fileHound.create() + .paths(gitHubDirPath) + .ext('yaml') + .find().then(function(files){ + if(files.length > 0){ + var count = 0; + var botObjList = []; + for(var i = 0; i < files.length; i++){ + (function(ymlFile){ + yamlJs.load(ymlFile, function(result) { + if(result !== null){ + count++; + var botsObj={ + name:result.name, + id:result.id, + desc:result.desc, + category:result.category, + type:result.type, + inputFormFields:result.input.form, + outputOptions:result.output, + ymlDocFilePath:ymlFile, + orgId:gitHubDetails.orgId, + orgName:gitHubDetails.orgName + } + botsDao.createNew(botsObj,function(err,data){ + if(err){ + logger.error(err); + } + botObjList.push(botsObj); + }) + }else{ + count++; + } + if(count === files.length){ + next(null,botObjList); + } + }); + })(files[i]); + } + + }else{ + logger.info("There is no YML files in this directory.",gitHubDirPath); + } + }).catch(function(err){ + next(err,null); + }); + + }else{ + next(null,gitHubDetails); + } + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; + }else { + callback(null, results) + return; + } + }); +} + + + + From 124769e778bc87ad1b7082df1c501bacf54d58ca Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 20 Jan 2017 11:31:26 +0530 Subject: [PATCH 11/66] New Implementation for BOTs --- server/app/model/bots/1.1/botsDao.js | 1 + server/app/services/botsNewService.js | 88 ++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/server/app/model/bots/1.1/botsDao.js b/server/app/model/bots/1.1/botsDao.js index 73d4c6d6b..8d714a59a 100644 --- a/server/app/model/bots/1.1/botsDao.js +++ b/server/app/model/bots/1.1/botsDao.js @@ -58,6 +58,7 @@ var BotsSchema = new Schema ({ }, inputFormFields:Schema.Types.Mixed, outputOptions:Schema.Types.Mixed, + params:Schema.Types.Mixed, ymlDocFilePath:{ type: String, trim: true, diff --git a/server/app/services/botsNewService.js b/server/app/services/botsNewService.js index 39878c7dd..451a17c5a 100644 --- a/server/app/services/botsNewService.js +++ b/server/app/services/botsNewService.js @@ -19,6 +19,7 @@ var logger = require('_pr/logger')(module); var botsDao = require('_pr/model/bots/1.1/botsDao.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var Cryptography = require('_pr/lib/utils/cryptography'); var appConfig = require('_pr/config'); const fileHound= require('filehound'); const yamlJs= require('yamljs'); @@ -42,20 +43,6 @@ botsNewService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,c callback(err,null); return; }else { - botsDao.getBotsById(botId, function (err, botsData) { - if (err) { - logger.error(err); - }else if(botsData.length > 0){ - var schedulerService = require('_pr/services/schedulerService.js'); - schedulerService.executeScheduledBots(botsData[0],function(err,data){ - if(err){ - logger.error("Error in executing BOTs Scheduler"); - } - }); - } else{ - logger.debug("There is no Bots "); - } - }); callback(null, data); return; } @@ -74,6 +61,59 @@ botsNewService.removeBotsById = function removeBotsById(botId,callback){ }); } +botsNewService.executeBots = function executeBots(botId,reqBody,callback){ + async.waterfall([ + function(next){ + if(reqBody !== null + && reqBody.scriptParams + && reqBody.scriptParams !== null){ + encryptedParam(reqBody.scriptParams,next); + }else{ + next(null,[]); + } + }, + function(encryptedParamList,next) { + if(encryptedParamList.length > 0){ + botsDao.updateBotsDetail(botId,{params:encryptedParamList},function(err,botsData){ + if(err){ + next(err); + }else{ + botsDao.getBotsById(botId, next); + } + }) + }else { + botsDao.getBotsById(botId, next); + } + }, + function(bots,next){ + if(bots.length > 0){ + if(bots[0].botLinkedCategory === 'Task'){ + if(reqBody === null) { + taskService.executeTask(botId, 'system', 'undefined', 'undefined', 'undefined', 'undefined', 'undefined', callback); + }else{ + taskService.executeTask(botId, reqBody.userName ? reqBody.userName : 'system', reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', + reqBody.choiceParam ? reqBody.choiceParam : 'undefined', reqBody.appData ? reqBody.appData : 'undefined', reqBody.paramOptions ? reqBody.paramOptions : 'undefined', + reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); + } + }else{ + blueprintService.launch(botId,reqBody,callback) + } + }else{ + next({errCode:400, errMsg:"Bots is not exist in DB"},null) + } + } + ],function(err,results){ + if(err){ + logger.error(err); + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }); +} + botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ async.waterfall([ function(next) { @@ -145,6 +185,26 @@ botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callbac }); } +function encryptedParam(paramDetails, callback) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var encryptedList = []; + if(paramDetails.length > 0) { + for (var i = 0; i < paramDetails.length; i++) { + var encryptedText = cryptography.encryptText(paramDetails[i].paramVal, cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedList.push({ + paramVal: encryptedText, + paramDesc: paramDetails[i].paramDesc, + paramType: paramDetails[i].paramType + }); + } + callback(null,encryptedList); + }else{ + callback(null,encryptedList); + } +} + From d668cf99d526cdc8cdaa6d270f7ed3c2dd63eace Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 23 Jan 2017 15:10:25 +0530 Subject: [PATCH 12/66] Remove mandatory for Instance Username for CFT --- .../sections/dashboard/design/view/blueprintCreate.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html index 7db32927b..b70888ddc 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -535,9 +535,9 @@ Configure Resource : {{key}}
- - + +
From 1887c90d33d7c211dc1732b35814d11973fae8f1 Mon Sep 17 00:00:00 2001 From: Udesh Kumar Date: Mon, 23 Jan 2017 19:37:18 +0530 Subject: [PATCH 13/66] Removed firebase code --- client/cat3/main.html | 3 - client/cat3/src/main.js | 2 +- .../angular-drag-and-drop-lists.min.js | 590 ------------------ 3 files changed, 1 insertion(+), 594 deletions(-) delete mode 100644 client/cat3/src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js diff --git a/client/cat3/main.html b/client/cat3/main.html index f55d9bff2..b3619babc 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -36,9 +36,6 @@ - - - diff --git a/client/cat3/src/main.js b/client/cat3/src/main.js index 5b0fde688..b1dc91af7 100644 --- a/client/cat3/src/main.js +++ b/client/cat3/src/main.js @@ -12,7 +12,7 @@ * All modules/feature will be through * */ -var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr','firebase', +var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr', 'global.login', 'global.breadcrumb', 'authentication', diff --git a/client/cat3/src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js b/client/cat3/src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js deleted file mode 100644 index 46c5a2d4a..000000000 --- a/client/cat3/src/partials/globals/drag-and-drop/angular-drag-and-drop-lists.min.js +++ /dev/null @@ -1,590 +0,0 @@ -/** - * angular-drag-and-drop-lists v1.4.0 - * - * Copyright (c) 2014 Marcel Juenemann marcel@juenemann.cc - * Copyright (c) 2014-2016 Google Inc. - * https://github.com/marceljuenemann/angular-drag-and-drop-lists - * - * License: MIT - */ -angular.module('dndLists', []) - - /** - * Use the dnd-draggable attribute to make your element draggable - * - * Attributes: - * - dnd-draggable Required attribute. The value has to be an object that represents the data - * of the element. In case of a drag and drop operation the object will be - * serialized and unserialized on the receiving end. - * - dnd-selected Callback that is invoked when the element was clicked but not dragged. - * The original click event will be provided in the local event variable. - * - dnd-effect-allowed Use this attribute to limit the operations that can be performed. Options: - * - "move": The drag operation will move the element. This is the default. - * - "copy": The drag operation will copy the element. Shows a copy cursor. - * - "copyMove": The user can choose between copy and move by pressing the - * ctrl or shift key. *Not supported in IE:* In Internet Explorer this - * option will be the same as "copy". *Not fully supported in Chrome on - * Windows:* In the Windows version of Chrome the cursor will always be the - * move cursor. However, when the user drops an element and has the ctrl - * key pressed, we will perform a copy anyways. - * - HTML5 also specifies the "link" option, but this library does not - * actively support it yet, so use it at your own risk. - * - dnd-moved Callback that is invoked when the element was moved. Usually you will - * remove your element from the original list in this callback, since the - * directive is not doing that for you automatically. The original dragend - * event will be provided in the local event variable. - * - dnd-canceled Callback that is invoked if the element was dragged, but the operation was - * canceled and the element was not dropped. The original dragend event will - * be provided in the local event variable. - * - dnd-copied Same as dnd-moved, just that it is called when the element was copied - * instead of moved. The original dragend event will be provided in the local - * event variable. - * - dnd-dragstart Callback that is invoked when the element was dragged. The original - * dragstart event will be provided in the local event variable. - * - dnd-dragend Callback that is invoked when the drag operation ended. Available local - * variables are event and dropEffect. - * - dnd-type Use this attribute if you have different kinds of items in your - * application and you want to limit which items can be dropped into which - * lists. Combine with dnd-allowed-types on the dnd-list(s). This attribute - * should evaluate to a string, although this restriction is not enforced. - * - dnd-disable-if You can use this attribute to dynamically disable the draggability of the - * element. This is useful if you have certain list items that you don't want - * to be draggable, or if you want to disable drag & drop completely without - * having two different code branches (e.g. only allow for admins). - * **Note**: If your element is not draggable, the user is probably able to - * select text or images inside of it. Since a selection is always draggable, - * this breaks your UI. You most likely want to disable user selection via - * CSS (see user-select). - * - * CSS classes: - * - dndDragging This class will be added to the element while the element is being - * dragged. It will affect both the element you see while dragging and the - * source element that stays at it's position. Do not try to hide the source - * element with this class, because that will abort the drag operation. - * - dndDraggingSource This class will be added to the element after the drag operation was - * started, meaning it only affects the original element that is still at - * it's source position, and not the "element" that the user is dragging with - * his mouse pointer. - */ - .directive('dndDraggable', ['$parse', '$timeout', 'dndDropEffectWorkaround', 'dndDragTypeWorkaround', - function($parse, $timeout, dndDropEffectWorkaround, dndDragTypeWorkaround) { - return function(scope, element, attr) { - // Set the HTML5 draggable attribute on the element - element.attr("draggable", "true"); - - // If the dnd-disable-if attribute is set, we have to watch that - if (attr.dndDisableIf) { - scope.$watch(attr.dndDisableIf, function(disabled) { - element.attr("draggable", !disabled); - }); - } - - /** - * When the drag operation is started we have to prepare the dataTransfer object, - * which is the primary way we communicate with the target element - */ - element.on('dragstart', function(event) { - event = event.originalEvent || event; - - // Check whether the element is draggable, since dragstart might be triggered on a child. - if (element.attr('draggable') == 'false') return true; - - // Serialize the data associated with this element. IE only supports the Text drag type - event.dataTransfer.setData("Text", angular.toJson(scope.$eval(attr.dndDraggable))); - - // Only allow actions specified in dnd-effect-allowed attribute - event.dataTransfer.effectAllowed = attr.dndEffectAllowed || "move"; - - // Add CSS classes. See documentation above - element.addClass("dndDragging"); - $timeout(function() { element.addClass("dndDraggingSource"); }, 0); - - // Workarounds for stupid browsers, see description below - dndDropEffectWorkaround.dropEffect = "none"; - dndDragTypeWorkaround.isDragging = true; - - // Save type of item in global state. Usually, this would go into the dataTransfer - // typename, but we have to use "Text" there to support IE - dndDragTypeWorkaround.dragType = attr.dndType ? scope.$eval(attr.dndType) : undefined; - - // Try setting a proper drag image if triggered on a dnd-handle (won't work in IE). - if (event._dndHandle && event.dataTransfer.setDragImage) { - event.dataTransfer.setDragImage(element[0], 0, 0); - } - - // Invoke callback - $parse(attr.dndDragstart)(scope, {event: event}); - - event.stopPropagation(); - }); - - /** - * The dragend event is triggered when the element was dropped or when the drag - * operation was aborted (e.g. hit escape button). Depending on the executed action - * we will invoke the callbacks specified with the dnd-moved or dnd-copied attribute. - */ - element.on('dragend', function(event) { - event = event.originalEvent || event; - - // Invoke callbacks. Usually we would use event.dataTransfer.dropEffect to determine - // the used effect, but Chrome has not implemented that field correctly. On Windows - // it always sets it to 'none', while Chrome on Linux sometimes sets it to something - // else when it's supposed to send 'none' (drag operation aborted). - var dropEffect = dndDropEffectWorkaround.dropEffect; - scope.$apply(function() { - switch (dropEffect) { - case "move": - $parse(attr.dndMoved)(scope, {event: event}); - break; - case "copy": - $parse(attr.dndCopied)(scope, {event: event}); - break; - case "none": - $parse(attr.dndCanceled)(scope, {event: event}); - break; - } - $parse(attr.dndDragend)(scope, {event: event, dropEffect: dropEffect}); - }); - - // Clean up - element.removeClass("dndDragging"); - $timeout(function() { element.removeClass("dndDraggingSource"); }, 0); - dndDragTypeWorkaround.isDragging = false; - event.stopPropagation(); - }); - - /** - * When the element is clicked we invoke the callback function - * specified with the dnd-selected attribute. - */ - element.on('click', function(event) { - if (!attr.dndSelected) return; - - event = event.originalEvent || event; - scope.$apply(function() { - $parse(attr.dndSelected)(scope, {event: event}); - }); - - // Prevent triggering dndSelected in parent elements. - event.stopPropagation(); - }); - - /** - * Workaround to make element draggable in IE9 - */ - element.on('selectstart', function() { - if (this.dragDrop) this.dragDrop(); - }); - }; - }]) - - /** - * Use the dnd-list attribute to make your list element a dropzone. Usually you will add a single - * li element as child with the ng-repeat directive. If you don't do that, we will not be able to - * position the dropped element correctly. If you want your list to be sortable, also add the - * dnd-draggable directive to your li element(s). Both the dnd-list and it's direct children must - * have position: relative CSS style, otherwise the positioning algorithm will not be able to - * determine the correct placeholder position in all browsers. - * - * Attributes: - * - dnd-list Required attribute. The value has to be the array in which the data of - * the dropped element should be inserted. - * - dnd-allowed-types Optional array of allowed item types. When used, only items that had a - * matching dnd-type attribute will be dropable. - * - dnd-disable-if Optional boolean expresssion. When it evaluates to true, no dropping - * into the list is possible. Note that this also disables rearranging - * items inside the list. - * - dnd-horizontal-list Optional boolean expresssion. When it evaluates to true, the positioning - * algorithm will use the left and right halfs of the list items instead of - * the upper and lower halfs. - * - dnd-dragover Optional expression that is invoked when an element is dragged over the - * list. If the expression is set, but does not return true, the element is - * not allowed to be dropped. The following variables will be available: - * - event: The original dragover event sent by the browser. - * - index: The position in the list at which the element would be dropped. - * - type: The dnd-type set on the dnd-draggable, or undefined if unset. - * - external: Whether the element was dragged from an external source. - * - dnd-drop Optional expression that is invoked when an element is dropped on the - * list. The following variables will be available: - * - event: The original drop event sent by the browser. - * - index: The position in the list at which the element would be dropped. - * - item: The transferred object. - * - type: The dnd-type set on the dnd-draggable, or undefined if unset. - * - external: Whether the element was dragged from an external source. - * The return value determines the further handling of the drop: - * - false: The drop will be canceled and the element won't be inserted. - * - true: Signalises that the drop is allowed, but the dnd-drop - * callback already took care of inserting the element. - * - otherwise: All other return values will be treated as the object to - * insert into the array. In most cases you want to simply return the - * item parameter, but there are no restrictions on what you can return. - * - dnd-inserted Optional expression that is invoked after a drop if the element was - * actually inserted into the list. The same local variables as for - * dnd-drop will be available. Note that for reorderings inside the same - * list the old element will still be in the list due to the fact that - * dnd-moved was not called yet. - * - dnd-external-sources Optional boolean expression. When it evaluates to true, the list accepts - * drops from sources outside of the current browser tab. This allows to - * drag and drop accross different browser tabs. Note that this will allow - * to drop arbitrary text into the list, thus it is highly recommended to - * implement the dnd-drop callback to check the incoming element for - * sanity. Furthermore, the dnd-type of external sources can not be - * determined, therefore do not rely on restrictions of dnd-allowed-type. - * - * CSS classes: - * - dndPlaceholder When an element is dragged over the list, a new placeholder child - * element will be added. This element is of type li and has the class - * dndPlaceholder set. Alternatively, you can define your own placeholder - * by creating a child element with dndPlaceholder class. - * - dndDragover Will be added to the list while an element is dragged over the list. - */ - .directive('dndList', ['$parse', '$timeout', 'dndDropEffectWorkaround', 'dndDragTypeWorkaround', - function($parse, $timeout, dndDropEffectWorkaround, dndDragTypeWorkaround) { - return function(scope, element, attr) { - // While an element is dragged over the list, this placeholder element is inserted - // at the location where the element would be inserted after dropping - var placeholder = getPlaceholderElement(); - var placeholderNode = placeholder[0]; - var listNode = element[0]; - placeholder.remove(); - - var horizontal = attr.dndHorizontalList && scope.$eval(attr.dndHorizontalList); - var externalSources = attr.dndExternalSources && scope.$eval(attr.dndExternalSources); - - /** - * The dragenter event is fired when a dragged element or text selection enters a valid drop - * target. According to the spec, we either need to have a dropzone attribute or listen on - * dragenter events and call preventDefault(). It should be noted though that no browser seems - * to enforce this behaviour. - */ - element.on('dragenter', function (event) { - event = event.originalEvent || event; - if (!isDropAllowed(event)) return true; - event.preventDefault(); - }); - - /** - * The dragover event is triggered "every few hundred milliseconds" while an element - * is being dragged over our list, or over an child element. - */ - element.on('dragover', function(event) { - event = event.originalEvent || event; - - if (!isDropAllowed(event)) return true; - - // First of all, make sure that the placeholder is shown - // This is especially important if the list is empty - if (placeholderNode.parentNode != listNode) { - element.append(placeholder); - } - - if (event.target !== listNode) { - // Try to find the node direct directly below the list node. - var listItemNode = event.target; - while (listItemNode.parentNode !== listNode && listItemNode.parentNode) { - listItemNode = listItemNode.parentNode; - } - - if (listItemNode.parentNode === listNode && listItemNode !== placeholderNode) { - // If the mouse pointer is in the upper half of the child element, - // we place it before the child element, otherwise below it. - if (isMouseInFirstHalf(event, listItemNode)) { - listNode.insertBefore(placeholderNode, listItemNode); - } else { - listNode.insertBefore(placeholderNode, listItemNode.nextSibling); - } - } - } else { - // This branch is reached when we are dragging directly over the list element. - // Usually we wouldn't need to do anything here, but the IE does not fire it's - // events for the child element, only for the list directly. Therefore, we repeat - // the positioning algorithm for IE here. - if (isMouseInFirstHalf(event, placeholderNode, true)) { - // Check if we should move the placeholder element one spot towards the top. - // Note that display none elements will have offsetTop and offsetHeight set to - // zero, therefore we need a special check for them. - while (placeholderNode.previousElementSibling - && (isMouseInFirstHalf(event, placeholderNode.previousElementSibling, true) - || placeholderNode.previousElementSibling.offsetHeight === 0)) { - listNode.insertBefore(placeholderNode, placeholderNode.previousElementSibling); - } - } else { - // Check if we should move the placeholder element one spot towards the bottom - while (placeholderNode.nextElementSibling && - !isMouseInFirstHalf(event, placeholderNode.nextElementSibling, true)) { - listNode.insertBefore(placeholderNode, - placeholderNode.nextElementSibling.nextElementSibling); - } - } - } - - // At this point we invoke the callback, which still can disallow the drop. - // We can't do this earlier because we want to pass the index of the placeholder. - if (attr.dndDragover && !invokeCallback(attr.dndDragover, event, getPlaceholderIndex())) { - return stopDragover(); - } - - element.addClass("dndDragover"); - event.preventDefault(); - event.stopPropagation(); - return false; - }); - - /** - * When the element is dropped, we use the position of the placeholder element as the - * position where we insert the transferred data. This assumes that the list has exactly - * one child element per array element. - */ - element.on('drop', function(event) { - event = event.originalEvent || event; - - if (!isDropAllowed(event)) return true; - - // The default behavior in Firefox is to interpret the dropped element as URL and - // forward to it. We want to prevent that even if our drop is aborted. - event.preventDefault(); - - // Unserialize the data that was serialized in dragstart. According to the HTML5 specs, - // the "Text" drag type will be converted to text/plain, but IE does not do that. - var data = event.dataTransfer.getData("Text") || event.dataTransfer.getData("text/plain"); - var transferredObject; - try { - transferredObject = JSON.parse(data); - } catch(e) { - return stopDragover(); - } - - // Invoke the callback, which can transform the transferredObject and even abort the drop. - var index = getPlaceholderIndex(); - if (attr.dndDrop) { - transferredObject = invokeCallback(attr.dndDrop, event, index, transferredObject); - if (!transferredObject) { - return stopDragover(); - } - } - - // Insert the object into the array, unless dnd-drop took care of that (returned true). - if (transferredObject !== true) { - scope.$apply(function() { - scope.$eval(attr.dndList).splice(index, 0, transferredObject); - }); - } - invokeCallback(attr.dndInserted, event, index, transferredObject); - - // In Chrome on Windows the dropEffect will always be none... - // We have to determine the actual effect manually from the allowed effects - if (event.dataTransfer.dropEffect === "none") { - if (event.dataTransfer.effectAllowed === "copy" || - event.dataTransfer.effectAllowed === "move") { - dndDropEffectWorkaround.dropEffect = event.dataTransfer.effectAllowed; - } else { - dndDropEffectWorkaround.dropEffect = event.ctrlKey ? "copy" : "move"; - } - } else { - dndDropEffectWorkaround.dropEffect = event.dataTransfer.dropEffect; - } - - // Clean up - stopDragover(); - event.stopPropagation(); - return false; - }); - - /** - * We have to remove the placeholder when the element is no longer dragged over our list. The - * problem is that the dragleave event is not only fired when the element leaves our list, - * but also when it leaves a child element -- so practically it's fired all the time. As a - * workaround we wait a few milliseconds and then check if the dndDragover class was added - * again. If it is there, dragover must have been called in the meantime, i.e. the element - * is still dragging over the list. If you know a better way of doing this, please tell me! - */ - element.on('dragleave', function(event) { - event = event.originalEvent || event; - - element.removeClass("dndDragover"); - $timeout(function() { - if (!element.hasClass("dndDragover")) { - placeholder.remove(); - } - }, 100); - }); - - /** - * Checks whether the mouse pointer is in the first half of the given target element. - * - * In Chrome we can just use offsetY, but in Firefox we have to use layerY, which only - * works if the child element has position relative. In IE the events are only triggered - * on the listNode instead of the listNodeItem, therefore the mouse positions are - * relative to the parent element of targetNode. - */ - function isMouseInFirstHalf(event, targetNode, relativeToParent) { - var mousePointer = horizontal ? (event.offsetX || event.layerX) - : (event.offsetY || event.layerY); - var targetSize = horizontal ? targetNode.offsetWidth : targetNode.offsetHeight; - var targetPosition = horizontal ? targetNode.offsetLeft : targetNode.offsetTop; - targetPosition = relativeToParent ? targetPosition : 0; - return mousePointer < targetPosition + targetSize / 2; - } - - /** - * Tries to find a child element that has the dndPlaceholder class set. If none was found, a - * new li element is created. - */ - function getPlaceholderElement() { - var placeholder; - angular.forEach(element.children(), function(childNode) { - var child = angular.element(childNode); - if (child.hasClass('dndPlaceholder')) { - placeholder = child; - } - }); - return placeholder || angular.element("
  • "); - } - - /** - * We use the position of the placeholder node to determine at which position of the array the - * object needs to be inserted - */ - function getPlaceholderIndex() { - return Array.prototype.indexOf.call(listNode.children, placeholderNode); - } - - /** - * Checks various conditions that must be fulfilled for a drop to be allowed - */ - function isDropAllowed(event) { - // Disallow drop from external source unless it's allowed explicitly. - if (!dndDragTypeWorkaround.isDragging && !externalSources) return false; - - // Check mimetype. Usually we would use a custom drag type instead of Text, but IE doesn't - // support that. - if (!hasTextMimetype(event.dataTransfer.types)) return false; - - // Now check the dnd-allowed-types against the type of the incoming element. For drops from - // external sources we don't know the type, so it will need to be checked via dnd-drop. - if (attr.dndAllowedTypes && dndDragTypeWorkaround.isDragging) { - var allowed = scope.$eval(attr.dndAllowedTypes); - if (angular.isArray(allowed) && allowed.indexOf(dndDragTypeWorkaround.dragType) === -1) { - return false; - } - } - - // Check whether droping is disabled completely - if (attr.dndDisableIf && scope.$eval(attr.dndDisableIf)) return false; - - return true; - } - - /** - * Small helper function that cleans up if we aborted a drop. - */ - function stopDragover() { - placeholder.remove(); - element.removeClass("dndDragover"); - return true; - } - - /** - * Invokes a callback with some interesting parameters and returns the callbacks return value. - */ - function invokeCallback(expression, event, index, item) { - return $parse(expression)(scope, { - event: event, - index: index, - item: item || undefined, - external: !dndDragTypeWorkaround.isDragging, - type: dndDragTypeWorkaround.isDragging ? dndDragTypeWorkaround.dragType : undefined - }); - } - - /** - * Check if the dataTransfer object contains a drag type that we can handle. In old versions - * of IE the types collection will not even be there, so we just assume a drop is possible. - */ - function hasTextMimetype(types) { - if (!types) return true; - for (var i = 0; i < types.length; i++) { - if (types[i] === "Text" || types[i] === "text/plain") return true; - } - - return false; - } - }; - }]) - - /** - * Use the dnd-nodrag attribute inside of dnd-draggable elements to prevent them from starting - * drag operations. This is especially useful if you want to use input elements inside of - * dnd-draggable elements or create specific handle elements. Note: This directive does not work - * in Internet Explorer 9. - */ - .directive('dndNodrag', function() { - return function(scope, element, attr) { - // Set as draggable so that we can cancel the events explicitly - element.attr("draggable", "true"); - - /** - * Since the element is draggable, the browser's default operation is to drag it on dragstart. - * We will prevent that and also stop the event from bubbling up. - */ - element.on('dragstart', function(event) { - event = event.originalEvent || event; - - if (!event._dndHandle) { - // If a child element already reacted to dragstart and set a dataTransfer object, we will - // allow that. For example, this is the case for user selections inside of input elements. - if (!(event.dataTransfer.types && event.dataTransfer.types.length)) { - event.preventDefault(); - } - event.stopPropagation(); - } - }); - - /** - * Stop propagation of dragend events, otherwise dnd-moved might be triggered and the element - * would be removed. - */ - element.on('dragend', function(event) { - event = event.originalEvent || event; - if (!event._dndHandle) { - event.stopPropagation(); - } - }); - }; - }) - - /** - * Use the dnd-handle directive within a dnd-nodrag element in order to allow dragging with that - * element after all. Therefore, by combining dnd-nodrag and dnd-handle you can allow - * dnd-draggable elements to only be dragged via specific "handle" elements. Note that Internet - * Explorer will show the handle element as drag image instead of the dnd-draggable element. You - * can work around this by styling the handle element differently when it is being dragged. Use - * the CSS selector .dndDragging:not(.dndDraggingSource) [dnd-handle] for that. - */ - .directive('dndHandle', function() { - return function(scope, element, attr) { - element.attr("draggable", "true"); - - element.on('dragstart dragend', function(event) { - event = event.originalEvent || event; - event._dndHandle = true; - }); - }; - }) - - /** - * This workaround handles the fact that Internet Explorer does not support drag types other than - * "Text" and "URL". That means we can not know whether the data comes from one of our elements or - * is just some other data like a text selection. As a workaround we save the isDragging flag in - * here. When a dropover event occurs, we only allow the drop if we are already dragging, because - * that means the element is ours. - */ - .factory('dndDragTypeWorkaround', function(){ return {} }) - - /** - * Chrome on Windows does not set the dropEffect field, which we need in dragend to determine - * whether a drag operation was successful. Therefore we have to maintain it in this global - * variable. The bug report for that has been open for years: - * https://code.google.com/p/chromium/issues/detail?id=39399 - */ - .factory('dndDropEffectWorkaround', function(){ return {} }); \ No newline at end of file From f9424d4870166b648c6f2b3b28e9442557b3b4c5 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 24 Jan 2017 14:53:58 +0530 Subject: [PATCH 14/66] js bug fixed --- .../dashboard/analytics/analytics.html | 2 +- .../sections/dashboard/analytics/analytics.js | 3 +- .../controller/capacityReportCtrl.js | 30 +++++++++---------- .../controller/discoveryResourcesCtrl.js | 30 +++++++++---------- .../controller/discoverySyncResultCtrl.js | 6 ++-- .../controller/discoveryTagMappingCtrl.js | 8 ++--- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index d36774c2c..26ade8722 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -125,7 +125,7 @@ - +
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 410b3c6ee..59beeae48 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -128,7 +128,8 @@ $rootScope.$emit('HEADER_NAV_CHANGE', 'ANALYTICS'); $scope.selectedResources = []; analytic.viewByFilter='orgView'; - $scope.$watch(function() { return analytic.viewByFilter}, function(newVal) { + $scope.$watch(function() { + return analytic.viewByFilter}, function(newVal) { if(newVal === 'ProviderView'){ $rootScope.viewType='ProviderView'; if($state.params && $state.params.filterView){ diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 3f426b8a0..e1024dd05 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -93,7 +93,7 @@ }); }; $scope.chefConfig=function (id) { - var promise = genSevs.editRunlist(id); + genSevs.editRunlist(id); }; capRept.createList = function () { capRept.filterValue=''; @@ -106,7 +106,7 @@ capRept.listGrid[value].data=[]; capRept.listGrid[value].paginationPageSizes= [25, 50, 100]; capRept.listGrid[value].paginationPageSize=25; - $scope.colArray=['platformId','state','orgName','privateIpAddress','os'] + $scope.colArray=['platformId','state','orgName','privateIpAddress','os']; if(capRept.serviceType === 'EC2') { capRept.listGrid[value].columnDefs = [ {name: 'Instance Id', field: 'platformId', cellTooltip: true}, @@ -134,7 +134,7 @@ ]; } if(capRept.serviceType === 'RDS') { - $scope.colArray=['platformId','state','orgName','dbEngine'] + $scope.colArray=['platformId','state','orgName','dbEngine']; capRept.listGrid[value].columnDefs = [ {name: 'Instance', field: 'platformId', cellTooltip: true}, {name: 'dbEngine', enableFiltering: true, displayName: 'Engine', field: 'dbEngine', cellTooltip: true}, @@ -160,7 +160,7 @@ ]; } if(capRept.serviceType === 'S3'){ - $scope.colArray=['bucketName','bucketOwnerName','orgName'] + $scope.colArray=['bucketName','bucketOwnerName','orgName']; capRept.listGrid[value].columnDefs=[ {name: 'bucketName', field: 'bucketName', cellTooltip: true}, {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, @@ -168,12 +168,12 @@ {name: 'orgName', field: 'orgName', cellTooltip: true}, {name: 'cost', displayName: 'Cost',cellTemplate: ''}, {name: 'Action', cellTooltip: true,cellTemplate:" "} - ] + ]; } capRept.listGrid[value].onRegisterApi=function (gridApi) { gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); $scope.gridApi = gridApi; - } + }; if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { @@ -215,19 +215,19 @@ capRept.listGrid[value].data[k].showSchedule=true; } }); - if(capRept.listGrid[value].data && capRept.listGrid[value].data.length == 0){ + if(capRept.listGrid[value].data && capRept.listGrid[value].data.length === 0){ capRept.listGrid[value].nodataFound =true; } else { capRept.listGrid[value].nodataFound =false; } }); } else if(fltrObj && fltrObj.provider && fltrObj.provider.id){ - var param = { + var paramResources= { inlineLoader:true, url: '/resources?filterBy=providerDetails.id:'+fltrObj.provider.id+',resourceType:'+capRept.serviceType+',category:'+$rootScope.organNewEnt.instanceType.toLowerCase() // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramResources).then(function (instResult) { ///// capRept.listGrid[value].data = instResult.data; if(capRept.serviceType === 'RDS'){ @@ -255,7 +255,7 @@ /// - if(capRept.listGrid[value].data && capRept.listGrid[value].data.length == 0){ + if(capRept.listGrid[value].data && capRept.listGrid[value].data.length === 0){ capRept.listGrid[value].nodataFound =true; } else { capRept.listGrid[value].nodataFound =false; @@ -265,7 +265,7 @@ //} }; - $scope.$watch('capRept.serviceType',function (newValue, oldValue) { + $scope.$watch('capRept.serviceType',function () { capRept.createList(); }); $scope.aggregateInstanceCost=function (cost) { @@ -363,11 +363,11 @@ var $yesterday = new Date($today); $yesterday.setDate($today.getDate() - 1); if(fltObj && fltObj.resources && fltObj.resources.length >0) { - var $today = new Date(); - var $yesterday = new Date($today); - $yesterday.setDate($today.getDate() - 1); + var $todayA = new Date(); + var $yesterdayA = new Date($todayA); + $yesterday.setDate($todayA.getDate() - 1); var param = { - url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterday + '&toTimeStamp=' + $today + '&interval=3600' + url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterdayA + '&toTimeStamp=' + $todayA + '&interval=3600' //url:'src/partials/sections/dashboard/analytics/data/usage.json' }; genSevs.promiseGet(param).then(function (result) { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index feb82a3f4..d7585f44e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -33,14 +33,14 @@ $scope.TagName.environmentTag=instResult.tagName+'-en'; $scope.TagName.envFild='tags.'+instResult.tagName; angular.forEach(instResult.tagValues,function(val){ - $scope.TagName.environment.push({id:val,name:val}) + $scope.TagName.environment.push({id:val,name:val}); }); }); // Bu - var param = { + var paramProviders = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/businessGroup' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramProviders).then(function (instResult) { $scope.TagName.bgTag=instResult.tagName+'-bu'; $scope.TagName.bgFild='tags.'+instResult.tagName; angular.forEach(instResult.tagValues,function(val){ @@ -48,14 +48,14 @@ }); }); // project - var param = { + var paramP = { url: '/providers/' + fltrObj.provider.id + '/tag-mappings/project' }; - genSevs.promiseGet(param).then(function (instResult) { + genSevs.promiseGet(paramP).then(function (instResult) { $scope.TagName.projectTag=instResult.tagName+'-pr'; $scope.TagName.projFild='tags.'+instResult.tagName; angular.forEach(instResult.tagValues,function(val){ - $scope.TagName.project.push({id:val,name:val}) + $scope.TagName.project.push({id:val,name:val}); }); }); @@ -313,7 +313,7 @@ }, 1000); } }; - disResrc.importInstance =function ($event) { + disResrc.importInstance =function () { var modalInstance = $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/analytics/view/instanceManage.html', @@ -346,7 +346,7 @@ var treeNames = ['Cloud Management','Discovery','Resources']; $rootScope.$emit('treeNameUpdate', treeNames); var fltrObj=$rootScope.filterNewEnt; - $rootScope.applyFilter =function(filterApp,period){ + $rootScope.applyFilter =function(){ analyticsServices.applyFilter(true,null); disResrc.init(); }; @@ -384,7 +384,7 @@ //get configmanagement var params={ url:'/d4dMasters/organization/'+$scope.IMGNewEnt.org.orgid+'/configmanagement/list' - } + }; genericServices.promiseGet(params).then(function (list) { $scope.configOptions=list; }); @@ -392,7 +392,7 @@ //get monitors var monitorParam={ url:'/monitors?filterBy=orgId:' + $scope.IMGNewEnt.org.orgid - } + }; genericServices.promiseGet(monitorParam).then(function (list) { $scope.monitorList = list; }); @@ -412,7 +412,7 @@ } }; $scope.ok = function() { - if($scope.monitorId == 'null') { + if($scope.monitorId === 'null') { $scope.monitorId = null; } $scope.importSpinner = true; @@ -420,7 +420,7 @@ reqBody.orgId = $scope.IMGNewEnt.org.orgid; reqBody.bgId = $scope.IMGNewEnt.buss.rowid; reqBody.projectId = $scope.IMGNewEnt.proj.rowId; - reqBody.envId = $scope.IMGNewEnt.env.rowid + reqBody.envId = $scope.IMGNewEnt.env.rowid; reqBody.orgName = $scope.IMGNewEnt.org.name; reqBody.bgName = $scope.IMGNewEnt.buss.name; reqBody.projectName = $scope.IMGNewEnt.proj.name; @@ -438,7 +438,7 @@ inlineLoader: true, url:'/providers/' + fltrObj.provider.id + '/sync', data:reqBody - } + }; genericServices.promisePost(params).then(function (response) { if(response.taskId){ @@ -459,7 +459,7 @@ }; } } - }).result.then(function(response) { + }).result.then(function() { }, function() { console.log("Dismiss at " + new Date()); }); @@ -484,7 +484,7 @@ $scope.postMethodImportByIp(); }; - } + }; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js index e9668e5ba..f501ed90d 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js @@ -27,8 +27,8 @@ } else { if (data.statusList && data.statusList.length) { $scope.progressValue = data.statusList.length; - for (var i = 0; i < data.statusList.length; i++) { - $scope.statusMessage = data.statusList[i].status.message; + for (var ii = 0; ii < data.statusList.length; ii++) { + $scope.statusMessage = data.statusList[ii].status.message; $scope.isInstanceImporting = false; } } @@ -39,5 +39,5 @@ },1000); }; $scope.pollTaskStatus(0); - }]) + }]); })(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index c6855d481..bd69ab663 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -25,8 +25,8 @@ $scope.newEnt.project.tagValues=[]; $scope.newEnt.businessGroup.tagValues=[]; $scope.newEnt.businessGroup.tagName=''; - $scope.newEnt.environment.tagName='' - $scope.newEnt.environment.tagValues=[];; + $scope.newEnt.environment.tagName=''; + $scope.newEnt.environment.tagValues=[]; disTgMap.getTagValues(false,'businessGroup'); disTgMap.getTagValues(false,'environment'); disTgMap.getTagValues(false,'project'); @@ -40,7 +40,7 @@ tagValues: v.tagValues, catalystEntityId: v.catalystEntityId, catalystEntityName: v.catalystEntityName - } + }; }); }); @@ -93,7 +93,7 @@ toastr.success('Successfully updated.','Update'); }); }; - $rootScope.applyFilter =function(filterApp,period){ + $rootScope.applyFilter =function(){ analyticsServices.applyFilter(true,null); disTgMap.getTagMapping(); }; From 8801dac6d1673b6fb10fb70a521fc065a38b6a13 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Tue, 24 Jan 2017 16:04:53 +0530 Subject: [PATCH 15/66] CAT-2653 , CAT-2652 --- .../sections/dashboard/analytics/analyticsServices.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index 75b9d1102..3e6b0e89b 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -18,10 +18,10 @@ month:months[new Date().getMonth()], day:moment(new Date()).format('YYYY-MM-DD') }; - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); }, applyFilter : function(filterApp,period){ - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date= moment($rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); if($rootScope.organObject) { var obj = $rootScope.organObject, or = $rootScope.organNewEnt.org, @@ -36,7 +36,7 @@ console.log(moment(dt).add(wk, 'days').format('YYYY-MM-DD')); $rootScope.filterNewEnt.date=moment(dt).add(wk, 'days').format('YYYY-MM-DD'); } else { - $rootScope.filterNewEnt.date= $rootScope.filterNewEnt.endDate.month+' '+ $rootScope.filterNewEnt.endDate.year; + $rootScope.filterNewEnt.date=moment( $rootScope.filterNewEnt.endDate.month+' 01 '+ $rootScope.filterNewEnt.endDate.year).format('YYYY-MM-DD'); } $rootScope.filterNewEnt.period = period; } From af0d7133ecac9930193aa5d672f80cf227a1467e Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 25 Jan 2017 11:37:07 +0530 Subject: [PATCH 16/66] New Implementation for BOTs --- server/app/cronjobs/task-sync/taskSync.js | 14 ++++------- server/app/model/bots/1.1/botsDao.js | 18 ++++++++++++++ server/app/services/botsNewService.js | 5 ++++ server/app/services/botsService.js | 2 +- server/app/services/gitHubService.js | 30 ++++++++++++++++++++++- 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/server/app/cronjobs/task-sync/taskSync.js b/server/app/cronjobs/task-sync/taskSync.js index cedb152b1..cb7578877 100644 --- a/server/app/cronjobs/task-sync/taskSync.js +++ b/server/app/cronjobs/task-sync/taskSync.js @@ -65,7 +65,7 @@ function executeTaskSyncForBotHistory(query,callback){ }else if(count === runningAuditTrailList.length){ next(null,runningAuditTrailList); }else{ - logger.debug("Task Sync is going on"); + logger.debug("BOTs Sync is going on"); } }) @@ -79,10 +79,8 @@ function executeTaskSyncForBotHistory(query,callback){ } }else{ - next({ - errCode:400, - errMsg:"There is no BOTs in running state currently." - },null); + logger.info("There is no BOTs in running state currently."); + next(null,runningAuditTrailList); } } ],function(err,results){ @@ -134,10 +132,8 @@ function executeTaskSyncForTaskHistory(query,callback){ } }else{ - next({ - errCode:400, - errMsg:"There is no Tasks in running state currently." - },null); + logger.info("There is no Tasks in running state currently."); + next(null,runningTaskHistoryList); } } ],function(err,results){ diff --git a/server/app/model/bots/1.1/botsDao.js b/server/app/model/bots/1.1/botsDao.js index 8d714a59a..bdf9f75ef 100644 --- a/server/app/model/bots/1.1/botsDao.js +++ b/server/app/model/bots/1.1/botsDao.js @@ -31,6 +31,11 @@ var BotsSchema = new Schema ({ trim: true, required: true }, + gitHubId: { + type: String, + trim: true, + required: true + }, type: { type: String, trim: true, @@ -230,6 +235,19 @@ BotsSchema.statics.removeBotsById = function(botId,callback){ }); }; +BotsSchema.statics.removeBotsByGitHubId = function(gitHubId,callback){ + Bots.remove({gitHubId:gitHubId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else { + return callback(null, bots); + } + }); +}; + BotsSchema.statics.removeSoftBotsById = function(botId,callback){ Bots.update({_id:ObjectId(botId)},{$set:{isDeleted:true}}, function(err, bots) { if (err) { diff --git a/server/app/services/botsNewService.js b/server/app/services/botsNewService.js index 451a17c5a..586d7af5a 100644 --- a/server/app/services/botsNewService.js +++ b/server/app/services/botsNewService.js @@ -117,6 +117,10 @@ botsNewService.executeBots = function executeBots(botId,reqBody,callback){ botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ async.waterfall([ function(next) { + botsDao.removeBotsByGitHubId(gitHubId,next); + }, + function(gitHubSyncStatus,next) { + var gitHubService = require('_pr/services/gitHubService.js'); gitHubService.getGitHubById(gitHubId,next); }, function(gitHubDetails,next){ @@ -136,6 +140,7 @@ botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callbac count++; var botsObj={ name:result.name, + gitHubId:gitHubDetails._id, id:result.id, desc:result.desc, category:result.category, diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 44bc22528..172918c8f 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -17,7 +17,7 @@ var logger = require('_pr/logger')(module); var botsDao = require('_pr/model/bots/1.1/botsDao.js'); -var bots = require('_pr/model/bots/bots.js'); +var bots = require('_pr/model/bots/1.0/bots.js'); var mongoose = require('mongoose'); var ObjectId = require('mongoose').Types.ObjectId; var async = require("async"); diff --git a/server/app/services/gitHubService.js b/server/app/services/gitHubService.js index 095ab3506..07882d532 100644 --- a/server/app/services/gitHubService.js +++ b/server/app/services/gitHubService.js @@ -24,6 +24,7 @@ var async = require('async'); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); +var botsNewService = require("_pr/services/botsNewService.js") var gitGubService = module.exports = {}; @@ -134,7 +135,13 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { return; }else{ callback(null,cloneStatus); - callback(null,cloneStatus); + botsNewService.syncBotsWithGitHub(gitHubId,function(err,data){ + if(err){ + logger.error("Error in Syncing GIT-Hub.",err); + }else{ + logger.debug("Git Hub Sync is Done."); + } + }); return; } }); @@ -160,6 +167,13 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { return; }else{ callback(null,cloneStatus); + botsNewService.syncBotsWithGitHub(gitHubId,function(err,data){ + if(err){ + logger.error("Error in Syncing GIT-Hub.",err); + }else{ + logger.debug("Git Hub Sync is Done."); + } + }); return; } }); @@ -185,6 +199,13 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { return; }else{ callback(null,cloneStatus); + botsNewService.syncBotsWithGitHub(gitHubId,function(err,data){ + if(err){ + logger.error("Error in Syncing GIT-Hub.",err); + }else{ + logger.debug("Git Hub Sync is Done."); + } + }); return; } }); @@ -197,6 +218,13 @@ gitGubService.getGitHubSync = function getGitHubSync(gitHubId, callback) { return; }else{ callback(null,cloneStatus); + botsNewService.syncBotsWithGitHub(gitHubId,function(err,data){ + if(err){ + logger.error("Error in Syncing GIT-Hub.",err); + }else{ + logger.debug("Git Hub Sync is Done."); + } + }); return; } }); From db5a035f8f5d9813e0107735d6b58724c3b3c01a Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 25 Jan 2017 11:42:52 +0530 Subject: [PATCH 17/66] Update logger message based upon data response --- server/app/cronjobs/task-sync/taskSync.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/app/cronjobs/task-sync/taskSync.js b/server/app/cronjobs/task-sync/taskSync.js index cedb152b1..098ef79d9 100644 --- a/server/app/cronjobs/task-sync/taskSync.js +++ b/server/app/cronjobs/task-sync/taskSync.js @@ -65,7 +65,7 @@ function executeTaskSyncForBotHistory(query,callback){ }else if(count === runningAuditTrailList.length){ next(null,runningAuditTrailList); }else{ - logger.debug("Task Sync is going on"); + logger.debug("BOTs Sync is going on"); } }) @@ -79,10 +79,8 @@ function executeTaskSyncForBotHistory(query,callback){ } }else{ - next({ - errCode:400, - errMsg:"There is no BOTs in running state currently." - },null); + logger.info("There is no BOTs in running state currently.") + next(null,runningAuditTrailList); } } ],function(err,results){ @@ -134,10 +132,8 @@ function executeTaskSyncForTaskHistory(query,callback){ } }else{ - next({ - errCode:400, - errMsg:"There is no Tasks in running state currently." - },null); + logger.info("There is no Task in running state currently.") + next(null,runningTaskHistoryList); } } ],function(err,results){ From 63fcf1944d7da7651224c97c5c14d3738f9bafa5 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 25 Jan 2017 14:02:14 +0530 Subject: [PATCH 18/66] manage instance view changed --- .../sections/dashboard/analytics/analytics.js | 4 ++-- .../analytics/controller/capacityReportCtrl.js | 15 +++++++-------- .../dashboard/analytics/controller/costCtrl.js | 1 + .../analytics/view/analyticsTreeMenu.html | 17 +++++++++-------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 59beeae48..1a0485f26 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -153,7 +153,7 @@ $scope.getProviders(orgs[0].rowid); }); if (!$rootScope.stateParams.view) { - $state.go('dashboard.analytics.cost'); + $state.go('dashboard.analytics.capacityReport'); } analytic.tabShow=function(chat,report){ analytic.tabShowChat=chat; @@ -288,7 +288,7 @@ $rootScope.filterNewEnt.resources=$scope.selectedResources; }; if (!$rootScope.stateParams.view && $rootScope.organObject) { - $state.go('dashboard.analytics.cost'); + $state.go('dashboard.analytics.capacityReport'); } }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index f92e475a6..3da5851ab 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -106,7 +106,7 @@ capRept.listGrid[value].data=[]; capRept.listGrid[value].paginationPageSizes= [25, 50, 100]; capRept.listGrid[value].paginationPageSize=25; - $scope.colArray=['platformId','state','orgName','privateIpAddress','os']; + $scope.colArray=['platformId','state','privateIpAddress','os']; if(capRept.serviceType === 'EC2') { capRept.listGrid[value].columnDefs = [ {name: 'Instance Id', field: 'platformId', cellTooltip: true}, @@ -118,7 +118,6 @@ field: 'region', cellTooltip: true }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, { name: 'cost', displayName: 'Cost', @@ -134,7 +133,7 @@ ]; } if(capRept.serviceType === 'RDS') { - $scope.colArray=['platformId','state','orgName','dbEngine']; + $scope.colArray=['platformId','state','dbEngine']; capRept.listGrid[value].columnDefs = [ {name: 'Instance', field: 'platformId', cellTooltip: true}, {name: 'dbEngine', enableFiltering: true, displayName: 'Engine', field: 'dbEngine', cellTooltip: true}, @@ -144,7 +143,6 @@ field: 'region', cellTooltip: true }, - {name: 'orgName', displayName: 'Org Name', field: 'orgName', cellTooltip: true}, { name: 'cost', displayName: 'Cost', @@ -165,7 +163,7 @@ {name: 'bucketName', field: 'bucketName', cellTooltip: true}, {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, {name: 'bucketSize', field: 'bucketSize', displayName:'Bucket Size (MB)', cellTooltip: true}, - {name: 'orgName', field: 'orgName', cellTooltip: true}, + {name: 'cost', displayName: 'Cost',cellTemplate: ''}, {name: 'Action', cellTooltip: true,cellTemplate:" "} ]; @@ -177,9 +175,10 @@ if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.colArray.push('bgName'); - capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); - $scope.instanceType= 'managedInstances'; + $scope.colArray.push('bgName','projectName','environmentName'); + capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ $scope.colArray.push('bgName'); capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 2b557cf21..67c471a30 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -114,6 +114,7 @@ } // param.url='src/partials/sections/dashboard/analytics/data/cost.json'; + console.log(fltObj.date); param.url='/analytics/cost/aggregate?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date(fltObj.date)+'&period='+fltObj.period; } diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html index d1c5e54bc..1a9f1bd14 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -82,24 +82,25 @@ ANALYTICS
      -
    • +
    • - - Cost - + + Capacity +
      • -
    • +
    • - - Capacity - + + Cost +
      • +
    • From 86210a400286fc18acb145f9f0d38b89510c62e9 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 25 Jan 2017 14:07:46 +0530 Subject: [PATCH 19/66] manage instance view changed --- .../dashboard/analytics/controller/capacityReportCtrl.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 3da5851ab..57dbfb6f7 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -179,9 +179,12 @@ capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true}); capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances'; + $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - $scope.colArray.push('bgName'); - capRept.listGrid[value].columnDefs.splice(6,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + $scope.colArray.push('bgName','projectName','environmentName'); + capRept.listGrid[value].columnDefs.splice(5,0,{name: 'bgName', displayName: 'Bg Name', field: 'bgName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(6,0,{name: 'projectName', displayName: 'Project Name', field: 'projectName', cellTooltip: true}); + capRept.listGrid[value].columnDefs.splice(7,0,{name: 'environmentName', displayName: 'Env Name', field: 'environmentName', cellTooltip: true}); $scope.instanceType= 'managedInstances'; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ $scope.instanceType= 'unassigned-instances'; From 5db01613881dd00a091c9845738b7ec89bf0dfc4 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 25 Jan 2017 17:08:12 +0530 Subject: [PATCH 20/66] Implement Reading and uploading YML documents from GIT HUB --- server/app/model/bots/1.1/botsDao.js | 20 ++ server/app/model/file-upload/file-upload.js | 6 +- server/app/routes/v1.0/routes.js | 3 + server/app/services/botsNewService.js | 201 ++++++++++++++++---- server/app/services/gitHubService.js | 2 +- 5 files changed, 195 insertions(+), 37 deletions(-) diff --git a/server/app/model/bots/1.1/botsDao.js b/server/app/model/bots/1.1/botsDao.js index bdf9f75ef..4a503741b 100644 --- a/server/app/model/bots/1.1/botsDao.js +++ b/server/app/model/bots/1.1/botsDao.js @@ -69,6 +69,11 @@ var BotsSchema = new Schema ({ trim: true, required: false }, + ymlDocFileId : { + type: String, + trim: true, + required: false + }, scriptDocFilePath:{ type: String, trim: true, @@ -207,6 +212,21 @@ BotsSchema.statics.getBotsById = function(botId,callback){ }); }; +BotsSchema.statics.getBotsByGitHubId = function(gitHubId,callback){ + Bots.find({gitHubId:gitHubId}, function(err, bots) { + if (err) { + logger.error(err); + var error = new Error('Internal server error'); + error.status = 500; + return callback(error); + }else if(bots.length > 0){ + return callback(null, bots); + }else{ + return callback(null, []); + } + }); +}; + BotsSchema.statics.getAllBots = function(queryParam,callback){ Bots.find(queryParam, function(err, bots) { if (err) { diff --git a/server/app/model/file-upload/file-upload.js b/server/app/model/file-upload/file-upload.js index b1b1a5d87..99ed55c75 100644 --- a/server/app/model/file-upload/file-upload.js +++ b/server/app/model/file-upload/file-upload.js @@ -5,6 +5,7 @@ var appConfig = require('_pr/config'); var logger = require('_pr/logger')(module); var gfs = null; var mongoDbClient = require('mongodb'); +var uuid = require('node-uuid'); mongoDbClient.connect('mongodb://' + appConfig.db.host + ':' + appConfig.db.port + '/' + appConfig.db.dbName, function (err, db) { if (err) { throw "unable to connect to mongodb" @@ -16,6 +17,9 @@ mongoDbClient.connect('mongodb://' + appConfig.db.host + ':' + appConfig.db.port var fileUpload = module.exports = {}; fileUpload.uploadFile = function uploadFile(filename, filePath, fileId, callback) { + if(fileId === null){ + fileId = uuid.v4(); + } var writeStream = gfs.createWriteStream({ _id: fileId, filename: filename, @@ -41,7 +45,7 @@ fileUpload.getFileByFileId = function getFileByFileId(fileId, callback) { }); }; -fileUpload.getReadStreamFileByFileId = function getFileByFileId(fileId, callback) { +fileUpload.getReadStreamFileByFileId = function getReadStreamFileByFileId(fileId, callback) { var buffer = ''; gfs.findOne({ _id: fileId diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js index 425ed8790..8baf89a8e 100755 --- a/server/app/routes/v1.0/routes.js +++ b/server/app/routes/v1.0/routes.js @@ -76,6 +76,7 @@ var settingWizard = require('./routes_setting_wizard'); var configData = require('./routes_config_data'); var monitors = require('./routes_monitors'); var bots = require('./routes_bots'); +var botsNew = require('./routes_botsNew'); var gitHub = require('./routes_github'); var routesCICD = require('./routes_d4dMastersCICD'); /* @@ -196,6 +197,8 @@ module.exports.setRoutes = function(app) { routesCICD.setRoutes(app, sessionVerificationFunc); + botsNew.setRoutes(app, sessionVerificationFunc); + app.get('/', function(req, res) { res.redirect('/cat3'); diff --git a/server/app/services/botsNewService.js b/server/app/services/botsNewService.js index 586d7af5a..c0d2b5a45 100644 --- a/server/app/services/botsNewService.js +++ b/server/app/services/botsNewService.js @@ -20,7 +20,9 @@ var botsDao = require('_pr/model/bots/1.1/botsDao.js'); var async = require("async"); var apiUtil = require('_pr/lib/utils/apiUtil.js'); var Cryptography = require('_pr/lib/utils/cryptography'); +var fileUpload = require('_pr/model/file-upload/file-upload'); var appConfig = require('_pr/config'); +var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); const fileHound= require('filehound'); const yamlJs= require('yamljs'); const gitHubService = require('_pr/services/gitHubService.js'); @@ -61,6 +63,62 @@ botsNewService.removeBotsById = function removeBotsById(botId,callback){ }); } +botsNewService.getBotsList = function getBotsList(botsQuery,actionStatus,callback) { + var reqData = {}; + async.waterfall([ + function(next) { + apiUtil.paginationRequest(botsQuery, 'bots', next); + }, + function(paginationReq, next) { + paginationReq['searchColumns'] = ['name', 'type', 'category','desc', 'orgName']; + reqData = paginationReq; + apiUtil.databaseUtil(paginationReq, next); + }, + function(queryObj, next) { + if(actionStatus !== null){ + var query = { + auditType: 'BOTs', + actionStatus: actionStatus, + isDeleted:false + }; + var botsIds = []; + auditTrail.getAuditTrails(query, function(err,botsAudits){ + if(err){ + next(err,null); + }else if (botsAudits.length > 0) { + for (var i = 0; i < botsAudits.length; i++) { + if (botsIds.indexOf(botsAudits[i].auditId) < 0) { + botsIds.push(botsAudits[i].auditId); + } + } + queryObj.queryObj.botId = {$in:botsIds}; + botsDao.getBotsList(queryObj, next); + } else { + queryObj.queryObj.botId = null; + botsDao.getBotsList(queryObj, next); + } + }); + }else{ + botsDao.getBotsList(queryObj, next); + } + }, + function(botList, next) { + addYmlFileDetailsForBots(botList,next); + }, + function(filterBotList, next) { + apiUtil.paginationResponse(filterBotList, reqData, next); + } + ],function(err, results) { + if (err){ + logger.error(err); + callback(err,null); + return; + } + callback(null,results) + return; + }); +} + botsNewService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ @@ -84,23 +142,6 @@ botsNewService.executeBots = function executeBots(botId,reqBody,callback){ }else { botsDao.getBotsById(botId, next); } - }, - function(bots,next){ - if(bots.length > 0){ - if(bots[0].botLinkedCategory === 'Task'){ - if(reqBody === null) { - taskService.executeTask(botId, 'system', 'undefined', 'undefined', 'undefined', 'undefined', 'undefined', callback); - }else{ - taskService.executeTask(botId, reqBody.userName ? reqBody.userName : 'system', reqBody.hostProtocol ? reqBody.hostProtocol : 'undefined', - reqBody.choiceParam ? reqBody.choiceParam : 'undefined', reqBody.appData ? reqBody.appData : 'undefined', reqBody.paramOptions ? reqBody.paramOptions : 'undefined', - reqBody.tagServer ? reqBody.tagServer : 'undefined', callback); - } - }else{ - blueprintService.launch(botId,reqBody,callback) - } - }else{ - next({errCode:400, errMsg:"Bots is not exist in DB"},null) - } } ],function(err,results){ if(err){ @@ -117,7 +158,40 @@ botsNewService.executeBots = function executeBots(botId,reqBody,callback){ botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callback){ async.waterfall([ function(next) { - botsDao.removeBotsByGitHubId(gitHubId,next); + botsDao.getBotsByGitHubId(gitHubId,next); + }, + function(botDetails,next) { + async.parallel({ + botsSync: function(callback){ + botsDao.removeBotsByGitHubId(gitHubId,callback); + }, + fileSync: function(callback){ + if(botDetails.length > 0){ + var count = 0; + for(var i = 0 ; i < botDetails.length; i++){ + (function(botDetail){ + fileUpload.removeFileByFileId(botDetail.ymlDocFileId,function(err,data){ + if(err){ + logger.error("There are some error in deleting yml file.",err,botDetail.ymlDocFileId); + } + count++; + if(count === botDetails.length){ + callback(null,botDetails); + } + }) + })(botDetails[i]); + } + }else{ + callback(null,botDetails); + } + } + },function(err,results){ + if(err){ + next(err); + }else{ + next(null,results); + } + }) }, function(gitHubSyncStatus,next) { var gitHubService = require('_pr/services/gitHubService.js'); @@ -137,25 +211,33 @@ botsNewService.syncBotsWithGitHub = function syncBotsWithGitHub(gitHubId,callbac (function(ymlFile){ yamlJs.load(ymlFile, function(result) { if(result !== null){ - count++; - var botsObj={ - name:result.name, - gitHubId:gitHubDetails._id, - id:result.id, - desc:result.desc, - category:result.category, - type:result.type, - inputFormFields:result.input.form, - outputOptions:result.output, - ymlDocFilePath:ymlFile, - orgId:gitHubDetails.orgId, - orgName:gitHubDetails.orgName - } - botsDao.createNew(botsObj,function(err,data){ + fileUpload.uploadFile(result.id,ymlFile,null,function(err,ymlDocFileId){ if(err){ - logger.error(err); + logger.error("Error in uploading yaml documents.",err); + next(err); + }else{ + count++; + var botsObj={ + name:result.name, + gitHubId:gitHubDetails._id, + id:result.id, + desc:result.desc, + category:result.category, + type:result.type, + inputFormFields:result.input.form, + outputOptions:result.output, + ymlDocFilePath:ymlFile, + ymlDocFileId:ymlDocFileId, + orgId:gitHubDetails.orgId, + orgName:gitHubDetails.orgName + } + botsDao.createNew(botsObj,function(err,data){ + if(err){ + logger.error(err); + } + botObjList.push(botsObj); + }) } - botObjList.push(botsObj); }) }else{ count++; @@ -210,6 +292,55 @@ function encryptedParam(paramDetails, callback) { } } +function addYmlFileDetailsForBots(bots,callback){ + if (bots.docs.length === 0) { + return callback(null,scripts); + }else{ + var botsList =[]; + var botsObj={}; + for(var i = 0; i Date: Wed, 25 Jan 2017 17:27:27 +0530 Subject: [PATCH 21/66] botLibrary card view implementation --- client/cat3/main.html | 7 + client/cat3/src/partials/global.scss | 19 + .../sections/dashboard/bots/bots.scss | 332 +++++++++- .../sections/dashboard/bots/botsCtrl.js | 18 + .../bots/controller/botDescriptionCtrl.js | 61 ++ .../bots/controller/botHistoryCtrl.js | 300 +++++++++ .../bots/controller/botScheduleCtrl.js | 140 ++++ .../dashboard/bots/controller/libraryCtrl.js | 612 +++++------------- .../sections/dashboard/bots/tabs/param.html | 104 +++ .../sections/dashboard/bots/tabs/readme.html | 11 + .../sections/dashboard/bots/tabs/report.html | 29 + .../dashboard/bots/tabs/schedule.html | 141 ++++ .../dashboard/bots/tabs/settings.html | 13 + .../dashboard/bots/view/botsDescription.html | 82 +++ .../sections/dashboard/bots/view/library.html | 309 +++++---- .../sections/dashboard/workzone/workzone.scss | 16 - 16 files changed, 1601 insertions(+), 593 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/bots/tabs/param.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/tabs/readme.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/tabs/report.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html create mode 100644 client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html diff --git a/client/cat3/main.html b/client/cat3/main.html index 7aee82223..62a706e7d 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -18,12 +18,16 @@ + + + + @@ -118,7 +122,10 @@ + + + diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index 2d8ce58b5..7bbcee069 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -1461,4 +1461,23 @@ div::-webkit-scrollbar-thumb } input[type="text"].ui-grid-filter-input{ color: #000000; +} + +// grid view tab class +.hide-grid { + margin: 0px auto !important; + padding: 0px !important; + visibility: hidden; + height: 0px !important; + overflow: hidden; +} + +.show-grid-tab { + visibility: visible; + height: auto; +} + +.show-grid { + visibility: inherit; + height: auto; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index ed52f151a..26feb7c1e 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -16,6 +16,10 @@ padding-bottom: 10px; } +.marginbottom15 { + margin-bottom: 15px; +} + .paddingbottom20 { padding-bottom: 20px; } @@ -50,10 +54,10 @@ overflow-y: auto; } -#botLibraryPage, #botAuditTrailPage { +#botLibraryPage, #botAuditTrailPage, #botsDescriptionPage { .page-name { font-size: 18px; - margin: 5px 0 5px 10px; + margin: 5px 0 5px 36px; } .search-icon { @@ -83,9 +87,9 @@ } } -#botLibraryPage { +#botLibraryPage, #botsDescriptionPage { .summary-container { - width: 100%; + width: 96%; } .bot-library-search { @@ -95,7 +99,7 @@ .section-bottom-glyph { position: absolute; - top: 140px; + top: 100px; /*140*/ left: 97px; font-size: 22px; display: none; @@ -183,6 +187,14 @@ font-size: 16px; } + .font-size-20 { + font-size: 20px; + } + + #grid1 a { + padding: 0 8px; + } + a.cursor { padding: 0 5px; } @@ -215,4 +227,314 @@ /*global css*/ .ui-grid .ui-grid-row { border-bottom: 1px solid #ccc; +} + +.grid-card-base { + background-color: white; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); + margin-left: 20px; + margin-bottom: 20px; + overflow: hidden; + position: relative; +} + +.grid-card-base.hoverable:hover { + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2); +} + +.grid-card-base.hoverable:active { + box-shadow: 0 0 0 1px rgba(62, 146, 210, 0.2); +} + +.grid-card { + background-color: white; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); + margin-left: 20px; + margin-bottom: 20px; + overflow: hidden; + position: relative; + min-width: 402px; + width: 402px; + float: left; +} + +.info-box { + display: block; + min-height: 90px; + background: #fff; + width: 100%; + box-shadow: 0 1px 1px rgba(0,0,0,0.1); + border-radius: 2px; + margin-bottom: 15px; +} + +.bg-aqua { + background-color: #00c0ef!important; + color: #fff !important; +} + +.bg-green { + background-color: #00a65a !important; + color: #fff !important; +} + +.bg-red { + background-color: #dd4b39 !important; + color: #fff !important; +} + +.info-box-icon { + border-top-left-radius: 2px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 2px; + display: block; + float: left; + height: 90px; + width: 90px; + text-align: center; + font-size: 45px; + line-height: 90px; + background: rgba(0,0,0,0.2); +} + +.info-box-content { + padding: 5px 10px; + margin-left: 90px; +} + +.info-box-number { + display: block; + font-weight: bold; + font-size: 24px; +} + +.info-box-text { + text-transform: uppercase; + display: block; + font-size: 13px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.faColor { + color : #fff!important; +} + +.grid-card.hoverable:hover { + box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2); +} + +.grid-card.hoverable:active { + box-shadow: 0 0 0 1px rgba(62, 146, 210, 0.2); +} + +.grid-card-full-width { + float: none; + display: block; + width: auto; +} + +.agent-card a:hover, +.agent-card a:visited { + color: #2B2B2B; +} + +.agent-card a { + color: #2B2B2B!important; +} + +.agent-info { + margin-bottom: 20px; +} +.agent-info .image-cell { + display: inline-block; + padding: 0; + margin-top: 0; +} + +.agent-card { + padding: 0; +} + +.agent-card > a { + display: block; + width: 100%; + height: 100%; + text-decoration: none; +} + +.agent-card .image-cell { + margin: 0; + float: left; +} + +.image-cell { + display: inline-block; + vertical-align: top; +} + +.image-cell { + width: 120px; + height: 120px; + margin-left: auto; + margin-right: auto; +} +.image-cell img { + display: block; + width: 70%; + height: 70%; + border-radius: 70%; + margin: 15%; +} + +.two-tone-11 .highlight { + background-color: #8A8E93; +} + +.agent-card .image-cell + * { + width: 282px; +} + +.two-tone-11 { + background-color: #D1D4D8; +} + +.two-tone-11 .highlight { + background-color: #8A8E93; +} + +.info-cell .title { + margin-top: 15px; + line-height: 1.1; + margin-bottom: 7px; +} + +.agent-card .title { + /* font-family: "Segoe UI", sans-serif; */ + font-size: 26px; + overflow: hidden; + line-height: 1.5; + white-space: nowrap; + text-overflow: ellipsis; + margin-bottom: -2px; +} + +.agent-card .title { + font-size: 22px; + /*previous 24px;*/ +} + +.agent-card .publisher { + padding-bottom: 5px; +} + +.info-cell .publisher { + font-size: 12px; + color: #999999; +} + +.info-cell { + display: inline-block; + vertical-align: top; + padding-left: 12px; +} + +.desc-cell { + float: left; + vertical-align: top; + padding-right: 15px; + padding-left: 12px; +} + +body { + background : rgba(0, 0, 0, 0.04); + /*background:#F7F7F7;ecf0f5*/ + overflow-y:auto!important; +} + +body .botDescriptionPage { + background:#F7F7F7; +} + +.boxBots { + position: relative; + border-radius: 3px; + background: #ffffff; + border-top: 1px solid #d2d6de; + margin-bottom: 20px; + width: 100%; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) +} + +.nav-tabs li { + cursor: pointer; + margin-bottom: -1px!important; +} + +.nav-tabs li.active a, .nav-tabs li.active a:hover { + border-bottom-width: 0px; + border-top-width: 3px; + border-color: #40BAF1; + background: #fcfcfc; +} + +.nav-tabs { + border-bottom: 0px!important; +} + +.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover { + background: none!important; + /* border: none!important;*/ +} + +.actionItems { + background-color: #d8d8d8; + padding: 5px 10px; + border-radius: 0px 0px 5px 5px; +} + +.top-stats { + .badge { + margin-right: 2px; + background: #40baf1; + padding: .2em 1.5em .3em; + font-size: 15px; + margin-top: -5px; + } +} + +.font-size-16 { + font-size: 16px; +} + +//For Active tab +.bots-tab-active { + background-color: #fff !important; + border: 1px solid #40baf1 !important; + border-bottom: 0px !important; + box-shadow: 0 -1px 5px -1px; + border-radius: 0px; + color: #40baf1 !important; + font-weight: 500; + outline: none !important; + text-decoration: none !important; + i { + color: #40baf1; + } +} + +.filterButtons { + padding: 5px 10px; + font-size: 85%; + background: #a7a7a7; + border: 1px solid #a7a7a7!important; +} + +.filterClear { + position:relative; + cursor:pointer; + float: right; + right: -9px; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js index 1249a53f6..0d4f5f079 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js @@ -45,6 +45,24 @@ return deferred.promise; }] } + }).state('dashboard.bots.botsDescription', { + url: "/botDescription", + templateUrl: "src/partials/sections/dashboard/bots/view/botsDescription.html", + controller: "botDescriptionCtrl as btsDescription", + parameters:{filterView:{botsDescription:true}}, + resolve: { + auth: ["$q", function ($q) { + var deferred = $q.defer(); + // instead, go to a different page + if (modulePerms.serviceBool()) { + // everything is fine, proceed + deferred.resolve(); + } else { + deferred.reject({redirectTo: 'dashboard'}); + } + return deferred.promise; + }] + } }); }]) .controller('botsCtrl',['$scope', '$rootScope', '$state', function ($scope, $rootScope, $state) { diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js new file mode 100644 index 000000000..ac573f09c --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js @@ -0,0 +1,61 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Oct 2016 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('botDescriptionCtrl',['$scope', 'uiGridOptionsClient', '$rootScope', '$state', 'genericServices', + function ($scope, uiGridOptionsClient, $rootScope, $state, genSevs) { + var treeNames = ['BOTs','Bots Description']; + $rootScope.$emit('treeNameUpdate', treeNames); + $rootScope.$on('BOTS_TEMPLATE_SELECTED', function(event,reqParams) { + $scope.templateSelected = reqParams; + }); + + $scope.launchInstance = function(launch){ + if(launch.botLinkedCategory === 'Task'){ + genSevs.executeTask(launch); + } else if(launch.botLinkedCategory === 'Blueprint') { + genSevs.launchBlueprint(launch); + } + }; + $scope.botInfo = $scope.templateSelected; + + var botsTab = { + tab : "ReadMe", + setTab : function (tabId) { + botsTab.tab = tabId; + }, + isSet : function (tabId) { + return botsTab.tab === tabId; + }, + templates: { + readme: { + "title": "ReadMe", + "url": "src/partials/sections/dashboard/bots/tabs/readme.html" + }, + param: { + "title": "Param", + "url": "src/partials/sections/dashboard/bots/tabs/param.html" + }, + report: { + "title": "Report", + "url": "src/partials/sections/dashboard/bots/tabs/report.html" + }, + schedule: { + "title": "Schedule", + "url": "src/partials/sections/dashboard/bots/tabs/schedule.html" + }, + settings: { + "title": "Settings", + "url": "src/partials/sections/dashboard/bots/tabs/settings.html" + } + } + }; + $scope.tab = botsTab; + }]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js new file mode 100644 index 000000000..a2ae146dd --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js @@ -0,0 +1,300 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Oct 2016 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('botHistoryCtrl',['$scope', '$rootScope', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', + function($scope, $rootScope, $modal, $timeout, uiGridOptionsClient, genSevs){ + + var items = $rootScope.botHistory; + + $rootScope.$on('BOTS_TEMPLATE_SELECTED', function(event,reqParams) { + $scope.templateSelected = reqParams; + }); + + if($scope.templateSelected) { + items = $scope.templateSelected; + } + + $scope.botHistory = items; + console.log(items); + $scope.botId = items.botId; + $scope.taskHistoryChefData = []; + var gridOptionsChef = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryChefGridOptions = gridOptionsChef; + + $scope.initChefGrids = function(){ + $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; + $scope.taskHistoryChefGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
      '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryChefListView: function() { + $scope.taskHistoryChefData = []; + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + $timeout(function() { + if(response.botHistory){ + $scope.taskHistoryChefData = response.botHistory; + $scope.ischefTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryChefData = response; + $scope.ischefTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Chef History Records found"; + $scope.ischefTaskHistoryPageLoading = false; + }); + }, + getExecutionTime: function(endTime, startTime) { + $scope.executionTimeinMS = endTime-startTime; + $scope.executionTime = $scope.executionTimeinMS/(60000); + return +(Math.round($scope.executionTime + "e+1") + "e-1"); + }, + getSavedTime: function(endTime, startTime) { + var executionTime = $scope.getExecutionTime(endTime, startTime); + $scope.savedTime = items.manualExecutionTime-executionTime; + return $scope.savedTime; + } + }); + $scope.initchef = function(){ + $scope.initChefGrids(); + $scope.taskHistoryChefListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for chef Task ends + + //UI Grid for jenkins Task starts + $scope.taskHistoryJenkinsData = []; + var gridOptionsJenkins = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryJenkinsGridOptions = gridOptionsJenkins; + + $scope.initJenkinsGrids = function(){ + $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; + $scope.taskHistoryJenkinsGridOptions.columnDefs = [ + { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'{{row.entity.auditTrailConfig.jenkinsBuildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'Job Output',cellTemplate:'',cellTooltip: true}, + { name:'Log Info',width: 90,cellTemplate:'',cellTooltip: true}, + { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status.toUpperCase()}}
      '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}',cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}',cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryJenkinsListView: function() { + $scope.taskHistoryJenkinsData = []; + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + $timeout(function() { + if(response.botHistory){ + $scope.taskHistoryJenkinsData = response.botHistory; + $scope.isjenkinsTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryJenkinsData = response; + console.log($scope.taskHistoryJenkinsData); + $scope.isjenkinsTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Jenkins History Records found"; + $scope.isjenkinsTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initjenkins = function(){ + $scope.initJenkinsGrids(); + $scope.taskHistoryJenkinsListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for jenkins Task ends + + //UI Grid for script Task starts + $scope.taskHistoryScriptData = []; + var gridOptionsScript = uiGridOptionsClient.options().gridOption; + $scope.taskHistoryScriptGridOptions = gridOptionsScript; + + $scope.initScriptGrids = function(){ + $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; + $scope.taskHistoryScriptGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
      '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + taskHistoryScriptListView: function() { + $scope.taskHistoryScriptData = []; + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + $timeout(function() { + if(response.botHistory){ + $scope.taskHistoryScriptData = response.botHistory; + $scope.isscriptTaskHistoryPageLoading = false; + }else if(response){ + $scope.taskHistoryScriptData = response; + $scope.isscriptTaskHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Script History Records found"; + $scope.isscriptTaskHistoryPageLoading = false; + }); + }, + }); + $scope.initscript = function(){ + $scope.initScriptGrids(); + $scope.taskHistoryScriptListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for script Task ends + + //UI Grid for Blueprint starts + $scope.botHistoryBlueprintData = []; + $scope.botHistoryBlueprintGridOptions = gridOptionsScript; + + $scope.initBlueprintGrids = function(){ + $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; + $scope.botHistoryBlueprintGridOptions.columnDefs = [ + { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
      '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + 'NA', cellTooltip: true} + ]; + }; + angular.extend($scope, { + botHistoryBlueprintListView: function() { + $scope.botHistoryBlueprintData = []; + var param={ + url:'/bots/' + $scope.botId + '/bots-history' + }; + genSevs.promiseGet(param).then(function (response) { + $timeout(function() { + if(response.botHistory){ + $scope.botHistoryBlueprintData = response.botHistory; + $scope.isBlueprintBotHistoryPageLoading = false; + }else if(response){ + $scope.botHistoryBlueprintData = response; + $scope.isBlueprintBotHistoryPageLoading = false; + } + },100); + }, function(){ + $scope.errorMessage = "No Script History Records found"; + $scope.isBlueprintBotHistoryPageLoading = false; + }); + }, + }); + $scope.initblueprint = function(){ + $scope.initBlueprintGrids(); + $scope.botHistoryBlueprintListView(); + $scope.getExecutionTime(); + $scope.getSavedTime(); + }; + //UI Grid for Blueprint ends + + $scope.bot=items; + switch ($scope.bot.botLinkedSubCategory){ + case 'chef' : + $scope.ischefTaskHistoryPageLoading = true; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initchef(); + break; + case 'jenkins' : + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = true; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initjenkins(); + break; + case 'script': + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = true; + $scope.isBlueprintBotHistoryPageLoading = false; + $scope.initscript(); + break; + case 'instance_launch': + case 'aws_cf': + case 'docker': + case 'azure_launch': + $scope.ischefTaskHistoryPageLoading = false; + $scope.isjenkinsTaskHistoryPageLoading = false; + $scope.isscriptTaskHistoryPageLoading = false; + $scope.isBlueprintBotHistoryPageLoading = true; + $scope.initblueprint(); + break; + } + var modalInstance; + $scope.historyLogs=function(hist) { + modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', + controller: 'botExecutionLogsCtrl as botExecLogCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId : hist.auditId, + historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, + taskType:hist.auditTrailConfig.executionType + }; + } + } + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + + $scope.cancel= function() { + modalInstance.dismiss('cancel'); + }; + } + ]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js new file mode 100644 index 000000000..8312d9972 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botScheduleCtrl.js @@ -0,0 +1,140 @@ +/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited + * Proprietary and confidential + * Written by Relevance UI Team, + * Oct 2016 + */ + +(function (angular) { + "use strict"; + angular.module('dashboard.bots') + .controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, genSevs, workzoneServices, toastr) { + + var items = $rootScope.botSchedule; + + $rootScope.$on('BOTS_TEMPLATE_SELECTED', function(event,reqParams) { + $scope.templateSelected = reqParams; + }); + + if($scope.templateSelected) { + items = $scope.templateSelected; + } + + if(items.isBotScheduled === true){ + $scope._isEventSelected = true; + $scope.isScheduled = true; + }else{ + $scope._isEventSelected = false; + $scope.isScheduled = false; + } + $scope.scheduleDeatils = items; + $scope.botId = items.botId; + $scope.defaultSelection = function() { + $scope.repeatsType = 'Minutes';//default selection. + $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); + $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); + }; + $scope.selectBotCheckbox = function(){ + if($scope.isScheduled === true || $scope.isScheduled === 'true') { + $scope._isEventSelected = true; + }else{ + $scope._isEventSelected = false; + } + }; + if(items.botScheduler){ + if(items.botScheduler.cronStartOn && items.botScheduler.cronEndOn) { + var newStartOn = parseInt(items.botScheduler.cronStartOn); + var newDate = new Date(newStartOn).toLocaleDateString(); + var datearray = newDate.split("/"); + var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; + $scope.schedulerStartOn = newdate; + var newEndOn = parseInt(items.botScheduler.cronEndOn); + var newEndData = new Date(newEndOn).toLocaleDateString(); + var datearrayNew = newEndData.split("/"); + var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; + $scope.schedulerEndOn = newdateEnd; + } else { + $scope.schedulerStartOn = items.botScheduler.cronStartOn; + $scope.schedulerEndOn = items.botScheduler.cronEndOn; + } + + $scope.repeatBy = items.botScheduler.repeatBy || items.botScheduler.cronRepeatEvery.toString(); + $scope.repeatsType = items.botScheduler.repeats || items.botScheduler.cronFrequency; + $scope.timeEventType = items.botScheduler.timeEventHour || (items.botScheduler.cronHour && items.botScheduler.cronHour !==null) ? items.botScheduler.cronHour.toString() : ''; + $scope.timeEventMinute = items.botScheduler.timeEventMinute || (items.botScheduler.cronMinute && items.botScheduler.cronMinute !==null) ? items.botScheduler.cronMinute.toString() : ''; + $scope.weekOfTheDay = items.botScheduler.weekOfTheDay || (items.botScheduler.cronWeekDay && items.botScheduler.cronWeekDay !==null) ?items.botScheduler.cronWeekDay.toString(): ''; + $scope.selectedDayOfTheMonth = items.botScheduler.selectedDayOfTheMonth || (items.botScheduler.cronDate && items.botScheduler.cronDate !==null) ?items.botScheduler.cronDate.toString() : ''; + $scope.selectedMonth = items.botScheduler.selectedMonth || (items.botScheduler.cronMonth && items.botScheduler.cronMonth !==null) ? items.botScheduler.cronMonth.toString() : ''; + /*$scope.currentDate = items.botScheduler.startDate;*/ + } else { + $scope.defaultSelection(); + } + + $scope.dateChange= function () { + var startDate = Date.parse($scope.schedulerStartOn); + var endDate = Date.parse($scope.schedulerEndOn); + if(startDate > endDate){ + $scope.validDateRange=true; + } else { + $scope.validDateRange=false; + } + }; + + $scope.repeatCount = function(max, step) { + step = step || 1; + var input = []; + for (var i = 1; i <= max; i += step) { + input.push(i); + } + return input; + }; + $scope.isDaySelected = { + flag:true + }; + + $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; + + $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; + + $scope.ok=function(){ + $scope.eventParams = { + cronFrequency: $scope.repeatsType, + cronRepeatEvery: $scope.repeatBy, + cronStartOn: $scope.schedulerStartOn, + cronEndOn: $scope.schedulerEndOn, + cronHour: $scope.timeEventType, + cronMinute: $scope.timeEventMinute, + cronWeekDay: $scope.weekOfTheDay, + cronDate: $scope.selectedDayOfTheMonth, + cronMonth: $scope.selectedMonth + }; + var reqBody = null; + if($scope.isScheduled === true || $scope.isScheduled === 'true'){ + reqBody = { + botScheduler:$scope.eventParams, + isBotScheduled:true + }; + }else{ + reqBody = { + botScheduler:{}, + isBotScheduled:false + }; + } + var param={ + url:'/bots/' + $scope.botId + '/scheduler', + data: reqBody + }; + genSevs.promisePut(param).then(function (response) { + if(response){ + toastr.success('BOTs Scheduler successfully updated'); + $rootScope.$emit('BOTS_LIBRARY_REFRESH'); + //$modalInstance.dismiss('cancel'); + } + }); + }; + + $scope.cancel = function() { + //$modalInstance.dismiss('cancel'); + }; + }]); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index cec610bc3..72c9fae5b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,18 +8,28 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) { + .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices','$filter', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', 'workzoneServices', function ($scope, $rootScope, $state, genSevs, $filter, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout, workzoneServices) { var treeNames = ['BOTs','Library']; $rootScope.$emit('treeNameUpdate', treeNames); var lib=this; + $rootScope.isOpenSidebar = false; $scope.totalBotsSelected = true; + $scope.botCategoryList = []; + workzoneServices.getBotCategoryList().then(function (catList) { + $scope.botCategoryList=catList.data; + }); var botLibraryUIGridDefaults = uiGridOptionsService.options(); $scope.paginationParams = botLibraryUIGridDefaults.pagination; $scope.paginationParams=[]; + $scope.numofCardPages = 0; $scope.paginationParams.page = 1; - $scope.paginationParams.pageSize = 10; + $scope.paginationParams.pageSize = 9; $scope.paginationParams.sortBy = 'createdOn'; $scope.paginationParams.sortOrder = 'desc'; + $scope.botLibrarySearch = ''; + /*$scope.botLibFilterBot = 'Task'; + $scope.botLibFilterTask = 'chef'; + $scope.botLibFilterCategory = 'Active Directory';*/ $scope.initGrids = function(){ $scope.botLibGridOptions={}; @@ -28,23 +38,24 @@ 'row.entity.botLinkedSubCategory'+ 'row.entity.taskType'+ 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botLinkedCategory',cellTooltip: true}, + { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, { name: 'BOT Name',displayName: 'BOT Name',field:'botName',cellTooltip: true}, { name: 'Category',field:'botCategory',cellTooltip: true}, { name: 'description',field:'botDesc',cellTooltip: true}, + { name: 'BOT Created From',displayName: 'BOT Created From',field:'botLinkedCategory',cellTooltip: true}, { name: 'Organization',field:'masterDetails.orgName',cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate: // ''+ - ''+ - ''+ + ''+ + ''+ //''+ - '' + - '' + + '' + + '' + //'' + - '' + '' } - ] + ]; $scope.botLibGridOptions.data=[]; angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption); }; @@ -69,6 +80,13 @@ }); }, }); + + $scope.cardPaginationChange = function() { + $scope.isBotLibraryPageLoading = true; + $scope.paginationParams.page = $scope.paginationParams.page + 1; + $scope.botLibraryGridView(); + }; + $scope.setFirstPageView = function(){ $scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; }; @@ -77,11 +95,10 @@ $scope.paginationParams.sortOrder = 'desc'; if($scope.paginationParams.page !== 1){ $scope.setFirstPageView();//if current page is not 1, then ui grid will trigger a call when set to 1. - }else{ - //$scope.botLibraryGridView(); } }; $scope.setPaginationDefaults(); + $scope.tabData = []; $scope.botLibraryGridView = function() { lib.gridOptions=[]; var param={ @@ -90,7 +107,13 @@ genSevs.promiseGet(param).then(function (result) { $timeout(function() { $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; + if($scope.isCardViewActive){ + $scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots); + } else { + $scope.botLibGridOptions.data = result.bots; + } + $scope.statusBar = "Showing " + ($scope.botLibGridOptions.data.length === 0 ? "0" : "1") + " to " + $filter('number')($scope.botLibGridOptions.data.length) + " of " + $filter('number')(result.metaData.totalRecords) + " entries"; + //$scope.filterBy(); }, 100); $scope.isBotLibraryPageLoading = false; }, function(error) { @@ -100,22 +123,33 @@ }); }; $scope.botLibraryGridView(); + $scope.botTemplateClick = function(templateDetail) { + templateDetail.selected = true; + $scope.nextEnabled = true; + $rootScope.templateSelected = templateDetail; + $rootScope.$emit('BOTS_TEMPLATE_SELECTED',templateDetail); + }; $scope.searchBotNameCategory = function() { $scope.searchString = $scope.botLibrarySearch; + $scope.searchText = true; lib.gridOptions=[]; if($scope.totalBotsSelected) { var param={ url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString - } + }; } else if($scope.runningBotsselected) { var param={ url:'/bots?actionStatus=running&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString - } + }; + } else if($scope.scheduledBotsselected) { + var param={ + url:'/bots?filterBy=isBotScheduled:true&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString + }; } else if($scope.failedBotsselected) { var param={ url:'/bots?actionStatus=failed&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder+'&search=' + $scope.searchString - } - }; + }; + } genSevs.promiseGet(param).then(function (result) { $timeout(function() { $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; @@ -128,6 +162,87 @@ $scope.errorMessage = "No Records found"; }); }; + $scope.clearBotSearchText = function() { + $scope.botLibrarySearch = ''; + $scope.searchText = false; + if($scope.totalBotsSelected) { + $scope.showAllBots(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + }else if($scope.scheduledBotsselected) { + $scope.showBotsScheduled(); + } else if($scope.failedBotsselected) { + $scope.showBotsFailed(); + } + }; + + /*$scope.filterBy = function() { + if($scope.botLibFilter === 'botType') { + $scope.filterByBotType = true; + $scope.filterByTaskType = false; + $scope.filterByCategory = false; + $scope.subFilterBy = false; + } else if($scope.botLibFilter === 'taskType') { + $scope.filterByTaskType = true; + $scope.filterByBotType = false; + $scope.filterByCategory = false; + $scope.subFilterBy = false; + } else if($scope.botLibFilter === 'category') { + $scope.filterByCategory = true; + $scope.filterByBotType = false; + $scope.filterByTaskType = false; + $scope.subFilterBy = false; + } else { + $scope.subFilterBy = true; + $scope.filterByBotType = false; + $scope.filterByTaskType = false; + $scope.filterByCategory = false; + //$scope.showAllBots(); + } + };*/ + + /*$rootScope.applyFilter = function() { + lib.gridOptions=[]; + if ($scope.botLibFilter) { + var param={ + url:'/bots?filterBy=botType:'+$scope.botLibFilterBot+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + } else if($scope.botLibType) { + var param={ + url:'/bots?filterBy=botLinkedSubCategory:'+$scope.botLibFilterTask+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + } else if($scope.botLibCategory) { + var param={ + url:'/bots?filterBy=botCategory:'+$scope.botLibFilterCategory+'&page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + } else { + $scope.RefreshBotsLibrary(); + } + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + toastr.error(error); + $scope.errorMessage = "No Records found"; + }); + };*/ + + $scope.setCardView = function() { + $scope.isCardViewActive = true; + $scope.botsCardViewSelection = "bots-tab-active"; + $scope.botsTableViewSelection = ""; + }; + + $scope.botsTableView = function() { + $scope.isCardViewActive = false; + $scope.botsTableViewSelection = "bots-tab-active"; + $scope.botsCardViewSelection = ""; + }; + var gridBottomSpace = 265; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ @@ -137,19 +252,17 @@ genSevs.launchBlueprint(launch); } }; + $rootScope.botHistory = ''; $scope.botHistory=function(bot) { + $rootScope.botHistory = bot; var modalInstance = $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/bots/view/botHistory.html', controller: 'botHistoryCtrl', backdrop : 'static', size: 'lg', - keyboard: false, - resolve: { - items: function() { - return bot; - } - } + scope: $scope, + keyboard: false }); modalInstance.result.then(function(selectedItem) { $scope.selected = selectedItem; @@ -157,6 +270,7 @@ console.log('Modal Dismissed at ' + new Date()); }); }; + $scope.botInfo=function(bot) { var modalInstance = $modal.open({ animation: true, @@ -171,23 +285,21 @@ } }); modalInstance.result.then(function(selectedItem) { + console.log(selectedItem); $scope.selected = selectedItem; }, function() { console.log('Modal Dismissed at ' + new Date()); }); }; + $rootScope.botSchedule = ''; $scope.botSchedule = function(bot) { + $rootScope.botSchedule = bot; $modal.open({ templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', controller: 'botScheduleCtrl', backdrop: 'static', - keyboard: false, - resolve: { - items: function () { - return bot - } - } + keyboard: false }).result.then(function () { }, function () { @@ -201,7 +313,7 @@ actionButtonText: 'Delete', actionButtonStyle: 'cat-btn-delete', headerText: 'Delete Bot', - bodyText: 'Are you sure you want to delete this bots?' + bodyText: 'Are you sure you want to delete this BOT?' }; confirmbox.showModal({}, modalOptions).then(function() { var param={ @@ -209,7 +321,7 @@ }; genSevs.promiseDelete(param).then(function (response) { if (response) { - toastr.success('Successfully deleted'); + toastr.success('Successfully deleted.'); lib.summary(); if($scope.totalBotsSelected) { $scope.botLibraryGridView(); @@ -232,7 +344,22 @@ lib.summary(); $scope.botLibraryGridView(); }); + + $scope.clearFilter = function(name) { + if(name === $scope.botLibCategory) { + $scope.botLibCategory = false; + } else if(name === $scope.botLibAction) { + $scope.botLibAction = false; + } else { + $scope.botLibType = false; + } + }; + $scope.RefreshBotsLibrary = function() { + $scope.botLibAction = ''; + $scope.botLibCategory = ''; + $scope.botLibType = ''; + // $scope.botLibFilterCategory = 'Active Directory'; $scope.botLibrarySearch = ''; lib.summary(); if($scope.totalBotsSelected) { @@ -317,434 +444,13 @@ }); }; lib.summary(); + $scope.setCardView(); }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { $scope.botInfo = items; - $scope.cancel= function() { $modalInstance.dismiss('cancel'); }; - }]).controller('botScheduleCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) { - if(items.isBotScheduled === true){ - $scope._isEventSelected = true; - $scope.isScheduled = true; - }else{ - $scope._isEventSelected = false; - $scope.isScheduled = false; - } - $scope.scheduleDeatils = items; - $scope.botId = items.botId; - $scope.defaultSelection = function() { - $scope.repeatsType = 'Minutes';//default selection. - $scope.schedulerStartOn=moment(new Date()).format('MM/DD/YYYY'); - $scope.schedulerEndOn=moment(new Date()).format('MM/DD/YYYY'); - }; - $scope.selectBotCheckbox = function(){ - if($scope.isScheduled === true || $scope.isScheduled === 'true') { - $scope._isEventSelected = true; - }else{ - $scope._isEventSelected = false; - } - } - if(items.botScheduler){ - if(items.botScheduler.cronStartOn && items.botScheduler.cronEndOn) { - var newStartOn = parseInt(items.botScheduler.cronStartOn); - var newDate = new Date(newStartOn).toLocaleDateString(); - var datearray = newDate.split("/"); - var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; - $scope.schedulerStartOn = newdate; - var newEndOn = parseInt(items.botScheduler.cronEndOn); - var newEndData = new Date(newEndOn).toLocaleDateString(); - var datearrayNew = newEndData.split("/"); - var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; - $scope.schedulerEndOn = newdateEnd; - } else { - $scope.schedulerStartOn = items.botScheduler.cronStartOn; - $scope.schedulerEndOn = items.botScheduler.cronEndOn; - } - - $scope.repeatBy = items.botScheduler.repeatBy || items.botScheduler.cronRepeatEvery.toString(); - $scope.repeatsType = items.botScheduler.repeats || items.botScheduler.cronFrequency; - $scope.timeEventType = items.botScheduler.timeEventHour || (items.botScheduler.cronHour && items.botScheduler.cronHour !==null) ? items.botScheduler.cronHour.toString() : ''; - $scope.timeEventMinute = items.botScheduler.timeEventMinute || (items.botScheduler.cronMinute && items.botScheduler.cronMinute !==null) ? items.botScheduler.cronMinute.toString() : ''; - $scope.weekOfTheDay = items.botScheduler.weekOfTheDay || (items.botScheduler.cronWeekDay && items.botScheduler.cronWeekDay !==null) ?items.botScheduler.cronWeekDay.toString(): ''; - $scope.selectedDayOfTheMonth = items.botScheduler.selectedDayOfTheMonth || (items.botScheduler.cronDate && items.botScheduler.cronDate !==null) ?items.botScheduler.cronDate.toString() : ''; - $scope.selectedMonth = items.botScheduler.selectedMonth || (items.botScheduler.cronMonth && items.botScheduler.cronMonth !==null) ? items.botScheduler.cronMonth.toString() : ''; - /*$scope.currentDate = items.botScheduler.startDate;*/ - } else { - $scope.defaultSelection(); - } - - - $scope.dateChange= function () { - var startDate = Date.parse($scope.schedulerStartOn); - var endDate = Date.parse($scope.schedulerEndOn); - if(startDate > endDate){ - $scope.validDateRange=true; - } else { - $scope.validDateRange=false; - } - - }; - - $scope.repeatCount = function(max, step) { - step = step || 1; - var input = []; - for (var i = 1; i <= max; i += step) { - input.push(i); - } - return input; - }; - $scope.isDaySelected = { - flag:true - } - - $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; - - $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; - - $scope.ok=function(){ - $scope.eventParams = { - cronFrequency: $scope.repeatsType, - cronRepeatEvery: $scope.repeatBy, - cronStartOn: $scope.schedulerStartOn, - cronEndOn: $scope.schedulerEndOn, - cronHour: $scope.timeEventType, - cronMinute: $scope.timeEventMinute, - cronWeekDay: $scope.weekOfTheDay, - cronDate: $scope.selectedDayOfTheMonth, - cronMonth: $scope.selectedMonth - }; - var reqBody = null; - if($scope.isScheduled === true || $scope.isScheduled === 'true'){ - reqBody = { - botScheduler:$scope.eventParams, - isBotScheduled:true - } - }else{ - reqBody = { - botScheduler:{}, - isBotScheduled:false - } - } - var param={ - url:'/bots/' + $scope.botId + '/scheduler', - data: reqBody - }; - genSevs.promisePut(param).then(function (response) { - if(response){ - toastr.success('BOTs Scheduler successfully updated'); - $rootScope.$emit('BOTS_LIBRARY_REFRESH'); - $modalInstance.dismiss('cancel'); - } - }); - }; - - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', 'workzoneServices', - function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs, workzoneServices){ - //UI Grid for chef Task starts - $scope.botHistory = items; - $scope.botId = items.botId; - $scope.taskHistoryChefData = []; - var gridOptionsChef = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryChefGridOptions = gridOptionsChef; - - $scope.initChefGrids = function(){ - $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; - $scope.taskHistoryChefGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
      '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + - 'NA', cellTooltip: true} - ]; - }; - angular.extend($scope, { - taskHistoryChefListView: function() { - $scope.taskHistoryChefData = []; - var param={ - url:'/bots/' + $scope.botId + '/bots-history' - }; - genSevs.promiseGet(param).then(function (response) { - $timeout(function() { - if(response.botHistory){ - $scope.taskHistoryChefData = response.botHistory; - $scope.ischefTaskHistoryPageLoading = false; - }else if(response){ - $scope.taskHistoryChefData = response; - $scope.ischefTaskHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Chef History Records found"; - $scope.ischefTaskHistoryPageLoading = false; - }); - }, - getExecutionTime: function(endTime, startTime) { - $scope.executionTimeinMS = endTime-startTime; - $scope.executionTime = $scope.executionTimeinMS/(60000); - return +(Math.round($scope.executionTime + "e+1") + "e-1"); - }, - getSavedTime: function(endTime, startTime) { - var executionTime = $scope.getExecutionTime(endTime, startTime); - $scope.savedTime = items.manualExecutionTime-executionTime; - return $scope.savedTime; - } - }); - $scope.initchef = function(){ - $scope.initChefGrids(); - $scope.taskHistoryChefListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); - }; - //UI Grid for chef Task ends - - //UI Grid for jenkins Task starts - $scope.taskHistoryJenkinsData = []; - var gridOptionsJenkins = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryJenkinsGridOptions = gridOptionsJenkins; - - $scope.initJenkinsGrids = function(){ - $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; - $scope.taskHistoryJenkinsGridOptions.columnDefs = [ - { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'{{row.entity.auditTrailConfig.jenkinsBuildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'Job Output',cellTemplate:'',cellTooltip: true}, - { name:'Log Info',width: 90,cellTemplate:'',cellTooltip: true}, - { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status.toUpperCase()}}
      '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}',cellTooltip: true}, - { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}',cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + - 'NA', cellTooltip: true} - ]; - }; - angular.extend($scope, { - taskHistoryJenkinsListView: function() { - $scope.taskHistoryJenkinsData = []; - var param={ - url:'/bots/' + $scope.botId + '/bots-history' - }; - genSevs.promiseGet(param).then(function (response) { - $timeout(function() { - if(response.botHistory){ - $scope.taskHistoryJenkinsData = response.botHistory; - $scope.isjenkinsTaskHistoryPageLoading = false; - }else if(response){ - $scope.taskHistoryJenkinsData = response; - console.log($scope.taskHistoryJenkinsData); - $scope.isjenkinsTaskHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Jenkins History Records found"; - $scope.isjenkinsTaskHistoryPageLoading = false; - }); - }, - }); - $scope.initjenkins = function(){ - $scope.initJenkinsGrids(); - $scope.taskHistoryJenkinsListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); - }; - //UI Grid for jenkins Task ends - - //UI Grid for script Task starts - $scope.taskHistoryScriptData = []; - var gridOptionsScript = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryScriptGridOptions = gridOptionsScript; - - $scope.initScriptGrids = function(){ - $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; - $scope.taskHistoryScriptGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
      '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + - 'NA', cellTooltip: true} - ]; - }; - angular.extend($scope, { - taskHistoryScriptListView: function() { - $scope.taskHistoryScriptData = []; - var param={ - url:'/bots/' + $scope.botId + '/bots-history' - }; - genSevs.promiseGet(param).then(function (response) { - $timeout(function() { - if(response.botHistory){ - $scope.taskHistoryScriptData = response.botHistory; - $scope.isscriptTaskHistoryPageLoading = false; - }else if(response){ - $scope.taskHistoryScriptData = response; - $scope.isscriptTaskHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Script History Records found"; - $scope.isscriptTaskHistoryPageLoading = false; - }); - }, - }); - $scope.initscript = function(){ - $scope.initScriptGrids(); - $scope.taskHistoryScriptListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); - }; - //UI Grid for script Task ends - - //UI Grid for Blueprint starts - $scope.botHistoryBlueprintData = []; - var gridOptionsScript = uiGridOptionsClient.options().gridOption; - $scope.botHistoryBlueprintGridOptions = gridOptionsScript; - - $scope.initBlueprintGrids = function(){ - $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; - $scope.botHistoryBlueprintGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
      {{row.entity.status}}
      ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
      '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + - 'NA', cellTooltip: true} - ]; - }; - angular.extend($scope, { - botHistoryBlueprintListView: function() { - $scope.botHistoryBlueprintData = []; - var param={ - url:'/bots/' + $scope.botId + '/bots-history' - }; - genSevs.promiseGet(param).then(function (response) { - $timeout(function() { - if(response.botHistory){ - $scope.botHistoryBlueprintData = response.botHistory; - $scope.isBlueprintBotHistoryPageLoading = false; - }else if(response){ - $scope.botHistoryBlueprintData = response; - $scope.isBlueprintBotHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Script History Records found"; - $scope.isBlueprintBotHistoryPageLoading = false; - }); - }, - }); - $scope.initblueprint = function(){ - $scope.initBlueprintGrids(); - $scope.botHistoryBlueprintListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); - }; - //UI Grid for Blueprint ends - - $scope.bot=items; - switch ($scope.bot.botLinkedSubCategory){ - case 'chef' : - $scope.ischefTaskHistoryPageLoading = true; - $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = false; - $scope.isBlueprintBotHistoryPageLoading = false; - $scope.initchef(); - break; - case 'jenkins' : - $scope.ischefTaskHistoryPageLoading = false; - $scope.isjenkinsTaskHistoryPageLoading = true; - $scope.isscriptTaskHistoryPageLoading = false; - $scope.isBlueprintBotHistoryPageLoading = false; - $scope.initjenkins(); - break; - case 'script': - $scope.ischefTaskHistoryPageLoading = false; - $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = true; - $scope.isBlueprintBotHistoryPageLoading = false; - $scope.initscript(); - break; - case 'instance_launch': - case 'aws_cf': - case 'docker': - case 'azure_launch': - $scope.ischefTaskHistoryPageLoading = false; - $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = false; - $scope.isBlueprintBotHistoryPageLoading = true; - $scope.initblueprint(); - break; - } - - $scope.historyLogs=function(hist) { - console.log(hist); - if(hist.auditTrailConfig && (hist.auditTrailConfig.executionType == 'chef') || (hist.auditTrailConfig.executionType == 'jenkins') || (hist.auditTrailConfig.executionType == 'script')) { - var modalInstance = $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', - controller: 'botExecutionLogsCtrl as botExecLogCtrl', - backdrop : 'static', - keyboard: false, - resolve: { - items: function() { - return { - taskId : hist.auditId, - historyId : hist.auditHistoryId ? hist.auditHistoryId : hist.auditTrailConfig.nodeIdsWithActionLog[0] && hist.auditTrailConfig.nodeIdsWithActionLog[0].actionLogId, - taskType:hist.auditTrailConfig.executionType - }; - } - } - }); - modalInstance.result.then(function(selectedItem) { - $scope.selected = selectedItem; - }, function() { - console.log('Modal Dismissed at ' + new Date()); - }); - } else { - var modalInstance = $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html', - controller: 'cpActionHistoryLogCtrl', - backdrop : 'static', - keyboard: false, - resolve: { - items: function() { - return { - actionHistoryData : hist, - cpInstance: hist - }; - } - } - }); - modalInstance.result.then(function(selectedItem) { - $scope.selected = selectedItem; - }, function() { - console.log('Modal Dismissed at ' + new Date()); - }); - }; - } - - $scope.cancel= function() { - $modalInstance.dismiss('cancel'); - }; - } - ]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', '$rootScope', function ($scope, $modal, $modalInstance, items, genSevs, toastr, $rootScope) { + }]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', '$rootScope', function ($scope, $modal, $modalInstance, items, genSevs, toastr, $rootScope) { $scope.botId = items.botId; $scope.isJobRunExecuting = false; diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html new file mode 100644 index 000000000..3591a25a1 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html @@ -0,0 +1,104 @@ + +
      +
      +
      +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParametersValues
    BOT Name{{botInfo.botName}}
    Task Type:{{botInfo.botLinkedSubCategory}}
    Blueprint Type + + + + + + +
    Bot Type{{botInfo.botType}}
    BOT Category{{botInfo.botCategory}}
    BOT Description{{botInfo.botDesc}}
    Runlist + +
    Attribute{{$index+1}}{{attribs.name}}
    Attribute{{botInfo.botConfig.attributes[0].name}}
    Job Name{{botInfo.botConfig.jobName}}
    Job URL{{botInfo.botConfig.jobURL}}
    Bot Parameter Type{{botInfo.botConfig.parameterized[0].parameterName}}
    Bot Parameter Name{{botInfo.botConfig.parameterized[0].name}}
    Bot Parameter Values{{botInfo.botConfig.parameterized[0].defaultValue}}
    Bot Parameter Description{{botInfo.botConfig.parameterized[0].description}}
    Script Type Name{{botInfo.botConfig.scriptTypeName}}
    Script Parameter Description{{botInfo.botConfig.scriptDetails[0].scriptParameters[0].paramDesc}}
    Script Parameter{{$index+1}} Description{{desc.paramDesc}}
    +
    +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/readme.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/readme.html new file mode 100644 index 000000000..5cbce112b --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/readme.html @@ -0,0 +1,11 @@ + + +
    + + +
    + +
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html new file mode 100644 index 000000000..0b9022453 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html @@ -0,0 +1,29 @@ + + +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    +
    No Data Found
    +
    +
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html new file mode 100644 index 000000000..762f510d0 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html @@ -0,0 +1,141 @@ + + +
    + + +
    +
    +
    + × +

     Schedule your Bot

    +
    + +
    +
    + +
    +
    + + + + +
    + + + +
    + + +
    +
    + + + Start Date should be less than End date ! +
    +
    +
    +
    +
    + Interval +
    + + +
    +
    + + +
    + + + + +
    + + +
    +
    + + +
    + +
    + + +
    + + +
    + + +
    + + + +
    +
    +
    +
    + + +
    +
    +
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html new file mode 100644 index 000000000..f1fae24d5 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html @@ -0,0 +1,13 @@ + + +
    + + +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sit amet turpis nec justo aliquet malesuada. Donec fringilla, nibh a efficitur accumsan, sapien lacus sodales ante, et finibus mi tortor id augue. Fusce facilisis non quam at consectetur. Sed sit amet sem eu lacus efficitur sodales. Mauris ut ligula eu dui rhoncus consectetur. Integer aliquet risus dolor, sit amet aliquet tellus lacinia et. Nullam eleifend tincidunt erat quis sodales. Duis pretium ultrices urna sed malesuada. Duis tristique, quam et placerat bibendum, tellus nisl luctus metus, vitae vulputate lectus ligula vitae enim. Sed ac eros non augue mollis semper. Phasellus tellus tellus, mollis at lacinia et, malesuada eget leo. Sed ex magna, consequat eget nibh vitae, gravida gravida nulla. Vivamus hendrerit molestie felis, vitae congue sem sodales vitae.

    + +

    Vivamus id lorem semper, sagittis elit eget, hendrerit velit. In ac urna et sem feugiat sollicitudin. Integer dapibus sem eu erat pellentesque porttitor. Sed ornare mi et pretium fermentum. Quisque ornare odio eu massa vehicula, a fermentum ante condimentum. Fusce at rutrum erat. Maecenas lacinia egestas quam ut faucibus. Praesent elementum felis viverra velit fermentum, et iaculis nunc consequat. Quisque tincidunt justo vel fringilla tincidunt. Suspendisse suscipit, dolor id bibendum efficitur, ex est semper ligula, at condimentum lacus nulla at lectus. Nunc bibendum felis sit amet tellus finibus pulvinar. In hac habitasse platea dictumst. Fusce a urna tempus, fringilla justo non, viverra ante. Fusce nunc erat, porttitor vel eros a, consectetur tincidunt odio.

    + +

    Cras aliquam magna et massa posuere posuere. Nunc scelerisque auctor purus, eget porta tortor volutpat sed. Donec ut congue lectus. Aliquam erat volutpat. Etiam quis eros in velit vulputate mollis. Aliquam metus metus, maximus sit amet tempor sed, fringilla vitae purus. Nam dictum eget velit sed lobortis. In non nisi dictum, fringilla mi congue, tincidunt massa. Integer accumsan viverra lectus. Duis sem purus, accumsan nec gravida in, consectetur sed felis. Maecenas dapibus eros vel magna auctor interdum. Cras aliquam nisi tincidunt, gravida lectus vel, laoreet metus. Integer dapibus, elit in mollis auctor, est ex accumsan lorem, vel consequat libero ligula eget sem. Fusce imperdiet purus non convallis tristique. Sed maximus nulla at nibh mollis ornare ut sed dolor.

    +
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html new file mode 100644 index 000000000..02a09ccb6 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html @@ -0,0 +1,82 @@ + + +
    +
    + BOTs Description  + +
    +
    +
    +
    +
    +
    + +
    +
    {{templateSelected.botName}}
    +
    + +
    +
    {{templateSelected.botDesc}}
    +
    +
    + + + +
    + +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 683e46691..401a2d0fb 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -1,123 +1,194 @@ - +
    -
    - BOTs Library  - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Total BOTs -
    -
    - {{botSummary.totalNoOfBots}} -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Running BOTs -
    -
    - {{botSummary.totalNoOfRunningBots}} -
    - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - Time saved -
    -
    - {{totalSavedTimeForBots}} mins -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Scheduled BOTs -
    -
    - {{botSummary.totalNoOfScheduledBots}} -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Failed BOTs -
    -
    - {{botSummary.totalNoOfFailedBots}} -
    - -
    -
    -
    -
    -
    +
    + BOTs Library  + + + + +
    +
    + + + + +
    +
    +
    +
    + +
    + Total + {{botSummary.totalNoOfBots}} +
    +
    +
    +
    +
    + +
    + Running + {{botSummary.totalNoOfRunningBots}} +
    +
    +
    +
    +
    + +
    + Scheduled + {{botSummary.totalNoOfScheduledBots}} +
    +
    +
    +
    +
    + +
    + Time Saved + {{totalSavedTimeForBots}} mins +
    +
    +
    +
    +
    + +
    + Failed + {{botSummary.totalNoOfFailedBots}} +
    +
    +
    + +
    +
    + + -
    -
    - -
    -
    + +
    +
    +
    + Featured BOTs  ({{botSummary.totalNoOfBots}}) + + + + + Functionality + {{botLibCategory}}× + + Action + {{botLibAction}}× + + Type + {{botLibType}}× + + + + + + + +
    + +
    +
    + +
    + +
    +
    +
    {{botsDetails.botName}}
    +
    + +
    +
    +
    +
    {{botsDetails.botDesc}}
    +
    +
    + +
    + +
    +
    + +
    Load More
    +
    +
    {{statusBar}}
    +
    +
    + -
    - No data Available -
    -
    -
    + +
    + No data Available +
    +
    + + \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss b/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss index 31191d43b..8df53d459 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/workzone.scss @@ -150,19 +150,3 @@ } } } -// grid view tab class -.hide-grid { - margin: 0px auto !important; - padding: 0px !important; - visibility: hidden; - height: 0px !important; - overflow: hidden; -} -.show-grid-tab { - visibility: visible; - height: auto; -} -.show-grid { - visibility: inherit; - height: auto; -} \ No newline at end of file From 4c16d0918d9d5cc05d8144950ff6e685e1b4afe5 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Fri, 27 Jan 2017 16:41:41 +0530 Subject: [PATCH 22/66] menu changed --- .../sections/dashboard/analytics/analytics.js | 4 ++-- .../analytics/controller/capacityReportCtrl.js | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 1a0485f26..59beeae48 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -153,7 +153,7 @@ $scope.getProviders(orgs[0].rowid); }); if (!$rootScope.stateParams.view) { - $state.go('dashboard.analytics.capacityReport'); + $state.go('dashboard.analytics.cost'); } analytic.tabShow=function(chat,report){ analytic.tabShowChat=chat; @@ -288,7 +288,7 @@ $rootScope.filterNewEnt.resources=$scope.selectedResources; }; if (!$rootScope.stateParams.view && $rootScope.organObject) { - $state.go('dashboard.analytics.capacityReport'); + $state.go('dashboard.analytics.cost'); } }]); })(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 57dbfb6f7..166d3404e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -37,19 +37,6 @@ capRept.serviceCapacity=result.capacity.AWS; //capRept.serviceType=Object.keys(capRept.serviceCapacity.services)[0]; capRept.serviceType='EC2'; - if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { - angular.forEach(result.splitUpCapacities, function (val, key) { - var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { - return str.toUpperCase(); - }); - $rootScope.splitUpCapacities.push({id:key,val:a}); - }); - if( $rootScope.splitUpCapacities && $rootScope.splitUpCapacities.length >0) { - $scope.$emit('CHANGE_splitUp', $rootScope.splitUpCapacities[0].id); - capRept.splitUp = $rootScope.splitUpCapacities[0].val; - capRept.createLable(result, $rootScope.splitUpCapacities[0].id); - } - } capRept.createList(); }); @@ -172,7 +159,6 @@ gridApi.grid.registerRowsProcessor($scope.singleFilter, 200); $scope.gridApi = gridApi; }; - if(capRept.serviceType === 'EC2' && fltrObj && fltrObj.provider && fltrObj.provider.id) { if($rootScope.organNewEnt.instanceType === 'Managed') { $scope.colArray.push('bgName','projectName','environmentName'); From 60c4d67c0328d74680eb9a00755aeb561ceaaf26 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Mon, 30 Jan 2017 11:38:12 +0530 Subject: [PATCH 23/66] added month name in cost field --- .../dashboard/analytics/controller/capacityReportCtrl.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 166d3404e..8bbac67f6 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -82,6 +82,9 @@ $scope.chefConfig=function (id) { genSevs.editRunlist(id); }; + $scope.monthNames = ["January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December"]; + + $scope.currentMonth = $scope.monthNames[new Date().getMonth()]; capRept.createList = function () { capRept.filterValue=''; capRept.listGrid=[]; @@ -107,7 +110,7 @@ }, { name: 'cost', - displayName: 'Cost', + displayName: 'Cost ( '+$scope.currentMonth+' )', cellTemplate: '' }, { @@ -132,7 +135,7 @@ }, { name: 'cost', - displayName: 'Cost', + displayName: 'Cost ( '+$scope.currentMonth+' )', cellTemplate: '' }, { @@ -151,7 +154,7 @@ {name: 'bucketOwnerName', field: 'bucketOwnerName', cellTooltip: true}, {name: 'bucketSize', field: 'bucketSize', displayName:'Bucket Size (MB)', cellTooltip: true}, - {name: 'cost', displayName: 'Cost',cellTemplate: ''}, + {name: 'cost', displayName: 'Cost ( '+$scope.currentMonth+' )',cellTemplate: ''}, {name: 'Action', cellTooltip: true,cellTemplate:" "} ]; } From 8bd98ebd98edf9b0ec05cb882845b937f4d41435 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Mon, 30 Jan 2017 18:19:46 +0530 Subject: [PATCH 24/66] Add LastRunTime field for BOTs --- server/app/model/bots/bots.js | 4 ++++ server/app/services/blueprintService.js | 12 ++++++------ server/app/services/taskService.js | 6 +++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 2736a74cc..49724d9e8 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -108,6 +108,10 @@ var BotsSchema = new Schema ({ type: Number, default: 0 }, + lastRunTime: { + type: Number, + default: Date.now() + }, isBotScheduled: { type: Boolean, default: false diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js index d7c78bada..6e014f799 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -238,12 +238,12 @@ blueprintService.launch = function launch(blueprintId,reqBody, callback) { logger.error(err); }else if(botData.length > 0){ var botExecutionCount = botData[0].executionCount + 1; - bots.updateBotsExecutionCount(blueprint._id,botExecutionCount,function(err,data){ - if(err){ - logger.error("Error while updating Bot Execution Count"); - } - }); - bots.updateBotsDetail(blueprint._id,{runTimeParams:reqBody},function(err,data){ + var botUpdateObj = { + executionCount:botExecutionCount, + lastRunTime:new Date().getTime(), + runTimeParams:reqBody + } + bots.updateBotsDetail(blueprint._id,botUpdateObj,function(err,data){ if(err){ logger.error("Error while updating Bots Configuration"); } diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 106c8d95d..fc7c35af8 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -215,7 +215,11 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic logger.error("Error while updating Task Execution Count"); } }); - bots.updateBotsExecutionCount(task._id, botExecutionCount, function (err, data) { + var botUpdateObj = { + executionCount:botExecutionCount, + lastRunTime:new Date().getTime() + } + bots.updateBotsDetail(task._id, botUpdateObj, function (err, data) { if (err) { logger.error("Error while updating Bot Execution Count"); } From af1d14102aa22d6149e13663eedcc7ab979318f0 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Mon, 30 Jan 2017 18:45:52 +0530 Subject: [PATCH 25/66] Removed commented code --- .../sections/dashboard/bots/tabs/param.html | 87 ------------------- 1 file changed, 87 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html index 3f77a1007..312af503b 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html @@ -16,93 +16,6 @@ {{botParams.type}} {{botParams.default}} - From 19c52bd82827ed04f00d5539a86e3af58c90c44e Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Mon, 30 Jan 2017 22:28:38 +0530 Subject: [PATCH 26/66] Last Run added in bots list, sorting as per last run and history pagination changed --- .../dashboard/bots/controller/libraryCtrl.js | 84 ++++++++++--------- .../dashboard/bots/view/botHistory.html | 10 +-- 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index 59624ca07..bdfbf14fd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -43,6 +43,7 @@ { name: 'description',field:'botDesc',cellTooltip: true}, { name: 'BOT Created From',displayName: 'BOT Created From',field:'botLinkedCategory',cellTooltip: true}, { name: 'Organization',field:'masterDetails.orgName',cellTooltip: true}, + { name: 'Last Run',field:'lastRunTime ',cellTemplate:'{{row.entity.lastRunTime | timestampToLocaleTime}}', cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate: // ''+ @@ -83,7 +84,7 @@ $scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; }; $scope.setPaginationDefaults = function() { - $scope.paginationParams.sortBy = 'createdOn'; + $scope.paginationParams.sortBy = 'lastRunTime'; $scope.paginationParams.sortOrder = 'desc'; if($scope.paginationParams.page !== 1){ $scope.setFirstPageView();//if current page is not 1, then ui grid will trigger a call when set to 1. @@ -551,17 +552,25 @@ $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; - }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsClient', 'genericServices', - function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsClient, genSevs){ + }]).controller('botHistoryCtrl',["items", '$scope', '$modalInstance', '$modal', '$timeout', 'uiGridOptionsService', 'genericServices', + function(items, $scope, $modalInstance, $modal, $timeout, uiGridOptionsService, genSevs){ //UI Grid for chef Task starts + $scope.botHistory = items; $scope.botId = items.botId; $scope.taskHistoryChefData = []; - var gridOptionsChef = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryChefGridOptions = gridOptionsChef; + $scope.paginationParams = []; + var botLibraryUIGridDefaults = uiGridOptionsService.options(); + $scope.paginationParams = botLibraryUIGridDefaults.pagination; + + $scope.paginationParams.page = 1; + $scope.paginationParams.pageSize = 10; + $scope.paginationParams.sortBy = 'startedOn'; + $scope.paginationParams.sortOrder = 'desc'; + $scope.initChefGrids = function(){ - $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; + $scope.taskHistoryChefGridOptions = {}; $scope.taskHistoryChefGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, { name:'User',field:'user',cellTooltip: true}, @@ -574,20 +583,23 @@ { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; + $scope.taskHistoryChefGridOptions.data = []; + angular.extend($scope.taskHistoryChefGridOptions,botLibraryUIGridDefaults.gridOption); }; angular.extend($scope, { taskHistoryChefListView: function() { - $scope.taskHistoryChefData = []; var param={ - url:'/bots/' + $scope.botId + '/bots-history' + url:'/bots/' + $scope.botId + '/bots-history?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { if(response.botHistory){ - $scope.taskHistoryChefData = response.botHistory; + $scope.taskHistoryChefGridOptions.totalItems = response.metaData.totalRecords; + $scope.taskHistoryChefGridOptions.data = response.botHistory; $scope.ischefTaskHistoryPageLoading = false; }else if(response){ - $scope.taskHistoryChefData = response; + $scope.taskHistoryChefGridOptions.data = response; + $scope.taskHistoryChefGridOptions = response; $scope.ischefTaskHistoryPageLoading = false; } },100); @@ -616,12 +628,8 @@ //UI Grid for chef Task ends //UI Grid for jenkins Task starts - $scope.taskHistoryJenkinsData = []; - var gridOptionsJenkins = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryJenkinsGridOptions = gridOptionsJenkins; - $scope.initJenkinsGrids = function(){ - $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; + $scope.taskHistoryJenkinsGridOptions={}; $scope.taskHistoryJenkinsGridOptions.columnDefs = [ { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'{{row.entity.auditTrailConfig.jenkinsBuildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, { name:'Job Output',cellTemplate:'',cellTooltip: true}, @@ -634,21 +642,23 @@ { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; + $scope.taskHistoryJenkinsGridOptions.data = []; + angular.extend($scope.taskHistoryJenkinsGridOptions,botLibraryUIGridDefaults.gridOption); }; angular.extend($scope, { taskHistoryJenkinsListView: function() { - $scope.taskHistoryJenkinsData = []; var param={ - url:'/bots/' + $scope.botId + '/bots-history' + url:'/bots/' + $scope.botId + '/bots-history?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { if(response.botHistory){ - $scope.taskHistoryJenkinsData = response.botHistory; + $scope.taskHistoryJenkinsGridOptions.totalItems = response.metaData.totalRecords; + $scope.taskHistoryJenkinsGridOptions.data = response.botHistory; $scope.isjenkinsTaskHistoryPageLoading = false; }else if(response){ - $scope.taskHistoryJenkinsData = response; - console.log($scope.taskHistoryJenkinsData); + $scope.taskHistoryJenkinsGridOptions.data = response; + $scope.taskHistoryJenkinsGridOptions = response; $scope.isjenkinsTaskHistoryPageLoading = false; } },100); @@ -667,12 +677,8 @@ //UI Grid for jenkins Task ends //UI Grid for script Task starts - $scope.taskHistoryScriptData = []; - var gridOptionsScript = uiGridOptionsClient.options().gridOption; - $scope.taskHistoryScriptGridOptions = gridOptionsScript; - $scope.initScriptGrids = function(){ - $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; + $scope.taskHistoryScriptGridOptions = {}; $scope.taskHistoryScriptGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, { name:'User',field:'user',cellTooltip: true}, @@ -685,20 +691,23 @@ { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; + $scope.taskHistoryScriptGridOptions.data = []; + angular.extend($scope.taskHistoryScriptGridOptions,botLibraryUIGridDefaults.gridOption); }; angular.extend($scope, { taskHistoryScriptListView: function() { - $scope.taskHistoryScriptData = []; var param={ - url:'/bots/' + $scope.botId + '/bots-history' + url:'/bots/' + $scope.botId + '/bots-history?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { if(response.botHistory){ - $scope.taskHistoryScriptData = response.botHistory; + $scope.taskHistoryScriptGridOptions.totalItems = response.metaData.totalRecords; + $scope.taskHistoryScriptGridOptions.data = response.botHistory; $scope.isscriptTaskHistoryPageLoading = false; }else if(response){ - $scope.taskHistoryScriptData = response; + $scope.taskHistoryScriptGridOptions.data = response; + $scope.taskHistoryScriptGridOptions = response; $scope.isscriptTaskHistoryPageLoading = false; } },100); @@ -717,12 +726,8 @@ //UI Grid for script Task ends //UI Grid for Blueprint starts - $scope.botHistoryBlueprintData = []; - var gridOptionsScript = uiGridOptionsClient.options().gridOption; - $scope.botHistoryBlueprintGridOptions = gridOptionsScript; - $scope.initBlueprintGrids = function(){ - $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; + $scope.botHistoryBlueprintGridOptions = {}; $scope.botHistoryBlueprintGridOptions.columnDefs = [ { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, { name:'User',field:'user',cellTooltip: true}, @@ -735,20 +740,23 @@ { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; + $scope.botHistoryBlueprintGridOptions.data = []; + angular.extend($scope.botHistoryBlueprintGridOptions,botLibraryUIGridDefaults.gridOption); }; angular.extend($scope, { botHistoryBlueprintListView: function() { - $scope.botHistoryBlueprintData = []; var param={ - url:'/bots/' + $scope.botId + '/bots-history' + url:'/bots/' + $scope.botId + '/bots-history?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (response) { $timeout(function() { if(response.botHistory){ - $scope.botHistoryBlueprintData = response.botHistory; + $scope.botHistoryBlueprintGridOptions.totalItems = response.metaData.totalRecords; + $scope.botHistoryBlueprintGridOptions.data = response.botHistory; $scope.isBlueprintBotHistoryPageLoading = false; }else if(response){ - $scope.botHistoryBlueprintData = response; + $scope.botHistoryBlueprintGridOptions.data = response.botHistory; + $scope.botHistoryBlueprintGridOptions = response.botHistory; $scope.isBlueprintBotHistoryPageLoading = false; } },100); diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html index 0a23d5a2b..26a34898d 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -14,24 +14,24 @@

    -
    +
    -
    +
    -
    +
    -
    +
    -
    No Data Found
    +
    No Data Found
    From 8ec7c4cf00b2c8a65f1f289e3582a86a8ee7cdb9 Mon Sep 17 00:00:00 2001 From: Udesh Kumar Date: Tue, 31 Jan 2017 11:53:37 +0530 Subject: [PATCH 27/66] Fixed Environment tag mapping issue for rds/s3 --- .../cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index f74a011c5..3009e6235 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -388,13 +388,14 @@ function tagMappingSyncForResources(resources,provider,category,next){ } } } + if (environmentTag !== null && environmentTag.name in resource.tags) { + var environmentEntityMappings = Object.keys(environmentTag.catalystEntityMapping).map( function (k) { return environmentTag.catalystEntityMapping[k] }); - - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + for (var y = 0; y < environmentEntityMappings.length; y++) { if ((resource.tags[environmentTag.name] !== '') && ('tagValues' in environmentEntityMappings[y]) && (environmentEntityMappings[y].tagValues.indexOf( From a9c91b59e7790de9619a4ffbe9bb7b3fbf1592fb Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Tue, 31 Jan 2017 18:00:40 +0530 Subject: [PATCH 28/66] Remove entity-cost/capacity/resource based on removing providers --- server/app/lib/utils/providerUtil.js | 4 +- server/app/model/bots/bots.js | 3 +- .../classes/masters/cloudprovider/keyPair.js | 60 ++++++++++++------- .../model/entity-capacity/entity-capacity.js | 14 +++++ server/app/model/entity-costs/entity-costs.js | 13 ++++ .../model/resource-costs/resource-costs.js | 13 ++++ server/app/services/instanceService.js | 10 +++- 7 files changed, 91 insertions(+), 26 deletions(-) diff --git a/server/app/lib/utils/providerUtil.js b/server/app/lib/utils/providerUtil.js index 58db65d81..a0560e59f 100755 --- a/server/app/lib/utils/providerUtil.js +++ b/server/app/lib/utils/providerUtil.js @@ -26,13 +26,13 @@ var Cryptography = require('../../lib/utils/cryptography'); // saveAwsPemFiles() capture all uploaded files from request and save. var ProviderUtil = function() { - this.saveAwsPemFiles = function(keyPair, inFiles, callback) { + this.saveAwsPemFiles = function(keyPairId, inFiles, callback) { logger.debug("Path: ", inFiles); var settings = appConfig; //encrypting default pem file var cryptoConfig = appConfig.cryptoSettings; var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var encryptedPemFileLocation = settings.instancePemFilesDir + keyPair._id; + var encryptedPemFileLocation = settings.instancePemFilesDir + keyPairId; fs.readFile(inFiles.path, function(err, data) { if (err) { logger.debug("File not found in specified path."); diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index 49724d9e8..456a3194d 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -109,8 +109,7 @@ var BotsSchema = new Schema ({ default: 0 }, lastRunTime: { - type: Number, - default: Date.now() + type: Number }, isBotScheduled: { type: Boolean, diff --git a/server/app/model/classes/masters/cloudprovider/keyPair.js b/server/app/model/classes/masters/cloudprovider/keyPair.js index 591d50249..46bac0652 100755 --- a/server/app/model/classes/masters/cloudprovider/keyPair.js +++ b/server/app/model/classes/masters/cloudprovider/keyPair.js @@ -104,27 +104,45 @@ awsKeyPairSchema.statics.createNew = function(req, providerId, callback) { var keyPairObj = keyPairs[count1]; keyPairObj.providerId = providerId; keyPairObj.id = 99; - - var keyPair = new that(keyPairObj); - keyPair.save(function(err, aKeyPair) { - if (err) { - logger.error(err); - callback(err, null); - return; - } - returnKeyPair.push(keyPair); - count++; - ProviderUtil.saveAwsPemFiles(keyPair, files[count1], function(err, flag) { - if (err) { - logger.debug("Unable to save pem files."); - res.status(500).send("Unable to save pem files."); - return; - } - }); - - if (keyPairs.length === count) { - logger.debug("Exit createNew with keyPair present"); - callback(null, returnKeyPair); + AWSKeyPair.find({ + "providerId": providerId, + 'keyPairName': keyPairObj.keyPairName + }, function(err, aKeyPair) { + if(err){ + + }else if(aKeyPair.length > 0){ + count++; + ProviderUtil.saveAwsPemFiles(aKeyPair[0]._id, files[count1], function(err, flag) { + if (err) { + logger.debug("Unable to save pem files."); + return; + } + }); + if (keyPairs.length === count) { + logger.debug("Exit createNew with keyPair present"); + callback(null, returnKeyPair); + } + }else{ + var keyPair = new that(keyPairObj); + keyPair.save(function(err, aKeyPair) { + if (err) { + logger.error(err); + callback(err, null); + return; + } + returnKeyPair.push(keyPair); + count++; + ProviderUtil.saveAwsPemFiles(aKeyPair._id, files[count1], function(err, flag) { + if (err) { + logger.debug("Unable to save pem files."); + return; + } + }); + if (keyPairs.length === count) { + logger.debug("Exit createNew with keyPair present"); + callback(null, returnKeyPair); + } + }); } }); })(i); diff --git a/server/app/model/entity-capacity/entity-capacity.js b/server/app/model/entity-capacity/entity-capacity.js index 8e0f19dde..3e6d09403 100644 --- a/server/app/model/entity-capacity/entity-capacity.js +++ b/server/app/model/entity-capacity/entity-capacity.js @@ -124,5 +124,19 @@ EntityCapacitySchema.statics.upsertEntityCapacity }); } +EntityCapacitySchema.statics.removeEntityCapacityByProviderId = function removeEntityCapacityByProviderId(providerId, callback) { + var query = { + 'entity.id': providerId, + 'entity.type':'provider' + }; + this.find(query).remove(function(err, result) { + if (err) { + callback(err) + } else { + callback(null, result) + } + }) +} + var EntityCapacity = mongoose.model('EntityCapacity', EntityCapacitySchema) module.exports = EntityCapacity \ No newline at end of file diff --git a/server/app/model/entity-costs/entity-costs.js b/server/app/model/entity-costs/entity-costs.js index 93172ebda..299bae8ca 100644 --- a/server/app/model/entity-costs/entity-costs.js +++ b/server/app/model/entity-costs/entity-costs.js @@ -138,5 +138,18 @@ EntityCostsSchema.statics.deleteEntityCost = function deleteEntityCost(parentEnt }) } +EntityCostsSchema.statics.removeEntityCostByProviderId = function removeEntityCostByProviderId(providerId, callback) { + var query = { + 'entity.id': providerId, + 'entity.type':'provider' + }; + this.find(query).remove(function(err, result) { + if (err) { + callback(err) + } else { + callback(null, result) + } + }) +} var EntityCosts = mongoose.model('EntityCosts', EntityCostsSchema) module.exports = EntityCosts \ No newline at end of file diff --git a/server/app/model/resource-costs/resource-costs.js b/server/app/model/resource-costs/resource-costs.js index 2c8f9a306..ba32154ea 100644 --- a/server/app/model/resource-costs/resource-costs.js +++ b/server/app/model/resource-costs/resource-costs.js @@ -166,6 +166,19 @@ ResourceCostsSchema.statics.remove }) } +ResourceCostsSchema.statics.removeResourceCostByProviderId = function(providerId, callback) { + this.remove({ + providerId: providerId + }, function(err, data) { + if (err) { + logger.error("Failed to removeResourceCostByProviderId (%s)", providerId, err); + callback(err, null); + return; + } + callback(null, data); + }); +}; + ResourceCostsSchema.statics.upsert = function upsert(resourceCostData, callback) { var query = { organizationId: resourceCostData.organizationId, diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js index 7d16da2a1..ef5e8e7e8 100644 --- a/server/app/services/instanceService.js +++ b/server/app/services/instanceService.js @@ -22,7 +22,7 @@ var logger = require('_pr/logger')(module); var EC2 = require('_pr/lib/ec2.js'); var Cryptography = require('../lib/utils/cryptography'); var tagsModel = require('_pr/model/tags/tags.js'); -var resourceCost = require('_pr/model/resource-costs-deprecated/resource-costs-deprecated.js'); +var resourceCost = require('_pr/model/resource-costs/resource-costs.js'); var resourceUsage = require('_pr/model/resource-metrics/resource-metrics.js'); var Route53 = require('_pr/lib/route53.js'); @@ -46,6 +46,8 @@ var AppData = require('_pr/model/app-deploy/app-data'); var instancesDao = require('_pr/model/classes/instance/instance'); var providerService = require('_pr/services/providerService.js'); var schedulerService = require('_pr/services/schedulerService.js'); +var entityCost = require('_pr/model/entity-costs'); +var entityCapacity = require('_pr/model/entity-capacity'); @@ -1301,6 +1303,12 @@ function removeInstancesByProviderId(providerId, callback) { resourcesUsage: function (callback) { resourceUsage.removeResourceUsageByProviderId(providerId, callback); }, + entityCost: function (callback) { + entityCost.removeEntityCostByProviderId(providerId, callback); + }, + entityCapacity: function (callback) { + entityCapacity.removeEntityCapacityByProviderId(providerId, callback); + }, resourcesTags: function (callback) { tagsModel.removeTagsByProviderId(providerId, callback); } From 792380afb08d5277ef539de5aeb71c8e079cd5d3 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 1 Feb 2017 00:49:00 +0530 Subject: [PATCH 29/66] Revoked the model changes for bots card --- client/cat3/images/bots/activeDirectory.png | Bin 0 -> 3881 bytes .../images/bots/applicationDeployment.png | Bin 0 -> 2900 bytes client/cat3/images/bots/installation.png | Bin 0 -> 2814 bytes client/cat3/images/bots/monitoring.png | Bin 0 -> 2505 bytes client/cat3/images/bots/openDJ.png | Bin 0 -> 3497 bytes client/cat3/images/bots/serviceManagement.png | Bin 0 -> 3847 bytes client/cat3/images/bots/upgrade.png | Bin 0 -> 3612 bytes client/cat3/images/bots/userManagement.png | Bin 0 -> 3472 bytes .../sections/dashboard/bots/bots.scss | 186 +++++++++++++++--- .../bots/controller/botDescriptionCtrl.js | 27 ++- .../dashboard/bots/controller/libraryCtrl.js | 108 +++++++--- .../sections/dashboard/bots/tabs/param.html | 152 +++++++++++++- .../sections/dashboard/bots/tabs/report.html | 2 +- .../dashboard/bots/tabs/schedule.html | 5 +- .../dashboard/bots/view/botHistory.html | 2 +- .../sections/dashboard/bots/view/botInfo.html | 167 +++++++++++++++- .../dashboard/bots/view/botsDescription.html | 54 +++-- .../sections/dashboard/bots/view/library.html | 38 ++-- 18 files changed, 627 insertions(+), 114 deletions(-) create mode 100644 client/cat3/images/bots/activeDirectory.png create mode 100644 client/cat3/images/bots/applicationDeployment.png create mode 100644 client/cat3/images/bots/installation.png create mode 100644 client/cat3/images/bots/monitoring.png create mode 100644 client/cat3/images/bots/openDJ.png create mode 100644 client/cat3/images/bots/serviceManagement.png create mode 100644 client/cat3/images/bots/upgrade.png create mode 100644 client/cat3/images/bots/userManagement.png diff --git a/client/cat3/images/bots/activeDirectory.png b/client/cat3/images/bots/activeDirectory.png new file mode 100644 index 0000000000000000000000000000000000000000..a5bf305d3017486350ed9246fbfd032592e875b4 GIT binary patch literal 3881 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 JuGJqREAYed* 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 literal 0 HcmV?d00001 diff --git a/client/cat3/images/bots/installation.png b/client/cat3/images/bots/installation.png new file mode 100644 index 0000000000000000000000000000000000000000..1a21a18ee7f4cce084a0bcd5a4cb6cb586cecc06 GIT binary patch literal 2814 zcmdT`X;c&E8jcDo2yMko5+Oh~La<~Rm?R{MvVgf|CRh=y2`->k zT#&Vk2q*+W6cq(g)VOhKH|(NTk!sOPK`-d#cn1}4e|Y-;e&@`5%e>F~KJPX&R%y&a zS7&!;3?E@b@EhL2Fq1h z>#o4_FqkO?+V~_SNfIqo8gwlAxC|>(XGGB$%)AAeM!9kgjF1#?s#YINd3O37g``yl zQxdrnj>H%aYqX29O>kUxOuRCCjZ&bZESOK4mnlRQ=wL)n%G9mZn}wOdls9^X=z9E^ zO(DGzLDmFQ-jYg^NJ-%a6HMZ=cuXZ27)0U=SRhvr6ae{?0yrR#%@MFch{*wk9D$Gn zlHLspYR#ll3uPklJ6q^3n4&=tqma$c$jD%21hNdKR5mCO2-utec0d3Vm0+5)^oTr@ zsW($6G>Blc(xf#aT7#Z6u2HTqtVe<=DATtt=!_D{d&PS5yFj5KV`s{ZY>>ra>vZFO zy^%H}GWdTqJ}7OD&oaVn8EiJJH!0D4sHqcRGQcF%8+698&A_)uSKv)n+~hQCWDUjCeA|b2RI1SkRTA` z!Au@cp6kbtRB1@M`2ff`hUeAIiiR^Q=Oe~aJSIz>-VKa3M}geq9g<0$wr6Nb24 zCJ4ejra+}oGS&PbNQH(|zzgD1*eFHzcbDF$OWL`3ea#FIC_aOJ&rLW!F_#^cU-1d;)Z`eAE_@p-Pw8_ zIND9~*Z9s%0*-YrVx$$OSC(ySc=qRCpi5#5%djbJ|6IcA_NJ>LUdn;TgQ?N^{!`|Hr%_@7x?kA zbIo@A{$su~6MfxKLzjWZD?n`*{-BNasiHt%3N+fW4c(p^3sBQR)LK1LEx0ew_&LP- z_^bwOR{@(HIMRh}xZ;aV!Zuze?5Za%HhXHUxXP2bs#Ca%7NE)Q9iIs_Ud5L+`(l^T z7%4uC6r$Eb)L4lc3)NpqOtlb-YiC<)fVwWqdu!>lms9x~d`X?BY70rW(Q8=_6-p&)3vo4_evUH6j5uHH zQjfe!tj&(EIDtRVL|U@JYv~3mq$7NB6u-Nku)CfdvX+>(9e=3B*DaCmu^fl`1uP>J z*HgG!eA#hNg#~}8nH;%}6ltc-QQ%9D<4YQWhHg@{8TVzI`{r^wVYvsgljfV^Ez73z zjfB0&$f697+zKDEf@m%xsx35j8evDRpMwl{q=UR@9o=&^uJVLCQiLyW^~l~&C$4z? z`gLfFJP3VTMhkn8h4Z9@!JP=q*y|WC!hP)^u{zXJ0wQoeWnc*06%?txUE?n$oh@pt#lFHgw7WYg@v=5Qv#(mq1THMwnTn>p}XqC|23 z=Msun%dxC6>!|V3hOP)bu7%qB>>2Aobazf(WZhYh{+m%R&W5c}rN*+Wb8kLuWBvT- zf@?MB{`@m_8=rc2MXbU}#A6F2-cH9Sxv7WlJ*ru=`=Rt!tIaZ?C`0Qup^_LKuZ`g=4lDtopR8ktf1xIn!!A+NfF zJ+wc$)*+W!*TmQm4ZArvx;%HdR!*M1XECGtc5BwNJx(i--%1BwPn(lN{idPw^__-| zPx@~D)IM)=$xBgWwoQ}bcFrpre%bqd^k>mf>*%Xf!zV@#ecVW69*jxbJoVPMGBK0D z;+NXDj*Zm^1H=2jJO9nBo~|Fx=kP(hd%ug#-hf-WZ(ri8?$m*zyIbog2?w1HYqqD) zNo}8N>vfm@u>P&Vt)HYlHSB+E4!wwe<$32!wNV8wi z-6&=VIk)?^-w}UaB)sMEYt(ZMn0>*nzrOhPmjnGr1)7ENZ zt^YN~9LlcOtp#5#u`RA>IyB!=R2EhC5(_`~^L`TF|NUWF!?*S+XIGi~hr`s@&OLbP bdmgjplWw&W?7v|Ak2EqOMszGJW%GXlduYm^ literal 0 HcmV?d00001 diff --git a/client/cat3/images/bots/monitoring.png b/client/cat3/images/bots/monitoring.png new file mode 100644 index 0000000000000000000000000000000000000000..479d59a9d45252e7e7bd7d71c5fba1cb419dde17 GIT binary patch literal 2505 zcmd5;c~}!?8V{nVsNh;jAPEpA9Er=2OvsHWkbq_j7!t0c2stJsKn{{1hgd5js2mC+ z5Uvsd0jmOvh(*LjtGiMaSe|;IRqAS8YEi0Ek1ckh;`R@p{=MJx%zVeZzxVyU*Uan^ zhOb#-i?v0eP)h`B`66VFv|J0Uk^5gy+>3FbGwKiK1i?hQcW!Wh*jvQFMim)=1izraTMhPKPovJZ#GyQ?Ldb!Bj za!dgTZ$*qL{=hp@v0*|2PpgLs3?C*agM8Tp7RLu-aM(1uH-Sclm=r390?|P##HDh$ zREY3?0EjicT)`FbL*Cm$cK(3UXw-2jl#GlFpA26gtv-nYaX1_bl}4e_KtuvGWND0& zOi*JW&T8Pp2AN)^Gpe*2f<>c5s!ccg0|?W1E~s^3VILH04DSPlgp86Y(NQ2DDn+ff z`1MxWU=+dsqw!H`Lu8f?rifsJHeD}6@}VHkf|1z$xgm=n!iKv}uR@X{N#$#0>1tSG z6!854@Ql%^ygy{?h z2thCtPkN+r>;krp zp-@&=grSkaWa|ir!{4|@W?;8e;tVAOLE5j+UmULM9XNTpxBVZ<>+&OL`ZLEaC53K( z{OFhdu0ds3-da-f{ks$8+gc0sbZc~3N<+4K+lcE5+qF@h!h!Ky^B0I!Yv>bmsv`l zCqg%zB+}%Vs&@3jeoW<2$D$_mfnLXwgMgpPC1I;OIngyL(`lF46Bmc6?!c?^y_QDf zlM8U!`@Ar*04vGEWdp!by74vW`V&sO8ocbIoN{X%_qI68w>uSliP?VyugoXeiqW-Q z?w$!mA1P@`6fV0QugG(a&cdY?ITklL96IL##5?8HVn440*h+wzgsJI7*B%47DqwYr z`wEG>w**sh)Tyx1gRsG&^(;G<; zt~M`jP6-H3R(iDFS$OD&XM+dI#}=))mo6S@^-y9@ojp{Z?N=fa3{|=BIG`EA zv+`f{-Hd2Yz&F}^bLvQTPo4L8H4iKQQoN&S=%wOH zjbqZxWWxR+9%Of7PRaDQRIdv^mRK9Rx@g6Beob3`7+?L(@T7le@07<_PIrxJ5_fjk zyC6i^wY9wOdFjBE=-LoHzWqnZN&BTXudoI+sy)H5{?M@Js zGs~|1SZQ_8Wfh2j_IJVL=;cjwPw13Odq?Jl_t*+A;&1J6n;ca=`rCFq_QFuNPc+-= zN$pGW=5edd2TwWk&f%*A{Z_omV>}rDuW`H}XP)z&s_Bb%U5&J3qGOB(2h*4DyP;CN$mqt`NwR-B>)Lj){4uG} z-FEw)jqUyHHCyY;YK1S{U~5yG_Wre7Ed$nZ8M^WK-fu@Q+RrR_$Pzr=ql#Wf|0;1p zTpZ^RHZmdnysTn#U29eArH*U`@d(S2?7hkMKJzs&#i2q7eOP+Z?VqYk~IP8jS9JRQoD)Eqx{dJFN< ze!n#xK(Y1hkctOFnJVGr%+fdOT+fVy0x|F9f}3ORanot!+tpW@JBtVNJ)74XI)MRE z;|nDvrW2TB($6;yEG}KP%p}E_j^Ryn0JF%;bimv63uF#rnaWn0_snlvWmx)(aQr{3 d^}k^fQI%QI{3pK&Vl6*cg5Yre(V)cK-vQA#GoSzf literal 0 HcmV?d00001 diff --git a/client/cat3/images/bots/openDJ.png b/client/cat3/images/bots/openDJ.png new file mode 100644 index 0000000000000000000000000000000000000000..6e0f273a0f620802fcee3db95f5f873c1b443187 GIT binary patch literal 3497 zcmd^C_ghnE8&1WAf-@(J5JDgfA!L$}2qK0sL=eIh1)pe0|&v7oiqG zAP_@O4_B^k514%x>gnD##~!@VZAb+tMBy(LDH3@y5aJ?~@Mv6U>WuSkuPkf_;;^4o z6wyw&&!j@UeX(q*48+>o(Fp=F)d9<3+L7&<4iuU#mO>)ai6kbGOe2uUEE1DNB4fWS zoX(p}C}MG4-M;wJNlv&(g(8kcBqk;%+9gu$q_PMinaN}lNfaW5LeOat) zK55GpT=0K1{!v>VkQ4_Jxu9H{AQR~7Au{_4*5&Ts9nC80*swOr#JZyJVqB$ygji6b z@N{*;>Au(r#X=TMNam3lLMB1LXe0-k8=LIF{)+XK$Q3+^0Q~A(tn>W^Oa50Zi!B3r3aKnW zDvkNt1-_9|g;X9Xjl;6pvsGtct%Ai8p)^r$JzJ*FQM-aN@pe$?CX>cuKjoPv{s#_x zI)%z3lLZ7Sk4YzpKpLOGJ aFi8S|J(Gg_f*1ZRf1mqQccY6V?kgRZ5ERi# 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 literal 0 HcmV?d00001 diff --git a/client/cat3/images/bots/serviceManagement.png b/client/cat3/images/bots/serviceManagement.png new file mode 100644 index 0000000000000000000000000000000000000000..d65135148c2553c90c9369dadbd06dd06f4d2000 GIT binary patch literal 3847 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 BVF~~M literal 0 HcmV?d00001 diff --git a/client/cat3/images/bots/userManagement.png b/client/cat3/images/bots/userManagement.png new file mode 100644 index 0000000000000000000000000000000000000000..5b2180e611c42435c2ec660d7550204bb9799fbc GIT binary patch literal 3472 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.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover { background: none!important; - /* border: none!important;*/ + border: none!important; +}*/ + +//For Active tab +.bots-tab-active { + /*background-color: #fff !important;*/ + /* border: 1px solid #40baf1 !important;*/ + border-bottom: 2px solid #4285F4 !important; + /*box-shadow: 0 -1px 5px -1px;*/ + border-radius: 0px; + color: #4285F4 !important; + font-weight: 500; + outline: none !important; + text-decoration: none !important; + i { + color: #40baf1; + } +} + +.tabReadme { + color: #666 !important +} + +.nav-tabs { + border-bottom: 0px; + margin-bottom: 15px; +} + +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:focus, +.nav-tabs > li.active > a:hover { + border-width: 0; +} + +.nav-tabs > li > a { + border: none; + color: #666; + cursor: pointer; +} + +.nav-tabs > li.active > a { + border: none; + color: #4285F4 !important; + background: transparent; + i { + color: #40baf1; + } +} + +.nav-tabs > li > a::after { + content: ""; + background: #4285F4; + height: 2px; + position: absolute; + width: 100%; + left: 0px; + bottom: -1px; + transition: all 250ms ease 0s; + transform: scale(0); + i { + color: #40baf1; + } +} + +.nav-tabs > li.active > a::after { + transform: scale(1); } .actionItems { @@ -538,22 +604,6 @@ body .botDescriptionPage { font-size: 16px; } -//For Active tab -.bots-tab-active { - background-color: #fff !important; - border: 1px solid #40baf1 !important; - border-bottom: 0px !important; - box-shadow: 0 -1px 5px -1px; - border-radius: 0px; - color: #40baf1 !important; - font-weight: 500; - outline: none !important; - text-decoration: none !important; - i { - color: #40baf1; - } -} - .filterButtons { padding: 5px 10px; font-size: 85%; @@ -566,4 +616,84 @@ body .botDescriptionPage { cursor:pointer; float: right; right: -9px; +} + +.bot-card-hero { + height: 100px; +} + +.bot-card-hero .image-cell { + height: 100px; + width: 100px; +} + +.bot-card-hero .bot-content { + margin-left: 120px; +} + +.bot-card-hero h3 { + font-family: "Segoe UI Semilight", sans-serif; + font-size: 24px; + line-height: 46px; + margin-top: 8px; +} + +.bot-card-hero .card-links { + position: absolute; + top: 15px; + right: 20px; +} + +.inner-grid > .bot-card-hero { + margin-top: 20px; +} + +.bot-card-hero h3, +.bot-card-hero ul { + white-space: nowrap; + text-overflow: ellipsis; +} + +.bot-card-hero .image-cell { + float: left; +} + +.ul-vert-bar { + list-style: none; + margin: 0; + padding: 0; +} + +.ul-vert-bar li { + display: inline; + padding-left: 3ex; + padding-right: 3ex; + border-left: 1px solid #999999!important; +} + +.ul-vert-bar li:first-child { + padding-left: 0; + border-left: 0px none transparent!important; +} + +.font-size-24 { + font-size: 24px; +} + +.botsWidth { + width:98%; +} + +@media (min-width : 1550px){ + .agent-card .image-cell + * { + width: 375px; + } + + .info-box-text { + font-size: 16px; + } + + .info-box-number { + font-size: 26px; + } } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js index 91879d148..643759ca3 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botDescriptionCtrl.js @@ -16,6 +16,24 @@ $scope.templateSelected = reqParams; }); + if($scope.templateSelected.botCategory === 'Active Directory' || $scope.templateSelected.botCategory === 'Database Management') { + $scope.botIcon = 'images/bots/activeDirectory.png'; + } else if($scope.templateSelected.botCategory === 'User Management') { + $scope.botIcon = 'images/bots/userManagement.png'; + } else if($scope.templateSelected.botCategory === 'Service Management') { + $scope.botIcon = 'images/bots/serviceManagement.png'; + } else if($scope.templateSelected.botCategory === 'Upgrade') { + $scope.botIcon = 'images/bots/upgrade.png'; + } else if($scope.templateSelected.botCategory === 'Monitoring') { + $scope.botIcon = 'images/bots/monitoring.png'; + } else if($scope.templateSelected.botCategory === 'Installation') { + $scope.botIcon = 'images/bots/installation.png'; + } else if($scope.templateSelected.botCategory === 'OpenDJ LDAP') { + $scope.botIcon = 'images/bots/openDJ.png'; + } else if($scope.templateSelected.botCategory === 'Application Deployment') { + $scope.botIcon = 'images/bots/applicationDeployment.png'; + } + $scope.launchInstance = function(launch){ if(launch.botLinkedCategory === 'Task'){ genSevs.executeTask(launch); @@ -24,7 +42,6 @@ } }; $scope.deleteBot = function(bot) { - console.log(bot.gitHubId); var modalOptions = { closeButtonText: 'Cancel', actionButtonText: 'Delete', @@ -34,7 +51,7 @@ }; confirmbox.showModal({}, modalOptions).then(function() { var param={ - url:'/botsNew/' + bot.gitHubId + url:'/botsNew/' + bot.botId }; genSevs.promiseDelete(param).then(function (response) { if (response) { @@ -60,7 +77,7 @@ $scope.botInfo = $scope.templateSelected; var botsTab = { - tab : "ReadMe", + tab : "Report", setTab : function (tabId) { botsTab.tab = tabId; }, @@ -68,10 +85,10 @@ return botsTab.tab === tabId; }, templates: { - readme: { + /*readme: { "title": "ReadMe", "url": "src/partials/sections/dashboard/bots/tabs/readme.html" - }, + }, */ param: { "title": "Param", "url": "src/partials/sections/dashboard/bots/tabs/param.html" diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index 2b9c95fdf..a0ff28c63 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -23,25 +23,30 @@ $scope.paginationParams=[]; $scope.numofCardPages = 0; $scope.paginationParams.page = 1; - $scope.paginationParams.pageSize = 9; + $scope.paginationParams.pageSize = 18; $scope.paginationParams.sortBy = 'createdOn'; $scope.paginationParams.sortOrder = 'desc'; $scope.botLibrarySearch = ''; $scope.showLoadMore = false; + $scope.showRecords = false; $scope.initGrids = function(){ $scope.botLibGridOptions={}; $scope.botLibGridOptions.columnDefs= [ - { name:'Task Type', field:'type' ,cellTemplate:'row.entity.taskType'+ - 'row.entity.botLinkedSubCategory'+ - 'row.entity.taskType'+ - 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'id',cellTooltip: true}, - { name: 'BOT Name',displayName: 'BOT Name',field:'name',cellTooltip: true}, - { name: 'Category',field:'category',cellTooltip: true}, - { name: 'description',field:'desc',cellTooltip: true}, - // { name: 'BOT Created From',displayName: 'BOT Created From',field:'botLinkedCategory',cellTooltip: true}, - { name: 'Organization',field:'orgName',cellTooltip: true}, + { name:'Task Type', field:'botCategory' ,cellTemplate:'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory'+ + 'row.entity.botCategory',cellTooltip: true}, + { name: 'BOT Name',displayName: 'BOT Name',field:'botName',cellTooltip: true}, + { name: 'Category',field:'botCategory',cellTooltip: true}, + { name: 'BOT Type',displayName: 'BOT Type',field:'botType',cellTooltip: true}, + { name: 'Description',field:'botDesc',cellTooltip: true}, + { name: 'BOT Created From',displayName: 'BOT Created From',field:'botLinkedCategory',cellTooltip: true}, + { name: 'Organization',field:'masterDetails.orgName',cellTooltip: true}, { name: 'Total Runs',field:'executionCount'}, { name: 'BOT Action',width:200,displayName: 'BOT Action',cellTemplate: ''+ @@ -71,6 +76,7 @@ gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { $scope.paginationParams.page = newPage; $scope.paginationParams.pageSize = pageSize; + $scope.currentCardPage = newPage; $scope.botLibraryGridView(); }); }, @@ -79,6 +85,7 @@ $scope.cardPaginationChange = function() { $scope.isBotLibraryPageLoading = true; $scope.paginationParams.page = $scope.paginationParams.page + 1; + $scope.botLibGridOptions.paginationCurrentPage = $scope.paginationParams.page; $scope.botLibraryGridView(); }; @@ -97,17 +104,40 @@ $scope.botLibraryGridView = function() { lib.gridOptions=[]; var param={ - url:'/botsNew?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + url:'/bots?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; genSevs.promiseGet(param).then(function (result) { $timeout(function() { $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botSummary = result.botSummary; - if(result.metaData.totalRecords >= 9) { + //$scope.botSummary = result.botSummary; + if(result.metaData.totalRecords >= 18) { $scope.showLoadMore = true; + $scope.showRecords = true; } if($scope.isCardViewActive){ $scope.botLibGridOptions.data = $scope.botLibGridOptions.data.concat(result.bots); + for(var i=0;i -
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParametersValues
    BOT Name + {{botInfo.botName}} +
    Task Type: + {{botInfo.botLinkedSubCategory}} +
    Blueprint Type + + + + + + +
    Bot Type + {{botInfo.botType}} +
    BOT Category + {{botInfo.botCategory}} +
    BOT Description + {{botInfo.botDesc}} +
    Runlist + {{botInfo.botConfig.runlist}} +
    Attribute{{$index+1}} + {{attribs.name}} +
    Attribute + {{botInfo.botConfig.attributes[0].name}} +
    Job Name + {{botInfo.botConfig.jobName}} +
    Job URL + {{botInfo.botConfig.jobURL}} +
    Bot Parameter Type + {{botInfo.botConfig.parameterized[0].parameterName}} +
    Bot Parameter Name + {{botInfo.botConfig.parameterized[0].name}} +
    Bot Parameter Values + {{botInfo.botConfig.parameterized[0].defaultValue}} +
    Bot Parameter Description + {{botInfo.botConfig.parameterized[0].description}} +
    Script Type Name{{botInfo.botConfig.scriptTypeName}} +
    Script Parameter Description + {{botInfo.botConfig.scriptDetails[0].scriptParameters[0].paramDesc}} +
    Script Parameter{{$index+1}} Description + {{desc.paramDesc}} +
    +
    +
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html index ea5417340..c621ea606 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html @@ -1,6 +1,6 @@
    -
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html index d5416aa92..8f7661e0e 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html @@ -3,10 +3,9 @@
    -
    +
    - ×

     Schedule Your BOT

    @@ -16,7 +15,7 @@

     Schedule Your BOT
    - +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html index 207432730..49e879b18 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -4,7 +4,7 @@

    ×   - Bot History For - {{botHistory.name}} + Bot History For - {{botHistory.botName}}

    diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html index 2bd40d356..c184f89bb 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botInfo.html @@ -1,4 +1,4 @@ -
    + + +
    +
    + × +

    + Bot Info - {{botInfo.botName}} +

    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParametersValues
    BOT Name + {{botInfo.botName}} +
    Task Type: + {{botInfo.botLinkedSubCategory}} +
    Blueprint Type + + + + + + +
    Bot Type + {{botInfo.botType}} +
    BOT Category + {{botInfo.botCategory}} +
    BOT Description + {{botInfo.botDesc}} +
    Runlist + {{botInfo.botConfig.runlist}} +
    Attribute{{$index+1}} + {{attribs.name}} +
    Attribute + {{botInfo.botConfig.attributes[0].name}} +
    Job Name + {{botInfo.botConfig.jobName}} +
    Job URL + {{botInfo.botConfig.jobURL}} +
    Bot Parameter Type + {{botInfo.botConfig.parameterized[0].parameterName}} +
    Bot Parameter Name + {{botInfo.botConfig.parameterized[0].name}} +
    Bot Parameter Values + {{botInfo.botConfig.parameterized[0].defaultValue}} +
    Bot Parameter Description + {{botInfo.botConfig.parameterized[0].description}} +
    Script Type Name{{botInfo.botConfig.scriptTypeName}} +
    Script Parameter Description + {{botInfo.botConfig.scriptDetails[0].scriptParameters[0].paramDesc}} +
    Script Parameter{{$index+1}} Description + {{desc.paramDesc}} +
    +
    +
    +
    +
    -
    -
    -
    -
    - -
    -
    -
    {{templateSelected.name}}
    -
    - -
    -
    -
    -
    {{templateSelected.desc}}
    -
    -
    - - - -
    +
    + +
    +
    + {{templateSelected.botCategory}}
    +
    +

    {{templateSelected.botName}}

    +
      +
    • {{templateSelected.botDesc}}
      • + +
    +
    +
    + + + +
    -
    +
    -
    +
    @@ -102,19 +102,21 @@
    - + -
    -
    +
    +
    - BOTs  ({{botSummary.totalNoOfBots}}) - - - @@ -137,7 +139,7 @@ --> -
    - +
    -
    +
    - + {{botsDetails.botCategory}}
    -
    {{botsDetails.name}}
    +
    {{botsDetails.botName}}
    -
    {{botsDetails.desc}}
    +
    {{botsDetails.botDesc}}
    @@ -169,7 +171,7 @@
    Load More
    -
    +
    {{statusBar}}
    From f254a545eb716fd518aef052231cda646806c663 Mon Sep 17 00:00:00 2001 From: hrushikesh07 Date: Wed, 1 Feb 2017 11:02:19 +0530 Subject: [PATCH 30/66] CAT-2661 --- .../controller/capacityReportCtrl.js | 32 ++----------------- .../analytics/view/capacityReport.html | 6 +--- .../dashboard/analytics/view/cost.html | 2 +- .../analytics/view/discoveryTagMapping.html | 6 ++-- .../sections/dashboard/genericServices.js | 24 +++++++------- 5 files changed, 20 insertions(+), 50 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js index 8bbac67f6..b4f9bb354 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityReportCtrl.js @@ -14,34 +14,8 @@ }; var capRept =this; capRept.chartData=[]; + capRept.serviceType='EC2'; capRept.splitUp=null; - capRept.getCapacityData=function(fltObj){ - var param = { - // url: 'src/partials/sections/dashboard/analytics/data/cost.json?org' - url:'' - }; - if(fltObj && fltObj.org){ - var entityId=null; - if(fltObj.provider){ - entityId=fltObj.provider.id; - } else { - entityId=fltObj.org.id; - } - //param.url='http://d4d.rlcatalyst.com/analytics/capacity?parentEntityId=46d1da9a-d927-41dc-8e9e-7e926d927537&entityId=46d1da9a-d927-41dc-8e9e-7e926d927537&toTimeStamp=Mon%20Nov%2014%202016%2010:41:29%20GMT+0530%20(IST)&period=month'; - param.url='/analytics/capacity?parentEntityId='+fltObj.org.id+'&entityId='+entityId+'&toTimeStamp='+new Date()+'&period=month'; - } - - genSevs.promiseGet(param).then(function (result) { - capRept.chartData=result; - $rootScope.splitUpCapacities=[]; - capRept.serviceCapacity=result.capacity.AWS; - //capRept.serviceType=Object.keys(capRept.serviceCapacity.services)[0]; - capRept.serviceType='EC2'; - capRept.createList(); - - }); - }; - $rootScope.applyFilter =function(filterApp,period){ analyticsServices.applyFilter(filterApp,period); if($state.current.name === "dashboard.analytics.capacityReport") { @@ -54,7 +28,7 @@ $rootScope.$emit('INI_usage', 'Unassigned'); $timeout(function () { $rootScope.applyFilter(true,'month'); - capRept.getCapacityData($rootScope.filterNewEnt); + capRept.createList(); var treeNames = ['Cloud Management','Analytics','capacity']; $rootScope.$emit('treeNameUpdate', treeNames); },500); @@ -356,7 +330,7 @@ if(fltObj && fltObj.resources && fltObj.resources.length >0) { var $todayA = new Date(); var $yesterdayA = new Date($todayA); - $yesterday.setDate($todayA.getDate() - 1); + $yesterdayA.setDate($todayA.getDate() - 1); var param = { url: '/analytics/trend/usage?resource=' + items._id + '&fromTimeStamp=' + $yesterdayA + '&toTimeStamp=' + $todayA + '&interval=3600' //url:'src/partials/sections/dashboard/analytics/data/usage.json' diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html index 8adbfd1dc..c8faecad5 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/capacityReport.html @@ -22,10 +22,8 @@
    -

    -

      @@ -39,9 +37,8 @@

    - -
    +
    No Data Available. @@ -51,7 +48,6 @@

    -
    @@ -140,9 +154,10 @@
  • - - -
    • + + + +
    @@ -193,7 +208,7 @@
    - + Welcome to Chef Factory

    You can Clone, Edit and Upload a Cookbook,Roles to Chef Server.
    From c60c532d5bbc825edcc702fe63d4228df07f9b1e Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Wed, 1 Feb 2017 12:43:23 +0530 Subject: [PATCH 33/66] Buttons added for bots description page and some minor changes --- .../sections/dashboard/bots/bots.scss | 6 ++ .../bots/controller/botHistoryCtrl.js | 56 +------------------ .../sections/dashboard/bots/tabs/param.html | 2 +- .../sections/dashboard/bots/tabs/report.html | 10 ++-- .../dashboard/bots/tabs/schedule.html | 2 +- .../dashboard/bots/tabs/settings.html | 10 ---- .../dashboard/bots/view/botHistory.html | 8 +-- .../dashboard/bots/view/botsDescription.html | 8 +-- 8 files changed, 22 insertions(+), 80 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index adbe92178..9dcc7d3ee 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -685,6 +685,12 @@ body .botDescriptionPage { width:98%; } +.btnPadding { + padding: 4px 10px; + margin-left:10px; + cursor:pointer; +} + @media (min-width : 1550px){ .agent-card .image-cell + * { width: 375px; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js index 246fd034a..2c6a9bbf5 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botHistoryCtrl.js @@ -141,55 +141,6 @@ }; //UI Grid for jenkins Task ends - //UI Grid for script Task starts - $scope.initScriptGrids = function(){ - $scope.taskHistoryScriptGridOptions = {}; - $scope.taskHistoryScriptGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
    '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + - 'NA', cellTooltip: true} - ]; - $scope.taskHistoryScriptGridOptions.data = []; - angular.extend($scope.taskHistoryScriptGridOptions,botLibraryUIGridDefaults.gridOption); - }; - angular.extend($scope, { - taskHistoryScriptListView: function() { - var param={ - url:'/bots/' + $scope.botId + '/bots-history?page=' + $scope.paginationParams.page +'&pageSize=' + $scope.paginationParams.pageSize +'&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder - }; - genSevs.promiseGet(param).then(function (response) { - $timeout(function() { - if(response.botHistory){ - $scope.taskHistoryScriptGridOptions.totalItems = response.metaData.totalRecords; - $scope.taskHistoryScriptGridOptions.data = response.botHistory; - $scope.isscriptTaskHistoryPageLoading = false; - }else if(response){ - $scope.taskHistoryScriptGridOptions.data = response; - $scope.taskHistoryScriptGridOptions = response; - $scope.isscriptTaskHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Script History Records found"; - $scope.isscriptTaskHistoryPageLoading = false; - }); - }, - }); - $scope.initscript = function(){ - $scope.initScriptGrids(); - $scope.taskHistoryScriptListView(); - $scope.getExecutionTime(); - $scope.getSavedTime(); - }; - //UI Grid for script Task ends - //UI Grid for Blueprint starts $scope.initBlueprintGrids = function(){ $scope.botHistoryBlueprintGridOptions = {}; @@ -244,23 +195,19 @@ case 'chef' : $scope.ischefTaskHistoryPageLoading = true; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = false; $scope.initchef(); break; case 'jenkins' : $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = true; - $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = false; $scope.initjenkins(); break; case 'script': - $scope.ischefTaskHistoryPageLoading = false; + $scope.ischefTaskHistoryPageLoading = true; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = true; $scope.isBlueprintBotHistoryPageLoading = false; - $scope.initscript(); break; case 'instance_launch': case 'aws_cf': @@ -268,7 +215,6 @@ case 'azure_launch': $scope.ischefTaskHistoryPageLoading = false; $scope.isjenkinsTaskHistoryPageLoading = false; - $scope.isscriptTaskHistoryPageLoading = false; $scope.isBlueprintBotHistoryPageLoading = true; $scope.initblueprint(); break; diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html index 98779b504..7d3c84888 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/param.html @@ -23,7 +23,7 @@
    -->
    -
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html index 36ec0d2ef..b393294f7 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/report.html @@ -1,6 +1,6 @@
    -
    +
    @@ -13,16 +13,16 @@
    - -
    -
    + +
    +
    -
    No Data Found
    +
    No Data Found
    \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html index 8f7661e0e..396ae3a37 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/schedule.html @@ -3,7 +3,7 @@
    -
    +

     Schedule Your BOT

    diff --git a/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html b/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html index f1fae24d5..157769baa 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html +++ b/client/cat3/src/partials/sections/dashboard/bots/tabs/settings.html @@ -1,13 +1,3 @@ -
    - -
    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sit amet turpis nec justo aliquet malesuada. Donec fringilla, nibh a efficitur accumsan, sapien lacus sodales ante, et finibus mi tortor id augue. Fusce facilisis non quam at consectetur. Sed sit amet sem eu lacus efficitur sodales. Mauris ut ligula eu dui rhoncus consectetur. Integer aliquet risus dolor, sit amet aliquet tellus lacinia et. Nullam eleifend tincidunt erat quis sodales. Duis pretium ultrices urna sed malesuada. Duis tristique, quam et placerat bibendum, tellus nisl luctus metus, vitae vulputate lectus ligula vitae enim. Sed ac eros non augue mollis semper. Phasellus tellus tellus, mollis at lacinia et, malesuada eget leo. Sed ex magna, consequat eget nibh vitae, gravida gravida nulla. Vivamus hendrerit molestie felis, vitae congue sem sodales vitae.

    - -

    Vivamus id lorem semper, sagittis elit eget, hendrerit velit. In ac urna et sem feugiat sollicitudin. Integer dapibus sem eu erat pellentesque porttitor. Sed ornare mi et pretium fermentum. Quisque ornare odio eu massa vehicula, a fermentum ante condimentum. Fusce at rutrum erat. Maecenas lacinia egestas quam ut faucibus. Praesent elementum felis viverra velit fermentum, et iaculis nunc consequat. Quisque tincidunt justo vel fringilla tincidunt. Suspendisse suscipit, dolor id bibendum efficitur, ex est semper ligula, at condimentum lacus nulla at lectus. Nunc bibendum felis sit amet tellus finibus pulvinar. In hac habitasse platea dictumst. Fusce a urna tempus, fringilla justo non, viverra ante. Fusce nunc erat, porttitor vel eros a, consectetur tincidunt odio.

    - -

    Cras aliquam magna et massa posuere posuere. Nunc scelerisque auctor purus, eget porta tortor volutpat sed. Donec ut congue lectus. Aliquam erat volutpat. Etiam quis eros in velit vulputate mollis. Aliquam metus metus, maximus sit amet tempor sed, fringilla vitae purus. Nam dictum eget velit sed lobortis. In non nisi dictum, fringilla mi congue, tincidunt massa. Integer accumsan viverra lectus. Duis sem purus, accumsan nec gravida in, consectetur sed felis. Maecenas dapibus eros vel magna auctor interdum. Cras aliquam nisi tincidunt, gravida lectus vel, laoreet metus. Integer dapibus, elit in mollis auctor, est ex accumsan lorem, vel consequat libero ligula eget sem. Fusce imperdiet purus non convallis tristique. Sed maximus nulla at nibh mollis ornare ut sed dolor.

    -
    -
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html index ad221f056..85138bb40 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistory.html @@ -22,16 +22,16 @@

    - -
    -
    + +
    +
    -
    No Data Found
    +
    No Data Found
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html index 0d79921c8..5758c40cc 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/botsDescription.html @@ -9,7 +9,7 @@
    -
    +
    {{templateSelected.botCategory}}
    @@ -22,11 +22,11 @@

    {{templateSelected.botName}}

    - - + +
    -
    +
    @@ -57,7 +57,7 @@
    - Total + Total {{botSummary.totalNoOfBots}}
    @@ -66,7 +66,7 @@
    - Running + Running {{botSummary.totalNoOfRunningBots}}
    @@ -75,7 +75,7 @@
    - Scheduled + Scheduled {{botSummary.totalNoOfScheduledBots}}
    @@ -84,7 +84,7 @@
    - Time Saved + Time Saved {{totalSavedTimeForBots}} mins
    @@ -93,7 +93,7 @@
    - Failed + Failed {{botSummary.totalNoOfFailedBots}}
    @@ -108,7 +108,7 @@
    -
    +
    diff --git a/client/htmls/private/ajax/Settings/CreateJiraConfig.html b/client/htmls/private/ajax/Settings/CreateJiraConfig.html index fc73c523c..7c7e07027 100644 --- a/client/htmls/private/ajax/Settings/CreateJiraConfig.html +++ b/client/htmls/private/ajax/Settings/CreateJiraConfig.html @@ -26,7 +26,7 @@

    New Jira Config - +

    diff --git a/client/htmls/private/ajax/Settings/jiraConfigList.html b/client/htmls/private/ajax/Settings/jiraConfigList.html index e8d2e4d06..c1518cf1f 100644 --- a/client/htmls/private/ajax/Settings/jiraConfigList.html +++ b/client/htmls/private/ajax/Settings/jiraConfigList.html @@ -29,7 +29,7 @@
    - +