External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 11:11:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4927 from jaredevantabor/projects-sockets

Browse Source 
Preventing page from refreshing when project list updates via the socket
This commit is contained in:
Jared Tabor
2017-01-26 12:20:25 -08:00
committed by GitHub
parent a86f3d61c2 67f2df64b3
commit 7488e09763
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/src/controllers/Projects.js
View File

@@ -14,7 +14,7 @@
export function ProjectsList($scope, $rootScope, $location, $log, $stateParams, export function ProjectsList($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, ProjectList, Prompt, ReturnToCaller, ClearScope, ProcessErrors, Rest, Alert, ProjectList, Prompt, ReturnToCaller, ClearScope, ProcessErrors,
GetBasePath, ProjectUpdate, Wait, GetChoices, Empty, Find, GetProjectIcon, GetBasePath, ProjectUpdate, Wait, GetChoices, Empty, Find, GetProjectIcon,
GetProjectToolTip, $filter, $state, rbacUiControlService, Dataset, i18n) { GetProjectToolTip, $filter, $state, rbacUiControlService, Dataset, i18n, qs) {
var list = ProjectList, var list = ProjectList,
defaultUrl = GetBasePath('projects'); defaultUrl = GetBasePath('projects');
@@ -95,6 +95,15 @@ export function ProjectsList($scope, $rootScope, $location, $log, $stateParams,
} }
} }
$scope.reloadList = function(){
let path = GetBasePath(list.basePath) || GetBasePath(list.name);
qs.search(path, $stateParams[`${list.iterator}_search`])
.then(function(searchResponse) {
$scope[`${list.iterator}_dataset`] = searchResponse.data;
$scope[list.name] = $scope[`${list.iterator}_dataset`].results;
});
};
$scope.$on(`ws-jobs`, function(e, data) { $scope.$on(`ws-jobs`, function(e, data) {
var project; var project;
$log.debug(data); $log.debug(data);
@@ -106,7 +115,7 @@ export function ProjectsList($scope, $rootScope, $location, $log, $stateParams,
$log.debug('Received event for project: ' + project.name); $log.debug('Received event for project: ' + project.name);
$log.debug('Status changed to: ' + data.status); $log.debug('Status changed to: ' + data.status);
if (data.status === 'successful' || data.status === 'failed') { if (data.status === 'successful' || data.status === 'failed') {
$state.go('.', null, { reload: true }); $scope.reloadList();
} else { } else {
project.scm_update_tooltip = "SCM update currently running"; project.scm_update_tooltip = "SCM update currently running";
project.scm_type_class = "btn-disabled"; project.scm_type_class = "btn-disabled";
@@ -292,7 +301,7 @@ export function ProjectsList($scope, $rootScope, $location, $log, $stateParams,
ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams', ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$stateParams',
'Rest', 'Alert', 'ProjectList', 'Prompt', 'ReturnToCaller', 'ClearScope', 'ProcessErrors', 'Rest', 'Alert', 'ProjectList', 'Prompt', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
'GetBasePath', 'ProjectUpdate', 'Wait', 'GetChoices', 'Empty', 'Find', 'GetProjectIcon', 'GetBasePath', 'ProjectUpdate', 'Wait', 'GetChoices', 'Empty', 'Find', 'GetProjectIcon',
'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService', 'Dataset', 'i18n' 'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet'
]; ];
export function ProjectsAdd($scope, $rootScope, $compile, $location, $log, export function ProjectsAdd($scope, $rootScope, $compile, $location, $log,