zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-28 19:01:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic inventory add form work

Browse Source
This commit is contained in:
Michael Abashian
2017-04-18 12:20:58 -04:00
committed by Jared Tabor
parent 62fafc9870
commit cc80cd8549
13 changed files with 216 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
queryset = _.cloneDeep($scope.querySet);
}
else {
queryset = $stateParams[`${$scope.iterator}_search`];
queryset = $state.params[`${$scope.iterator}_search`];
}
// build $scope.tags from $stateParams.QuerySet, build fieldset key
@@ -30,7 +30,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
function init() {
path = GetBasePath($scope.basePath) || $scope.basePath;
$scope.searchTags = stripDefaultParams($state.params[`${$scope.iterator}_search`]);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
qs.initFieldset(path, $scope.djangoModel).then((data) => {
$scope.models = data.models;
$scope.options = data.options.data;
@@ -69,7 +69,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
});
$scope.searchTerm = null;
$scope.searchTags = stripDefaultParams(queryset);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
}
}
});
@@ -86,28 +86,6 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
});
}
// Removes state definition defaults and pagination terms
function stripDefaultParams(params) {
let stripped =_.pick(params, (value, key) => {
// setting the default value of a term to null in a state definition is a very explicit way to ensure it will NEVER generate a search tag, even with a non-default value
return defaults[key] !== value && key !== 'order_by' && key !== 'page' && key !== 'page_size' && defaults[key] !== null;
});
let strippedCopy = _.cloneDeep(stripped);
if(_.keys(_.pick(defaults, _.keys(strippedCopy))).length > 0){
for (var key in strippedCopy) {
if (strippedCopy.hasOwnProperty(key)) {
let value = strippedCopy[key];
if(_.isArray(value)){
let index = _.indexOf(value, defaults[key]);
value = value.splice(index, 1)[0];
}
}
}
stripped = strippedCopy;
}
return _(strippedCopy).map(qs.decodeParam).flatten().value();
}
function setDefaults(term) {
if ($scope.list.defaultSearchParams) {
return $scope.list.defaultSearchParams(encodeURIComponent(term));
@@ -136,7 +114,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
$scope.dataset = res.data;
$scope.collection = res.data.results;
});
$scope.searchTags = stripDefaultParams(queryset);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
};
// remove tag, merge new queryset, $state.go
@@ -208,7 +186,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
$scope.dataset = res.data;
$scope.collection = res.data.results;
});
$scope.searchTags = stripDefaultParams(queryset);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
};
// add a search tag, merge new queryset, $state.go()
@@ -311,7 +289,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
});
$scope.searchTerm = null;
$scope.searchTags = stripDefaultParams(queryset);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
}
};
@@ -333,7 +311,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
});
$scope.searchTerm = null;
$scope.searchTags = stripDefaultParams(queryset);
$scope.searchTags = qs.stripDefaultParams(queryset, defaults);
};
}
];