From 6ed18de85b7e287c95edb707d24c69e09b9aaa5d Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Mon, 9 Aug 2021 10:22:40 +0200 Subject: [PATCH] Rename _sort filter to sort (#10688) --- .../src/components/HeaderSearch/index.js | 8 ++--- .../components/Users/SortPicker/ListItem.js | 2 +- .../components/CustomTable/Headers/Header.js | 6 ++-- .../components/SettingsViewWrapper/index.js | 4 +-- .../tests/selectors.test.js | 8 ++--- .../pages/App/utils/generateModelsLinks.js | 2 +- .../utils/tests/generateModelsLinks.test.js | 2 +- .../App/utils/tests/getContentTypeLinks.js | 2 +- .../content-manager/pages/ListView/index.js | 4 +-- .../utils/tests/buildQueryString.test.js | 16 +++++----- .../admin/src/hooks/useSettingsMenu/init.js | 2 +- .../admin/src/pages/Users/ListPage/index.js | 4 +-- .../pages/Users/ListPage/utils/getFilters.js | 12 ++++---- .../ListPage/utils/tests/getFilters.test.js | 4 +-- .../src/utils/generateFiltersFromSearch.js | 2 +- .../tests/generateFiltersFromSearch.test.js | 2 +- .../tests/generateSearchFromFilters.test.js | 4 +-- .../tests/generateSearchFromObject.test.js | 16 +++++----- .../src/components/BrowseAssets/index.js | 2 +- .../admin/src/components/Initializer/index.js | 30 ++----------------- .../src/components/Initializer/reducer.js | 5 ++-- .../InputModalStepperProvider/index.js | 4 +-- .../InputModalStepperProvider/reducer.js | 4 +-- .../tests/reducer.test.js | 2 +- .../src/components/SortListItem/index.js | 2 +- .../HomePageContent/HomePageSettings.js | 2 +- .../upload/admin/src/pages/HomePage/index.js | 8 ++--- .../services/__tests__/data-loaders.test.js | 2 +- .../src/utils/tests/getInitialLocale.test.js | 6 ++-- 29 files changed, 72 insertions(+), 95 deletions(-) diff --git a/packages/core/admin/admin/src/components/HeaderSearch/index.js b/packages/core/admin/admin/src/components/HeaderSearch/index.js index 52c7a5a785..ca2f5115e7 100644 --- a/packages/core/admin/admin/src/components/HeaderSearch/index.js +++ b/packages/core/admin/admin/src/components/HeaderSearch/index.js @@ -33,10 +33,10 @@ const HeaderSearch = ({ label, queryParameter }) => { // Create a new search in order to remove the filters currentSearch = new URLSearchParams(''); - // Keep the previous params _sort, pageSize, page + // Keep the previous params sort, pageSize, page const pageSize = query.get('pageSize'); const page = query.get('page'); - const _sort = query.get('_sort'); + const sort = query.get('sort'); if (page) { currentSearch.set('page', page); @@ -46,8 +46,8 @@ const HeaderSearch = ({ label, queryParameter }) => { currentSearch.set('pageSize', pageSize); } - if (_sort) { - currentSearch.set('_sort', _sort); + if (sort) { + currentSearch.set('sort', sort); } currentSearch.set(queryParameter, encodeURIComponent(value)); diff --git a/packages/core/admin/admin/src/components/Users/SortPicker/ListItem.js b/packages/core/admin/admin/src/components/Users/SortPicker/ListItem.js index 2ad417f7b8..ca5bc13440 100644 --- a/packages/core/admin/admin/src/components/Users/SortPicker/ListItem.js +++ b/packages/core/admin/admin/src/components/Users/SortPicker/ListItem.js @@ -8,7 +8,7 @@ const ListItem = ({ onClick, selectedItem, label, value }) => { const { formatMessage } = useIntl(); const handleClick = () => { - onClick({ target: { name: '_sort', value } }); + onClick({ target: { name: 'sort', value } }); }; return ( diff --git a/packages/core/admin/admin/src/content-manager/components/CustomTable/Headers/Header.js b/packages/core/admin/admin/src/content-manager/components/CustomTable/Headers/Header.js index da527ead83..20ef3dc030 100644 --- a/packages/core/admin/admin/src/content-manager/components/CustomTable/Headers/Header.js +++ b/packages/core/admin/admin/src/content-manager/components/CustomTable/Headers/Header.js @@ -4,9 +4,9 @@ import { Carret, useTracking } from '@strapi/helper-plugin'; import { useListView } from '../../../hooks'; const Header = ({ fieldSchema: { type }, metadatas: { label, sortable, mainField }, name }) => { - const { _sort, firstSortableHeader, setQuery } = useListView(); + const { sort, firstSortableHeader, setQuery } = useListView(); const { trackUsage } = useTracking(); - const [sortBy, sortOrder] = _sort.split(':'); + const [sortBy, sortOrder] = sort.split(':'); let sortField = name; let useRelation = false; @@ -29,7 +29,7 @@ const Header = ({ fieldSchema: { type }, metadatas: { label, sortable, mainField } setQuery({ - _sort: value, + sort: value, }); } }; diff --git a/packages/core/admin/admin/src/content-manager/components/SettingsViewWrapper/index.js b/packages/core/admin/admin/src/content-manager/components/SettingsViewWrapper/index.js index 00f95224b5..7426335d68 100644 --- a/packages/core/admin/admin/src/content-manager/components/SettingsViewWrapper/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SettingsViewWrapper/index.js @@ -151,12 +151,12 @@ const SettingsViewWrapper = ({ kind, uid, } = modifiedData; - const _sort = `${defaultSortBy}:${defaultSortOrder}`; + const sort = `${defaultSortBy}:${defaultSortOrder}`; const goBackSearch = `${stringify( { page: 1, pageSize, - _sort, + sort, }, { encode: false } )}${pluginsQueryParams ? `&${pluginsQueryParams}` : ''}`; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/tests/selectors.test.js b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/tests/selectors.test.js index 85001aded9..1e526718d4 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/tests/selectors.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/tests/selectors.test.js @@ -15,7 +15,7 @@ describe('CONTENT MANAGER | Containers | CollectionTypeFormWrapper | selectors', { kind: 'collectionType', name: 'application::address.address', - search: 'page=1&pageSize=50&_sort=city:ASC&plugins[i18n][locale]=fr', + search: 'page=1&pageSize=50&sort=city:ASC&plugins[i18n][locale]=fr', title: 'Addresses', to: '/content-manager/collectionType/application::address.address', uid: 'application::address.address', @@ -23,7 +23,7 @@ describe('CONTENT MANAGER | Containers | CollectionTypeFormWrapper | selectors', { kind: 'collectionType', name: 'application::category.category', - search: 'page=1&pageSize=50&_sort=city:ASC&plugins[i18n][locale]=fr', + search: 'page=1&pageSize=50&sort=city:ASC&plugins[i18n][locale]=fr', title: 'Categories', to: '/content-manager/collectionType/application::category.category', uid: 'application::category.category', @@ -36,7 +36,7 @@ describe('CONTENT MANAGER | Containers | CollectionTypeFormWrapper | selectors', { kind: 'collectionType', name: 'application::address.address', - search: 'page=1&pageSize=50&_sort=city:ASC&plugins[i18n][locale]=fr', + search: 'page=1&pageSize=50&sort=city:ASC&plugins[i18n][locale]=fr', title: 'Addresses', to: '/content-manager/collectionType/application::address.address', uid: 'application::address.address', @@ -44,7 +44,7 @@ describe('CONTENT MANAGER | Containers | CollectionTypeFormWrapper | selectors', { kind: 'collectionType', name: 'application::category.category', - search: 'page=1&pageSize=50&_sort=city:ASC&plugins[i18n][locale]=fr', + search: 'page=1&pageSize=50&sort=city:ASC&plugins[i18n][locale]=fr', title: 'Categories', to: '/content-manager/collectionType/application::category.category', uid: 'application::category.category', diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js index 2333ac7957..77d69be99b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/generateModelsLinks.js @@ -23,7 +23,7 @@ const generateLinks = (links, type, configurations = []) => { const searchParams = { page: 1, pageSize: currentContentTypeConfig.settings.pageSize, - _sort: `${currentContentTypeConfig.settings.defaultSortBy}:${currentContentTypeConfig.settings.defaultSortOrder}`, + sort: `${currentContentTypeConfig.settings.defaultSortBy}:${currentContentTypeConfig.settings.defaultSortOrder}`, }; search = stringify(searchParams, { encode: false }); diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js index 4951952ee2..dab07d3f41 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/generateModelsLinks.test.js @@ -48,7 +48,7 @@ describe('ADMIN | LeftMenu | utils', () => { { to: '/content-manager/collectionType/application::address.address', isDisplayed: true, - search: `page=1&pageSize=2&_sort=name:ASC`, + search: `page=1&pageSize=2&sort=name:ASC`, permissions: [ { action: 'plugins::content-manager.explorer.create', diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.js index 239a619c4f..e6bff8461d 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.js @@ -106,7 +106,7 @@ describe('checkPermissions', () => { subject: 'application::address.address', }, ], - search: 'page=1&pageSize=10&_sort=name:ASC', + search: 'page=1&pageSize=10&sort=name:ASC', }, { destination: '/content-manager/collectionType/application::article.article', diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js index e11f4636e2..f98839a369 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js @@ -122,7 +122,7 @@ function ListView({ return formatFiltersFromQuery(query); }, [query]); - const _sort = query._sort; + const sort = query.sort; const _q = query._q || ''; const label = contentType.info.label; @@ -382,7 +382,7 @@ function ListView({ <> { const queryParams = { page: '1', pageSize: '10', - _sort: 'name:ASC', + sort: 'name:ASC', }; const queryString = buildQueryString(queryParams); - expect(queryString).toBe('?page=1&pageSize=10&_sort=name:ASC'); + expect(queryString).toBe('?page=1&pageSize=10&sort=name:ASC'); }); it('creates a valid query string with default params & plugin options', () => { const queryParams = { page: '1', pageSize: '10', - _sort: 'name:ASC', + sort: 'name:ASC', plugins: { i18n: { locale: 'en' }, }, @@ -25,27 +25,27 @@ describe('buildQueryString', () => { const queryString = buildQueryString(queryParams); - expect(queryString).toBe('?page=1&pageSize=10&_sort=name:ASC&_locale=en'); + expect(queryString).toBe('?page=1&pageSize=10&sort=name:ASC&_locale=en'); }); it('creates a valid query string with a _where clause', () => { const queryParams = { page: '1', pageSize: '10', - _sort: 'name:ASC', + sort: 'name:ASC', _where: [{ name: 'hello world' }], }; const queryString = buildQueryString(queryParams); - expect(queryString).toBe('?page=1&pageSize=10&_sort=name:ASC&_where[0][name]=hello world'); + expect(queryString).toBe('?page=1&pageSize=10&sort=name:ASC&_where[0][name]=hello world'); }); it('creates a valid query string with a _where and plugin options', () => { const queryParams = { page: '1', pageSize: '10', - _sort: 'name:ASC', + sort: 'name:ASC', _where: [{ name: 'hello world' }], plugins: { i18n: { locale: 'en' }, @@ -55,7 +55,7 @@ describe('buildQueryString', () => { const queryString = buildQueryString(queryParams); expect(queryString).toBe( - '?page=1&pageSize=10&_sort=name:ASC&_where[0][name]=hello world&_locale=en' + '?page=1&pageSize=10&sort=name:ASC&_where[0][name]=hello world&_locale=en' ); }); }); diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js index 9ac5de5c8d..3b5c7a27b9 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js @@ -30,7 +30,7 @@ const init = (initialState, settings) => { { intlLabel: { id: 'Settings.permissions.menu.link.users.label' }, // Init the search params directly - to: '/settings/users?pageSize=10&page=1&_sort=firstname%3AASC', + to: '/settings/users?pageSize=10&page=1&sort=firstname', id: 'users', isDisplayed: false, permissions: adminPermissions.settings.users.main, diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/index.js b/packages/core/admin/admin/src/pages/Users/ListPage/index.js index d3ce734a7f..947c7584a7 100644 --- a/packages/core/admin/admin/src/pages/Users/ListPage/index.js +++ b/packages/core/admin/admin/src/pages/Users/ListPage/index.js @@ -50,7 +50,7 @@ const ListPage = () => { ] = useReducer(reducer, initialState, init); const pageSize = parseInt(query.get('pageSize') || 10, 10); const page = parseInt(query.get('page') || 0, 10); - const _sort = decodeURIComponent(query.get('_sort')); + const sort = decodeURIComponent(query.get('sort')); const _q = decodeURIComponent(query.get('_q') || ''); const getDataRef = useRef(); const listRef = useRef(); @@ -242,7 +242,7 @@ const ListPage = () => { <> - + diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/utils/getFilters.js b/packages/core/admin/admin/src/pages/Users/ListPage/utils/getFilters.js index a17cfb8254..29b451edce 100644 --- a/packages/core/admin/admin/src/pages/Users/ListPage/utils/getFilters.js +++ b/packages/core/admin/admin/src/pages/Users/ListPage/utils/getFilters.js @@ -3,24 +3,24 @@ const getFilters = search => { const filters = []; // eslint-disable-next-line no-restricted-syntax - for (let pair of query.entries()) { - if (!['_sort', 'pageSize', 'page', '_q'].includes(pair[0])) { - const splitted = pair[0].split('_'); + for (let [key, queryValue] of query.entries()) { + if (!['sort', 'pageSize', 'page', '_q'].includes(key)) { + const splitted = key.split('_'); let filterName; let filterType; // Filter type === '=') if (splitted.length === 1) { filterType = '='; - filterName = pair[0]; + filterName = key; } else { filterType = `_${splitted[1]}`; filterName = splitted[0]; } - const value = decodeURIComponent(pair[1]); + const value = decodeURIComponent(queryValue); - filters.push({ displayName: filterName, name: pair[0], filter: filterType, value }); + filters.push({ displayName: filterName, name: key, filter: filterType, value }); } } diff --git a/packages/core/admin/admin/src/pages/Users/ListPage/utils/tests/getFilters.test.js b/packages/core/admin/admin/src/pages/Users/ListPage/utils/tests/getFilters.test.js index fd47c4c04e..288dc82d06 100644 --- a/packages/core/admin/admin/src/pages/Users/ListPage/utils/tests/getFilters.test.js +++ b/packages/core/admin/admin/src/pages/Users/ListPage/utils/tests/getFilters.test.js @@ -2,13 +2,13 @@ import getFilters from '../getFilters'; describe('ADMIN | CONTAINERS | USERS | ListPage | utils | getFilters', () => { it('should return an empty array if there is not filter', () => { - const search = '_q=test&_sort=firstname&page=1&pageSize=1'; + const search = '_q=test&sort=firstname&page=1&pageSize=1'; expect(getFilters(search)).toHaveLength(0); }); it('should handle the = filter correctly ', () => { - const search = '_sort=firstname&page=1&pageSize=1&firstname=test&firstname_ne=something'; + const search = 'sort=firstname&page=1&pageSize=1&firstname=test&firstname_ne=something'; const expected = [ { displayName: 'firstname', diff --git a/packages/core/helper-plugin/lib/src/utils/generateFiltersFromSearch.js b/packages/core/helper-plugin/lib/src/utils/generateFiltersFromSearch.js index 0a89086a33..5053ff5ce3 100644 --- a/packages/core/helper-plugin/lib/src/utils/generateFiltersFromSearch.js +++ b/packages/core/helper-plugin/lib/src/utils/generateFiltersFromSearch.js @@ -10,7 +10,7 @@ const generateFiltersFromSearch = search => { x => !x.includes('_limit') && !x.includes('_page') && - !x.includes('_sort') && + !x.includes('sort') && !x.includes('_start') && !x.includes('_q=') && x !== '' diff --git a/packages/core/helper-plugin/lib/src/utils/tests/generateFiltersFromSearch.test.js b/packages/core/helper-plugin/lib/src/utils/tests/generateFiltersFromSearch.test.js index 26ae3a6a8e..458078daaa 100644 --- a/packages/core/helper-plugin/lib/src/utils/tests/generateFiltersFromSearch.test.js +++ b/packages/core/helper-plugin/lib/src/utils/tests/generateFiltersFromSearch.test.js @@ -3,7 +3,7 @@ import generateFiltersFromSearch from '../generateFiltersFromSearch'; describe('HELPER PLUGIN | utils | generateFiltersFromSearch', () => { it('should generate an array of filters', () => { const search = - '?_sort=id:ASC&bool=true&big_number_ne=1&created_at_lt=2019-08-01T00:00:00Z&date_lte=2019-08-02T00:00:00Z&decimal_number_gt=2&enum_ne=noon&float_number_gte=3'; + '?sort=id:ASC&bool=true&big_number_ne=1&created_at_lt=2019-08-01T00:00:00Z&date_lte=2019-08-02T00:00:00Z&decimal_number_gt=2&enum_ne=noon&float_number_gte=3'; const expected = [ { name: 'bool', diff --git a/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromFilters.test.js b/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromFilters.test.js index bd659e8295..c153f85762 100644 --- a/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromFilters.test.js +++ b/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromFilters.test.js @@ -4,7 +4,7 @@ describe('HELPER PLUGIN | utils | generateSearchFromFilters', () => { it('should return a string with all the applied filters', () => { const data = { _limit: 10, - _sort: 'id:ASC', + sort: 'id:ASC', _page: 2, filters: [ { @@ -46,7 +46,7 @@ describe('HELPER PLUGIN | utils | generateSearchFromFilters', () => { }; const expected = - '_limit=10&_sort=id:ASC&_page=2&bool=true&big_number_ne=1&created_at_lt=2019-08-01T00:00:00Z&date_lte=2019-08-02T00:00:00Z&decimal_number_gt=2&enum_ne=noon&float_number_gte=3'; + '_limit=10&sort=id:ASC&_page=2&bool=true&big_number_ne=1&created_at_lt=2019-08-01T00:00:00Z&date_lte=2019-08-02T00:00:00Z&decimal_number_gt=2&enum_ne=noon&float_number_gte=3'; const encoded = expected .split('&') .map(pair => { diff --git a/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromObject.test.js b/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromObject.test.js index 419fe9c596..ff52224685 100644 --- a/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromObject.test.js +++ b/packages/core/helper-plugin/lib/src/utils/tests/generateSearchFromObject.test.js @@ -2,15 +2,15 @@ import generateSearchFromObject from '../generateSearchFromObject'; describe('HELPER PLUGIN | utils | generateSearchFromObject', () => { it('should return a string containing the _limit, _start and order', () => { - const search = { _page: 1, _limit: 10, _sort: 'city:ASC' }; - const expected = '_limit=10&_sort=city:ASC&_start=0'; + const search = { _page: 1, _limit: 10, sort: 'city:ASC' }; + const expected = '_limit=10&sort=city:ASC&_start=0'; expect(generateSearchFromObject(search)).toEqual(expected); }); it('should remove the _q param from the search if it is empty', () => { - const search = { _page: 1, _limit: 10, _sort: 'city:ASC', _q: '' }; - const expected = '_limit=10&_sort=city:ASC&_start=0'; + const search = { _page: 1, _limit: 10, sort: 'city:ASC', _q: '' }; + const expected = '_limit=10&sort=city:ASC&_start=0'; expect(generateSearchFromObject(search)).toEqual(expected); }); @@ -19,11 +19,11 @@ describe('HELPER PLUGIN | utils | generateSearchFromObject', () => { const search = { _page: 1, _limit: 10, - _sort: 'city:ASC', + sort: 'city:ASC', _q: '', filters: [], }; - const expected = '_limit=10&_sort=city:ASC&_start=0'; + const expected = '_limit=10&sort=city:ASC&_start=0'; expect(generateSearchFromObject(search)).toEqual(expected); }); @@ -33,11 +33,11 @@ describe('HELPER PLUGIN | utils | generateSearchFromObject', () => { _limit: 10, _page: 1, _q: '', - _sort: 'city:ASC', + sort: 'city:ASC', filters: [{ name: 'city', filter: '=', value: 'test' }], }; - const expected = '_limit=10&_sort=city:ASC&city=test&_start=0'; + const expected = '_limit=10&sort=city:ASC&city=test&_start=0'; expect(generateSearchFromObject(search)).toEqual(expected); }); diff --git a/packages/core/upload/admin/src/components/BrowseAssets/index.js b/packages/core/upload/admin/src/components/BrowseAssets/index.js index 719130307e..4bd2145a0c 100644 --- a/packages/core/upload/admin/src/components/BrowseAssets/index.js +++ b/packages/core/upload/admin/src/components/BrowseAssets/index.js @@ -134,7 +134,7 @@ const BrowseAssets = () => { /> )} - + { const ref = useRef(); - const dispatch = useDispatch(); ref.current = setPlugin; - const toggleNotification = useNotification(); + // TODO: remove useEffect(() => { - const getData = async () => { - const requestURL = '/content-manager/content-types'; - - try { - const { data } = await request(requestURL, { method: 'GET' }); - const fileModel = data.find(model => model.uid === 'plugins::upload.file'); - const timestamps = get(fileModel, ['options', 'timestamps']); - - dispatch(setFileModelTimestamps(timestamps)); - - ref.current(pluginId); - } catch (err) { - toggleNotification({ - type: 'warning', - message: { id: 'content-manager.error.model.fetch' }, - }); - } - }; - - getData(); - }, [dispatch, toggleNotification]); + ref.current(pluginId); + }, []); return null; }; diff --git a/packages/core/upload/admin/src/components/Initializer/reducer.js b/packages/core/upload/admin/src/components/Initializer/reducer.js index 7950b1d1d2..af85eeb6e2 100644 --- a/packages/core/upload/admin/src/components/Initializer/reducer.js +++ b/packages/core/upload/admin/src/components/Initializer/reducer.js @@ -2,7 +2,8 @@ import produce from 'immer'; import { SET_FILE_MODE_TIMESTAMPS } from './constants'; const initialState = { - fileModelTimestamps: [], + // TODO: rename to camelCase + fileModelTimestamps: ['created_at', 'updated_at'], }; const reducer = (state = initialState, action) => @@ -10,7 +11,7 @@ const reducer = (state = initialState, action) => produce(state, draftState => { switch (action.type) { case SET_FILE_MODE_TIMESTAMPS: { - draftState.fileModelTimestamps = action.timestamps; + // draftState.fileModelTimestamps = action.timestamps; break; } default: diff --git a/packages/core/upload/admin/src/components/InputModalStepperProvider/index.js b/packages/core/upload/admin/src/components/InputModalStepperProvider/index.js index d05e641890..08a698af44 100644 --- a/packages/core/upload/admin/src/components/InputModalStepperProvider/index.js +++ b/packages/core/upload/admin/src/components/InputModalStepperProvider/index.js @@ -64,7 +64,7 @@ const InputModalStepperProvider = ({ : [], params: { ...state.params, - _sort: `${updated_at}:DESC`, + sort: `${updated_at}:DESC`, }, }) ); @@ -336,7 +336,7 @@ const InputModalStepperProvider = ({ const fetchMediaLibFilesCount = async () => { const requestURL = getRequestUrl('files/count'); - const paramsToSend = getFilters(['_limit', '_sort', '_start']); + const paramsToSend = getFilters(['_limit', '_start']); try { return await request(`${requestURL}?${paramsToSend}`, { diff --git a/packages/core/upload/admin/src/components/InputModalStepperProvider/reducer.js b/packages/core/upload/admin/src/components/InputModalStepperProvider/reducer.js index 9563c64e55..e9e3ebb17d 100644 --- a/packages/core/upload/admin/src/components/InputModalStepperProvider/reducer.js +++ b/packages/core/upload/admin/src/components/InputModalStepperProvider/reducer.js @@ -21,7 +21,7 @@ const initialState = { _start: 0, _q: '', filters: [], - _sort: null, + sort: null, }, currentStep: 'list', isFormDisabled: false, @@ -180,7 +180,7 @@ const reducer = (state, action) => } case 'RESET_PROPS': { if (action.defaultSort) { - draftState.params._sort = action.defaultSort; + draftState.params.sort = action.defaultSort; } else { return initialState; } diff --git a/packages/core/upload/admin/src/components/InputModalStepperProvider/tests/reducer.test.js b/packages/core/upload/admin/src/components/InputModalStepperProvider/tests/reducer.test.js index 465208d897..e280d07ba3 100644 --- a/packages/core/upload/admin/src/components/InputModalStepperProvider/tests/reducer.test.js +++ b/packages/core/upload/admin/src/components/InputModalStepperProvider/tests/reducer.test.js @@ -1725,7 +1725,7 @@ describe('UPLOAD | components | InputModalStepperProvider | reducer', () => { _start: 0, _q: '', filters: [], - _sort: null, + sort: null, }, currentStep: 'list', isFormDisabled: false, diff --git a/packages/core/upload/admin/src/components/SortListItem/index.js b/packages/core/upload/admin/src/components/SortListItem/index.js index 48eb0ff821..9e3fe9147c 100644 --- a/packages/core/upload/admin/src/components/SortListItem/index.js +++ b/packages/core/upload/admin/src/components/SortListItem/index.js @@ -8,7 +8,7 @@ import IntlText from '../IntlText'; const SortListItem = ({ onClick, selectedItem, label, value }) => { const handleClick = () => { - onClick({ target: { name: '_sort', value } }); + onClick({ target: { name: 'sort', value } }); }; return ( diff --git a/packages/core/upload/admin/src/pages/HomePage/HomePageContent/HomePageSettings.js b/packages/core/upload/admin/src/pages/HomePage/HomePageContent/HomePageSettings.js index d32ae5f05a..c398fd9e7e 100644 --- a/packages/core/upload/admin/src/pages/HomePage/HomePageContent/HomePageSettings.js +++ b/packages/core/upload/admin/src/pages/HomePage/HomePageContent/HomePageSettings.js @@ -72,7 +72,7 @@ const HomePageSettings = ({ )} - + diff --git a/packages/core/upload/admin/src/pages/HomePage/index.js b/packages/core/upload/admin/src/pages/HomePage/index.js index d5641621e3..084570f825 100644 --- a/packages/core/upload/admin/src/pages/HomePage/index.js +++ b/packages/core/upload/admin/src/pages/HomePage/index.js @@ -42,7 +42,7 @@ const HomePage = () => { const isMounted = useRef(true); const pluginName = formatMessage({ id: getTrad('plugin.name') }); - const paramsKeys = ['_limit', '_start', '_q', '_sort']; + const paramsKeys = ['_limit', '_start', '_q', 'sort']; useEffect(() => { return () => (isMounted.current = false); @@ -74,9 +74,9 @@ const HomePage = () => { const dataRequestURL = getRequestUrl('files'); const params = generateStringFromParams(query); - const paramsToSend = params.includes('_sort') + const paramsToSend = params.includes('sort') ? params - : params.concat(`&_sort=${updated_at}:DESC`); + : params.concat(`&sort=${updated_at}:DESC`); try { const data = await request(`${dataRequestURL}?${paramsToSend}`, { @@ -98,7 +98,7 @@ const HomePage = () => { }; const fetchDataCount = async () => { - const params = generateStringFromParams(query, ['_limit', '_sort', '_start']); + const params = generateStringFromParams(query, ['_limit', '_start']); const requestURL = getRequestUrl('files/count'); try { diff --git a/packages/plugins/graphql/services/__tests__/data-loaders.test.js b/packages/plugins/graphql/services/__tests__/data-loaders.test.js index 32e3f68677..63e7ac54e8 100644 --- a/packages/plugins/graphql/services/__tests__/data-loaders.test.js +++ b/packages/plugins/graphql/services/__tests__/data-loaders.test.js @@ -35,7 +35,7 @@ describe('dataloader', () => { test('makeQuery calls find', async () => { const uid = 'uid'; const find = jest.fn(() => [{ id: 1 }]); - const filters = { _limit: 5, _sort: 'field' }; + const filters = { limit: 5, sort: 'field' }; global.strapi = { query() { diff --git a/packages/plugins/i18n/admin/src/utils/tests/getInitialLocale.test.js b/packages/plugins/i18n/admin/src/utils/tests/getInitialLocale.test.js index 4ed11b9afc..bb5a7c8109 100644 --- a/packages/plugins/i18n/admin/src/utils/tests/getInitialLocale.test.js +++ b/packages/plugins/i18n/admin/src/utils/tests/getInitialLocale.test.js @@ -5,7 +5,7 @@ describe('getInitialLocale', () => { const query = { page: '1', pageSize: '10', - _sort: 'Name:ASC', + sort: 'Name:ASC', plugins: { i18n: { locale: 'fr-FR' }, }, @@ -47,7 +47,7 @@ describe('getInitialLocale', () => { const query = { page: '1', pageSize: '10', - _sort: 'Name:ASC', + sort: 'Name:ASC', plugins: { something: 'great', }, @@ -90,7 +90,7 @@ describe('getInitialLocale', () => { const query = { page: '1', pageSize: '10', - _sort: 'Name:ASC', + sort: 'Name:ASC', plugins: { something: 'great', },