diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e5854a56..9401950a5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - SANs information to the SSL key endpoint and Traffic Portal page. - Added definition for `heartbeat.polling.interval` for CDN Traffic Monitor config in API documentation. - New `pkg` script options, `-h`, `-s`, `-S`, and `-L`. +- Added `Invalidation Type` (REFRESH or REFETCH) for invalidating content to Traffic Portal. ### Fixed - [#6197](https://github.com/apache/trafficcontrol/issues/6197) - TO `/deliveryservices/:id/routing` makes requests to all TRs instead of by CDN. diff --git a/cache-config/testing/ort-tests/tcdata/todb.go b/cache-config/testing/ort-tests/tcdata/todb.go index 2de9861739..68eddb7e41 100644 --- a/cache-config/testing/ort-tests/tcdata/todb.go +++ b/cache-config/testing/ort-tests/tcdata/todb.go @@ -107,7 +107,7 @@ func SetupRoles(db *sql.DB) error { sqlStmt := ` INSERT INTO role (name, description, priv_level) VALUES ('disallowed','Block all access',0) ON CONFLICT DO NOTHING; -INSERT INTO role (name, description, priv_level) VALUES ('read-only user','Block all access', 10) ON CONFLICT DO NOTHING; +INSERT INTO role (name, description, priv_level) VALUES ('read-only','Block all access', 10) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('operations','Block all access', 20) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('admin','super-user', 30) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('portal','Portal User', 2) ON CONFLICT DO NOTHING; diff --git a/traffic_ops/testing/api/v2/todb_test.go b/traffic_ops/testing/api/v2/todb_test.go index b5aa360549..297fbd97e0 100644 --- a/traffic_ops/testing/api/v2/todb_test.go +++ b/traffic_ops/testing/api/v2/todb_test.go @@ -106,7 +106,7 @@ func SetupRoles(db *sql.DB) error { sqlStmt := ` INSERT INTO role (name, description, priv_level) VALUES ('disallowed','Block all access',0) ON CONFLICT DO NOTHING; -INSERT INTO role (name, description, priv_level) VALUES ('read-only user','Block all access', 10) ON CONFLICT DO NOTHING; +INSERT INTO role (name, description, priv_level) VALUES ('read-only','Block all access', 10) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('operations','Block all access', 20) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('admin','super-user', 30) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('portal','Portal User', 2) ON CONFLICT DO NOTHING; diff --git a/traffic_ops/testing/api/v3/todb_test.go b/traffic_ops/testing/api/v3/todb_test.go index 088717fdc8..601dceb802 100644 --- a/traffic_ops/testing/api/v3/todb_test.go +++ b/traffic_ops/testing/api/v3/todb_test.go @@ -106,7 +106,7 @@ func SetupRoles(db *sql.DB) error { sqlStmt := ` INSERT INTO role (name, description, priv_level) VALUES ('disallowed','Block all access',0) ON CONFLICT DO NOTHING; -INSERT INTO role (name, description, priv_level) VALUES ('read-only user','Block all access', 10) ON CONFLICT DO NOTHING; +INSERT INTO role (name, description, priv_level) VALUES ('read-only','Block all access', 10) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('operations','Block all access', 20) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('admin','super-user', 30) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('portal','Portal User', 2) ON CONFLICT DO NOTHING; diff --git a/traffic_ops/testing/api/v4/crconfig_test.go b/traffic_ops/testing/api/v4/crconfig_test.go index 495511e692..aac5ab4ba0 100644 --- a/traffic_ops/testing/api/v4/crconfig_test.go +++ b/traffic_ops/testing/api/v4/crconfig_test.go @@ -61,7 +61,7 @@ func SnapshotWithReadOnlyUser(t *testing.T) { RegistrationSent: new(time.Time), LocalPassword: util.StrPtr("test_pa$$word"), ConfirmLocalPassword: util.StrPtr("test_pa$$word"), - Role: "read-only user", + Role: "read-only", } user.Email = util.StrPtr("email_tm@domain.com") user.TenantID = resp.Response[0].ID diff --git a/traffic_ops/testing/api/v4/tc-fixtures.json b/traffic_ops/testing/api/v4/tc-fixtures.json index 9d04c57ded..55238dd36f 100644 --- a/traffic_ops/testing/api/v4/tc-fixtures.json +++ b/traffic_ops/testing/api/v4/tc-fixtures.json @@ -5541,7 +5541,7 @@ "phoneNumber": "", "postalCode": "", "publicSshKey": "", - "role": "read-only user", + "role": "read-only", "stateOrProvince": "", "tenant": "tenant1", "uid": 0, diff --git a/traffic_ops/testing/api/v4/todb_test.go b/traffic_ops/testing/api/v4/todb_test.go index 83f34d41a4..60e833f49c 100644 --- a/traffic_ops/testing/api/v4/todb_test.go +++ b/traffic_ops/testing/api/v4/todb_test.go @@ -100,7 +100,7 @@ func SetupRoles(db *sql.DB) error { sqlStmt := ` INSERT INTO role (name, description, priv_level) VALUES ('disallowed','Block all access',0) ON CONFLICT DO NOTHING; -INSERT INTO role (name, description, priv_level) VALUES ('read-only user','Block all access', 10) ON CONFLICT DO NOTHING; +INSERT INTO role (name, description, priv_level) VALUES ('read-only','Block all access', 10) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('operations','Block all access', 20) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('admin','super-user', 30) ON CONFLICT DO NOTHING; INSERT INTO role (name, description, priv_level) VALUES ('portal','Portal User', 2) ON CONFLICT DO NOTHING; diff --git a/traffic_ops/testing/api/v4/topologies_test.go b/traffic_ops/testing/api/v4/topologies_test.go index 05db1cd5fa..c9fa5a8dbf 100644 --- a/traffic_ops/testing/api/v4/topologies_test.go +++ b/traffic_ops/testing/api/v4/topologies_test.go @@ -996,7 +996,7 @@ func CRUDTopologyReadOnlyUser(t *testing.T) { RegistrationSent: new(time.Time), LocalPassword: util.StrPtr("test_pa$$word"), ConfirmLocalPassword: util.StrPtr("test_pa$$word"), - Role: "read-only user", + Role: "read-only", } user.Email = util.StrPtr("email@domain.com") user.TenantID = resp.Response[0].ID diff --git a/traffic_portal/app/src/common/api/JobService.js b/traffic_portal/app/src/common/api/JobService.js index 4db2d6161d..39155f9552 100644 --- a/traffic_portal/app/src/common/api/JobService.js +++ b/traffic_portal/app/src/common/api/JobService.js @@ -20,7 +20,7 @@ var JobService = function($http, ENV) { this.getJobs = function(queryParams) { - return $http.get(ENV.api.stable + 'jobs', {params: queryParams}).then( + return $http.get(ENV.api.unstable + 'jobs', {params: queryParams}).then( function(result) { return result.data.response; }, @@ -31,7 +31,7 @@ var JobService = function($http, ENV) { }; this.createJob = function(job) { - return $http.post(ENV.api.stable + 'jobs', job).then( + return $http.post(ENV.api.unstable + 'jobs', job).then( function (result) { return result; }, @@ -42,7 +42,7 @@ var JobService = function($http, ENV) { }; this.deleteJob = function(id) { - return $http.delete(ENV.api.stable + 'jobs', {params: {id: id}}).then( + return $http.delete(ENV.api.unstable + 'jobs', {params: {id: id}}).then( function(result) { return result; }, diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html index 92a4139a63..470a9c6a1f 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html @@ -40,14 +40,20 @@ -
+
- - Required Whole Number - Too Long - Whole Number - + + Required Whole Number + +
+
+
+ +
+ + Required
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/new/FormNewDeliveryServiceJobController.js b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/new/FormNewDeliveryServiceJobController.js index 7815b516c6..055955fcd4 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/new/FormNewDeliveryServiceJobController.js +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/new/FormNewDeliveryServiceJobController.js @@ -22,6 +22,14 @@ var FormNewDeliveryServiceJobController = function(deliveryService, job, $scope, // extends the FormDeliveryServiceJobController to inherit common methods angular.extend(this, $controller('FormDeliveryServiceJobController', { deliveryService: deliveryService, job: job, $scope: $scope })); + // define invalidation types + $scope.invalidationtypes = [ + 'REFRESH', + 'REFETCH' + ]; + // set default invalidation type + $scope.job.invalidationType = $scope.invalidationtypes[0]; + $scope.jobName = 'New'; $scope.settings = { diff --git a/traffic_portal/app/src/common/modules/form/job/form.job.tpl.html b/traffic_portal/app/src/common/modules/form/job/form.job.tpl.html index 06dfc74303..028cafd739 100644 --- a/traffic_portal/app/src/common/modules/form/job/form.job.tpl.html +++ b/traffic_portal/app/src/common/modules/form/job/form.job.tpl.html @@ -31,7 +31,7 @@
- Required @@ -47,14 +47,20 @@
-
+
- - Required Whole Number - Too Long - Whole Number - + + Required Whole Number + +
+
+
+ +
+ + Required
diff --git a/traffic_portal/app/src/common/modules/form/job/new/FormNewJobController.js b/traffic_portal/app/src/common/modules/form/job/new/FormNewJobController.js index 6b209647e1..b1621594ba 100644 --- a/traffic_portal/app/src/common/modules/form/job/new/FormNewJobController.js +++ b/traffic_portal/app/src/common/modules/form/job/new/FormNewJobController.js @@ -22,6 +22,14 @@ var FormNewJobController = function(job, $scope, $controller, jobService, messag // extends the FormJobController to inherit common methods angular.extend(this, $controller('FormJobController', { job: job, $scope: $scope })); + // define invalidation types + $scope.invalidationtypes = [ + 'REFRESH', + 'REFETCH' + ]; + // set default invalidation type + $scope.job.invalidationType = $scope.invalidationtypes[0]; + $scope.jobName = 'New'; $scope.settings = { diff --git a/traffic_portal/app/src/common/modules/table/jobs/TableJobsController.js b/traffic_portal/app/src/common/modules/table/jobs/TableJobsController.js index 999d2e5f7c..2ba1bf6e5e 100644 --- a/traffic_portal/app/src/common/modules/table/jobs/TableJobsController.js +++ b/traffic_portal/app/src/common/modules/table/jobs/TableJobsController.js @@ -34,8 +34,8 @@ var TableJobsController = function(tableName, jobs, $document, $scope, $state, $ hide: false }, { - headerName: "Parameters", - field: "parameters", + headerName: "TTL (Hours)", + field: "ttlHours", hide: false }, { @@ -54,6 +54,11 @@ var TableJobsController = function(tableName, jobs, $document, $scope, $state, $ headerName: "Created By", field: "createdBy", hide: false + }, + { + headerName: "Invalidation Type", + field: "invalidationType", + hide: false } ]; @@ -63,9 +68,7 @@ var TableJobsController = function(tableName, jobs, $document, $scope, $state, $ // need to convert this to a date object for ag-grid filter to work properly x.startTime = new Date(x.startTime.replace("+00", "Z")); - // going to derive the expires date from start + TTL (hours). Format: TTL:24h - let ttl = parseInt(x.parameters.slice('TTL:'.length, x.parameters.length-1), 10); - x.expires = new Date(x.startTime.getTime() + ttl*3600*1000); + x.expires = new Date(x.startTime.getTime() + x.ttlHours*3600*1000); return x; }); diff --git a/traffic_portal/package-lock.json b/traffic_portal/package-lock.json index 17a97e3166..166dbc2d6f 100644 --- a/traffic_portal/package-lock.json +++ b/traffic_portal/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "traffic_portal", "version": "6.1.0", "dependencies": { "@uirouter/angularjs": "0.4.2", @@ -43,7 +44,7 @@ "grunt-contrib-jshint": "2.1.0", "grunt-contrib-uglify": "4.0.1", "grunt-contrib-watch": "1.1.0", - "grunt-dart-sass": "^2.0.1", + "grunt-dart-sass": "2.0.1", "grunt-express-server": "0.5.4", "grunt-html2js": "0.7.1", "grunt-install-dependencies": "0.2.0", @@ -54,7 +55,7 @@ "load-grunt-tasks": "5.1.0", "morgan": "1.9.1", "requirejs": "2.3.6", - "sass": "^1.42.1", + "sass": "1.42.1", "ssl-root-cas": "1.3.1", "time-grunt": "1.3.0" } diff --git a/traffic_portal/test/integration/Data/jobs.ts b/traffic_portal/test/integration/Data/jobs.ts index 80649ccc98..2da6286607 100644 --- a/traffic_portal/test/integration/Data/jobs.ts +++ b/traffic_portal/test/integration/Data/jobs.ts @@ -96,8 +96,9 @@ export const jobs = { description: "create an invalidation request", DeliveryService: "dstestjob1", Regex: "/test", - Ttl: "1", - validationMessage: "Invalidation request created" + TtlHours: "1", + InvalidationType: "REFRESH", + validationMessage: "Invalidation (REFRESH) request created" } ], } diff --git a/traffic_portal/test/integration/PageObjects/Jobs.po.ts b/traffic_portal/test/integration/PageObjects/Jobs.po.ts index 661bbe3fd8..779c7585e3 100644 --- a/traffic_portal/test/integration/PageObjects/Jobs.po.ts +++ b/traffic_portal/test/integration/PageObjects/Jobs.po.ts @@ -25,14 +25,16 @@ import { SideNavigationPage } from './SideNavigationPage.po'; interface Job { DeliveryService: string; Regex: string; - Ttl: string; + TtlHours: string; + InvalidationType: string; validationMessage: string; } export class JobsPage extends BasePage { private moreBtn = element(by.name('moreBtn')); private createJobMenuItem = element(by.name('createJobMenuItem')); private txtRegex = element(by.name('regex')); - private txtTtl = element(by.name('ttl')); + private txtTtl = element(by.name('ttlhours')); + private txtInvalidationType = element(by.name('invalidationtype')); private txtDeliveryservice = element(by.name('deliveryservice')); private randomize = randomize; @@ -55,7 +57,8 @@ export class JobsPage extends BasePage { await this.createJobMenuItem.click(); await this.txtDeliveryservice.sendKeys(jobs.DeliveryService + this.randomize) await this.txtRegex.sendKeys(jobs.Regex); - await this.txtTtl.sendKeys(jobs.Ttl); + await this.txtTtl.sendKeys(jobs.TtlHours); + await this.txtInvalidationType.sendKeys(jobs.InvalidationType); await basePage.ClickCreate(); result = await basePage.GetOutputMessage().then(value => value.includes(jobs.validationMessage)); return result;