This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8c9d7bb Removed an unused/broken module from Traffic Portal (#3636)
8c9d7bb is described below
commit 8c9d7bb914763ef077c8caadc6eb4914216a845a
Author: ocket8888 <[email protected]>
AuthorDate: Tue Oct 8 19:57:16 2019 -0600
Removed an unused/broken module from Traffic Portal (#3636)
* Removed an unused/broken module from Traffic Portal
* removes configuration associated with parameter cachegroups
---
traffic_portal/app/src/app.js | 2 -
.../TableParameterCacheGroupsController.js | 40 --------------
.../modules/table/parameterCacheGroups/index.js | 21 --------
.../table.parameterCacheGroups.tpl.html | 63 ----------------------
.../private/parameters/cacheGroups/index.js | 42 ---------------
5 files changed, 168 deletions(-)
diff --git a/traffic_portal/app/src/app.js b/traffic_portal/app/src/app.js
index afde31a..cd0fa48 100644
--- a/traffic_portal/app/src/app.js
+++ b/traffic_portal/app/src/app.js
@@ -156,7 +156,6 @@ var trafficPortal = angular.module('trafficPortal', [
require('./modules/private/physLocations/new').name,
require('./modules/private/physLocations/servers').name,
require('./modules/private/parameters').name,
- require('./modules/private/parameters/cacheGroups').name,
require('./modules/private/parameters/edit').name,
require('./modules/private/parameters/list').name,
require('./modules/private/parameters/new').name,
@@ -364,7 +363,6 @@ var trafficPortal = angular.module('trafficPortal', [
require('./common/modules/table/physLocations').name,
require('./common/modules/table/physLocationServers').name,
require('./common/modules/table/parameters').name,
- require('./common/modules/table/parameterCacheGroups').name,
require('./common/modules/table/parameterProfiles').name,
require('./common/modules/table/profileDeliveryServices').name,
require('./common/modules/table/profileParameters').name,
diff --git
a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
b/traffic_portal/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
deleted file mode 100644
index bec83a5..0000000
---
a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/TableParameterCacheGroupsController.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 TableParameterCacheGroupsController = function(parameter, cacheGroups,
$controller, $scope, $state, locationUtils) {
-
- // extends the TableCacheGroupsController to inherit common methods
- angular.extend(this, $controller('TableCacheGroupsController', {
cacheGroups: cacheGroups, $scope: $scope }));
-
- $scope.parameter = parameter;
-
- $scope.addCacheGroup = function() {
- alert('not hooked up yet: add cg to parameter');
- };
-
- $scope.removeCacheGroup = function() {
- alert('not hooked up yet: remove cg from parameter');
- };
-
- $scope.navigateToPath = locationUtils.navigateToPath;
-
-};
-
-TableParameterCacheGroupsController.$inject = ['parameter', 'cacheGroups',
'$controller', '$scope', '$state', 'locationUtils'];
-module.exports = TableParameterCacheGroupsController;
diff --git
a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/index.js
b/traffic_portal/app/src/common/modules/table/parameterCacheGroups/index.js
deleted file mode 100644
index 69f34a9..0000000
--- a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-module.exports = angular.module('trafficPortal.table.parameterCacheGroups', [])
- .controller('TableParameterCacheGroupsController',
require('./TableParameterCacheGroupsController'));
diff --git
a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/table.parameterCacheGroups.tpl.html
b/traffic_portal/app/src/common/modules/table/parameterCacheGroups/table.parameterCacheGroups.tpl.html
deleted file mode 100644
index 460605a..0000000
---
a/traffic_portal/app/src/common/modules/table/parameterCacheGroups/table.parameterCacheGroups.tpl.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you 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.
--->
-
-<div class="x_panel">
- <div class="x_title">
- <ol class="breadcrumb pull-left">
- <li><a ng-click="navigateToPath('/parameters')">Parameters</a></li>
- <li><a ng-click="navigateToPath('/parameters/' +
parameter.id)">{{::parameter.name}}</a></li>
- <li class="active">Cache Groups</li>
- </ol>
- <div class="pull-right">
- <button class="btn btn-primary" title="Add Cache Group"
ng-click="addCacheGroup()"><i class="fa fa-plus"></i></button>
- <button class="btn btn-default" title="Refresh"
ng-click="refresh()"><i class="fa fa-refresh"></i></button>
- </div>
- <div class="clearfix"></div>
- </div>
- <div class="x_content">
- <br>
- <table id="cacheGroupsTable" class="table responsive-utilities
jambo_table">
- <thead>
- <tr class="headings">
- <th>Name</th>
- <th>Short Name</th>
- <th>Type</th>
- <th>Parent</th>
- <th>2nd Parent</th>
- <th>Latitude</th>
- <th>Longitude</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="cg in ::cacheGroups"
context-menu="contextMenuItems">
- <td data-search="^{{::cg.name}}$">{{::cg.name}}</td>
- <td data-search="^{{::cg.shortName}}$">{{::cg.shortName}}</td>
- <td data-search="^{{::cg.typeName}}$">{{::cg.typeName}}</td>
- <td
data-search="^{{::cg.parentCachegroupName}}$">{{::cg.parentCachegroupName}}</td>
- <td
data-search="^{{::cg.secondaryParentCachegroupName}}$">{{::cg.secondaryParentCachegroupName}}</td>
- <td data-search="^{{::cg.latitude}}$">{{::cg.latitude}}</td>
- <td data-search="^{{::cg.longitude}}$">{{::cg.longitude}}</td>
- <td><button type="button" class="btn btn-link" title="Remove
Cache Group" ng-click="removeCacheGroup()"><i class="fa
fa-trash-o"></i></button></td>
- </tr>
- </tbody>
- </table>
- </div>
-</div>
-
diff --git
a/traffic_portal/app/src/modules/private/parameters/cacheGroups/index.js
b/traffic_portal/app/src/modules/private/parameters/cacheGroups/index.js
deleted file mode 100644
index a8f9279..0000000
--- a/traffic_portal/app/src/modules/private/parameters/cacheGroups/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-module.exports =
angular.module('trafficPortal.private.parameters.cacheGroups', [])
- .config(function($stateProvider, $urlRouterProvider) {
- $stateProvider
- .state('trafficPortal.private.parameters.cacheGroups', {
- url: '/{parameterId}/cache-groups',
- views: {
- parametersContent: {
- templateUrl:
'common/modules/table/parameterCacheGroups/table.parameterCacheGroups.tpl.html',
- controller:
'TableParameterCacheGroupsController',
- resolve: {
- parameter:
function($stateParams, parameterService) {
- return
parameterService.getParameter($stateParams.parameterId);
- },
- cacheGroups:
function($stateParams, cacheGroupService) {
- return
cacheGroupService.getParameterCacheGroups($stateParams.parameterId);
- }
- }
- }
- }
- })
- ;
- $urlRouterProvider.otherwise('/');
- });
