diff --git a/client/src/boot/registerComponents.js b/client/src/boot/registerComponents.js index ec02d4c450..468e7ee5b8 100644 --- a/client/src/boot/registerComponents.js +++ b/client/src/boot/registerComponents.js @@ -11,7 +11,7 @@ export default () => { (updater) => { // Add CMS page history GraphQL query to the HistoryViewer updater.component('HistoryViewer.pages-controller-cms-content', readOnePageQuery, 'PageHistoryViewer'); - } + }, ); Injector.transform( @@ -24,8 +24,8 @@ export default () => { // arguments. The "rollback" mutation correctly handles relations and is a more consumable // API endpoint. rollbackPageMutation, - 'PageRevertMutation' + 'PageRevertMutation', ); - } + }, ); }; diff --git a/client/src/components/AnchorSelectorField/AnchorSelectorField.js b/client/src/components/AnchorSelectorField/AnchorSelectorField.js index 7836b1f4ee..512e2226ef 100644 --- a/client/src/components/AnchorSelectorField/AnchorSelectorField.js +++ b/client/src/components/AnchorSelectorField/AnchorSelectorField.js @@ -62,7 +62,7 @@ class AnchorSelectorField extends SilverStripeComponent { // Query endpoint for anchors for this page const fetchURL = props.data.endpoint.replace(/:id/, props.pageId); return fetch(fetchURL, { credentials: 'same-origin' }) - .then(response => response.json()) + .then((response) => response.json()) .then((anchors) => { // Fold in field anchors and ensure array has only unique values const allAnchors = [...new Set([...anchors, ...fieldAnchors])]; @@ -82,9 +82,9 @@ class AnchorSelectorField extends SilverStripeComponent { * @return {Array} */ getDropdownOptions() { - const options = this.props.anchors.map(value => ({ value })); + const options = this.props.anchors.map((value) => ({ value })); // Ensure value is available in the list - if (this.props.value && !this.props.anchors.find(value => value === this.props.value)) { + if (this.props.value && !this.props.anchors.find((value) => value === this.props.value)) { options.unshift({ value: this.props.value }); } return options; @@ -153,8 +153,8 @@ AnchorSelectorField.propTypes = { pageId: PropTypes.number, anchors: PropTypes.array, loadingState: PropTypes.oneOf(Object - .keys(anchorSelectorStates) - .map((key) => anchorSelectorStates[key])), + .keys(anchorSelectorStates) + .map((key) => anchorSelectorStates[key])), onLoadingError: PropTypes.func, data: PropTypes.shape({ endpoint: PropTypes.string, @@ -167,7 +167,7 @@ AnchorSelectorField.defaultProps = { extraClass: '', onLoadingError: noop, attributes: {}, - CreatableSelectComponent: CreatableSelect + CreatableSelectComponent: CreatableSelect, }; function mapStateToProps(state, ownProps) { @@ -179,7 +179,7 @@ function mapStateToProps(state, ownProps) { // Load anchors from page let anchors = []; const page = pageId - ? state.cms.anchorSelector.pages.find(next => next.id === pageId) + ? state.cms.anchorSelector.pages.find((next) => next.id === pageId) : null; if (page && ( diff --git a/client/src/components/AnchorSelectorField/tests/AnchorSelectorField-test.js b/client/src/components/AnchorSelectorField/tests/AnchorSelectorField-test.js index ae5ec1cb79..facbab7005 100644 --- a/client/src/components/AnchorSelectorField/tests/AnchorSelectorField-test.js +++ b/client/src/components/AnchorSelectorField/tests/AnchorSelectorField-test.js @@ -1,13 +1,12 @@ /* global jest, test, describe, beforeEach, it, expect, setTimeout */ import React from 'react'; -import { Component as AnchorSelectorField } from '../AnchorSelectorField'; import anchorSelectorStates from 'state/anchorSelector/AnchorSelectorStates'; import { render, screen } from '@testing-library/react'; +import { Component as AnchorSelectorField } from '../AnchorSelectorField'; -jest.mock('isomorphic-fetch', () => - () => Promise.resolve({ - json: () => ['anchor3', 'anchor4'], +jest.mock('isomorphic-fetch', () => () => Promise.resolve({ + json: () => ['anchor3', 'anchor4'], })); jest.mock('i18n'); @@ -24,7 +23,7 @@ function makeProps(obj = {}) { loadingState: anchorSelectorStates.SUCCESS, CreatableSelectComponent: ({ options }) => (
- {options.map(option =>
)} + {options.map((option) =>
)}
), ...obj, @@ -50,7 +49,7 @@ test('AnchorSelectorField componentDidMount() Loads dirty selectors', async () = test('AnchorSelectorField Merges value with page anchors', async () => { const beginUpdating = jest.fn(); - const { container } = render( next.id !== id), + ...state.pages.filter((next) => next.id !== id), { id, loadingState, diff --git a/client/src/state/history/readOnePageQuery.js b/client/src/state/history/readOnePageQuery.js index 1840398226..63a420e63d 100644 --- a/client/src/state/history/readOnePageQuery.js +++ b/client/src/state/history/readOnePageQuery.js @@ -68,7 +68,7 @@ const config = { }, ownProps: { actions = { - versions: {} + versions: {}, }, limit, recordId, @@ -88,12 +88,12 @@ const config = { versions: { ...versions, goToPage(page) { - refetch({ + refetch({ offset: ((page || 1) - 1) * limit, limit, page_id: recordId, - }); - } + }); + }, }, }, }; diff --git a/client/src/state/history/revertToPageVersionMutation.js b/client/src/state/history/revertToPageVersionMutation.js index f11466c523..b840ea5aa3 100644 --- a/client/src/state/history/revertToPageVersionMutation.js +++ b/client/src/state/history/revertToPageVersionMutation.js @@ -35,8 +35,8 @@ const config = { }, options: { // Refetch versions after mutation is completed - refetchQueries: ['ReadHistoryViewerPage'] - } + refetchQueries: ['ReadHistoryViewerPage'], + }, }; export { mutation, config }; diff --git a/client/src/state/history/rollbackPageMutation.js b/client/src/state/history/rollbackPageMutation.js index 69d92eb983..7eaf7c5d76 100644 --- a/client/src/state/history/rollbackPageMutation.js +++ b/client/src/state/history/rollbackPageMutation.js @@ -32,8 +32,8 @@ const config = { }, options: { // Refetch versions after mutation is completed - refetchQueries: ['ReadHistoryViewerPage'] - } + refetchQueries: ['ReadHistoryViewerPage'], + }, }; export { mutation, config };