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

in favor or $urlService
2026-01-16 04:10:44 -03:30 · 2017-10-16 15:46:40 -07:00 · 2017-10-16 15:46:40 -07:00 · 4f0fa57a1b
commit 4f0fa57a1b
parent 3d5f301a07
31 changed files with 64 additions and 71 deletions
--- a/awx/ui/client/features/credentials/legacy.credentials.js
+++ b/awx/ui/client/features/credentials/legacy.credentials.js
@ -108,7 +108,7 @@ function LegacyCredentialsService () {
                    page_size: '20',
                    order_by: 'username'
                },
-                dynamic: false,
+                dyanmic: true,
                squash: ''
            }
        },
@ -185,14 +185,14 @@ function LegacyCredentialsService () {
                    page_size: 5,
                    is_superuser: false
                },
-                dynamic: false
+                dyanmic: true
            },
            team_search: {
                value: {
                    order_by: 'name',
                    page_size: 5
                },
-                dynamic: false
+                dyanmic: true
            }
        },
        ncyBreadcrumb: {
@ -240,7 +240,7 @@ function LegacyCredentialsService () {
                    order_by: 'name',
                    role_level: 'admin_role'
                },
-                dynamic: false,
+                dyanmic: true,
                squash: ''
            }
        },
@ -279,7 +279,7 @@ function LegacyCredentialsService () {
                    page_size: 5,
                    order_by: 'name'
                },
-                dynamic: false,
+                dyanmic: true,
                squash: ''
            }
        },
--- a/awx/ui/client/src/activity-stream/activitystream.route.js
+++ b/awx/ui/client/src/activity-stream/activitystream.route.js
@ -21,7 +21,7 @@ export default {
                or__object1__in: null,
                or__object2__in: null
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    ncyBreadcrumb: {
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@ -2,11 +2,6 @@
 global.$AnsibleConfig = null;
 // Provided via Webpack DefinePlugin in webpack.config.js
 global.$ENV = {};
-// ui-router debugging
-// if ($ENV['route-debug']){
-    // let trace = angular.module('ui.router').trace;
-    // trace.enable();
-// }

 var urlPrefix;

@ -130,20 +125,20 @@ angular
            timeout: 4000
        });
    }])
-    .config(['$urlRouterProvider', '$breadcrumbProvider', 'QuerySetProvider',
-        '$urlMatcherFactoryProvider',
-        function($urlRouterProvider, $breadcrumbProvider, QuerySet,
-            $urlMatcherFactoryProvider) {
-            $urlMatcherFactoryProvider.strictMode(false);
+    .config(['$breadcrumbProvider', 'QuerySetProvider',
+        '$urlServiceProvider',
+        function($breadcrumbProvider, QuerySet,
+            $urlServiceProvider) {
+            $urlServiceProvider.config.strictMode(false);
            $breadcrumbProvider.setOptions({
                templateUrl: urlPrefix + 'partials/breadcrumb.html'
            });

            // 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');
-            $urlRouterProvider.otherwise('/home');
+            $urlServiceProvider.rules.when('/jobs/*/host-event/*', '/jobs/*/host-event/*/details');
+            $urlServiceProvider.rules.otherwise('/home');

-            $urlMatcherFactoryProvider.type('queryset', {
+            $urlServiceProvider.config.type('queryset', {
                // encoding
                // from {operator__key1__comparator=value, ... }
                // to "_search=operator:key:compator=value& ... "
@ -175,13 +170,13 @@ angular
        'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer',
        'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
        'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService',
-        'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions', '$trace',
+        'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions',
        function($stateExtender, $q, $compile, $cookies, $rootScope, $log, $stateParams,
            CheckLicense, $location, Authorization, LoadBasePaths, Timer,
            LoadConfig, Store, pendoService, Prompt, Rest, Wait,
            ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
-            $filter, SocketService, AppStrings, $transitions, $trace) {
-            $trace.enable();
+            $filter, SocketService, AppStrings, $transitions) {
+                
            $rootScope.$state = $state;
            $rootScope.$state.matches = function(stateName) {
                return $state.current.name.search(stateName) > 0;
--- a/awx/ui/client/src/configuration/configuration.route.js
+++ b/awx/ui/client/src/configuration/configuration.route.js
@ -20,7 +20,7 @@
     params: {
         currentTab: {
             value: 'auth',
-             dynamic: false,
+             dyanmic: true,
             isOptional: true
         }

--- a/awx/ui/client/src/instance-groups/instance-groups.route.js
+++ b/awx/ui/client/src/instance-groups/instance-groups.route.js
@ -14,7 +14,7 @@ export default {
                page_size: '20',
                order_by: 'name'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    data: {
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
@ -15,7 +15,7 @@ export default {
                order_by: '-finished',
                not__launch_type: 'sync'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    views: {
--- a/awx/ui/client/src/instance-groups/instances/instances-list.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.route.js
@ -15,7 +15,7 @@ export default {
                page_size: '20',
                order_by: 'hostname'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    views: {
--- a/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
+++ b/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
@ -15,7 +15,7 @@ export default {
                order_by: '-finished',
                not__launch_type: 'sync'
            },
-            dynamic: false
+            dyanmic: true
        },
        instance_group_id: null
    },
--- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
@ -36,7 +36,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
@ -10,7 +10,7 @@ export default {
                page_size: '5'
            },
            squash: true,
-            dynamic: false
+            dyanmic: true
        }
    },
    ncyBreadcrumb: {
--- a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
@ -11,7 +11,7 @@ export default {
                or__inventoryupdate__inventory_source__inventory:"",
                order_by: "-id"
            },
-            dynamic: false,
+            dyanmic: true,
            squash:""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
@ -37,7 +37,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
@ -10,7 +10,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
@ -10,7 +10,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
@ -9,7 +9,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash:""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
@ -10,7 +10,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
@ -10,7 +10,7 @@ export default {
                order_by: "name",
                not__source: ""
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
@ -6,7 +6,7 @@ export default {
                order_by: "name",
                role_level: "admin_role",
            },
-            dynamic: false,
+            dyanmic: true,
            squash: ""
        }
    },
--- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
@ -9,7 +9,7 @@ export default {
                page_size: "20",
                order_by: "name"
            },
-            dynamic: false,
+            dyanmic: true,
            squash:""
        }
    },
--- a/awx/ui/client/src/job-results/job-results.route.js
+++ b/awx/ui/client/src/job-results/job-results.route.js
@ -31,7 +31,7 @@ export default {
    params: {
        job_event_search: {
            value: defaultParams,
-            dynamic: false,
+            dyanmic: true,
            squash: ''
        }
    },
--- a/awx/ui/client/src/jobs/jobs.route.js
+++ b/awx/ui/client/src/jobs/jobs.route.js
@ -11,7 +11,6 @@ export default {
    searchPrefix: 'job',
    name: 'jobs',
    url: '/jobs',
-    reloadOnSearch: true,
    ncyBreadcrumb: {
        label: N_("JOBS")
    },
@ -21,7 +20,7 @@ export default {
                not__launch_type: 'sync',
                order_by: '-finished'
            },
-            dynamic: false,
+            dynamic: true,
            squash: false
        }
    },
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
@ -34,7 +34,7 @@ export default [{
            value: {
                order_by: 'username'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    ncyBreadcrumb: {
@ -239,7 +239,7 @@ export default [{
                or__inventory__organization: null,
                page_size: 20
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    data: {
@ -297,14 +297,14 @@ export default [{
            value: {
                order_by: 'username'
            },
-            dynamic: false
+            dyanmic: true
        },
        add_user_search: {
            value: {
                order_by: 'username',
                page_size: '5',
            },
-            dynamic: false,
+            dyanmic: true,
            squash: true
        }
    },
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
+++ b/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
@ -14,7 +14,7 @@ export default {
                page_size: '20',
                order_by: '-finished'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    data: {
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
+++ b/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
@ -15,7 +15,7 @@ export default {
                order_by: '-finished',
                created_by: null
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    data: {
--- a/awx/ui/client/src/portal-mode/portal-mode.route.js
+++ b/awx/ui/client/src/portal-mode/portal-mode.route.js
@ -17,7 +17,7 @@ export default {
                page_size: '20',
                order_by: 'name'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    data: {
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@ -318,7 +318,7 @@ export default
                            next_run__isnull: 'false',
                            order_by: 'unified_job_template__polymorphic_ctype__model'
                        },
-                        dynamic: false
+                        dyanmic: true
                    }
                },
                data: {
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@ -122,7 +122,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
            // but will register new $stateParams[$scope.iterator + '_search'] terms
            if(!$scope.querySet) {
                $state.go('.', {
-                    [$scope.iterator + '_search']: queryset }, {reload:true});
+                    [$scope.iterator + '_search']: queryset });
            }
            qs.search(path, queryset).then((res) => {
                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(_.isArray(object[key])) {
                            // 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
                // but will register new $stateParams[$scope.iterator + '_search'] terms
                if(!$scope.querySet) {
-                    $state.go('.', {
-                        [$scope.iterator + '_search']: queryset }, { reload:true }).then(function(){
+                    $state.go('.', {[$scope.iterator + '_search']:queryset }).then(function(){
                            // ISSUE: same as above in $scope.remove.  For some reason deleting the page
                            // from the queryset works for all lists except lists in modals.
                            delete $stateParams[$scope.iterator + '_search'].page;
@ -379,7 +378,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
            removeFromQuerySet(queryset);
            if(!$scope.querySet) {
                $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
                        // remove the param from $stateParams.  Here we'll manually check to make sure
                        // that that happened and remove it if it didn't.
@ -403,7 +402,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
            delete cleared.page;
            queryset = cleared;
            if(!$scope.querySet) {
-                $state.go('.', {[$scope.iterator + '_search']: queryset}, {reload:true});
+                $state.go('.', {[$scope.iterator + '_search']: queryset});
            }
            qs.search(path, queryset).then((res) => {
                if($scope.querySet) {
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@ -257,27 +257,27 @@ function($injector, $stateExtender, $log, i18n) {
                    params: {
                        project_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        },
                        job_template_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        },
                        workflow_template_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        },
                        inventory_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        },
                        credential_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        },
                        organization_search: {
                            value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: false
+                            dyanmic: true
                        }
                    },
                    ncyBreadcrumb:{
@ -398,11 +398,11 @@ function($injector, $stateExtender, $log, i18n) {
                    params: {
                        user_search: {
                            value: { order_by: 'username', page_size: '5', is_superuser: false },
-                            dynamic: false,
+                            dyanmic: true,
                        },
                        team_search: {
                            value: { order_by: 'name', page_size: '5' },
-                            dynamic: false
+                            dyanmic: true
                        }
                    },
                    views: {
@ -570,7 +570,7 @@ function($injector, $stateExtender, $log, i18n) {
                    params: {
                        user_search: {
                            value: { order_by: 'username', page_size: '5' },
-                            dynamic: false,
+                            dyanmic: true,
                        }
                    },
                    views: {
--- a/awx/ui/client/src/shared/stateExtender.provider.js
+++ b/awx/ui/client/src/shared/stateExtender.provider.js
@ -30,7 +30,7 @@ export default function($stateProvider) {
                                    page_size: "20",
                                    order_by: "name"
                                },
-                                dynamic: false,
+                                dyanmic: true,
                                squash: false
                            }
                        }
--- a/awx/ui/client/src/templates/list/templates-list.route.js
+++ b/awx/ui/client/src/templates/list/templates-list.route.js
@ -26,7 +26,7 @@ export default {
            value: {
                type: 'workflow_job_template,job_template'
            },
-            dynamic: false
+            dyanmic: true
        }
    },
    searchPrefix: 'template',
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@ -369,7 +369,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                credential__isnull: false
                            },
                            squash: false,
-                            dynamic: false
+                            dyanmic: true
                        },
                        project_search: {
                            value: {
@ -377,7 +377,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                order_by: 'name'
                            },
                            squash: true,
-                            dynamic: false
+                            dyanmic: true
                        },
                        inventory_source_search: {
                            value: {
@ -386,7 +386,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                order_by: 'name'
                            },
                            squash: true,
-                            dynamic: false
+                            dyanmic: true
                        }
                    },
                    views: {
@ -775,7 +775,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                page_size: '5'
                            },
                            squash: true,
-                            dynamic: false
+                            dyanmic: true
                        }
                    },
                    ncyBreadcrumb: {
@ -830,7 +830,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                page_size: '5'
                            },
                            squash: true,
-                            dynamic: false
+                            dyanmic: true
                        }
                    },
                    ncyBreadcrumb: {