Skip to content
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

Servers table switch to ag-grid #4769

Merged
merged 27 commits into from
Jun 17, 2020
Merged

Servers table switch to ag-grid #4769

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e378928
Added ag-grid tables to TP
ocket8888 Jun 8, 2020
d481904
Fixed build issues
ocket8888 Jun 9, 2020
6285be1
Replaced servers table with agGrid
ocket8888 Jun 9, 2020
321a479
Switch to tabs
ocket8888 Jun 9, 2020
866a1aa
Started setting up context menu support
ocket8888 Jun 9, 2020
e7b993b
Added some context menu functionality, fixed some styling
ocket8888 Jun 9, 2020
73934aa
Put styling in the stylesheet; added server delete to context menu
ocket8888 Jun 9, 2020
666cb54
Moved menu outside of panel
ocket8888 Jun 9, 2020
93c9805
Added server status update to context menu
ocket8888 Jun 9, 2020
ba6127b
Added queue updates to context menu
ocket8888 Jun 9, 2020
7d17b68
Added clear updates to context menu; added disabled menuitem styling
ocket8888 Jun 9, 2020
5eafc48
Fixed a type error, finished context menu
ocket8888 Jun 9, 2020
4d80a94
Removed unused things, general clean-up and re-organization
ocket8888 Jun 9, 2020
a6aaaac
added CSV export
ocket8888 Jun 9, 2020
936d5e9
Rolled back changes to source of AngularJS
ocket8888 Jun 9, 2020
6893f85
Fixed menuitem button styling
ocket8888 Jun 10, 2020
8982d00
table now saves sort, filter, and column state
ocket8888 Jun 10, 2020
b8b7eb6
table now saves column sizes
ocket8888 Jun 10, 2020
e3df429
Rolled back inneffectual browserify changes
ocket8888 Jun 10, 2020
54bb16e
fixes server TP tests to work with ag-grid
mitchell852 Jun 16, 2020
7cf8e98
fixes broken TP ds test
mitchell852 Jun 16, 2020
c011cde
adds a new super controller for the *servers tables
mitchell852 Jun 16, 2020
6c22fdd
Fixed blank CDNs column
ocket8888 Jun 16, 2020
9be0f62
Fixed incorrect update pending label icon
ocket8888 Jun 16, 2020
74eaf9a
Removed unused coldef properties, removed unused gridOptions property
ocket8888 Jun 16, 2020
bc70950
Fixed broken 'show charts' button in servers table context menu
ocket8888 Jun 16, 2020
3418938
Fixed context menu not closing when certain actions were selected
ocket8888 Jun 16, 2020
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
6 changes: 4 additions & 2 deletions traffic_portal/app/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ var App = function($urlRouterProvider) {
$urlRouterProvider.otherwise('/');
};


App.$inject = ['$urlRouterProvider'];

agGrid.initialiseAgGridWithAngular1(angular);

var trafficPortal = angular.module('trafficPortal', [
'config',
'ngAnimate',
Expand All @@ -42,6 +45,7 @@ var trafficPortal = angular.module('trafficPortal', [
'angular-loading-bar',
'moment-picker',
'jsonFormatter',
'agGrid',

// public modules
require('./modules/public').name,
Expand Down Expand Up @@ -509,5 +513,3 @@ trafficPortal.factory('authInterceptor', function ($rootScope, $q, $window, $loc
trafficPortal.config(function ($httpProvider) {
$httpProvider.interceptors.push('authInterceptor');
});


71 changes: 71 additions & 0 deletions traffic_portal/app/src/common/modules/table/_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,74 @@ th.center, td.center {
.dt-button.btn-link {
text-decoration: underline;
}

/* Table context menus */
menu[type="contextmenu"] {
display: block;
position: fixed;
background-color: white;
padding: 0;
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
border-radius: 3px;

ul {
display: block;
clear: both;
font-weight: normal;
line-height: 1.428571429;
white-space: nowrap;
padding: 0;
margin: 0;

li {
display: block;
clear: both;

&:hover {
color: #262626;
background-color: #f5f5f5;
}

a, button {
color: #333333;
text-decoration: none;
padding: 7px 20px;
display: block;
clear: both;
}

button {
background: transparent;
border: none;
width: 100%;
text-align: left;

&[disabled] {
color: gray;
background-color: #f5f5f5;
}
}
}

hr.divider {
margin: 0;
}
}
}

div.dropdown button.menu-item-button {
color: #333333;
width: 100%;
background: transparent;
border: none;
text-align: inherit;
display: block;
clear: both;
padding: 3px 20px;
margin: 0;

&:hover {
color: #262626;
background-color: #f5f5f5;
}
}
4 changes: 2 additions & 2 deletions ...portal/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TableCacheGroupsServersController = function(cacheGroup, servers, $controller, $scope, $state, $uibModal, cacheGroupService) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

let cacheGroupServersTable;

Expand Down
4 changes: 2 additions & 2 deletions traffic_portal/app/src/common/modules/table/cdnServers/TableCDNServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TableCDNServersController = function(cdn, servers, $controller, $scope) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

let cdnServersTable;

Expand Down
4 changes: 2 additions & 2 deletions .../src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TableDeliveryServiceServersController = function(deliveryService, servers, $controller, $scope, $uibModal, deliveryServiceService, serverUtils) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

let dsServersTable;

Expand Down
4 changes: 2 additions & 2 deletions ...al/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TablePhysLocationServersController = function(physLocation, servers, $controller, $scope) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

let physLocServersTable;

Expand Down
4 changes: 2 additions & 2 deletions traffic_portal/app/src/common/modules/table/profileServers/TableProfileServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TableProfileServersController = function(profile, servers, $controller, $scope) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

let profileServersTable;

Expand Down
4 changes: 2 additions & 2 deletions ...rc/common/modules/table/serverCapabilityServers/TableServerCapabilityServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

var TableServerCapabilityServersController = function(serverCapability, servers, $scope, $state, $controller, $uibModal, $window, locationUtils, serverService, messageModel) {

// extends the TableServersController to inherit common methods
angular.extend(this, $controller('TableServersController', { servers: servers, $scope: $scope }));
// extends the TableParentServersController to inherit common methods
angular.extend(this, $controller('TableParentServersController', { servers: servers, $scope: $scope }));

var removeCapability = function(serverId) {
serverService.removeServerCapability(serverId, serverCapability.name)
Expand Down
Loading