Skip to content

Bot history, execute & schedular related changes. #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 16, 2016
Merged

Bot history, execute & schedular related changes. #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
643b0f6
Merge remote-tracking branch 'upstream/dev' into divakar-dev
divakarkonakalla Nov 18, 2016
c8432f8
Merge branch 'divakar-dev' into topic-service-deliver
divakarkonakalla Dec 15, 2016
4c65545
Bot history, execute & schedular related changes.
divakarkonakalla Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/botHistoryLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/aDesignCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js"></script>
Expand Down
4 changes: 0 additions & 4 deletions client/cat3/src/clientRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
url: "/workzone",
templateUrl: "src/partials/sections/dashboard/workzone/workzone.html",
controller: "workzoneCtrl",
params:{filterView:{workzone:true}},
onEnter: function () {
},
onExit: function () {
Expand All @@ -58,7 +57,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
url: "/design",
templateUrl: "src/partials/sections/dashboard/design/design.html",
controller: "designCtrl as desCtrl",
params:{filterView:{design:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand All @@ -76,7 +74,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
url: "/analytics/",
templateUrl: "src/partials/sections/dashboard/analytics/analytics.html",
controller: "analyticsCtrl as analytic",
params:{filterView:{analytics:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand All @@ -95,7 +92,6 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
url: "/bots",
templateUrl: "src/partials/sections/dashboard/bots/bots.html",
controller: "botsCtrl as bts",
params:{filterView:{bots:true}},
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand Down
4 changes: 2 additions & 2 deletions client/cat3/src/partials/globals/header/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
cursor:pointer;
}

.header-selected-item {
color: #40BAF1;
.activeSection i {
color: #40BAF1 !important;
}

.header-logo-image {
Expand Down
41 changes: 8 additions & 33 deletions client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
};

$scope.executeBot=function(){
if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') {
if (items.botConfig && items.botConfig.taskType === 'script') {
var checkParam = false;
if ($scope.scriptParamsFlag) {
for(var i =0; i<$scope.parameters.length; i++){
Expand All @@ -130,26 +130,25 @@
scriptParams = $scope.parameters;
}
}
if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef') {
if (items.botConfig && items.botConfig.taskType === 'chef') {
cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes);

}
if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') {
if (items.botConfig && items.botConfig.taskType === 'jenkins') {
choiceParam = $scope.jenparams;
}
$scope.executeBot();
};

$scope.executeBot = function(){
var reqBody = {};
if (items.botConfig && items.botConfig.botLinkedSubCategory === 'jenkins') {
if (items.botConfig && items.botConfig.taskType === 'jenkins') {
reqBody.choiceParam = choiceParam;
} else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'chef'){
} else if (items.botConfig && items.botConfig.taskType === 'chef'){
reqBody.tagServer = $scope.tagSerSelected;
if ($scope.chefAttributesFlag) {
reqBody.cookbookAttributes = cookbookAttributes;
}
} else if (items.botConfig && items.botConfig.botLinkedSubCategory === 'script') {
} else if (items.botConfig && items.botConfig.taskType === 'script') {
reqBody.tagServer = $scope.tagSerSelected;
if ($scope.scriptParamsFlag) {
reqBody.scriptParams = scriptParams;
Expand All @@ -163,7 +162,7 @@
console.log(response);
$modalInstance.close(response.data);
$rootScope.$emit('BOTS_LIBRARY_REFRESH');
helper.botLogModal(items._id, response.historyId, response.taskType);
helper.botLogModal(items.botId, response.historyId, response.taskType);
},
function (error) {
error = error.responseText || error;
Expand All @@ -173,34 +172,10 @@
toastr.error(error);
}
});
/*workzoneServices.runTask(items._id, reqBody).then(
function (response) {
$modalInstance.close(response.data);
$rootScope.$emit('BOTS_LIBRARY_REFRESH');
$rootScope.$emit('WZ_ORCHESTRATION_REFRESH_CURRENT');
},
function (error) {
error = error.responseText || error;
if (error.message) {
toastr.error(error.message);
} else {
toastr.error(error);
}
}
);*/
};

$scope.cancel= function() {
$modalInstance.dismiss('cancel');
};
}])/*.controller('botExecutionLogsCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) {
$scope.botExecutionLogs = items;
console.log(items);



$scope.cancel= function() {
$modalInstance.dismiss('cancel');
};
}])*/;
}]);
})(angular);
Loading