diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index fcfb01da2f..64df8e6912 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -open_collective: strapi \ No newline at end of file +open_collective: strapi diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js index a03c2ed326..65355ef5b9 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/index.js @@ -207,9 +207,6 @@ RepeatableComponent.propTypes = { const Memoized = memo(RepeatableComponent); -export default connect( - Memoized, - select -); +export default connect(Memoized, select); export { RepeatableComponent }; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js index 27c250fa3e..67f348da20 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/tests/formatLayouts.test.js @@ -124,7 +124,10 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { uid: 'compo', layouts: { edit: [ - [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], + [ + { name: 'full_name', size: 6 }, + { name: 'city', size: 6 }, + ], [{ name: 'compo', size: 12 }], ], }, @@ -166,7 +169,10 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { editRelations: [], edit: [ [{ name: 'dz', size: 12 }], - [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], + [ + { name: 'full_name', size: 6 }, + { name: 'city', size: 6 }, + ], [{ name: 'compo', size: 12 }], ], }, @@ -364,7 +370,10 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { layouts: { edit: [ [{ name: 'dz', size: 12 }], - [{ name: 'full_name', size: 6 }, { name: 'city', size: 6 }], + [ + { name: 'full_name', size: 6 }, + { name: 'city', size: 6 }, + ], [{ name: 'compo', size: 12 }], ], }, @@ -612,7 +621,10 @@ describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { describe('getDisplayedModels', () => { it('should return an array containing only the displayable models', () => { - const models = [{ uid: 'test', isDisplayed: false }, { uid: 'testtest', isDisplayed: true }]; + const models = [ + { uid: 'test', isDisplayed: false }, + { uid: 'testtest', isDisplayed: true }, + ]; expect(getDisplayedModels([])).toHaveLength(0); expect(getDisplayedModels(models)).toHaveLength(1); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js index eff3f96b78..103c029c9d 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js @@ -11,7 +11,12 @@ import { makeSelectModelAndComponentSchemas } from '../../App/selectors'; import getTrad from '../../../utils/getTrad'; import GenericInput from './GenericInput'; -const FIELD_SIZES = [[4, '33%'], [6, '50%'], [8, '66%'], [12, '100%']]; +const FIELD_SIZES = [ + [4, '33%'], + [6, '50%'], + [8, '66%'], + [12, '100%'], +]; const NON_RESIZABLE_FIELD_TYPES = ['dynamiczone', 'component', 'json', 'richtext']; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js index e5e1966c1a..097a4e085a 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js @@ -34,7 +34,12 @@ const makeApp = (history, layout) => { }, kind: 'collectionType', layouts: { - edit: [[{ name: 'postal_code', size: 6 }, { name: 'city', size: 6 }]], + edit: [ + [ + { name: 'postal_code', size: 6 }, + { name: 'city', size: 6 }, + ], + ], list: ['postal_code', 'categories'], editRelations: ['categories'], }, diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js index 6b09e56361..4cb6f4b988 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/reducer.test.js @@ -150,7 +150,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'title', size: 6 }, { name: '_TEMP_', size: 6 }], + rowContent: [ + { name: 'title', size: 6 }, + { name: '_TEMP_', size: 6 }, + ], }, ], }, @@ -170,7 +173,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'title', size: 8 }, { name: '_TEMP_', size: 4 }], + rowContent: [ + { name: 'title', size: 8 }, + { name: '_TEMP_', size: 4 }, + ], }, ], }; @@ -186,7 +192,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'title', size: 8 }, { name: 'isActive', size: 4 }], + rowContent: [ + { name: 'title', size: 8 }, + { name: 'isActive', size: 4 }, + ], }, ], }, @@ -234,7 +243,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { }, { rowId: 1, - rowContent: [{ name: 'title', size: 6 }, { name: '_TEMP_', size: 6 }], + rowContent: [ + { name: 'title', size: 6 }, + { name: '_TEMP_', size: 6 }, + ], }, ], }, @@ -358,7 +370,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'isActive', size: 4 }, { name: '_TEMP_', size: 8 }], + rowContent: [ + { name: 'isActive', size: 4 }, + { name: '_TEMP_', size: 8 }, + ], }, ], }, @@ -404,7 +419,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { }, { rowId: 1, - rowContent: [{ name: 'slug', size: 6 }, { name: '_TEMP_', size: 6 }], + rowContent: [ + { name: 'slug', size: 6 }, + { name: '_TEMP_', size: 6 }, + ], }, ], }, @@ -424,7 +442,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { }, { rowId: 1, - rowContent: [{ name: 'second', size: 4 }, { name: '_TEMP_', size: 8 }], + rowContent: [ + { name: 'second', size: 4 }, + { name: '_TEMP_', size: 8 }, + ], }, ], }, @@ -455,7 +476,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { }, { rowId: 1, - rowContent: [{ name: 'slug', size: 6 }, { name: '_TEMP_', size: 6 }], + rowContent: [ + { name: 'slug', size: 6 }, + { name: '_TEMP_', size: 6 }, + ], }, ], }, @@ -475,7 +499,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { }, { rowId: 1, - rowContent: [{ name: 'slug', size: 6 }, { name: '_TEMP_', size: 6 }], + rowContent: [ + { name: 'slug', size: 6 }, + { name: '_TEMP_', size: 6 }, + ], }, ], }, @@ -499,7 +526,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'city', size: 6 }, { name: 'slug', size: 6 }], + rowContent: [ + { name: 'city', size: 6 }, + { name: 'slug', size: 6 }, + ], }, { rowId: 1, @@ -518,7 +548,10 @@ describe('CONTENT MANAGER | CONTAINERS | EditSettingsView | reducer', () => { edit: [ { rowId: 0, - rowContent: [{ name: 'city', size: 6 }, { name: 'slug', size: 6 }], + rowContent: [ + { name: 'city', size: 6 }, + { name: 'slug', size: 6 }, + ], }, { rowId: 1, diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/layout.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/layout.js index 46d63747de..9acb0d7049 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/layout.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/layout.js @@ -28,7 +28,13 @@ const formatLayout = arr => { return acc2; }, []); - const rowId = acc.length === 0 ? 0 : Math.max.apply(Math, acc.map(o => o.rowId)) + 1; + const rowId = + acc.length === 0 + ? 0 + : Math.max.apply( + Math, + acc.map(o => o.rowId) + ) + 1; const currentRowSize = getRowSize(currentRow); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/tests/layout.test.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/tests/layout.test.js index 1ab6ddfba2..2558d5ff3e 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/tests/layout.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/tests/layout.test.js @@ -12,19 +12,31 @@ describe('Content Manager | containers | EditSettingsView | utils | layout', () describe('createLayout', () => { it('should return an array of object with keys rowId and rowContent', () => { const data = [ - [{ name: 'test', size: 4 }, { name: 'test1', size: 4 }], + [ + { name: 'test', size: 4 }, + { name: 'test1', size: 4 }, + ], [{ name: 'test2', size: 12 }], - [{ name: 'test3', size: 6 }, { name: 'test4', size: 1 }], + [ + { name: 'test3', size: 6 }, + { name: 'test4', size: 1 }, + ], ]; const expected = [ { rowId: 0, - rowContent: [{ name: 'test', size: 4 }, { name: 'test1', size: 4 }], + rowContent: [ + { name: 'test', size: 4 }, + { name: 'test1', size: 4 }, + ], }, { rowId: 1, rowContent: [{ name: 'test2', size: 12 }] }, { rowId: 2, - rowContent: [{ name: 'test3', size: 6 }, { name: 'test4', size: 1 }], + rowContent: [ + { name: 'test3', size: 6 }, + { name: 'test4', size: 1 }, + ], }, ]; @@ -37,12 +49,18 @@ describe('Content Manager | containers | EditSettingsView | utils | layout', () const data = [ { rowId: 0, - rowContent: [{ name: 'test', size: 4 }, { name: 'test1', size: 4 }], + rowContent: [ + { name: 'test', size: 4 }, + { name: 'test1', size: 4 }, + ], }, { rowId: 1, rowContent: [{ name: 'test2', size: 12 }] }, { rowId: 2, - rowContent: [{ name: 'test3', size: 6 }, { name: 'test4', size: 1 }], + rowContent: [ + { name: 'test3', size: 6 }, + { name: 'test4', size: 1 }, + ], }, ]; const expected = [ @@ -89,7 +107,10 @@ describe('Content Manager | containers | EditSettingsView | utils | layout', () }, { rowId: 3, - rowContent: [{ name: 'test5', size: 6 }, { name: 'test6', size: 6 }], + rowContent: [ + { name: 'test5', size: 6 }, + { name: 'test6', size: 6 }, + ], }, ]; @@ -238,7 +259,10 @@ describe('Content Manager | containers | EditSettingsView | utils | layout', () }, ]; const expected = [ - [{ name: 'name', size: 6 }, { name: 'test', size: 4 }], + [ + { name: 'name', size: 6 }, + { name: 'test', size: 4 }, + ], [{ name: 'name1', size: 4 }], ]; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/index.js index 92baeefc44..85402afe75 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/index.js @@ -71,7 +71,4 @@ DeleteLink.propTypes = { const Memoized = memo(DeleteLink, isEqual); -export default connect( - Memoized, - select -); +export default connect(Memoized, select); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/index.js index 12366f377e..694e007fab 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/index.js @@ -88,8 +88,5 @@ DraftAndPublishBadge.propTypes = { isPublished: PropTypes.bool.isRequired, }; -export default connect( - DraftAndPublishBadge, - select -); +export default connect(DraftAndPublishBadge, select); export { DraftAndPublishBadge }; diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/selectors.js b/packages/core/admin/admin/src/content-manager/pages/ListView/selectors.js index 9166927ebb..3d4060923b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/selectors.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/selectors.js @@ -15,12 +15,9 @@ const listViewDomain = () => state => state['content-manager_listView'] || initi */ const makeSelectListView = () => - createSelector( - listViewDomain(), - substate => { - return substate; - } - ); + createSelector(listViewDomain(), substate => { + return substate; + }); const selectDisplayedHeaders = state => { const { displayedHeaders } = state['content-manager_listView']; diff --git a/packages/core/admin/admin/src/content-manager/testUtils/data.js b/packages/core/admin/admin/src/content-manager/testUtils/data.js index 4e18936a12..2396af577d 100644 --- a/packages/core/admin/admin/src/content-manager/testUtils/data.js +++ b/packages/core/admin/admin/src/content-manager/testUtils/data.js @@ -140,7 +140,11 @@ const testData = { id: 1, name: 'name', subcomponotrepeatable: { id: 4, name: 'name' }, - subrepeatable: [{ id: 1, name: 'name' }, { id: 2, name: 'name' }, { id: 3, name: 'name' }], + subrepeatable: [ + { id: 1, name: 'name' }, + { id: 2, name: 'name' }, + { id: 3, name: 'name' }, + ], }, repeatable: [ { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js index c71dad43e4..f94ad466b6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/tests/getRowLabelCheckboxesState.test.js @@ -10,7 +10,10 @@ describe('ADMIN | COMPONENTS | PERMISSIONS | GlobalActions | utils', () => { }); it('should return an array of actionId string', () => { - const data = [{ test: true, actionId: 'create' }, { test: 'false', actionId: 'read' }]; + const data = [ + { test: true, actionId: 'create' }, + { test: 'false', actionId: 'read' }, + ]; const expected = ['create', 'read']; expect(getActionsIds(data)).toEqual(expected); diff --git a/packages/core/admin/server/validation/permission.js b/packages/core/admin/server/validation/permission.js index 0ec07768b3..9cf1644755 100644 --- a/packages/core/admin/server/validation/permission.js +++ b/packages/core/admin/server/validation/permission.js @@ -32,7 +32,11 @@ const checkPermissionsAreBound = role => for (const [subject, perms] of Object.entries(permsBySubject)) { const boundActions = getBoundActionsBySubject(role, subject); - const missingActions = _.xor(perms.map(p => p.action), boundActions).length !== 0; + const missingActions = + _.xor( + perms.map(p => p.action), + boundActions + ).length !== 0; if (missingActions) return false; const permsBoundByFields = perms.filter(p => BOUND_ACTIONS_FOR_FIELDS.includes(p.action)); diff --git a/packages/core/content-manager/server/services/__tests__/metrics.test.js b/packages/core/content-manager/server/services/__tests__/metrics.test.js index 7669928f15..f71c52a03c 100644 --- a/packages/core/content-manager/server/services/__tests__/metrics.test.js +++ b/packages/core/content-manager/server/services/__tests__/metrics.test.js @@ -38,12 +38,27 @@ describe('metrics', () => { const testData = [ [['fieldA'], [false]], [['fieldA', 'fieldB'], [false]], - [['fieldA', 'field1'], [true, 2, 1]], - [['field1', 'field2'], [true, 2, 2]], + [ + ['fieldA', 'field1'], + [true, 2, 1], + ], + [ + ['field1', 'field2'], + [true, 2, 2], + ], [['field1'], [true, 1, 1]], - [['fieldA', 'fieldB', 'field1', 'field2'], [true, 4, 2]], - [['fieldA', 'fieldB', 'field3', 'field4'], [true, 4, 2]], - [['fieldA', 'fieldB', 'field5', 'field6'], [true, 4, 2]], + [ + ['fieldA', 'fieldB', 'field1', 'field2'], + [true, 4, 2], + ], + [ + ['fieldA', 'fieldB', 'field3', 'field4'], + [true, 4, 2], + ], + [ + ['fieldA', 'fieldB', 'field5', 'field6'], + [true, 4, 2], + ], ]; test.each(testData)('%s', async (list, expectedResult) => { diff --git a/packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js b/packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js index 9d49dc0447..8c48fdc49c 100644 --- a/packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js +++ b/packages/core/content-manager/server/tests/api/x-to-many-rf-preview.test.e2e.js @@ -208,25 +208,26 @@ describe('x-to-many RF Preview', () => { }); describe('Pagination', () => { - test.each([[1, 10], [2, 10], [5, 1], [4, 2], [1, 100]])( - 'Custom pagination (%s, %s)', - async (page, pageSize) => { - const product = data.product[0]; + test.each([ + [1, 10], + [2, 10], + [5, 1], + [4, 2], + [1, 100], + ])('Custom pagination (%s, %s)', async (page, pageSize) => { + const product = data.product[0]; - const { body, statusCode } = await rq.get( - `${cmProductUrl}/${product.id}/shops?page=${page}&pageSize=${pageSize}` - ); + const { body, statusCode } = await rq.get( + `${cmProductUrl}/${product.id}/shops?page=${page}&pageSize=${pageSize}` + ); - expect(statusCode).toBe(200); + expect(statusCode).toBe(200); - const { pagination, results } = body; + const { pagination, results } = body; - expect(pagination.page).toBe(page); - expect(pagination.pageSize).toBe(pageSize); - expect(results).toHaveLength( - Math.min(pageSize, PRODUCT_SHOP_COUNT - pageSize * (page - 1)) - ); - } - ); + expect(pagination.page).toBe(page); + expect(pagination.pageSize).toBe(pageSize); + expect(results).toHaveLength(Math.min(pageSize, PRODUCT_SHOP_COUNT - pageSize * (page - 1))); + }); }); }); diff --git a/packages/core/content-type-builder/admin/src/utils/formAPI.js b/packages/core/content-type-builder/admin/src/utils/formAPI.js index d709f69013..43652f5073 100644 --- a/packages/core/content-type-builder/admin/src/utils/formAPI.js +++ b/packages/core/content-type-builder/admin/src/utils/formAPI.js @@ -51,13 +51,7 @@ const formsAPI = { contentType.form.advanced.push(advanced); contentType.form.base.push(base); }, - extendFields( - fields, - { - validator, - form: { advanced, base }, - } - ) { + extendFields(fields, { validator, form: { advanced, base } }) { const formType = this.types.attribute; fields.forEach(field => { diff --git a/packages/core/content-type-builder/server/services/schema-builder/index.js b/packages/core/content-type-builder/server/services/schema-builder/index.js index eae41e4e03..1825216f43 100644 --- a/packages/core/content-type-builder/server/services/schema-builder/index.js +++ b/packages/core/content-type-builder/server/services/schema-builder/index.js @@ -182,9 +182,10 @@ function createSchemaBuilder({ components, contentTypes }) { */ rollback() { return Promise.all( - [...Array.from(tmpComponents.values()), ...Array.from(tmpContentTypes.values())].map( - schema => schema.rollback() - ) + [ + ...Array.from(tmpComponents.values()), + ...Array.from(tmpContentTypes.values()), + ].map(schema => schema.rollback()) ); }, }; diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js index 18fa4507c0..2f71fb98f2 100644 --- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js +++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js @@ -137,7 +137,7 @@ const GenericInput = ({ id: 'app.components.ToggleCheckbox.on-label', defaultMessage: 'True', })} - onChange={(e) => { + onChange={e => { onChange({ target: { name, value: e.target.checked } }); }} required={required} @@ -153,7 +153,7 @@ const GenericInput = ({ hint={hint} id={name} name={name} - onValueChange={(value) => { + onValueChange={value => { onChange({ target: { name, value } }); }} required={required} @@ -174,7 +174,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onChange={(date) => { + onChange={date => { const formattedDate = date.toISOString(); onChange({ target: { name, value: formattedDate, type } }); @@ -184,7 +184,7 @@ const GenericInput = ({ placeholder={formattedPlaceholder} required={required} value={value && new Date(value)} - selectedDateLabel={(formattedDate) => `Date picker, current is ${formattedDate}`} + selectedDateLabel={formattedDate => `Date picker, current is ${formattedDate}`} /> ); } @@ -205,7 +205,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onChange={(date) => { + onChange={date => { onChange({ target: { name, value: formatISO(date, { representation: 'date' }), type }, }); @@ -214,7 +214,7 @@ const GenericInput = ({ placeholder={formattedPlaceholder} required={required} selectedDate={selectedDate} - selectedDateLabel={(formattedDate) => `Date picker, current is ${formattedDate}`} + selectedDateLabel={formattedDate => `Date picker, current is ${formattedDate}`} /> ); } @@ -228,7 +228,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onValueChange={(value) => { + onValueChange={value => { onChange({ target: { name, value: value ?? null, type } }); }} placeholder={formattedPlaceholder} @@ -291,7 +291,7 @@ const GenericInput = ({ defaultMessage: 'Show password', })} onClick={() => { - setShowPassword((prev) => !prev); + setShowPassword(prev => !prev); }} style={{ border: 'none', @@ -330,7 +330,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onChange={(value) => { + onChange={value => { onChange({ target: { name, value: value === '' ? null : value, type: 'select' } }); }} placeholder={formattedPlaceholder} @@ -388,7 +388,7 @@ const GenericInput = ({ id={name} hint={hint} name={name} - onChange={(time) => { + onChange={time => { onChange({ target: { name, value: `${time}`, type } }); }} onClear={() => { diff --git a/packages/core/strapi/lib/middlewares/session.js b/packages/core/strapi/lib/middlewares/session.js index a298dac0ea..b60312f58e 100644 --- a/packages/core/strapi/lib/middlewares/session.js +++ b/packages/core/strapi/lib/middlewares/session.js @@ -19,7 +19,9 @@ const defaultConfig = { module.exports = (userConfig, { strapi }) => { const keys = strapi.server.app.keys; if (!isArray(keys) || isEmpty(keys) || keys.some(isEmpty)) { - throw new Error(`App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`); + throw new Error( + `App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])` + ); } const config = defaultsDeep(defaultConfig, userConfig); diff --git a/packages/core/strapi/lib/services/server/index.js b/packages/core/strapi/lib/services/server/index.js index 78f8d25a7e..58959c2ec1 100644 --- a/packages/core/strapi/lib/services/server/index.js +++ b/packages/core/strapi/lib/services/server/index.js @@ -30,7 +30,7 @@ const healthCheck = async ctx => { const createServer = strapi => { const app = createKoaApp({ proxy: strapi.config.get('server.proxy'), - keys: strapi.config.get('server.app.keys'), + keys: strapi.config.get('server.app.keys'), }); const router = new Router(); diff --git a/packages/core/utils/lib/pagination.js b/packages/core/utils/lib/pagination.js index 52283e9022..bef6b935d3 100644 --- a/packages/core/utils/lib/pagination.js +++ b/packages/core/utils/lib/pagination.js @@ -47,10 +47,7 @@ const withDefaultPagination = (args, { defaults = {}, maxLimit = -1 } = {}) => { const usePagePagination = !isNil(args.page) || !isNil(args.pageSize); const useOffsetPagination = !isNil(args.start) || !isNil(args.limit); - const ensureValidValues = pipe( - ensureMinValues, - ensureMaxValues(maxLimit) - ); + const ensureValidValues = pipe(ensureMinValues, ensureMaxValues(maxLimit)); // If there is no pagination attribute, don't modify the payload if (!usePagePagination && !useOffsetPagination) { diff --git a/packages/generators/admin/component/index.js b/packages/generators/admin/component/index.js index e3eb9915cb..e7bd61640f 100644 --- a/packages/generators/admin/component/index.js +++ b/packages/generators/admin/component/index.js @@ -6,10 +6,7 @@ const fileExistsInPackages = require('../utils/fileExistsInPackages'); const getPluginList = require('../utils/getPluginList'); const packagesFolder = require('../utils/packagesFolder'); -const pascalCase = flow( - camelCase, - upperFirst -); +const pascalCase = flow(camelCase, upperFirst); const prompts = [ { diff --git a/packages/plugins/graphql/server/services/builders/relation-response-collection.js b/packages/plugins/graphql/server/services/builders/relation-response-collection.js index 712887c254..c812f7af78 100644 --- a/packages/plugins/graphql/server/services/builders/relation-response-collection.js +++ b/packages/plugins/graphql/server/services/builders/relation-response-collection.js @@ -23,10 +23,7 @@ module.exports = ({ strapi }) => { t.nonNull.list.field('data', { type: nonNull(entityName), - resolve: pipe( - prop('nodes'), - defaultTo([]) - ), + resolve: pipe(prop('nodes'), defaultTo([])), }); }, }); diff --git a/packages/plugins/graphql/server/services/builders/response-collection.js b/packages/plugins/graphql/server/services/builders/response-collection.js index eb2faa3f58..b9e5f5d9b2 100644 --- a/packages/plugins/graphql/server/services/builders/response-collection.js +++ b/packages/plugins/graphql/server/services/builders/response-collection.js @@ -24,10 +24,7 @@ module.exports = ({ strapi }) => { t.nonNull.list.field('data', { type: nonNull(entityName), - resolve: pipe( - prop('nodes'), - defaultTo([]) - ), + resolve: pipe(prop('nodes'), defaultTo([])), }); t.nonNull.field('meta', { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/data.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/data.js index 576a030ba7..3ce3fae051 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/data.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/data.js @@ -140,7 +140,11 @@ const testData = { id: 1, name: 'name', subcomponotrepeatable: { id: 4, name: 'name' }, - subrepeatable: [{ id: 1, name: 'name' }, { id: 2, name: 'name' }, { id: 3, name: 'name' }], + subrepeatable: [ + { id: 1, name: 'name' }, + { id: 2, name: 'name' }, + { id: 3, name: 'name' }, + ], }, repeatable: [ { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/generateOptions.test.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/generateOptions.test.js index 069cfdbc93..6014f54a63 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/generateOptions.test.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/generateOptions.test.js @@ -24,7 +24,10 @@ describe('I18n | Components | CMEditViewCopyLocale | utils', () => { { publishedAt: 'test', locale: 'it', id: 3 }, ]; - const expected = [{ label: 'French', value: 2 }, { label: 'Italian', value: 3 }]; + const expected = [ + { label: 'French', value: 2 }, + { label: 'Italian', value: 3 }, + ]; expect(generateOptions(appLocales, currentLocale, localizations, permissions)).toEqual( expected @@ -41,7 +44,10 @@ describe('I18n | Components | CMEditViewCopyLocale | utils', () => { { publishedAt: 'test', locale: 'fr', id: 2 }, ]; - const expected = [{ label: 'English', value: 1 }, { label: 'French', value: 2 }]; + const expected = [ + { label: 'English', value: 1 }, + { label: 'French', value: 2 }, + ]; const currentLocale = 'test'; expect(generateOptions(appLocales, currentLocale, localizations, permissions)).toEqual( expected @@ -60,7 +66,10 @@ describe('I18n | Components | CMEditViewCopyLocale | utils', () => { { publishedAt: 'test', locale: 'it', id: 3 }, ]; - const expected = [{ label: 'English', value: 1 }, { label: 'Italian', value: 3 }]; + const expected = [ + { label: 'English', value: 1 }, + { label: 'Italian', value: 3 }, + ]; expect(generateOptions(appLocales, currentLocale, localizations, permissions)).toEqual( expected diff --git a/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js b/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js index 640330492c..203bad9552 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js +++ b/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js @@ -50,7 +50,11 @@ const ActionWrapper = styled.div` `; const mapToLocaleName = (locales, localeCode) => - get(locales.find(({ code }) => code === localeCode), 'name', localeCode); + get( + locales.find(({ code }) => code === localeCode), + 'name', + localeCode + ); const LocaleListCell = ({ localizations, locale: currentLocaleCode, id }) => { const locales = useSelector(selectI18NLocales);