Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
bb92a10
Added usage icon for instannces which are not imported by ip, added g…
divakarkonakalla Oct 13, 2016
214a689
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 13, 2016
19b02c1
Merge pull request #818 from divakarkonakalla/dev-divakar
udeshrl Oct 13, 2016
8231ca4
code update to generate weekly aggregate cost
Oct 14, 2016
bbdec65
Implemented serviceDeliveryCheck
VIJAYKUMARNINGANURE Oct 14, 2016
9aff9f1
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 14, 2016
4b18d05
Merge pull request #821 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Oct 14, 2016
f6d6d83
entity cost aggregation optimization
Oct 14, 2016
8c6a1e7
Implementation of Tag servers
VIJAYKUMARNINGANURE Oct 14, 2016
b91a2ca
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 14, 2016
a695029
Merge pull request #824 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Oct 14, 2016
dceb444
service cost precision and dateUtil changes
Oct 17, 2016
88b8f46
Merge pull request #825 from kkn/dev
liteverge-bot Oct 17, 2016
ad9aa98
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 17, 2016
9d04ab0
Added Service Delivery check while creating new blueprint.
divakarkonakalla Oct 17, 2016
3e2b4fb
Added check before send bot type & description to API.
divakarkonakalla Oct 17, 2016
f15505e
Added tag server check in chef import, import by ip pages.
divakarkonakalla Oct 18, 2016
92b94d5
Merge pull request #827 from divakarkonakalla/dev-divakar
udeshrl Oct 18, 2016
1b1b380
Deleted entities classified as Unknown in analytics
Oct 18, 2016
bad5397
Merge pull request #830 from kkn/dev
liteverge-bot Oct 18, 2016
8f53558
Added tag server check, added dropdown to select a server to tag.
divakarkonakalla Oct 18, 2016
e43018d
Implemented the Tagging Server List
VIJAYKUMARNINGANURE Oct 18, 2016
41cf85a
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 18, 2016
6698f48
cost trend aggregation for previous dates disabled
Oct 18, 2016
b97fd02
Merge pull request #833 from kkn/dev
liteverge-bot Oct 18, 2016
698b9b5
Monitor API changes
udeshrl Oct 18, 2016
eb25118
moved help & logout header menu items inside dropdown to allocate spa…
divakarkonakalla Oct 18, 2016
04c83d4
UI changes.
divakarkonakalla Oct 18, 2016
63bb599
Created basic folder structure for service delivery, added menu item …
divakarkonakalla Oct 18, 2016
62ebc2f
Merge pull request #836 from divakarkonakalla/topic-service-deliver
udeshrl Oct 19, 2016
4066cdf
Merge pull request #831 from divakarkonakalla/dev-divakar
udeshrl Oct 19, 2016
a078c20
Implemnetd the Bot type lists and Tagging server list
VIJAYKUMARNINGANURE Oct 19, 2016
da92959
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Oct 19, 2016
fe31760
Merge pull request #832 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Oct 19, 2016
c6713ff
Added bots
Oct 19, 2016
9f48427
New base and pages for bots
Oct 19, 2016
dfef904
Merge pull request #839 from hrushikesh07/serve
udeshrl Oct 19, 2016
87961f2
Added API with launch
Oct 20, 2016
da4868a
Merge pull request #840 from hrushikesh07/serve
udeshrl Oct 20, 2016
77be425
Merge pull request #842 from RLOpenCatalyst/topic-sevice-delivery
udeshrl Oct 20, 2016
64fa1c2
Changed the icon
Oct 20, 2016
ae2e0e5
Merge pull request #843 from hrushikesh07/serve
udeshrl Oct 20, 2016
12fc85d
Merge pull request #844 from RLOpenCatalyst/topic-sevice-delivery
udeshrl Oct 20, 2016
7951871
monitor api changes
udeshrl Oct 20, 2016
db898a7
rebased with dev
udeshrl Oct 20, 2016
9300fdc
Changed the launch type
Oct 20, 2016
1139f19
Changed the launch type
Oct 20, 2016
831c439
Merge pull request #845 from hrushikesh07/serve
Oct 20, 2016
0f13800
BP id added
Oct 20, 2016
5254484
Merge pull request #846 from hrushikesh07/serve
Oct 20, 2016
71f47de
Merge pull request #847 from RLOpenCatalyst/topic-sevice-delivery
udeshrl Oct 20, 2016
3956b08
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 21, 2016
f529cf7
Added env for launch blueprint
Oct 21, 2016
1f36ab0
Added env for launch blueprint
Oct 21, 2016
adf7802
Merge pull request #848 from hrushikesh07/serve
udeshrl Oct 21, 2016
c4084dc
Changed the icon
Oct 21, 2016
4ec870b
Changed the icon
Oct 21, 2016
25a4f18
Merge pull request #849 from hrushikesh07/serve
udeshrl Oct 21, 2016
8962638
Added default select env for launch
Oct 21, 2016
93c83b5
Merge pull request #850 from hrushikesh07/serve
Oct 21, 2016
77d0e5f
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Oct 24, 2016
62a4a1c
response format changes
udeshrl Oct 24, 2016
09e09be
changed function name
udeshrl Oct 24, 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/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ module.exports = function(grunt) {
{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
{'catalyst/partials/sections/dashboard/bots/bots.css':'src/partials/sections/dashboard/bots/bots.scss'},
{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
]
}
Expand Down
3 changes: 3 additions & 0 deletions client/cat3/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
<script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>
Expand Down Expand Up @@ -144,6 +146,7 @@
<script src="src/partials/sections/dashboard/workzone/instance/manage/templates/cpLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/manage/templates/cpServicesCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/popups/InstanceImportByIpCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/popups/instanceUsageCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/popups/deleteInstanceCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/popups/instanceLogsCtrl.js"></script>
<script src="src/partials/sections/dashboard/workzone/instance/popups/instanceNameEditCtrl.js"></script>
Expand Down
17 changes: 17 additions & 0 deletions client/cat3/src/clientRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,23 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe

}]
}
}).state('dashboard.bots', {
url: "/bots",
templateUrl: "src/partials/sections/dashboard/bots/bots.html",
controller: "botsCtrl as bts",
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;
}]
}
}).state('dashboard.settings', {
url: "/settings",
templateUrl: "src/partials/sections/dashboard/setting/setting.html",
Expand Down
5 changes: 5 additions & 0 deletions client/cat3/src/factory/appPermissionServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,10 @@
//return uac.hasPermission('track','read','module');
return true;
};
this.serviceBool = function() {
//permission response not available in the api response.
//return uac.hasPermission('track','read','module');
return true;
};
}]);
})(angular);
12 changes: 10 additions & 2 deletions client/cat3/src/factory/workzoneServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@
var url = '/blueprints/' + blueprintID;
return $http.delete(fullUrl(url), Auth.getHeaderObject());
},
launchBlueprint: function (blueprintID, version, envId, stackName,domainName) {
launchBlueprint: function (blueprintID, version, envId, stackName,domainName, tagServer) {
var url = '/blueprints/' + blueprintID + '/launch?version=' + version +
'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName;
'&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName + '&tagServer=' + tagServer;
return $http.get(fullUrl(url), Auth.getHeaderObject());
},
getBlueprintById: function(blueprintId) {
Expand Down Expand Up @@ -527,6 +527,14 @@
getUnassignedInstances:function (providerId) {
var url ='/providers/'+providerId+'/unassigned-instances';
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getBotTypeList:function () {
var url ='/config-data/bot-type';
return $http.get(fullUrl(url),Auth.getHeaderObject());
},
getTaggingServer:function () {
var url ='/config-data/tagging-server';
return $http.get(fullUrl(url),Auth.getHeaderObject());
}
};
return serviceInterface;
Expand Down
6 changes: 4 additions & 2 deletions client/cat3/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,15 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
design: modulePerms.designAccess(),
settings: modulePerms.settingsAccess(),
track: modulePerms.trackAccess(),
analyticsBool: modulePerms.analyticsBool()
analyticsBool: modulePerms.analyticsBool(),
serviceBool: modulePerms.serviceBool()
};
$rootScope.workZoneBool = _permSet.workzone;
$rootScope.designBool = _permSet.design;
$rootScope.settingsBool = _permSet.settings;
$rootScope.trackBool = _permSet.track;
$rootScope.analyticsBool = _permSet.analyticsBool;
$rootScope.serviceBool = _permSet.serviceBool;
});
$rootScope.$emit('SET_HEADER', $rootScope.appDetails);
$scope.showLogoutConfirmationSection = false;
Expand All @@ -111,4 +113,4 @@ angularApp.controller('HeadNavigatorCtrl', ['$scope', '$rootScope', '$http', '$l
$rootScope.$on('USER_LOGOUT', function () {
$scope.doLogout();
});
}]);
}]);
23 changes: 22 additions & 1 deletion client/cat3/src/partials/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ $imagePath : "../../../../../../cat3/images";
z-index: 10;
transition: all .4s ease 0s;
left: -254px;
height: 100%;

&.show-left-tree {
left: 0px;
Expand All @@ -121,6 +122,7 @@ $imagePath : "../../../../../../cat3/images";
background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
color: #fff;
overflow-y: auto;
height: 100%;
}

div[data-angular-treeview] {
Expand Down Expand Up @@ -1102,7 +1104,7 @@ option.script {
background-color: #E49C25 !important;
}
.ui-grid-menu-button{
height: 28px !important;
height: 36px !important;
background-color: #5bc0de !important;
border-color: #46b8da !important;
display: inline-block;
Expand Down Expand Up @@ -1161,4 +1163,23 @@ option.script {
}
.loading-body{
opacity: 0.4;
}
#bots .control-panel-button {
border-radius: 17px;
padding: 2px 0px 0 5px;
width: 25px;
height: 25px;
}

// ui grid style
.ui-grid-header-cell-row{
background: #636363 !important;
color: #FBFBFB !important;
}
.ui-grid-cell-contents.ui-grid-header-cell-primary-focus{
min-height: 36px;
line-height: 25px;
}
.ui-grid-column-menu-button{
top:5px !important;
}
24 changes: 24 additions & 0 deletions client/cat3/src/partials/globals/header/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,30 @@
}
}

.header-right {
.dropdown {
margin: 11px 0px 0 10px;
}

.dropdown-toggle {
font-size: 18px;
margin-top: 5px;
}

.dropdown-menu {
color: #000;
background: #fff;
padding: 6px;
min-width: 100px;
line-height: 2;
}

a {
color: #000;
text-decoration: none;
}
}

/*Styles for Logout Confirmation starts here*/
.divMessageBox {
width: 100%;
Expand Down
5 changes: 5 additions & 0 deletions client/cat3/src/partials/globals/header/headerDashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<i class="fa fa-area-chart white"></i> ANALYTICS
</div>
</li>
<li>
<div id="service" class="headNavigItem" ng-if="serviceBool" ui-sref='dashboard.bots' ui-sref-active='activeSection'>
<i class="fa fa-delicious white"></i> BOTS
</div>
</li>
<li class="header-right">
<div id="header-menu">
<div id="userInfo" class="headNavigItem" title="{{appDetails.roleId}}">
Expand Down
14 changes: 14 additions & 0 deletions client/cat3/src/partials/sections/dashboard/bots/bots.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<link rel='stylesheet' href='catalyst/partials/sections/dashboard/analytics/analytics.css'>

<div id="analyticsPage" class='fluid-container'>
<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12 panelLeft no-padding'>
<div ng-include="'src/partials/sections/dashboard/bots/view/botsTreeMenu.html'"></div>
</div>


<div class="panelRight" id="bots">
<div id='rightPanel' class='container-fluid'>
<div ui-view></div>
</div>
</div>
</div>
Loading