External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

removing $urlMatcherFactory and $urlRouter b/c they're deprecated

Browse Source 
in favor or $urlService
This commit is contained in:
Jared Tabor
2017-10-16 15:46:40 -07:00
parent 3d5f301a07
commit 4f0fa57a1b
31 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/features/credentials/legacy.credentials.js
View File

@@ -108,7 +108,7 @@ function LegacyCredentialsService () {
page_size: '20', page_size: '20',
order_by: 'username' order_by: 'username'
}, },
dynamic: false, dyanmic: true,
squash: '' squash: ''
} }
}, },
@@ -185,14 +185,14 @@ function LegacyCredentialsService () {
page_size: 5, page_size: 5,
is_superuser: false is_superuser: false
}, },
dynamic: false dyanmic: true
}, },
team_search: { team_search: {
value: { value: {
order_by: 'name', order_by: 'name',
page_size: 5 page_size: 5
}, },
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -240,7 +240,7 @@ function LegacyCredentialsService () {
order_by: 'name', order_by: 'name',
role_level: 'admin_role' role_level: 'admin_role'
}, },
dynamic: false, dyanmic: true,
squash: '' squash: ''
} }
}, },
@@ -279,7 +279,7 @@ function LegacyCredentialsService () {
page_size: 5, page_size: 5,
order_by: 'name' order_by: 'name'
}, },
dynamic: false, dyanmic: true,
squash: '' squash: ''
} }
}, },

2
awx/ui/client/src/activity-stream/activitystream.route.js
View File

@@ -21,7 +21,7 @@ export default {
or__object1__in: null, or__object1__in: null,
or__object2__in: null or__object2__in: null
}, },
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {

27
awx/ui/client/src/app.js
View File

@@ -2,11 +2,6 @@
global.$AnsibleConfig = null; global.$AnsibleConfig = null;
// Provided via Webpack DefinePlugin in webpack.config.js // Provided via Webpack DefinePlugin in webpack.config.js
global.$ENV = {}; global.$ENV = {};
// ui-router debugging
// if ($ENV['route-debug']){
// let trace = angular.module('ui.router').trace;
// trace.enable();
// }
var urlPrefix; var urlPrefix;
@@ -130,20 +125,20 @@ angular
timeout: 4000 timeout: 4000
}); });
}]) }])
.config(['$urlRouterProvider', '$breadcrumbProvider', 'QuerySetProvider', .config(['$breadcrumbProvider', 'QuerySetProvider',
'$urlMatcherFactoryProvider', '$urlServiceProvider',
function($urlRouterProvider, $breadcrumbProvider, QuerySet, function($breadcrumbProvider, QuerySet,
$urlMatcherFactoryProvider) { $urlServiceProvider) {
$urlMatcherFactoryProvider.strictMode(false); $urlServiceProvider.config.strictMode(false);
$breadcrumbProvider.setOptions({ $breadcrumbProvider.setOptions({
templateUrl: urlPrefix + 'partials/breadcrumb.html' templateUrl: urlPrefix + 'partials/breadcrumb.html'
}); });
// route to the details pane of /job/:id/host-event/:eventId if no other child specified // route to the details pane of /job/:id/host-event/:eventId if no other child specified
$urlRouterProvider.when('/jobs/*/host-event/*', '/jobs/*/host-event/*/details'); $urlServiceProvider.rules.when('/jobs/*/host-event/*', '/jobs/*/host-event/*/details');
$urlRouterProvider.otherwise('/home'); $urlServiceProvider.rules.otherwise('/home');
$urlMatcherFactoryProvider.type('queryset', { $urlServiceProvider.config.type('queryset', {
// encoding // encoding
// from {operator__key1__comparator=value, ... } // from {operator__key1__comparator=value, ... }
// to "_search=operator:key:compator=value& ... " // to "_search=operator:key:compator=value& ... "
@@ -175,13 +170,13 @@ angular
'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer',
'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest', 'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService', 'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService',
'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions', '$trace', 'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions',
function($stateExtender, $q, $compile, $cookies, $rootScope, $log, $stateParams, function($stateExtender, $q, $compile, $cookies, $rootScope, $log, $stateParams,
CheckLicense, $location, Authorization, LoadBasePaths, Timer, CheckLicense, $location, Authorization, LoadBasePaths, Timer,
LoadConfig, Store, pendoService, Prompt, Rest, Wait, LoadConfig, Store, pendoService, Prompt, Rest, Wait,
ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService, ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
$filter, SocketService, AppStrings, $transitions, $trace) { $filter, SocketService, AppStrings, $transitions) {
$trace.enable();
$rootScope.$state = $state; $rootScope.$state = $state;
$rootScope.$state.matches = function(stateName) { $rootScope.$state.matches = function(stateName) {
return $state.current.name.search(stateName) > 0; return $state.current.name.search(stateName) > 0;

2
awx/ui/client/src/configuration/configuration.route.js
View File

@@ -20,7 +20,7 @@
params: { params: {
currentTab: { currentTab: {
value: 'auth', value: 'auth',
dynamic: false, dyanmic: true,
isOptional: true isOptional: true
} }

2
awx/ui/client/src/instance-groups/instance-groups.route.js
View File

@@ -14,7 +14,7 @@ export default {
page_size: '20', page_size: '20',
order_by: 'name' order_by: 'name'
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {

2
awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
View File

@@ -15,7 +15,7 @@ export default {
order_by: '-finished', order_by: '-finished',
not__launch_type: 'sync' not__launch_type: 'sync'
}, },
dynamic: false dyanmic: true
} }
}, },
views: { views: {

2
awx/ui/client/src/instance-groups/instances/instances-list.route.js
View File

@@ -15,7 +15,7 @@ export default {
page_size: '20', page_size: '20',
order_by: 'hostname' order_by: 'hostname'
}, },
dynamic: false dyanmic: true
} }
}, },
views: { views: {

2
awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
View File

@@ -15,7 +15,7 @@ export default {
order_by: '-finished', order_by: '-finished',
not__launch_type: 'sync' not__launch_type: 'sync'
}, },
dynamic: false dyanmic: true
}, },
instance_group_id: null instance_group_id: null
}, },

2
awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
View File

@@ -36,7 +36,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
View File

@@ -10,7 +10,7 @@ export default {
page_size: '5' page_size: '5'
}, },
squash: true, squash: true,
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {

2
awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
View File

@@ -11,7 +11,7 @@ export default {
or__inventoryupdate__inventory_source__inventory:"", or__inventoryupdate__inventory_source__inventory:"",
order_by: "-id" order_by: "-id"
}, },
dynamic: false, dyanmic: true,
squash:"" squash:""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
View File

@@ -37,7 +37,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
View File

@@ -10,7 +10,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
View File

@@ -10,7 +10,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
View File

@@ -9,7 +9,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash:"" squash:""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
View File

@@ -10,7 +10,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
View File

@@ -10,7 +10,7 @@ export default {
order_by: "name", order_by: "name",
not__source: "" not__source: ""
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
View File

@@ -6,7 +6,7 @@ export default {
order_by: "name", order_by: "name",
role_level: "admin_role", role_level: "admin_role",
}, },
dynamic: false, dyanmic: true,
squash: "" squash: ""
} }
}, },

2
awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
View File

@@ -9,7 +9,7 @@ export default {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash:"" squash:""
} }
}, },

2
awx/ui/client/src/job-results/job-results.route.js
View File

@@ -31,7 +31,7 @@ export default {
params: { params: {
job_event_search: { job_event_search: {
value: defaultParams, value: defaultParams,
dynamic: false, dyanmic: true,
squash: '' squash: ''
} }
}, },

3
awx/ui/client/src/jobs/jobs.route.js
View File

@@ -11,7 +11,6 @@ export default {
searchPrefix: 'job', searchPrefix: 'job',
name: 'jobs', name: 'jobs',
url: '/jobs', url: '/jobs',
reloadOnSearch: true,
ncyBreadcrumb: { ncyBreadcrumb: {
label: N_("JOBS") label: N_("JOBS")
}, },
@@ -21,7 +20,7 @@ export default {
not__launch_type: 'sync', not__launch_type: 'sync',
order_by: '-finished' order_by: '-finished'
}, },
dynamic: false, dynamic: true,
squash: false squash: false
} }
}, },

8
awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
View File

@@ -34,7 +34,7 @@ export default [{
value: { value: {
order_by: 'username' order_by: 'username'
}, },
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -239,7 +239,7 @@ export default [{
or__inventory__organization: null, or__inventory__organization: null,
page_size: 20 page_size: 20
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {
@@ -297,14 +297,14 @@ export default [{
value: { value: {
order_by: 'username' order_by: 'username'
}, },
dynamic: false dyanmic: true
}, },
add_user_search: { add_user_search: {
value: { value: {
order_by: 'username', order_by: 'username',
page_size: '5', page_size: '5',
}, },
dynamic: false, dyanmic: true,
squash: true squash: true
} }
}, },

2
awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
View File

@@ -14,7 +14,7 @@ export default {
page_size: '20', page_size: '20',
order_by: '-finished' order_by: '-finished'
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {

2
awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
View File

@@ -15,7 +15,7 @@ export default {
order_by: '-finished', order_by: '-finished',
created_by: null created_by: null
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {

2
awx/ui/client/src/portal-mode/portal-mode.route.js
View File

@@ -17,7 +17,7 @@ export default {
page_size: '20', page_size: '20',
order_by: 'name' order_by: 'name'
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {

2
awx/ui/client/src/scheduler/main.js
View File

@@ -318,7 +318,7 @@ export default
next_run__isnull: 'false', next_run__isnull: 'false',
order_by: 'unified_job_template__polymorphic_ctype__model' order_by: 'unified_job_template__polymorphic_ctype__model'
}, },
dynamic: false dyanmic: true
} }
}, },
data: { data: {

11
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -122,7 +122,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
// but will register new $stateParams[$scope.iterator + '_search'] terms // but will register new $stateParams[$scope.iterator + '_search'] terms
if(!$scope.querySet) { if(!$scope.querySet) {
$state.go('.', { $state.go('.', {
[$scope.iterator + '_search']: queryset }, {reload:true}); [$scope.iterator + '_search']: queryset });
} }
qs.search(path, queryset).then((res) => { qs.search(path, queryset).then((res) => {
if($scope.querySet) { if($scope.querySet) {
@@ -246,7 +246,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
} }
}); });
queryset = _.merge(queryset, params, (objectValue, sourceValue, key, object) => { queryset = _.merge({}, queryset, params, (objectValue, sourceValue, key, object) => {
if (object[key] && object[key] !== sourceValue){ if (object[key] && object[key] !== sourceValue){
if(_.isArray(object[key])) { if(_.isArray(object[key])) {
// Add the new value to the array and return // Add the new value to the array and return
@@ -287,8 +287,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
// This transition will not reload controllers/resolves/views // This transition will not reload controllers/resolves/views
// but will register new $stateParams[$scope.iterator + '_search'] terms // but will register new $stateParams[$scope.iterator + '_search'] terms
if(!$scope.querySet) { if(!$scope.querySet) {
$state.go('.', { $state.go('.', {[$scope.iterator + '_search']:queryset }).then(function(){
[$scope.iterator + '_search']: queryset }, { reload:true }).then(function(){
// ISSUE: same as above in $scope.remove. For some reason deleting the page // ISSUE: same as above in $scope.remove. For some reason deleting the page
// from the queryset works for all lists except lists in modals. // from the queryset works for all lists except lists in modals.
delete $stateParams[$scope.iterator + '_search'].page; delete $stateParams[$scope.iterator + '_search'].page;
@@ -379,7 +378,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
removeFromQuerySet(queryset); removeFromQuerySet(queryset);
if(!$scope.querySet) { if(!$scope.querySet) {
$state.go('.', { $state.go('.', {
[$scope.iterator + '_search']: queryset }, {reload:true}).then(function(){ [$scope.iterator + '_search']: queryset }).then(function(){
// ISSUE: for some reason deleting a tag from a list in a modal does not // ISSUE: for some reason deleting a tag from a list in a modal does not
// remove the param from $stateParams. Here we'll manually check to make sure // remove the param from $stateParams. Here we'll manually check to make sure
// that that happened and remove it if it didn't. // that that happened and remove it if it didn't.
@@ -403,7 +402,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
delete cleared.page; delete cleared.page;
queryset = cleared; queryset = cleared;
if(!$scope.querySet) { if(!$scope.querySet) {
$state.go('.', {[$scope.iterator + '_search']: queryset}, {reload:true}); $state.go('.', {[$scope.iterator + '_search']: queryset});
} }
qs.search(path, queryset).then((res) => { qs.search(path, queryset).then((res) => {
if($scope.querySet) { if($scope.querySet) {

18
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -257,27 +257,27 @@ function($injector, $stateExtender, $log, i18n) {
params: { params: {
project_search: { project_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
}, },
job_template_search: { job_template_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
}, },
workflow_template_search: { workflow_template_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
}, },
inventory_search: { inventory_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
}, },
credential_search: { credential_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
}, },
organization_search: { organization_search: {
value: {order_by: 'name', page_size: '5', role_level: 'admin_role'}, value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb:{ ncyBreadcrumb:{
@@ -398,11 +398,11 @@ function($injector, $stateExtender, $log, i18n) {
params: { params: {
user_search: { user_search: {
value: { order_by: 'username', page_size: '5', is_superuser: false }, value: { order_by: 'username', page_size: '5', is_superuser: false },
dynamic: false, dyanmic: true,
}, },
team_search: { team_search: {
value: { order_by: 'name', page_size: '5' }, value: { order_by: 'name', page_size: '5' },
dynamic: false dyanmic: true
} }
}, },
views: { views: {
@@ -570,7 +570,7 @@ function($injector, $stateExtender, $log, i18n) {
params: { params: {
user_search: { user_search: {
value: { order_by: 'username', page_size: '5' }, value: { order_by: 'username', page_size: '5' },
dynamic: false, dyanmic: true,
} }
}, },
views: { views: {

2
awx/ui/client/src/shared/stateExtender.provider.js
View File

@@ -30,7 +30,7 @@ export default function($stateProvider) {
page_size: "20", page_size: "20",
order_by: "name" order_by: "name"
}, },
dynamic: false, dyanmic: true,
squash: false squash: false
} }
} }

2
awx/ui/client/src/templates/list/templates-list.route.js
View File

@@ -26,7 +26,7 @@ export default {
value: { value: {
type: 'workflow_job_template,job_template' type: 'workflow_job_template,job_template'
}, },
dynamic: false dyanmic: true
} }
}, },
searchPrefix: 'template', searchPrefix: 'template',

10
awx/ui/client/src/templates/main.js
View File

@@ -369,7 +369,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
credential__isnull: false credential__isnull: false
}, },
squash: false, squash: false,
dynamic: false dyanmic: true
}, },
project_search: { project_search: {
value: { value: {
@@ -377,7 +377,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
order_by: 'name' order_by: 'name'
}, },
squash: true, squash: true,
dynamic: false dyanmic: true
}, },
inventory_source_search: { inventory_source_search: {
value: { value: {
@@ -386,7 +386,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
order_by: 'name' order_by: 'name'
}, },
squash: true, squash: true,
dynamic: false dyanmic: true
} }
}, },
views: { views: {
@@ -775,7 +775,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
page_size: '5' page_size: '5'
}, },
squash: true, squash: true,
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
@@ -830,7 +830,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
page_size: '5' page_size: '5'
}, },
squash: true, squash: true,
dynamic: false dyanmic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {