External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity

refactor ListHeader to use replaceNamespacedParams

Browse Source
This commit is contained in:
Keith J. Grant 2021-05-17 14:40:32 -07:00
parent 9bbaa6993f
commit f8374def64
4 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
awx/ui_next/src/components/ListHeader/ListHeader.jsx
View File

@ -6,11 +6,10 @@ import { Toolbar, ToolbarContent } from '@patternfly/react-core';
import DataListToolbar from '../DataListToolbar';
import {
encodeNonDefaultQueryString,
parseQueryString,
mergeParams,
replaceParams,
removeParams,
replaceNamespacedParams,
} from '../../util/qs';
import { QSConfig, SearchColumns, SortColumns } from '../../types';
@ -38,60 +37,59 @@ class ListHeader extends React.Component {
handleSearch(key, value) {
const { location, qsConfig } = this.props;
let params = parseQueryString(qsConfig, location.search);
params = mergeParams(params, { [key]: value });
params = replaceParams(params, { page: 1 });
this.pushHistoryState(params);
const params = parseQueryString(qsConfig, location.search);
const qs = replaceNamespacedParams(qsConfig, location.search, {
...mergeParams(params, { [key]: value }),
page: 1,
});
this.pushHistoryState(qs);
}
handleReplaceSearch(key, value) {
const { location, qsConfig } = this.props;
const oldParams = parseQueryString(qsConfig, location.search);
this.pushHistoryState(replaceParams(oldParams, { [key]: value }));
const qs = replaceNamespacedParams(qsConfig, location.search, {
[key]: value,
});
this.pushHistoryState(qs);
}
handleRemove(key, value) {
const { location, qsConfig } = this.props;
let oldParams = parseQueryString(qsConfig, location.search);
if (parseInt(value, 10)) {
oldParams = removeParams(qsConfig, oldParams, {
[key]: parseInt(value, 10),
});
}
this.pushHistoryState(removeParams(qsConfig, oldParams, { [key]: value }));
const oldParams = parseQueryString(qsConfig, location.search);
const updatedParams = removeParams(qsConfig, oldParams, {
[key]: value,
});
const qs = replaceNamespacedParams(
qsConfig,
location.search,
updatedParams
);
this.pushHistoryState(qs);
}
handleRemoveAll() {
// remove everything in oldParams except for page_size and order_by
const { location, qsConfig } = this.props;
const oldParams = parseQueryString(qsConfig, location.search);
const oldParamsClone = { ...oldParams };
delete oldParamsClone.page_size;
delete oldParamsClone.order_by;
this.pushHistoryState(removeParams(qsConfig, oldParams, oldParamsClone));
Object.keys(oldParams).forEach(key => {
oldParams[key] = null;
});
const qs = replaceNamespacedParams(qsConfig, location.search, oldParams);
this.pushHistoryState(qs);
}
handleSort(key, order) {
const { location, qsConfig } = this.props;
const oldParams = parseQueryString(qsConfig, location.search);
this.pushHistoryState(
replaceParams(oldParams, {
order_by: order === 'ascending' ? key : `-${key}`,
page: null,
})
);
const qs = replaceNamespacedParams(qsConfig, location.search, {
order_by: order === 'ascending' ? key : `-${key}`,
page: null,
});
this.pushHistoryState(qs);
}
pushHistoryState(params) {
const { history, qsConfig } = this.props;
pushHistoryState(queryString) {
const { history } = this.props;
const { pathname } = history.location;
const nonNamespacedParams = parseQueryString({}, history.location.search);
const encodedParams = encodeNonDefaultQueryString(
qsConfig,
params,
nonNamespacedParams
);
history.push(encodedParams ? `${pathname}?${encodedParams}` : pathname);
history.push(queryString ? `${pathname}?${queryString}` : pathname);
}
render() {

4
awx/ui_next/src/components/ListHeader/ListHeader.test.jsx
View File

@ -51,7 +51,7 @@ describe('ListHeader', () => {
expect(history.location.search).toEqual('');
});
test('should test clear all', () => {
test('should clear all', () => {
const query = '?item.page_size=5&item.name=foo';
const history = createMemoryHistory({
initialEntries: [`/organizations/1/teams${query}`],
@ -71,7 +71,7 @@ describe('ListHeader', () => {
expect(history.location.search).toEqual(query);
const toolbar = wrapper.find('DataListToolbar');
toolbar.prop('clearAllFilters')();
expect(history.location.search).toEqual('?item.page_size=5');
expect(history.location.search).toEqual('');
});
test('should test handle search', () => {

5
awx/ui_next/src/util/qs.js
View File

@ -164,9 +164,10 @@ export function removeParams(config, oldParams, paramsToRemove) {
};
Object.keys(oldParams).forEach(key => {
const value = removeParam(oldParams[key], paramsToRemove[key]);
if (value !== null) {
updated[key] = value;
if (value == null && Object.prototype.hasOwnProperty.call(updated, key)) {
return;
}
updated[key] = value;
});
return updated;
}

9
awx/ui_next/src/util/qs.test.js
View File

@ -341,6 +341,7 @@ describe('qs (qs.js)', () => {
baz: 'bar',
page: 3,
page_size: 15,
bag: null,
});
});
@ -429,6 +430,7 @@ describe('qs (qs.js)', () => {
baz: ['bar', 'bang'],
page: 3,
page_size: 15,
pat: null,
});
});
@ -443,6 +445,7 @@ describe('qs (qs.js)', () => {
expect(removeParams(config, oldParams, toRemove)).toEqual({
page: 3,
page_size: 15,
baz: null,
});
});
@ -457,6 +460,7 @@ describe('qs (qs.js)', () => {
expect(removeParams(config, oldParams, toRemove)).toEqual({
page: 1,
page_size: 15,
baz: null,
});
});
@ -526,6 +530,7 @@ describe('qs (qs.js)', () => {
baz: ['one', 'two', 'three'],
page: 3,
page_size: 15,
bag: null,
});
});
@ -546,6 +551,7 @@ describe('qs (qs.js)', () => {
baz: ['bar', 'bang'],
page: 3,
page_size: 15,
pat: null,
});
});
@ -559,6 +565,7 @@ describe('qs (qs.js)', () => {
const toRemove = { bag: 'boom' };
expect(removeParams(config, oldParams, toRemove)).toEqual({
baz: '',
bag: null,
page: 3,
page_size: 15,
});
@ -860,6 +867,8 @@ describe('qs (qs.js)', () => {
);
});
// This fix needed after we're confident refactoring components
// to use replaceNamespacedParams provides equivalent functionality
test.skip('should not alter params of other namespaces', () => {
const query =
'template.name__icontains=workflow&template.page=2&credential.page=3';