yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: return the same data format for search and relations

Browse Source
This commit is contained in:
Josh 2022-10-18 12:10:42 +01:00 committed by Gustav Hansen
parent cf23e39892
commit 5e3490104b
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeSearchResults.js
View File

@ -1,12 +1,15 @@
import { normalizeRelation } from './normalizeRelations';
export const normalizeSearchResults = (relations, { mainFieldName }) => {
const { data } = relations;
const { pages = [] } = data ?? {};
return {
...relations,
data: {
pages: [...(relations?.data?.pages ?? [])]?.map((page) =>
page?.results.map((relation) => normalizeRelation(relation, { mainFieldName }))
),
},
data: pages
.map((page) =>
(page ?? []).results.map((relation) => normalizeRelation(relation, { mainFieldName }))
)
.flat(),
};
};

40
packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/tests/normalizeSearchResults.test.js
View File

@ -30,15 +30,11 @@ const FIXTURE_RELATIONS = {
describe('RelationInputDataManager || normalizeSearchResults', () => {
test('add publicationState attribute to each relation', () => {
expect(normalizeSearchResults(FIXTURE_RELATIONS, {})).toStrictEqual({
data: {
pages: [
[
expect.objectContaining({ publicationState: 'published' }),
expect.objectContaining({ publicationState: 'draft' }),
expect.objectContaining({ publicationState: false }),
],
],
},
data: [
expect.objectContaining({ publicationState: 'published' }),
expect.objectContaining({ publicationState: 'draft' }),
expect.objectContaining({ publicationState: false }),
],
});
});
@ -48,21 +44,17 @@ describe('RelationInputDataManager || normalizeSearchResults', () => {
mainFieldName: 'name',
})
).toStrictEqual({
data: {
pages: [
[
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[0].name,
}),
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[1].name,
}),
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[2].name,
}),
],
],
},
data: [
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[0].name,
}),
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[1].name,
}),
expect.objectContaining({
mainField: FIXTURE_RELATIONS.data.pages[0].results[2].name,
}),
],
});
});
});