diff --git a/packages/core/admin/admin/src/StrapiApp.js b/packages/core/admin/admin/src/StrapiApp.js index 9484f7749b..bbe0ef2bad 100644 --- a/packages/core/admin/admin/src/StrapiApp.js +++ b/packages/core/admin/admin/src/StrapiApp.js @@ -1,27 +1,29 @@ import React from 'react'; -import { BrowserRouter } from 'react-router-dom'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import invariant from 'invariant'; +import isFunction from 'lodash/isFunction'; import merge from 'lodash/merge'; import pick from 'lodash/pick'; -import isFunction from 'lodash/isFunction'; -import invariant from 'invariant'; import { Helmet } from 'react-helmet'; -import { basename, createHook } from './core/utils'; -import configureStore from './core/store/configureStore'; -import { customFields, Plugin } from './core/apis'; -import App from './pages/App'; +import { BrowserRouter } from 'react-router-dom'; + import Logo from './assets/images/logo-strapi-2022.svg'; +import localStorageKey from './components/LanguageProvider/utils/localStorageKey'; import Providers from './components/Providers'; -import languageNativeNames from './translations/languageNativeNames'; +import { customFields, Plugin } from './core/apis'; +import configureStore from './core/store/configureStore'; +import { basename, createHook } from './core/utils'; import { INJECT_COLUMN_IN_TABLE, MUTATE_COLLECTION_TYPES_LINKS, MUTATE_EDIT_VIEW_LAYOUT, MUTATE_SINGLE_TYPES_LINKS, } from './exposedHooks'; -import injectionZones from './injectionZones'; import favicon from './favicon.png'; -import localStorageKey from './components/LanguageProvider/utils/localStorageKey'; +import injectionZones from './injectionZones'; +import App from './pages/App'; +import languageNativeNames from './translations/languageNativeNames'; class StrapiApp { constructor({ adminConfig, appPlugins, library, middlewares, reducers }) { diff --git a/packages/core/admin/admin/src/components/AuthenticatedApp/index.js b/packages/core/admin/admin/src/components/AuthenticatedApp/index.js index f8465ffcd4..a0bb170e27 100644 --- a/packages/core/admin/admin/src/components/AuthenticatedApp/index.js +++ b/packages/core/admin/admin/src/components/AuthenticatedApp/index.js @@ -1,18 +1,22 @@ -import React, { useState, useEffect } from 'react'; -// TODO: DS add loader +import React, { useEffect, useState } from 'react'; + import { + AppInfoProvider, auth, LoadingIndicatorPage, - AppInfoProvider, useGuidedTour, useNotification, } from '@strapi/helper-plugin'; -import { useQueries } from 'react-query'; import get from 'lodash/get'; +import { useQueries } from 'react-query'; +// TODO: DS add loader + import packageJSON from '../../../../package.json'; import { useConfigurations } from '../../hooks'; +import { getFullName, hashAdminUserEmail } from '../../utils'; import PluginsInitializer from '../PluginsInitializer'; import RBACProvider from '../RBACProvider'; + import { fetchAppInfo, fetchCurrentUserPermissions, @@ -20,7 +24,6 @@ import { fetchUserRoles, } from './utils/api'; import checkLatestStrapiVersion from './utils/checkLatestStrapiVersion'; -import { getFullName, hashAdminUserEmail } from '../../utils'; const strapiVersion = packageJSON.version; diff --git a/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js b/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js index 606782674e..c531079c6f 100644 --- a/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js +++ b/packages/core/admin/admin/src/components/AuthenticatedApp/tests/index.test.js @@ -1,21 +1,23 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { render, waitFor } from '@testing-library/react'; -import { QueryClientProvider, QueryClient } from 'react-query'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { useGuidedTour } from '@strapi/helper-plugin'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { render, waitFor } from '@testing-library/react'; +import PropTypes from 'prop-types'; import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; + +import AuthenticatedApp from '..'; +import packageJSON from '../../../../../package.json'; import { ConfigurationsContext } from '../../../contexts'; +import Theme from '../../Theme'; +import ThemeToggleProvider from '../../ThemeToggleProvider'; import { fetchAppInfo, fetchCurrentUserPermissions, fetchStrapiLatestRelease, fetchUserRoles, } from '../utils/api'; -import packageJSON from '../../../../../package.json'; -import Theme from '../../Theme'; -import ThemeToggleProvider from '../../ThemeToggleProvider'; -import AuthenticatedApp from '..'; const strapiVersion = packageJSON.version; diff --git a/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js b/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js index 03479df8ad..1b5845b421 100644 --- a/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js +++ b/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js @@ -1,7 +1,9 @@ import { getFetchClient } from '@strapi/helper-plugin'; -import checkLatestStrapiVersion from './checkLatestStrapiVersion'; + import packageJSON from '../../../../../package.json'; +import checkLatestStrapiVersion from './checkLatestStrapiVersion'; + const strapiVersion = packageJSON.version; const showUpdateNotif = !JSON.parse(localStorage.getItem('STRAPI_UPDATE_NOTIF')); const { get } = getFetchClient(); diff --git a/packages/core/admin/admin/src/components/ConfigurationsProvider/index.js b/packages/core/admin/admin/src/components/ConfigurationsProvider/index.js index ce94ed79c2..e6a4963d00 100644 --- a/packages/core/admin/admin/src/components/ConfigurationsProvider/index.js +++ b/packages/core/admin/admin/src/components/ConfigurationsProvider/index.js @@ -1,6 +1,9 @@ import React, { useCallback, useMemo, useReducer } from 'react'; + import PropTypes from 'prop-types'; + import { ConfigurationsContext } from '../../contexts'; + import reducer, { initialState } from './reducer'; const ConfigurationsProvider = ({ diff --git a/packages/core/admin/admin/src/components/ConfigurationsProvider/tests/index.test.js b/packages/core/admin/admin/src/components/ConfigurationsProvider/tests/index.test.js index d28f7dd8d1..1b3aa674c3 100644 --- a/packages/core/admin/admin/src/components/ConfigurationsProvider/tests/index.test.js +++ b/packages/core/admin/admin/src/components/ConfigurationsProvider/tests/index.test.js @@ -1,7 +1,9 @@ import React from 'react'; -import { render, fireEvent, screen } from '@testing-library/react'; -import ConfigurationsProvider from '../index'; + +import { fireEvent, render, screen } from '@testing-library/react'; + import { useConfigurations } from '../../../hooks'; +import ConfigurationsProvider from '../index'; describe('ConfigurationsProvider', () => { it('should not crash', () => { diff --git a/packages/core/admin/admin/src/components/DragLayer/DragLayer.js b/packages/core/admin/admin/src/components/DragLayer/DragLayer.js index 6a4e1ea60e..e05706f9e6 100644 --- a/packages/core/admin/admin/src/components/DragLayer/DragLayer.js +++ b/packages/core/admin/admin/src/components/DragLayer/DragLayer.js @@ -1,7 +1,8 @@ import * as React from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useDragLayer } from 'react-dnd'; -import { Box } from '@strapi/design-system'; function getStyle(initialOffset, currentOffset, mouseOffset) { if (!initialOffset || !currentOffset) { diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Step.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Step.js index ea31ed55c2..c4bb9f24b4 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Step.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Step.js @@ -1,11 +1,13 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; -import { Typography, Box, Flex } from '@strapi/design-system'; -import StepNumber from '../../Stepper/StepNumber'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + +import { IS_ACTIVE, IS_DONE, IS_NOT_DONE } from '../../constants'; import StepLine from '../../Stepper/StepLine'; -import { IS_DONE, IS_ACTIVE, IS_NOT_DONE } from '../../constants'; +import StepNumber from '../../Stepper/StepNumber'; const StepHomepage = ({ type, title, number, content, hasLine }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Stepper.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Stepper.js index 9c53587462..bbf41646d4 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Stepper.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/Stepper.js @@ -1,8 +1,11 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + +import { IS_ACTIVE, IS_DONE, IS_NOT_DONE } from '../../constants'; + import StepHomepage from './Step'; -import { IS_DONE, IS_ACTIVE, IS_NOT_DONE } from '../../constants'; const getType = (activeSectionIndex, index) => { if (activeSectionIndex === -1) { diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js index 3a0005fb77..c46b2db290 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import Stepper from '../Stepper'; const sections = [ diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js index ed38c93d6c..000f07de68 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/index.js @@ -1,11 +1,14 @@ import React from 'react'; -import { useGuidedTour, useTracking, LinkButton } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import { Flex, Box, Typography, Button } from '@strapi/design-system'; + +import { Box, Button, Flex, Typography } from '@strapi/design-system'; +import { LinkButton, useGuidedTour, useTracking } from '@strapi/helper-plugin'; import { ArrowRight } from '@strapi/icons'; -import StepperHomepage from './components/Stepper'; +import { useIntl } from 'react-intl'; + import layout from '../layout'; +import StepperHomepage from './components/Stepper'; + const GuidedTourHomepage = () => { const { guidedTourState, setSkipped } = useGuidedTour(); const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js index c5161a2ece..bb10aa99e0 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider, useGuidedTour } from '@strapi/helper-plugin'; import { render, screen } from '@testing-library/react'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; -import { useGuidedTour, TrackingProvider } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { Router } from 'react-router-dom'; + import GuidedTourHomepage from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js index 69c01f1760..62828b2481 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Flex, Box, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const LiStyled = styled.li` list-style: disc; diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Modal.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Modal.js index 561cf9ed39..d9c3be542b 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Modal.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Modal.js @@ -1,10 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; + +import { Box, Button, Flex, FocusTrap, IconButton, Portal } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { Cross } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { pxToRem } from '@strapi/helper-plugin'; -import { Portal, FocusTrap, Flex, Box, IconButton, Button } from '@strapi/design-system'; -import { Cross } from '@strapi/icons'; +import styled from 'styled-components'; const ModalWrapper = styled(Flex)` position: fixed; diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/StepNumberWithPadding.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/StepNumberWithPadding.js index 27cf9bc9b2..393262714f 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/StepNumberWithPadding.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/StepNumberWithPadding.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import StepNumber from '../../Stepper/StepNumber'; const StepNumberWithPadding = ({ number, last, type }) => ( diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Stepper.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Stepper.js index b24e2533cd..4d63b4bc95 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Stepper.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Stepper.js @@ -1,13 +1,16 @@ import React from 'react'; + +import { Box, Button, Flex, Typography } from '@strapi/design-system'; +import { LinkButton, pxToRem } from '@strapi/helper-plugin'; +import { ArrowRight } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { pxToRem, LinkButton } from '@strapi/helper-plugin'; -import { Typography, Button, Box, Flex } from '@strapi/design-system'; -import { ArrowRight } from '@strapi/icons'; -import Content from './Content'; + +import { IS_ACTIVE, IS_DONE } from '../../constants'; import StepLine from '../../Stepper/StepLine'; + +import Content from './Content'; import StepNumberWithPadding from './StepNumberWithPadding'; -import { IS_DONE, IS_ACTIVE } from '../../constants'; const StepperModal = ({ title, diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/index.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/index.js index d238a52533..5d2e4b1846 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/index.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/index.js @@ -1,10 +1,13 @@ -import React, { useEffect, useState, useReducer } from 'react'; -import at from 'lodash/at'; +import React, { useEffect, useReducer, useState } from 'react'; + import { useGuidedTour, useTracking } from '@strapi/helper-plugin'; +import at from 'lodash/at'; + import layout from '../layout'; + import Modal from './components/Modal'; -import reducer, { initialState } from './reducer'; import StepperModal from './components/Stepper'; +import reducer, { initialState } from './reducer'; const GuidedTourModal = () => { const { diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js index 2ab784b220..5fe0529002 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { useGuidedTour } from '@strapi/helper-plugin'; import { render, screen } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { useGuidedTour } from '@strapi/helper-plugin'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + import Theme from '../../../Theme'; import ThemeToggleProvider from '../../../ThemeToggleProvider'; import GuidedTourModal from '../index'; diff --git a/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepLine.js b/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepLine.js index 715dbc857c..329142fbad 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepLine.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepLine.js @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { pxToRem } from '@strapi/helper-plugin'; + import { Box } from '@strapi/design-system'; -import { IS_DONE, IS_ACTIVE, IS_NOT_DONE } from '../constants'; +import { pxToRem } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + +import { IS_ACTIVE, IS_DONE, IS_NOT_DONE } from '../constants'; const StepLine = ({ type, ...props }) => { return ( diff --git a/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepNumber.js b/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepNumber.js index 67306c50a3..e2ca6823a4 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepNumber.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Stepper/StepNumber.js @@ -1,9 +1,11 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { pxToRem } from '@strapi/helper-plugin'; + import { Flex, Icon, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; import { Check } from '@strapi/icons'; -import { IS_DONE, IS_ACTIVE, IS_NOT_DONE } from '../constants'; +import PropTypes from 'prop-types'; + +import { IS_ACTIVE, IS_DONE, IS_NOT_DONE } from '../constants'; const StepNumber = ({ type, number }) => { if (type === IS_DONE) { diff --git a/packages/core/admin/admin/src/components/GuidedTour/index.js b/packages/core/admin/admin/src/components/GuidedTour/index.js index cab615509c..22a0c3e87a 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/index.js +++ b/packages/core/admin/admin/src/components/GuidedTour/index.js @@ -1,12 +1,14 @@ import React, { useReducer } from 'react'; -import PropTypes from 'prop-types'; -import get from 'lodash/get'; + import { GuidedTourProvider } from '@strapi/helper-plugin'; -import persistStateToLocaleStorage from './utils/persistStateToLocaleStorage'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; + +import init from './init'; +import reducer, { initialState } from './reducer'; import arePreviousSectionsDone from './utils/arePreviousSectionsDone'; import arePreviousStepsDone from './utils/arePreviousStepsDone'; -import reducer, { initialState } from './reducer'; -import init from './init'; +import persistStateToLocaleStorage from './utils/persistStateToLocaleStorage'; const GuidedTour = ({ children }) => { const [{ currentStep, guidedTourState, isGuidedTourVisible, isSkipped }, dispatch] = useReducer( diff --git a/packages/core/admin/admin/src/components/GuidedTour/init.js b/packages/core/admin/admin/src/components/GuidedTour/init.js index 4aadedce0b..82ec4f3e7b 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/init.js +++ b/packages/core/admin/admin/src/components/GuidedTour/init.js @@ -1,4 +1,5 @@ import set from 'lodash/set'; + import persistStateToLocaleStorage, { COMPLETED_STEPS, CURRENT_STEP, diff --git a/packages/core/admin/admin/src/components/GuidedTour/tests/index.test.js b/packages/core/admin/admin/src/components/GuidedTour/tests/index.test.js index d4aae9d8c6..3eb554a837 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/tests/index.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/tests/index.test.js @@ -1,6 +1,8 @@ import React, { useEffect } from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; + import { useGuidedTour } from '@strapi/helper-plugin/'; +import { fireEvent, render, screen } from '@testing-library/react'; + import GuidedTour from '../index'; describe('GuidedTour', () => { diff --git a/packages/core/admin/admin/src/components/GuidedTour/tests/init.test.js b/packages/core/admin/admin/src/components/GuidedTour/tests/init.test.js index ba6eeccae2..f65924af1d 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/tests/init.test.js +++ b/packages/core/admin/admin/src/components/GuidedTour/tests/init.test.js @@ -1,4 +1,5 @@ import cloneDeep from 'lodash/cloneDeep'; + import init from '../init'; import { initialState } from '../reducer'; diff --git a/packages/core/admin/admin/src/components/LanguageProvider/index.js b/packages/core/admin/admin/src/components/LanguageProvider/index.js index 25d19c819c..1d069e5dfe 100644 --- a/packages/core/admin/admin/src/components/LanguageProvider/index.js +++ b/packages/core/admin/admin/src/components/LanguageProvider/index.js @@ -7,13 +7,16 @@ */ import React, { useEffect, useReducer } from 'react'; + +import defaultsDeep from 'lodash/defaultsDeep'; import PropTypes from 'prop-types'; import { IntlProvider } from 'react-intl'; -import defaultsDeep from 'lodash/defaultsDeep'; + import LocalesProvider from '../LocalesProvider'; -import localStorageKey from './utils/localStorageKey'; + import init from './init'; import reducer, { initialState } from './reducer'; +import localStorageKey from './utils/localStorageKey'; const LanguageProvider = ({ children, localeNames, messages }) => { const [{ locale }, dispatch] = useReducer(reducer, initialState, () => init(localeNames)); diff --git a/packages/core/admin/admin/src/components/LanguageProvider/tests/index.test.js b/packages/core/admin/admin/src/components/LanguageProvider/tests/index.test.js index cbb7dbea59..de659b72f0 100644 --- a/packages/core/admin/admin/src/components/LanguageProvider/tests/index.test.js +++ b/packages/core/admin/admin/src/components/LanguageProvider/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; + +import { fireEvent, render, screen } from '@testing-library/react'; import { useIntl } from 'react-intl'; -import useLocalesProvider from '../../LocalesProvider/useLocalesProvider'; -import LanguageProvider from '../index'; + import en from '../../../translations/en.json'; import fr from '../../../translations/fr.json'; +import useLocalesProvider from '../../LocalesProvider/useLocalesProvider'; +import LanguageProvider from '../index'; const messages = { en, fr }; const localeNames = { en: 'English', fr: 'Français' }; diff --git a/packages/core/admin/admin/src/components/LeftMenu/index.js b/packages/core/admin/admin/src/components/LeftMenu/index.js index daf5466c89..0210176bdb 100644 --- a/packages/core/admin/admin/src/components/LeftMenu/index.js +++ b/packages/core/admin/admin/src/components/LeftMenu/index.js @@ -1,27 +1,29 @@ import React, { useRef, useState } from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { NavLink as RouterNavLink, useLocation, useHistory } from 'react-router-dom'; -import { Divider, FocusTrap, Box, Typography, Flex } from '@strapi/design-system'; + +import { Box, Divider, Flex, FocusTrap, Typography } from '@strapi/design-system'; import { MainNav, NavBrand, - NavSections, - NavLink, - NavSection, - NavUser, NavCondense, NavFooter, + NavLink, + NavSection, + NavSections, + NavUser, } from '@strapi/design-system/v2'; -import { Write, Exit } from '@strapi/icons'; import { auth, - usePersistentState, - useAppInfo, - useTracking, getFetchClient, + useAppInfo, + usePersistentState, + useTracking, } from '@strapi/helper-plugin'; +import { Exit, Write } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { NavLink as RouterNavLink, useHistory, useLocation } from 'react-router-dom'; +import styled from 'styled-components'; + import { useConfigurations } from '../../hooks'; const LinkUserWrapper = styled(Box)` diff --git a/packages/core/admin/admin/src/components/LocalesProvider/index.js b/packages/core/admin/admin/src/components/LocalesProvider/index.js index 98ee3c4100..32a7fa0e91 100644 --- a/packages/core/admin/admin/src/components/LocalesProvider/index.js +++ b/packages/core/admin/admin/src/components/LocalesProvider/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import PropTypes from 'prop-types'; + import LocalesProviderContext from './context'; const LocalesProvider = ({ changeLocale, children, localeNames }) => { diff --git a/packages/core/admin/admin/src/components/LocalesProvider/tests/index.test.js b/packages/core/admin/admin/src/components/LocalesProvider/tests/index.test.js index c3a6853e28..7eb2a00001 100644 --- a/packages/core/admin/admin/src/components/LocalesProvider/tests/index.test.js +++ b/packages/core/admin/admin/src/components/LocalesProvider/tests/index.test.js @@ -1,5 +1,7 @@ import React from 'react'; + import { render } from '@testing-library/react'; + import LocalesProvider from '../index'; describe('LocalesProvider', () => { diff --git a/packages/core/admin/admin/src/components/LocalesProvider/useLocalesProvider.js b/packages/core/admin/admin/src/components/LocalesProvider/useLocalesProvider.js index 1c0e418fb9..524bd9b98d 100644 --- a/packages/core/admin/admin/src/components/LocalesProvider/useLocalesProvider.js +++ b/packages/core/admin/admin/src/components/LocalesProvider/useLocalesProvider.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import LocalesProviderContext from './context'; const useLocalesProvider = () => { diff --git a/packages/core/admin/admin/src/components/PluginsInitializer/index.js b/packages/core/admin/admin/src/components/PluginsInitializer/index.js index bd3a1b6c74..51a3cb904a 100644 --- a/packages/core/admin/admin/src/components/PluginsInitializer/index.js +++ b/packages/core/admin/admin/src/components/PluginsInitializer/index.js @@ -1,5 +1,7 @@ import React, { useReducer, useRef } from 'react'; + import { LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin'; + import Admin from '../../pages/Admin'; import init from './init'; diff --git a/packages/core/admin/admin/src/components/PluginsInitializer/tests/index.test.js b/packages/core/admin/admin/src/components/PluginsInitializer/tests/index.test.js index f9909a3e63..0109608db9 100644 --- a/packages/core/admin/admin/src/components/PluginsInitializer/tests/index.test.js +++ b/packages/core/admin/admin/src/components/PluginsInitializer/tests/index.test.js @@ -1,6 +1,8 @@ import React from 'react'; + import { StrapiAppProvider } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; + import PluginsInitializer from '../index'; jest.mock('../../../pages/Admin', () => () => { diff --git a/packages/core/admin/admin/src/components/PrivateRoute/index.js b/packages/core/admin/admin/src/components/PrivateRoute/index.js index 9f99bff0e9..e09b1a56ce 100644 --- a/packages/core/admin/admin/src/components/PrivateRoute/index.js +++ b/packages/core/admin/admin/src/components/PrivateRoute/index.js @@ -8,9 +8,10 @@ */ import React, { memo } from 'react'; -import { Redirect, Route, useLocation } from 'react-router-dom'; -import PropTypes from 'prop-types'; + import { auth } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { Redirect, Route, useLocation } from 'react-router-dom'; /* eslint-disable react/jsx-curly-newline */ diff --git a/packages/core/admin/admin/src/components/PrivateRoute/tests/index.test.js b/packages/core/admin/admin/src/components/PrivateRoute/tests/index.test.js index ac06f7b7c6..4ce68d512c 100644 --- a/packages/core/admin/admin/src/components/PrivateRoute/tests/index.test.js +++ b/packages/core/admin/admin/src/components/PrivateRoute/tests/index.test.js @@ -1,9 +1,10 @@ import React from 'react'; -import { Router, Route, Switch } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { act, render, screen, waitFor } from '@testing-library/react'; import { auth } from '@strapi/helper-plugin'; +import { act, render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; +import { Route, Router, Switch } from 'react-router-dom'; + import PrivateRoute from '..'; const ProtectedPage = () => { diff --git a/packages/core/admin/admin/src/components/Providers/index.js b/packages/core/admin/admin/src/components/Providers/index.js index 9bd08c6213..412891cbc7 100644 --- a/packages/core/admin/admin/src/components/Providers/index.js +++ b/packages/core/admin/admin/src/components/Providers/index.js @@ -1,21 +1,23 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { QueryClientProvider, QueryClient } from 'react-query'; + import { - LibraryProvider, - CustomFieldsProvider, - StrapiAppProvider, AutoReloadOverlayBlockerProvider, - OverlayBlockerProvider, + CustomFieldsProvider, + LibraryProvider, NotificationsProvider, + OverlayBlockerProvider, + StrapiAppProvider, } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider } from 'react-redux'; + import { AdminContext } from '../../contexts'; import ConfigurationsProvider from '../ConfigurationsProvider'; -import LanguageProvider from '../LanguageProvider'; import GuidedTour from '../GuidedTour'; -import ThemeToggleProvider from '../ThemeToggleProvider'; +import LanguageProvider from '../LanguageProvider'; import Theme from '../Theme'; +import ThemeToggleProvider from '../ThemeToggleProvider'; const queryClient = new QueryClient({ defaultOptions: { diff --git a/packages/core/admin/admin/src/components/RBACProvider/index.js b/packages/core/admin/admin/src/components/RBACProvider/index.js index 15ec3ed7e8..9d37cf89d4 100644 --- a/packages/core/admin/admin/src/components/RBACProvider/index.js +++ b/packages/core/admin/admin/src/components/RBACProvider/index.js @@ -1,7 +1,9 @@ import React, { useEffect } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; + import { LoadingIndicatorPage, RBACProviderContext } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; +import { useDispatch, useSelector } from 'react-redux'; + import { resetStore, setPermissions } from './actions'; const RBACProvider = ({ children, permissions, refetchPermissions }) => { diff --git a/packages/core/admin/admin/src/components/RBACProvider/tests/reducer.test.js b/packages/core/admin/admin/src/components/RBACProvider/tests/reducer.test.js index 0654a3baa8..bc50e42559 100644 --- a/packages/core/admin/admin/src/components/RBACProvider/tests/reducer.test.js +++ b/packages/core/admin/admin/src/components/RBACProvider/tests/reducer.test.js @@ -1,6 +1,6 @@ import { fixtures } from '@strapi/admin-test-utils'; -import { setPermissions, resetStore } from '../actions'; +import { resetStore, setPermissions } from '../actions'; import rbacProviderReducer, { initialState } from '../reducer'; describe('rbacProviderReducer', () => { diff --git a/packages/core/admin/admin/src/components/Theme/index.js b/packages/core/admin/admin/src/components/Theme/index.js index 9788a82d1b..3792d4e854 100644 --- a/packages/core/admin/admin/src/components/Theme/index.js +++ b/packages/core/admin/admin/src/components/Theme/index.js @@ -1,7 +1,9 @@ import React from 'react'; + import { DesignSystemProvider } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import { useThemeToggle } from '../../hooks'; import GlobalStyle from '../GlobalStyle'; diff --git a/packages/core/admin/admin/src/components/ThemeToggleProvider/index.js b/packages/core/admin/admin/src/components/ThemeToggleProvider/index.js index 65482a77a0..76adccec1a 100644 --- a/packages/core/admin/admin/src/components/ThemeToggleProvider/index.js +++ b/packages/core/admin/admin/src/components/ThemeToggleProvider/index.js @@ -4,8 +4,10 @@ * */ -import React, { useState, useMemo, useCallback } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; + import PropTypes from 'prop-types'; + import { ThemeToggleContext } from '../../contexts'; const THEME_KEY = 'STRAPI_THEME'; diff --git a/packages/core/admin/admin/src/components/UnauthenticatedLogo/index.js b/packages/core/admin/admin/src/components/UnauthenticatedLogo/index.js index 0f32bdf9be..f89a5b72b3 100644 --- a/packages/core/admin/admin/src/components/UnauthenticatedLogo/index.js +++ b/packages/core/admin/admin/src/components/UnauthenticatedLogo/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import styled from 'styled-components'; + import { useConfigurations } from '../../hooks'; const Img = styled.img` diff --git a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js index 73fca489e4..ee2755fe0c 100644 --- a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js +++ b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/Filters.js @@ -1,9 +1,10 @@ import React, { useRef, useState } from 'react'; + +import { Box, Button } from '@strapi/design-system'; +import { FilterListURLQuery, FilterPopoverURLQuery, useTracking } from '@strapi/helper-plugin'; +import { Filter } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Box, Button } from '@strapi/design-system'; -import { Filter } from '@strapi/icons'; -import { FilterListURLQuery, FilterPopoverURLQuery, useTracking } from '@strapi/helper-plugin'; const Filters = ({ displayedFilters }) => { const [isVisible, setIsVisible] = useState(false); diff --git a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/hooks/useAllowedAttributes.js b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/hooks/useAllowedAttributes.js index edfe341101..05068e0460 100644 --- a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/hooks/useAllowedAttributes.js +++ b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/hooks/useAllowedAttributes.js @@ -1,5 +1,5 @@ +import { findMatchingPermissions, useRBACProvider } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import { useRBACProvider, findMatchingPermissions } from '@strapi/helper-plugin'; const NOT_ALLOWED_FILTERS = ['json', 'component', 'media', 'richtext', 'dynamiczone', 'password']; const TIMESTAMPS = ['createdAt', 'updatedAt']; diff --git a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/index.js b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/index.js index 48f922124d..b34e5a1d33 100644 --- a/packages/core/admin/admin/src/content-manager/components/AttributeFilter/index.js +++ b/packages/core/admin/admin/src/content-manager/components/AttributeFilter/index.js @@ -1,8 +1,10 @@ import React from 'react'; + import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import useAllowedAttributes from './hooks/useAllowedAttributes'; + import Filters from './Filters'; +import useAllowedAttributes from './hooks/useAllowedAttributes'; const AttributeFilter = ({ contentType, slug, metadatas }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js b/packages/core/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js index 6ec515527d..d1425f2836 100644 --- a/packages/core/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js +++ b/packages/core/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js @@ -1,27 +1,23 @@ import { memo, useCallback, useEffect, useMemo, useRef } from 'react'; -import { useQueryClient } from 'react-query'; -import { useHistory } from 'react-router-dom'; -import axios from 'axios'; -import get from 'lodash/get'; + import { - useTracking, - useNotification, - useQueryParams, - formatContentTypeData, contentManagementUtilRemoveFieldsFromData, - useGuidedTour, + formatContentTypeData, useAPIErrorHandler, useFetchClient, + useGuidedTour, + useNotification, + useQueryParams, + useTracking, } from '@strapi/helper-plugin'; -import { useSelector, useDispatch } from 'react-redux'; -import PropTypes from 'prop-types'; +import axios from 'axios'; +import get from 'lodash/get'; import isEqual from 'lodash/isEqual'; -import { - createDefaultForm, - getTrad, - getRequestUrl, - removePasswordFieldsFromData, -} from '../../utils'; +import PropTypes from 'prop-types'; +import { useQueryClient } from 'react-query'; +import { useDispatch, useSelector } from 'react-redux'; +import { useHistory } from 'react-router-dom'; + import { useFindRedirectionLink } from '../../hooks'; import { getData, @@ -33,6 +29,12 @@ import { submitSucceeded, } from '../../sharedReducers/crudReducer/actions'; import selectCrudReducer from '../../sharedReducers/crudReducer/selectors'; +import { + createDefaultForm, + getRequestUrl, + getTrad, + removePasswordFieldsFromData, +} from '../../utils'; // This container is used to handle the CRUD const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }) => { diff --git a/packages/core/admin/admin/src/content-manager/components/ComponentIcon/ComponentIcon.js b/packages/core/admin/admin/src/content-manager/components/ComponentIcon/ComponentIcon.js index 21ceb566f9..620fee625f 100644 --- a/packages/core/admin/admin/src/content-manager/components/ComponentIcon/ComponentIcon.js +++ b/packages/core/admin/admin/src/content-manager/components/ComponentIcon/ComponentIcon.js @@ -1,7 +1,8 @@ -import PropTypes from 'prop-types'; import React from 'react'; import { Flex, Icon } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import { COMPONENT_ICONS } from './constants'; export function ComponentIcon({ showBackground = true, size = 'M', icon }) { diff --git a/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js b/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js index d3a0394567..bd9777da58 100644 --- a/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js +++ b/packages/core/admin/admin/src/content-manager/components/ComponentInitializer/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { PlusCircle } from '@strapi/icons'; + import { Box, Flex, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; +import { PlusCircle } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { getTrad } from '../../utils'; const IconWrapper = styled.span` diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js index 7ffe9c9336..868c652e28 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js @@ -1,13 +1,15 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + import { Button, Dialog, DialogBody, DialogFooter, Flex, Typography } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; import { Check, ExclamationMarkCircle, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import { useSelector } from 'react-redux'; -import { useTracking } from '@strapi/helper-plugin'; + +import { listViewDomain } from '../../../pages/ListView/selectors'; import { getTrad } from '../../../utils'; import InjectionZoneList from '../../InjectionZoneList'; -import { listViewDomain } from '../../../pages/ListView/selectors'; const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, dialogBody, endAction }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js index eeb623a564..5891532d56 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/tests/index.test.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; + import BulkActionsBar from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/CellValue.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/CellValue.js index 3e94f5d83c..69797d5ea4 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/CellValue.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/CellValue.js @@ -1,7 +1,7 @@ +import parseISO from 'date-fns/parseISO'; +import toString from 'lodash/toString'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import toString from 'lodash/toString'; -import parseISO from 'date-fns/parseISO'; const CellValue = ({ type, value }) => { const { formatDate, formatTime, formatNumber } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/FileWrapper.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/FileWrapper.js index 6dbd43a84c..cd18ee6324 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/FileWrapper.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/FileWrapper.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Flex, Typography } from '@strapi/design-system'; const Wrapper = styled(Flex)` position: relative; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/index.js index f6c614184a..c174940c82 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Media/index.js @@ -1,7 +1,8 @@ -import PropTypes from 'prop-types'; import React from 'react'; + import { Avatar, Tooltip } from '@strapi/design-system'; import { getFileExtension, prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import FileWrapper from './FileWrapper'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/MultipleMedias.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/MultipleMedias.js index a3baf012c9..e4481d7018 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/MultipleMedias.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/MultipleMedias.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { AvatarGroup } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import Media from './Media'; import FileWrapper from './Media/FileWrapper'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js index 596cf694d6..9a204cd173 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Status, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Status, Typography } from '@strapi/design-system'; import { getTrad } from '../../../../utils'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js index e0c00c4943..c9925dd5c0 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import { PublicationState } from '..'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/index.js index 04b70824c6..2bd7ac1d11 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/index.js @@ -1,3 +1,5 @@ +import React, { useMemo, useState } from 'react'; + import { Badge, Box, @@ -10,10 +12,10 @@ import { } from '@strapi/design-system'; import { stopPropagation, useFetchClient } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import React, { useMemo, useState } from 'react'; import { useIntl } from 'react-intl'; import { useQuery } from 'react-query'; import styled from 'styled-components'; + import { getRequestUrl, getTrad } from '../../../../utils'; import CellValue from '../CellValue'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/index.test.js index 80941050c6..a4f688531c 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationMultiple/tests/index.test.js @@ -1,10 +1,11 @@ import React from 'react'; -import { render, fireEvent, screen, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { useFetchClient } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import RelationMultiple from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/index.js index 1c3f6bfcfb..537e7a2180 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/index.js @@ -1,7 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import styled from 'styled-components'; + import CellValue from '../CellValue'; const TypographyMaxWidth = styled(Typography)` diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js index 7551f0ff0c..f3b3cd918b 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/tests/index.test.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import RelationSingle from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RepeatableComponent/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RepeatableComponent/index.js index 431a33cf98..d02ffb4e43 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RepeatableComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RepeatableComponent/index.js @@ -1,9 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { Badge, Box, Typography, SimpleMenu, MenuItem } from '@strapi/design-system'; + +import { Badge, Box, MenuItem, SimpleMenu, Typography } from '@strapi/design-system'; import { stopPropagation } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import CellValue from '../CellValue'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/SingleComponent/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/SingleComponent/index.js index af31e23216..34473b02b6 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/SingleComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/SingleComponent/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Tooltip, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Tooltip, Typography } from '@strapi/design-system'; import CellValue from '../CellValue'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js index 99c6f28a0f..2ef15275b9 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js @@ -1,14 +1,16 @@ import React from 'react'; + +import { Tooltip, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Typography, Tooltip } from '@strapi/design-system'; + +import CellValue from './CellValue'; import Media from './Media'; import MultipleMedias from './MultipleMedias'; import RelationMultiple from './RelationMultiple'; import RelationSingle from './RelationSingle'; import RepeatableComponent from './RepeatableComponent'; import SingleComponent from './SingleComponent'; -import CellValue from './CellValue'; import hasContent from './utils/hasContent'; import isSingleRelation from './utils/isSingleRelation'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/tests/CellValue.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/tests/CellValue.test.js index e3fb485eb8..35a2dcb9c6 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/tests/CellValue.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/tests/CellValue.test.js @@ -1,4 +1,5 @@ import React from 'react'; + import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/utils/hasContent.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/utils/hasContent.js index 8e5c097051..228fe734ae 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/utils/hasContent.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/utils/hasContent.js @@ -1,9 +1,10 @@ import isEmpty from 'lodash/isEmpty'; import isNumber from 'lodash/isNumber'; -import isSingleRelation from './isSingleRelation'; import isFieldTypeNumber from '../../../../utils/isFieldTypeNumber'; +import isSingleRelation from './isSingleRelation'; + export default function hasContent(type, content, metadatas, fieldSchema) { if (type === 'component') { const { diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDelete/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDelete/index.js index 5514cba8e0..9343167c1f 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDelete/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmDialogDelete/index.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { Button, Dialog, DialogBody, DialogFooter, Flex, Typography } from '@strapi/design-system'; +import { ExclamationMarkCircle, Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Dialog, DialogBody, DialogFooter, Flex, Typography, Button } from '@strapi/design-system'; -import { ExclamationMarkCircle, Trash } from '@strapi/icons'; + import InjectionZoneList from '../../InjectionZoneList'; const ConfirmDialogDelete = ({ isConfirmButtonLoading, isOpen, onToggleDialog, onConfirm }) => { diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js index 18b97091d4..89fa6dd133 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js @@ -1,18 +1,14 @@ import React from 'react'; + +import { BaseCheckbox, Box, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system'; +import { onRowClick, stopPropagation, useTracking } from '@strapi/helper-plugin'; +import { Duplicate, Pencil, Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; -import { Link, useHistory } from 'react-router-dom'; import { useIntl } from 'react-intl'; - -import { BaseCheckbox, Box, IconButton, Tbody, Td, Tr, Flex } from '@strapi/design-system'; - -import { Trash, Duplicate, Pencil } from '@strapi/icons'; - -import { useTracking, stopPropagation, onRowClick } from '@strapi/helper-plugin'; - -import { usePluginsQueryParams } from '../../../hooks'; +import { Link, useHistory } from 'react-router-dom'; import { getFullName } from '../../../../utils'; - +import { usePluginsQueryParams } from '../../../hooks'; import CellContent from '../CellContent'; const TableRows = ({ diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js index 9adc757ff4..c2bc4f152c 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js @@ -1,17 +1,19 @@ import React, { useMemo } from 'react'; + +import { DynamicTable as Table, useStrapiApp } from '@strapi/helper-plugin'; +import getReviewWorkflowsColumn from 'ee_else_ce/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { DynamicTable as Table, useStrapiApp } from '@strapi/helper-plugin'; import { useSelector } from 'react-redux'; -import getReviewWorkflowsColumn from 'ee_else_ce/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn'; import { INJECT_COLUMN_IN_TABLE } from '../../../exposedHooks'; import { selectDisplayedHeaders } from '../../pages/ListView/selectors'; import { getTrad } from '../../utils'; -import TableRows from './TableRows'; -import ConfirmDialogDelete from './ConfirmDialogDelete'; -import { PublicationState } from './CellContent/PublicationState/PublicationState'; + import BulkActionsBar from './BulkActionsBar'; +import { PublicationState } from './CellContent/PublicationState/PublicationState'; +import ConfirmDialogDelete from './ConfirmDialogDelete'; +import TableRows from './TableRows'; const DynamicTable = ({ canCreate, diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton.js index 9f0860eaba..2f5f27cee4 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton.js @@ -5,10 +5,11 @@ */ import React from 'react'; + +import { BaseButton, Flex, Typography } from '@strapi/design-system'; +import { PlusCircle } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { PlusCircle } from '@strapi/icons'; -import { BaseButton, Flex, Typography } from '@strapi/design-system'; export const AddComponentButton = ({ hasError, isDisabled, isOpen, children, onClick }) => { return ( diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCard.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCard.js index e3bfc6c1fc..c84f74e7fc 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCard.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCard.js @@ -5,12 +5,12 @@ */ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box, Typography, Flex } from '@strapi/design-system'; -import { pxToRem } from '@strapi/helper-plugin'; - import { ComponentIcon } from '../../ComponentIcon'; const ComponentBox = styled(Box)` diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCategory.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCategory.js index 0d3c4c3287..44cba930b5 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCategory.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentCategory.js @@ -1,16 +1,17 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Accordion, - AccordionToggle, AccordionContent, + AccordionToggle, Box, Flex, Typography, } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; -import styled from 'styled-components'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { ComponentIcon } from '../../ComponentIcon'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker.js index 1eff918632..d96a56678d 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/ComponentPicker.js @@ -1,7 +1,8 @@ import React, { useEffect, useState } from 'react'; + +import { Box, Flex, KeyboardNavigable, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { KeyboardNavigable, Box, Flex, Typography } from '@strapi/design-system'; import { getTrad } from '../../../utils'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js index 80f7fb9d88..f714b3e880 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicComponent.js @@ -1,28 +1,27 @@ import React, { useEffect, useMemo, useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import get from 'lodash/get'; -import { getEmptyImage } from 'react-dnd-html5-backend'; import { Accordion, - AccordionToggle, AccordionContent, - IconButton, + AccordionToggle, Box, Flex, + IconButton, VisuallyHidden, } from '@strapi/design-system'; import { Menu, MenuItem } from '@strapi/design-system/v2'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { Trash, Drag, More } from '@strapi/icons'; +import { Drag, More, Trash } from '@strapi/icons'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; +import { getEmptyImage } from 'react-dnd-html5-backend'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { useContentTypeLayout, useDragAndDrop } from '../../../hooks'; import { composeRefs, getTrad, ItemTypes } from '../../../utils'; - -import FieldComponent from '../../FieldComponent'; import { ComponentIcon } from '../../ComponentIcon'; +import FieldComponent from '../../FieldComponent'; export const DynamicComponent = ({ componentUid, diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicZoneLabel.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicZoneLabel.js index 4df303ef28..316cec5539 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicZoneLabel.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/DynamicZoneLabel.js @@ -5,10 +5,11 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { pxToRem } from '@strapi/helper-plugin'; + import { Box, Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; export const DynamicZoneLabel = ({ label, diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/AddComponentButton.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/AddComponentButton.test.js index 87d6b50b98..7dfac70631 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/AddComponentButton.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/AddComponentButton.test.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import { AddComponentButton } from '../AddComponentButton'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCard.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCard.test.js index d50b0feeea..7b7dcb2122 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCard.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCard.test.js @@ -1,10 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; - import GlobalStyle from '../../../../../components/GlobalStyle'; - import ComponentCard from '../ComponentCard'; describe('ComponentCard', () => { diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCategory.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCategory.test.js index 4f9ad0b022..6379168d31 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCategory.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentCategory.test.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import { ComponentCategory } from '../ComponentCategory'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentPicker.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentPicker.test.js index 4078d91d97..0b366e2185 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentPicker.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/ComponentPicker.test.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import { ComponentPicker } from '../ComponentPicker'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicComponent.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicComponent.test.js index b002fa95d8..27fe6cfbf7 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicComponent.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicComponent.test.js @@ -1,14 +1,15 @@ import React from 'react'; -import { render as renderRTL, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { IntlProvider } from 'react-intl'; import { DynamicComponent } from '../DynamicComponent'; -import { layoutData, dynamicComponentsByCategory } from './fixtures'; +import { dynamicComponentsByCategory, layoutData } from './fixtures'; jest.mock('../../../../hooks', () => ({ ...jest.requireActual('../../../../hooks'), diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicZoneLabel.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicZoneLabel.test.js index dc211ebabd..f03a193357 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicZoneLabel.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/tests/DynamicZoneLabel.test.js @@ -1,9 +1,9 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { render as renderRTL } from '@testing-library/react'; -import { ThemeProvider, lightTheme, Tooltip } from '@strapi/design-system'; +import { lightTheme, ThemeProvider, Tooltip } from '@strapi/design-system'; import { Earth } from '@strapi/icons'; +import { render as renderRTL } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; import { DynamicZoneLabel } from '../DynamicZoneLabel'; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/index.js index 58b726bbe5..71ad20c839 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/index.js @@ -1,17 +1,17 @@ import React, { useMemo, useState } from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex, VisuallyHidden } from '@strapi/design-system'; -import { NotAllowedInput, useNotification, useCMEditViewDataManager } from '@strapi/helper-plugin'; +import { NotAllowedInput, useCMEditViewDataManager, useNotification } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import { useContentTypeLayout } from '../../hooks'; import { getTrad } from '../../utils'; -import { DynamicComponent } from './components/DynamicComponent'; import { AddComponentButton } from './components/AddComponentButton'; -import { DynamicZoneLabel } from './components/DynamicZoneLabel'; import { ComponentPicker } from './components/ComponentPicker'; - -import { useContentTypeLayout } from '../../hooks'; +import { DynamicComponent } from './components/DynamicComponent'; +import { DynamicZoneLabel } from './components/DynamicZoneLabel'; const DynamicZone = ({ name, labelAction, fieldSchema, metadatas }) => { // We cannot use the default props here diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/tests/index.test.js index 9c58f035b7..9557db2f2d 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/tests/index.test.js @@ -1,11 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { IntlProvider } from 'react-intl'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { IntlProvider } from 'react-intl'; import { DynamicZone } from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js index 5a3ba433a3..1e42ca971d 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js @@ -1,37 +1,35 @@ /* eslint-disable react/jsx-no-constructed-context-values */ -import React, { useCallback, useEffect, useMemo, useRef, useReducer } from 'react'; -import isEmpty from 'lodash/isEmpty'; -import cloneDeep from 'lodash/cloneDeep'; -import get from 'lodash/get'; -import isEqual from 'lodash/isEqual'; -import set from 'lodash/set'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { Prompt, Redirect } from 'react-router-dom'; -import { flushSync } from 'react-dom'; -import { useDispatch, useSelector } from 'react-redux'; +import React, { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'; import { Main } from '@strapi/design-system'; import { - LoadingIndicatorPage, ContentManagerEditViewDataManagerContext, + getAPIInnerErrors, + getYupInnerErrors, + LoadingIndicatorPage, useNotification, useOverlayBlocker, useTracking, - getYupInnerErrors, - getAPIInnerErrors, } from '@strapi/helper-plugin'; +import cloneDeep from 'lodash/cloneDeep'; +import get from 'lodash/get'; +import isEmpty from 'lodash/isEmpty'; +import isEqual from 'lodash/isEqual'; +import set from 'lodash/set'; +import PropTypes from 'prop-types'; +import { flushSync } from 'react-dom'; +import { useIntl } from 'react-intl'; +import { useDispatch, useSelector } from 'react-redux'; +import { Prompt, Redirect } from 'react-router-dom'; -import { createYupSchema, getTrad } from '../../utils'; - +import { usePrev } from '../../hooks'; +import { clearSetModifiedDataOnly } from '../../sharedReducers/crudReducer/actions'; import selectCrudReducer from '../../sharedReducers/crudReducer/selectors'; +import { createYupSchema, getTrad } from '../../utils'; import reducer, { initialState } from './reducer'; import { cleanData } from './utils'; -import { clearSetModifiedDataOnly } from '../../sharedReducers/crudReducer/actions'; -import { usePrev } from '../../hooks'; - const EditViewDataManagerProvider = ({ allLayoutData, allowedActions: { canRead, canUpdate }, diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js index 7153d84c20..19d3926275 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/reducer.js @@ -1,14 +1,15 @@ +import { generateNKeysBetween } from 'fractional-indexing'; import produce from 'immer'; -import unset from 'lodash/unset'; +import cloneDeep from 'lodash/cloneDeep'; import get from 'lodash/get'; import set from 'lodash/set'; import take from 'lodash/take'; -import cloneDeep from 'lodash/cloneDeep'; import uniqBy from 'lodash/uniqBy'; -import { generateNKeysBetween } from 'fractional-indexing'; +import unset from 'lodash/unset'; + +import { getMaxTempKey } from '../../utils'; import { findAllAndReplace, moveFields } from './utils'; -import { getMaxTempKey } from '../../utils'; const initialState = { componentsDataStructure: {}, diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js index e33eff09fe..7505a15921 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js @@ -1,6 +1,7 @@ import get from 'lodash/get'; import isArray from 'lodash/isArray'; import isObject from 'lodash/isObject'; + import { getInitialDataPathUsingTempKeys } from '../../../utils/paths'; /* eslint-disable indent */ diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/index.js index b978c442f9..261fa85387 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/index.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/index.js @@ -1,3 +1,3 @@ -export { default as moveFields } from './moveFields'; export { default as cleanData } from './cleanData'; export { findAllAndReplace } from './findAllAndReplace'; +export { default as moveFields } from './moveFields'; diff --git a/packages/core/admin/admin/src/content-manager/components/FieldComponent/Label.js b/packages/core/admin/admin/src/content-manager/components/FieldComponent/Label.js index 874689eefb..3af37fc573 100644 --- a/packages/core/admin/admin/src/content-manager/components/FieldComponent/Label.js +++ b/packages/core/admin/admin/src/content-manager/components/FieldComponent/Label.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Box, Flex, Typography } from '@strapi/design-system'; const LabelAction = styled(Box)` svg path { diff --git a/packages/core/admin/admin/src/content-manager/components/FieldComponent/index.js b/packages/core/admin/admin/src/content-manager/components/FieldComponent/index.js index 6770ba91d4..bc531d3722 100644 --- a/packages/core/admin/admin/src/content-manager/components/FieldComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/FieldComponent/index.js @@ -1,22 +1,23 @@ /* eslint-disable import/no-cycle */ import React, { memo, useMemo } from 'react'; -import PropTypes from 'prop-types'; -import size from 'lodash/size'; -import isEqual from 'lodash/isEqual'; -import { useIntl } from 'react-intl'; +import { Box, Flex, IconButton } from '@strapi/design-system'; import { NotAllowedInput } from '@strapi/helper-plugin'; import { Trash } from '@strapi/icons'; -import { Box, IconButton, Flex } from '@strapi/design-system'; +import isEqual from 'lodash/isEqual'; +import size from 'lodash/size'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; -import connect from './utils/connect'; -import select from './utils/select'; -import Label from './Label'; +import { useContentTypeLayout } from '../../hooks'; +import { getTrad } from '../../utils'; import ComponentInitializer from '../ComponentInitializer'; import NonRepeatableComponent from '../NonRepeatableComponent'; import RepeatableComponent from '../RepeatableComponent'; -import { useContentTypeLayout } from '../../hooks'; -import { getTrad } from '../../utils'; + +import Label from './Label'; +import connect from './utils/connect'; +import select from './utils/select'; const FieldComponent = ({ addNonRepeatableComponentToField, diff --git a/packages/core/admin/admin/src/content-manager/components/FieldComponent/utils/select.js b/packages/core/admin/admin/src/content-manager/components/FieldComponent/utils/select.js index 5c084dc4b4..3bc43c1c73 100644 --- a/packages/core/admin/admin/src/content-manager/components/FieldComponent/utils/select.js +++ b/packages/core/admin/admin/src/content-manager/components/FieldComponent/utils/select.js @@ -1,10 +1,11 @@ import { useMemo } from 'react'; + +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import get from 'lodash/get'; import take from 'lodash/take'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { getFieldName } from '../../../utils'; import { useContentTypeLayout } from '../../../hooks'; +import { getFieldName } from '../../../utils'; function useSelect({ isFromDynamicZone, name }) { const { diff --git a/packages/core/admin/admin/src/content-manager/components/FieldTypeIcon/index.js b/packages/core/admin/admin/src/content-manager/components/FieldTypeIcon/index.js index e26b86fc62..988d8dc044 100644 --- a/packages/core/admin/admin/src/content-manager/components/FieldTypeIcon/index.js +++ b/packages/core/admin/admin/src/content-manager/components/FieldTypeIcon/index.js @@ -1,21 +1,22 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; import { useCustomFields } from '@strapi/helper-plugin'; import { - Date, Boolean, + Component, + Date, + DynamicZone, Email, Enumeration, + Json, Media, + Number, Relation, Text, Uid, - Number, - Json, - Component, - DynamicZone, } from '@strapi/icons'; +import PropTypes from 'prop-types'; const iconByTypes = { biginteger: , diff --git a/packages/core/admin/admin/src/content-manager/components/Hint/index.js b/packages/core/admin/admin/src/content-manager/components/Hint/index.js index 3831bb43f4..e216bb84b6 100644 --- a/packages/core/admin/admin/src/content-manager/components/Hint/index.js +++ b/packages/core/admin/admin/src/content-manager/components/Hint/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; export const Hint = ({ id, error, name, hint }) => { if (hint.length === 0 || error) { diff --git a/packages/core/admin/admin/src/content-manager/components/InjectionZoneList/index.js b/packages/core/admin/admin/src/content-manager/components/InjectionZoneList/index.js index daa5fb62ff..92b16595cc 100644 --- a/packages/core/admin/admin/src/content-manager/components/InjectionZoneList/index.js +++ b/packages/core/admin/admin/src/content-manager/components/InjectionZoneList/index.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import { useInjectionZone } from '../../../shared/hooks'; const InjectionZoneList = ({ area, ...props }) => { diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/endActionStyle.js b/packages/core/admin/admin/src/content-manager/components/InputUID/endActionStyle.js index 88da2f7ff1..468a043a85 100644 --- a/packages/core/admin/admin/src/content-manager/components/InputUID/endActionStyle.js +++ b/packages/core/admin/admin/src/content-manager/components/InputUID/endActionStyle.js @@ -1,5 +1,5 @@ +import { FieldAction, Flex } from '@strapi/design-system'; import styled, { keyframes } from 'styled-components'; -import { Flex, FieldAction } from '@strapi/design-system'; export const FieldActionWrapper = styled(FieldAction)` svg { diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js index 7b8d6401a4..63f36fc449 100644 --- a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js +++ b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js @@ -1,19 +1,21 @@ -import React, { useEffect, useState, useRef } from 'react'; -import PropTypes from 'prop-types'; +import React, { useEffect, useRef, useState } from 'react'; + +import { Flex, TextInput, Typography } from '@strapi/design-system'; import { + useAPIErrorHandler, useCMEditViewDataManager, useFetchClient, useNotification, - useAPIErrorHandler, } from '@strapi/helper-plugin'; +import { CheckCircle, ExclamationMarkCircle, Loader, Refresh } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Flex, TextInput, Typography } from '@strapi/design-system'; -import { Refresh, CheckCircle, ExclamationMarkCircle, Loader } from '@strapi/icons'; -import { getRequestUrl } from '../../utils'; import useDebounce from '../../../hooks/useDebounce'; +import { getRequestUrl } from '../../utils'; + +import { FieldActionWrapper, LoadingWrapper, TextValidation } from './endActionStyle'; import UID_REGEX from './regex'; -import { FieldActionWrapper, TextValidation, LoadingWrapper } from './endActionStyle'; const InputUID = ({ attribute, diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js index 77a5aa8109..5ec41224d3 100644 --- a/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/InputUID/tests/index.test.js @@ -1,10 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; import userEvent from '@testing-library/user-event'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; +import { IntlProvider } from 'react-intl'; import InputUID from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/components/Inputs/index.js b/packages/core/admin/admin/src/content-manager/components/Inputs/index.js index d52a6ce20a..90057cfc1b 100644 --- a/packages/core/admin/admin/src/content-manager/components/Inputs/index.js +++ b/packages/core/admin/admin/src/content-manager/components/Inputs/index.js @@ -1,16 +1,18 @@ import React, { memo, useMemo } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + +import { GenericInput, NotAllowedInput, useLibrary } from '@strapi/helper-plugin'; import get from 'lodash/get'; +import isEqual from 'lodash/isEqual'; import omit from 'lodash/omit'; import take from 'lodash/take'; -import isEqual from 'lodash/isEqual'; -import { GenericInput, NotAllowedInput, useLibrary } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { useContentTypeLayout } from '../../hooks'; import { getFieldName } from '../../utils'; -import Wysiwyg from '../Wysiwyg'; import InputUID from '../InputUID'; import { RelationInputDataManager } from '../RelationInputDataManager'; +import Wysiwyg from '../Wysiwyg'; import { connect, generateOptions, getInputType, select, VALIDATIONS_TO_OMIT } from './utils'; diff --git a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/select.js b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/select.js index 017e6cfa10..dc2dd88a3d 100644 --- a/packages/core/admin/admin/src/content-manager/components/Inputs/utils/select.js +++ b/packages/core/admin/admin/src/content-manager/components/Inputs/utils/select.js @@ -1,6 +1,7 @@ import { useMemo } from 'react'; -import get from 'lodash/get'; + import { useCMEditViewDataManager } from '@strapi/helper-plugin'; +import get from 'lodash/get'; function useSelect(keys) { const { diff --git a/packages/core/admin/admin/src/content-manager/components/NonRepeatableComponent/index.js b/packages/core/admin/admin/src/content-manager/components/NonRepeatableComponent/index.js index 086da55f94..ea029fc64c 100644 --- a/packages/core/admin/admin/src/content-manager/components/NonRepeatableComponent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/NonRepeatableComponent/index.js @@ -2,12 +2,14 @@ /* eslint-disable import/no-cycle */ import React, { useMemo } from 'react'; + +import { Box, Flex, Grid, GridItem } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, Grid, GridItem, Flex } from '@strapi/design-system'; + import { useContentTypeLayout } from '../../hooks'; +import useLazyComponents from '../../hooks/useLazyComponents'; import FieldComponent from '../FieldComponent'; import Inputs from '../Inputs'; -import useLazyComponents from '../../hooks/useLazyComponents'; const NonRepeatableComponent = ({ componentUid, isFromDynamicZone, isNested, name }) => { const { getComponentLayout } = useContentTypeLayout(); diff --git a/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/index.js b/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/index.js index 42fc3845bb..94b04195ee 100644 --- a/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/index.js +++ b/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/index.js @@ -6,6 +6,7 @@ */ import React, { memo, useMemo } from 'react'; + import PropTypes from 'prop-types'; import md from './utils/mdRenderer'; diff --git a/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/utils/mdRenderer.js b/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/utils/mdRenderer.js index b8c2cf212b..d7770fa766 100644 --- a/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/utils/mdRenderer.js +++ b/packages/core/admin/admin/src/content-manager/components/PreviewWysiwyg/utils/mdRenderer.js @@ -1,6 +1,6 @@ /* eslint-disable prefer-template */ +import { getLanguage, highlight, highlightAuto } from 'highlight.js'; import Markdown from 'markdown-it'; -import { getLanguage, highlightAuto, highlight } from 'highlight.js'; import abbr from 'markdown-it-abbr'; import container from 'markdown-it-container'; import deflist from 'markdown-it-deflist'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/RelationInput.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/RelationInput.js index 2dea8bb112..712cd4ed46 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/RelationInput.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/RelationInput.js @@ -1,37 +1,37 @@ -import React, { useRef, useState, useMemo, useEffect } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { FixedSizeList as List } from 'react-window'; +import React, { useEffect, useMemo, useRef, useState } from 'react'; + +import { + Box, + Field, + FieldError, + FieldHint, + FieldLabel, + Icon, + Link, + Status, + TextButton, + Tooltip, + Typography, + VisuallyHidden, +} from '@strapi/design-system'; /** * TODO: this will come in another PR. */ // eslint-disable-next-line no-restricted-imports import { ReactSelect } from '@strapi/helper-plugin'; -import { - Status, - Box, - Link, - Icon, - FieldLabel, - FieldError, - FieldHint, - Field, - TextButton, - Typography, - Tooltip, - VisuallyHidden, -} from '@strapi/design-system'; - import { Cross, Refresh } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { FixedSizeList as List } from 'react-window'; +import styled from 'styled-components'; +import { usePrev } from '../../hooks'; + +import { Option } from './components/Option'; import { Relation } from './components/Relation'; import { RelationItem } from './components/RelationItem'; import { RelationList } from './components/RelationList'; -import { Option } from './components/Option'; import { RELATION_GUTTER, RELATION_ITEM_HEIGHT } from './constants'; -import { usePrev } from '../../hooks'; - export const LinkEllipsis = styled(Link)` display: block; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js index 9b3ef0cfc6..9f4f88c0e7 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Option.js @@ -1,11 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; -import { components } from 'react-select'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { pxToRem } from '@strapi/helper-plugin'; import { Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { components } from 'react-select'; +import styled from 'styled-components'; import { getTrad } from '../../../utils'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js index 71dd4b3f1f..606e90742d 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/Relation.js @@ -1,7 +1,7 @@ -import PropTypes from 'prop-types'; import React from 'react'; import { Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; export const Relation = ({ children, diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js index e557339511..16a30d517f 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationItem.js @@ -1,15 +1,13 @@ import React, { useEffect } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { getEmptyImage } from 'react-dnd-html5-backend'; import { Box, Flex, IconButton } from '@strapi/design-system'; import { Drag } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { getEmptyImage } from 'react-dnd-html5-backend'; +import styled from 'styled-components'; import { useDragAndDrop } from '../../../hooks/useDragAndDrop'; - import { composeRefs, ItemTypes } from '../../../utils'; - import { RELATION_GUTTER } from '../constants'; export const FlexWrapper = styled(Flex)` diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js index 32e3218efd..1aee2f977d 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/RelationList.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; const ShadowBox = styled(Box)` position: relative; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js index 55cf7bbf0c..df1a401b19 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/Option.test.js @@ -1,13 +1,13 @@ import React from 'react'; -import { render, screen, fireEvent, act } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; /** * TODO: this will come in another PR. */ // eslint-disable-next-line no-restricted-imports import { ReactSelect } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { act, fireEvent, render, screen } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; import { Option } from '../Option'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js index 3616ab8dd6..44bd936aaa 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationItem.test.js @@ -1,6 +1,7 @@ import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen } from '@testing-library/react'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js index 1b935bf413..13f4526fd1 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/components/tests/RelationList.test.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/RelationInput.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/RelationInput.test.js index 20a79f7d56..5d4c253eb7 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/RelationInput.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInput/tests/RelationInput.test.js @@ -1,10 +1,11 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { MemoryRouter } from 'react-router-dom'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { IntlProvider } from 'react-intl'; +import { MemoryRouter } from 'react-router-dom'; import { RelationInput } from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js index ad795e03df..7d7fab9040 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js @@ -1,21 +1,19 @@ /* eslint-disable no-nested-ternary */ -import PropTypes from 'prop-types'; import React, { memo, useMemo, useState } from 'react'; -import { useIntl } from 'react-intl'; + +import { NotAllowedInput, useCMEditViewDataManager } from '@strapi/helper-plugin'; import get from 'lodash/get'; import pick from 'lodash/pick'; - -import { useCMEditViewDataManager, NotAllowedInput } from '@strapi/helper-plugin'; - -import { RelationInput } from '../RelationInput'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { useRelation } from '../../hooks/useRelation'; - import { getTrad } from '../../utils'; +import { getInitialDataPathUsingTempKeys } from '../../utils/paths'; +import { RelationInput } from '../RelationInput'; import { PUBLICATION_STATES, RELATIONS_TO_DISPLAY, SEARCH_RESULTS_TO_DISPLAY } from './constants'; -import { connect, select, normalizeSearchResults, diffRelations, normalizeRelation } from './utils'; -import { getInitialDataPathUsingTempKeys } from '../../utils/paths'; +import { connect, diffRelations, normalizeRelation, normalizeSearchResults, select } from './utils'; export const RelationInputDataManager = ({ error, diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/tests/RelationInputDataManger.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/tests/RelationInputDataManger.test.js index d1180baec0..da8db36c1a 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/tests/RelationInputDataManger.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/tests/RelationInputDataManger.test.js @@ -1,16 +1,16 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { fireEvent, render, act, screen } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { MemoryRouter } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; +import { act, fireEvent, render, screen } from '@testing-library/react'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; - -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { useRelation } from '../../../hooks/useRelation'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; import { RelationInputDataManager } from '..'; +import { useRelation } from '../../../hooks/useRelation'; const queryClient = new QueryClient({ defaultOptions: { diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/index.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/index.js index 682a3045da..614c90551a 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/index.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/index.js @@ -1,5 +1,5 @@ export { default as connect } from './connect'; -export { default as select } from './select'; -export { normalizeRelations, normalizeRelation } from './normalizeRelations'; -export { normalizeSearchResults } from './normalizeSearchResults'; export { diffRelations } from './diffRelations'; +export { normalizeRelation, normalizeRelations } from './normalizeRelations'; +export { normalizeSearchResults } from './normalizeSearchResults'; +export { default as select } from './select'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeRelations.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeRelations.js index 664790f9bc..74dfbde17c 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeRelations.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeRelations.js @@ -1,7 +1,7 @@ -import { getRelationLink } from './getRelationLink'; - import { PUBLICATION_STATES } from '../constants'; +import { getRelationLink } from './getRelationLink'; + export const normalizeRelation = (relation, { shouldAddLink, mainFieldName, targetModel }) => { const nextRelation = { ...relation }; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js index aebfc85bc6..92315db9b2 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js @@ -1,6 +1,7 @@ import { useMemo } from 'react'; -import get from 'lodash/get'; + import { useCMEditViewDataManager } from '@strapi/helper-plugin'; +import get from 'lodash/get'; import { getRequestUrl } from '../../../utils'; diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/tests/select.test.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/tests/select.test.js index 00f8c6a9b9..85ac326c54 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/tests/select.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/tests/select.test.js @@ -1,5 +1,5 @@ import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { renderHook, act } from '@testing-library/react'; +import { act, renderHook } from '@testing-library/react'; import useSelect from '../select'; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Accordion.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Accordion.js index 0418aa8baa..c734f89b3d 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Accordion.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Accordion.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Box, KeyboardNavigable, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Box, Typography, KeyboardNavigable } from '@strapi/design-system'; export const Footer = styled(Box)` overflow: hidden; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Component.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Component.js index 249db3fcad..7b95a01fe3 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Component.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Component.js @@ -1,34 +1,32 @@ /* eslint-disable import/no-cycle */ import React, { memo, useEffect, useRef } from 'react'; -import PropTypes from 'prop-types'; -import { getEmptyImage } from 'react-dnd-html5-backend'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import toString from 'lodash/toString'; -import get from 'lodash/get'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { Accordion, - AccordionToggle, AccordionContent, + AccordionToggle, + Box, + Flex, Grid, GridItem, - Flex, - Box, IconButton, } from '@strapi/design-system'; -import { Trash, Drag } from '@strapi/icons'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; +import { Drag, Trash } from '@strapi/icons'; +import get from 'lodash/get'; +import toString from 'lodash/toString'; +import PropTypes from 'prop-types'; +import { getEmptyImage } from 'react-dnd-html5-backend'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { useDragAndDrop } from '../../../hooks/useDragAndDrop'; - +import useLazyComponents from '../../../hooks/useLazyComponents'; import { composeRefs, getTrad, ItemTypes } from '../../../utils'; - -import Inputs from '../../Inputs'; import FieldComponent from '../../FieldComponent'; +import Inputs from '../../Inputs'; import Preview from './Preview'; -import useLazyComponents from '../../../hooks/useLazyComponents'; const CustomIconButton = styled(IconButton)` background-color: transparent; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Preview.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Preview.js index 08055e08b6..209690f6c6 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Preview.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/Preview.js @@ -1,4 +1,5 @@ import React from 'react'; + import styled from 'styled-components'; const StyledSpan = styled.span` diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Accordion.test.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Accordion.test.js index 1eae41339b..f08fcf75a0 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Accordion.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Accordion.test.js @@ -1,7 +1,8 @@ import * as React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import * as Accordion from '../Accordion'; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Component.test.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Component.test.js index b1e75b41a4..bf6c3ead7c 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Component.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Component.test.js @@ -1,9 +1,10 @@ import * as React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render, screen } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { IntlProvider } from 'react-intl'; import Component from '../Component'; diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Preview.test.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Preview.test.js index 1cc0e6f3f7..65627ec50d 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Preview.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/components/tests/Preview.test.js @@ -1,6 +1,7 @@ import * as React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import Preview from '../Preview'; 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 ffa517c932..fbb6992239 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 @@ -1,21 +1,20 @@ /* eslint-disable import/no-cycle */ import React, { memo, useMemo, useState } from 'react'; + +import { Box, Flex, TextButton, VisuallyHidden } from '@strapi/design-system'; +import { useCMEditViewDataManager, useNotification } from '@strapi/helper-plugin'; +import { Plus } from '@strapi/icons'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import get from 'lodash/get'; -import { useNotification, useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { Box, Flex, TextButton, VisuallyHidden } from '@strapi/design-system'; -import { Plus } from '@strapi/icons'; - -import { getMaxTempKey, getTrad } from '../../utils'; import { useContentTypeLayout } from '../../hooks'; - +import { getMaxTempKey, getTrad } from '../../utils'; import ComponentInitializer from '../ComponentInitializer'; -import Component from './components/Component'; -import * as Accordion from './components/Accordion'; +import * as Accordion from './components/Accordion'; +import Component from './components/Component'; import getComponentErrorKeys from './utils/getComponentErrorKeys'; const TextButtonCustom = styled(TextButton)` diff --git a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/tests/index.test.js index ba6b2b3e5d..2fa921c1a7 100644 --- a/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/RepeatableComponent/tests/index.test.js @@ -1,17 +1,17 @@ import * as React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager, useNotification } from '@strapi/helper-plugin'; import { fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { IntlProvider } from 'react-intl'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; - -import { useCMEditViewDataManager, useNotification } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; - -import { layoutData } from './fixtures'; +import { IntlProvider } from 'react-intl'; import RepeatableComponent from '../index'; +import { layoutData } from './fixtures'; + jest.mock('../../FieldComponent', () => () => "I'm a field component"); jest.mock('../../Inputs', () => () => "I'm inputs"); diff --git a/packages/core/admin/admin/src/content-manager/components/SingleTypeFormWrapper/index.js b/packages/core/admin/admin/src/content-manager/components/SingleTypeFormWrapper/index.js index bb8976c5b5..b8b14baf58 100644 --- a/packages/core/admin/admin/src/content-manager/components/SingleTypeFormWrapper/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SingleTypeFormWrapper/index.js @@ -1,20 +1,22 @@ import { memo, useCallback, useEffect, useRef, useState } from 'react'; -import { useHistory } from 'react-router-dom'; -import { useQueryClient } from 'react-query'; -import get from 'lodash/get'; + import { - useTracking, formatContentTypeData, - useQueryParams, - useNotification, - useGuidedTour, useAPIErrorHandler, useFetchClient, + useGuidedTour, + useNotification, + useQueryParams, + useTracking, } from '@strapi/helper-plugin'; -import { useSelector, useDispatch } from 'react-redux'; -import PropTypes from 'prop-types'; import axios from 'axios'; -import { createDefaultForm, getTrad, removePasswordFieldsFromData } from '../../utils'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; +import { useQueryClient } from 'react-query'; +import { useDispatch, useSelector } from 'react-redux'; +import { useHistory } from 'react-router-dom'; + +import buildQueryString from '../../pages/ListView/utils/buildQueryString'; import { getData, getDataSucceeded, @@ -25,8 +27,9 @@ import { submitSucceeded, } from '../../sharedReducers/crudReducer/actions'; import selectCrudReducer from '../../sharedReducers/crudReducer/selectors'; +import { createDefaultForm, getTrad, removePasswordFieldsFromData } from '../../utils'; + import { getRequestUrl } from './utils'; -import buildQueryString from '../../pages/ListView/utils/buildQueryString'; // This container is used to handle the CRUD const SingleTypeFormWrapper = ({ allLayoutData, children, slug }) => { diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/Editor.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/Editor.js index a3213da5d2..a470857dea 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/Editor.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/Editor.js @@ -1,11 +1,15 @@ import React, { useEffect, useRef } from 'react'; -import PropTypes from 'prop-types'; + import CodeMirror from 'codemirror5'; -import 'codemirror5/addon/display/placeholder'; +import PropTypes from 'prop-types'; + import PreviewWysiwyg from '../PreviewWysiwyg'; + import { EditorStylesContainer } from './EditorStylesContainer'; -import { EditorAndPreviewWrapper } from './WysiwygStyles'; import newlineAndIndentContinueMarkdownList from './utils/continueList'; +import { EditorAndPreviewWrapper } from './WysiwygStyles'; + +import 'codemirror5/addon/display/placeholder'; const Editor = ({ disabled, diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/EditorLayout.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/EditorLayout.js index 3d15eca963..787f96b1f2 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/EditorLayout.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/EditorLayout.js @@ -1,10 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; + import { BaseButton, Box, Flex, FocusTrap, Portal, Typography } from '@strapi/design-system'; -import { Collapse } from '@strapi/icons'; import { pxToRem, useLockScroll } from '@strapi/helper-plugin'; +import { Collapse } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import PreviewWysiwyg from '../PreviewWysiwyg'; diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygFooter.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygFooter.js index 8d3ea1c01f..b85d39db35 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygFooter.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygFooter.js @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Box, Flex, Typography } from '@strapi/design-system'; import { Expand } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { ExpandButton } from './WysiwygStyles'; const WysiwygFooter = ({ onToggleExpand }) => { diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js index 6f431af831..b9a989cf0c 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygNav.js @@ -1,28 +1,29 @@ import React, { useRef, useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { Button, IconButtonGroup, Option, Select, Popover, Flex } from '@strapi/design-system'; + +import { Button, Flex, IconButtonGroup, Option, Popover, Select } from '@strapi/design-system'; import { Bold, - Italic, - Underline, - StrikeThrough, BulletList, - NumberList, Code, - Picture as Image, + Italic, Link, - Quote, More, + NumberList, + Picture as Image, + Quote, + StrikeThrough, + Underline, } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { - MainButtons, CustomIconButton, - MoreButton, - IconButtonGroupMargin, CustomLinkIconButton, + IconButtonGroupMargin, + MainButtons, + MoreButton, } from './WysiwygStyles'; /** diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygStyles.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygStyles.js index f7e735ad6f..987996cd78 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygStyles.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/WysiwygStyles.js @@ -1,5 +1,5 @@ +import { BaseButton, IconButton, IconButtonGroup } from '@strapi/design-system'; import styled from 'styled-components'; -import { IconButtonGroup, IconButton, BaseButton } from '@strapi/design-system'; // NAV BUTTONS export const CustomIconButton = styled(IconButton)` diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js index 0cf3c8fe02..6a5d082887 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/index.js @@ -1,22 +1,24 @@ import React, { useRef, useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { Typography, Box, Flex } from '@strapi/design-system'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import { prefixFileUrlWithBackendUrl, useLibrary } from '@strapi/helper-plugin'; -import Editor from './Editor'; -import WysiwygNav from './WysiwygNav'; -import WysiwygFooter from './WysiwygFooter'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import Hint from '../Hint'; -import { - markdownHandler, - listHandler, - titleHandler, - insertFile, - quoteAndCodeHandler, -} from './utils/utils'; +import Editor from './Editor'; import { EditorLayout } from './EditorLayout'; +import { + insertFile, + listHandler, + markdownHandler, + quoteAndCodeHandler, + titleHandler, +} from './utils/utils'; +import WysiwygFooter from './WysiwygFooter'; +import WysiwygNav from './WysiwygNav'; const LabelAction = styled(Box)` svg path { diff --git a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js index 62166ac669..c6c4b68012 100644 --- a/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js @@ -1,8 +1,10 @@ import * as React from 'react'; -import { IntlProvider } from 'react-intl'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; + import Wysiwyg from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/content-manager/hooks/index.js b/packages/core/admin/admin/src/content-manager/hooks/index.js index ff6e0bf5e9..e2662d6f5e 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/index.js @@ -1,9 +1,9 @@ export { default as useContentTypeLayout } from './useContentTypeLayout'; +export { useDragAndDrop } from './useDragAndDrop'; export { default as useFetchContentTypeLayout } from './useFetchContentTypeLayout'; export { default as useFindRedirectionLink } from './useFindRedirectionLink'; +export { useKeyboardDragAndDrop } from './useKeyboardDragAndDrop'; export { default as usePluginsQueryParams } from './usePluginsQueryParams'; +export { usePrev } from './usePrev'; export { default as useSyncRbac } from './useSyncRbac'; export { default as useWysiwyg } from './useWysiwyg'; -export { usePrev } from './usePrev'; -export { useDragAndDrop } from './useDragAndDrop'; -export { useKeyboardDragAndDrop } from './useKeyboardDragAndDrop'; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useContentTypeLayout/index.js b/packages/core/admin/admin/src/content-manager/hooks/useContentTypeLayout/index.js index fa5661af45..baf67be30a 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useContentTypeLayout/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useContentTypeLayout/index.js @@ -1,5 +1,7 @@ import { useCallback } from 'react'; + import { useSelector } from 'react-redux'; + import selectLayout from '../../pages/EditViewLayoutManager/selectors'; const useContentTypeLayout = () => { diff --git a/packages/core/admin/admin/src/content-manager/hooks/useDragAndDrop.js b/packages/core/admin/admin/src/content-manager/hooks/useDragAndDrop.js index 2371810036..6ea46e4891 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useDragAndDrop.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useDragAndDrop.js @@ -1,4 +1,5 @@ import { useRef } from 'react'; + import { useDrag, useDrop } from 'react-dnd'; import { useKeyboardDragAndDrop } from './useKeyboardDragAndDrop'; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js index 0d34d5dec9..23ed5dbb31 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/index.js @@ -1,11 +1,14 @@ import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'; -import { useSelector, shallowEqual } from 'react-redux'; -import axios from 'axios'; + import { useFetchClient } from '@strapi/helper-plugin'; -import formatLayouts from './utils/formatLayouts'; -import reducer, { initialState } from './reducer'; +import axios from 'axios'; +import { shallowEqual, useSelector } from 'react-redux'; + import { makeSelectModelAndComponentSchemas } from '../../pages/App/selectors'; +import reducer, { initialState } from './reducer'; +import formatLayouts from './utils/formatLayouts'; + const useFetchContentTypeLayout = (contentTypeUID) => { const [{ error, isLoading, layout, layouts }, dispatch] = useReducer(reducer, initialState); const schemasSelector = useMemo(makeSelectModelAndComponentSchemas, []); diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/tests/reducer.test.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/tests/reducer.test.js index ce10c20009..07f3780495 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/tests/reducer.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/tests/reducer.test.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import reducer from '../reducer'; describe('CONTENT MANAGER | hooks | useFetchContentTypeLayout | reducer', () => { diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js index 1bbaf4e7ce..c173db6fe4 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFetchContentTypeLayout/utils/formatLayouts.js @@ -162,6 +162,6 @@ export default formatLayouts; export { formatLayoutWithMetas, formatListLayoutWithMetas, - shouldDisplayRelationLink, getDisplayedModels, + shouldDisplayRelationLink, }; 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 41874ad139..3a1f2c770c 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 @@ -1,8 +1,8 @@ import formatLayouts, { formatLayoutWithMetas, formatListLayoutWithMetas, - shouldDisplayRelationLink, getDisplayedModels, + shouldDisplayRelationLink, } from '../formatLayouts'; describe('Content Manager | hooks | useFetchContentTypeLayout | utils ', () => { diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/index.js b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/index.js index 124fa0a7a1..fdfa17d2e0 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/index.js @@ -1,5 +1,6 @@ -import { useSelector } from 'react-redux'; import { useQueryParams } from '@strapi/helper-plugin'; +import { useSelector } from 'react-redux'; + import selectMenuLinks from './selectors'; import getRedirectionLink from './utils/getRedirectionLink'; 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 9d455fc07d..7e30a13cd8 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 @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import selectMenuLinks from '../selectors'; describe('CONTENT MANAGER | Containers | CollectionTypeFormWrapper | selectors', () => { diff --git a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/utils/getRedirectionLink.js b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/utils/getRedirectionLink.js index 869d8f0db0..0d1f5caf3d 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/utils/getRedirectionLink.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useFindRedirectionLink/utils/getRedirectionLink.js @@ -1,6 +1,6 @@ -import { stringify, parse } from 'qs'; import get from 'lodash/get'; import isObject from 'lodash/isObject'; +import { parse, stringify } from 'qs'; /** * Updates the leafs of the first argument diff --git a/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/index.js b/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/index.js index 4aedef5905..0961b299cd 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/index.js @@ -1,4 +1,5 @@ import { useCallback, useEffect, useState } from 'react'; + import { useCustomFields } from '@strapi/helper-plugin'; const componentStore = new Map(); diff --git a/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/tests/useLazyComponents.test.js b/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/tests/useLazyComponents.test.js index 87de6481f4..c04a06931c 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/tests/useLazyComponents.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useLazyComponents/tests/useLazyComponents.test.js @@ -1,4 +1,5 @@ import { renderHook, waitFor } from '@testing-library/react'; + import useLazyComponents from '../index'; const mockCustomField = { diff --git a/packages/core/admin/admin/src/content-manager/hooks/usePluginsQueryParams/index.js b/packages/core/admin/admin/src/content-manager/hooks/usePluginsQueryParams/index.js index f08e747395..381088c2c9 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/usePluginsQueryParams/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/usePluginsQueryParams/index.js @@ -1,5 +1,5 @@ -import { useLocation } from 'react-router-dom'; import { parse, stringify } from 'qs'; +import { useLocation } from 'react-router-dom'; const usePluginsQueryParams = () => { const { search } = useLocation(); diff --git a/packages/core/admin/admin/src/content-manager/hooks/useRelation/tests/useRelation.test.js b/packages/core/admin/admin/src/content-manager/hooks/useRelation/tests/useRelation.test.js index d86214fb70..8d61b11612 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useRelation/tests/useRelation.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useRelation/tests/useRelation.test.js @@ -1,8 +1,9 @@ import React from 'react'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; import { useFetchClient } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import { useRelation } from '../useRelation'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js b/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js index 7ab2e7cc3a..97bb9693f8 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js @@ -1,7 +1,7 @@ -import { useState, useEffect } from 'react'; -import { useInfiniteQuery } from 'react-query'; +import { useEffect, useState } from 'react'; -import { useFetchClient, useCallbackRef } from '@strapi/helper-plugin'; +import { useCallbackRef, useFetchClient } from '@strapi/helper-plugin'; +import { useInfiniteQuery } from 'react-query'; import { normalizeRelations } from '../../components/RelationInputDataManager/utils'; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/index.js b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/index.js index 64e8f6c1b3..e88b664f7f 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/index.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/index.js @@ -1,7 +1,9 @@ import { useEffect } from 'react'; + import { useDispatch, useSelector } from 'react-redux'; + import { resetPermissions, setPermissions } from './actions'; -import { selectPermissions, selectCollectionTypePermissions } from './selectors'; +import { selectCollectionTypePermissions, selectPermissions } from './selectors'; const useSyncRbac = (query, collectionTypeUID, containerName = 'listView') => { const collectionTypesRelatedPermissions = useSelector(selectCollectionTypePermissions); diff --git a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/reducer.js b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/reducer.js index 42a3cad550..223c75b736 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/reducer.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/reducer.js @@ -4,7 +4,8 @@ */ import produce from 'immer'; -import { SET_PERMISSIONS, RESET_PERMISSIONS } from './constants'; + +import { RESET_PERMISSIONS, SET_PERMISSIONS } from './constants'; export const initialState = { permissions: null, diff --git a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/tests/selectors.test.js b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/tests/selectors.test.js index 773ece61ec..8d73461177 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/tests/selectors.test.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useSyncRbac/tests/selectors.test.js @@ -1,5 +1,6 @@ import { fixtures } from '@strapi/admin-test-utils'; -import { selectPermissions, selectCollectionTypePermissions } from '../selectors'; + +import { selectCollectionTypePermissions, selectPermissions } from '../selectors'; describe('Admin | content manager | hooks | useSyncRbac | selectors', () => { let store; diff --git a/packages/core/admin/admin/src/content-manager/hooks/useWysiwyg.js b/packages/core/admin/admin/src/content-manager/hooks/useWysiwyg.js index 44717dac05..382c5af775 100644 --- a/packages/core/admin/admin/src/content-manager/hooks/useWysiwyg.js +++ b/packages/core/admin/admin/src/content-manager/hooks/useWysiwyg.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import WysiwygContext from '../contexts/Wysiwyg'; const useWysiwyg = () => useContext(WysiwygContext); diff --git a/packages/core/admin/admin/src/content-manager/pages/App/LeftMenu/index.js b/packages/core/admin/admin/src/content-manager/pages/App/LeftMenu/index.js index 3f53c956bf..9e6f8a7e19 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/LeftMenu/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/LeftMenu/index.js @@ -5,18 +5,18 @@ */ import React, { useMemo, useState } from 'react'; -import { useSelector, shallowEqual } from 'react-redux'; -import { useIntl } from 'react-intl'; -import { NavLink } from 'react-router-dom'; import { SubNav, SubNavHeader, + SubNavLink, SubNavSection, SubNavSections, - SubNavLink, } from '@strapi/design-system/v2'; -import { useFilter, useCollator } from '@strapi/helper-plugin'; +import { useCollator, useFilter } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; +import { shallowEqual, useSelector } from 'react-redux'; +import { NavLink } from 'react-router-dom'; import getTrad from '../../../utils/getTrad'; import { makeSelectModelLinks } from '../selectors'; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/components/CardDragPreview.js b/packages/core/admin/admin/src/content-manager/pages/App/components/CardDragPreview.js index 326cc50910..843e2a3950 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/components/CardDragPreview.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/components/CardDragPreview.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { Cross, Drag, Pencil } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Flex, Typography } from '@strapi/design-system'; -import { Pencil, Cross, Drag } from '@strapi/icons'; -import { pxToRem } from '@strapi/helper-plugin'; const ActionBox = styled(Flex)` height: ${({ theme }) => theme.spaces[7]}; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/components/ComponentDragPreview.js b/packages/core/admin/admin/src/content-manager/pages/App/components/ComponentDragPreview.js index 11ad22671c..8230125a24 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/components/ComponentDragPreview.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/components/ComponentDragPreview.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Flex, IconButton, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { CarretDown, Drag, Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { pxToRem } from '@strapi/helper-plugin'; -import { Flex, Typography, IconButton } from '@strapi/design-system'; -import { Trash, Drag, CarretDown } from '@strapi/icons'; const DropdownIconWrapper = styled(Flex)` border-radius: 50%; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/components/RelationDragPreview.js b/packages/core/admin/admin/src/content-manager/pages/App/components/RelationDragPreview.js index 44ca070944..51561f25d0 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/components/RelationDragPreview.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/components/RelationDragPreview.js @@ -1,16 +1,17 @@ import * as React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { Box, Flex, IconButton, Typography, Status, Icon } from '@strapi/design-system'; -import { Drag, Cross } from '@strapi/icons'; -import { getTrad } from '../../../utils'; -import { PUBLICATION_STATES } from '../../../components/RelationInputDataManager/constants'; +import { Box, Flex, Icon, IconButton, Status, Typography } from '@strapi/design-system'; +import { Cross, Drag } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + +import { DisconnectButton, LinkEllipsis } from '../../../components/RelationInput'; import { ChildrenWrapper, FlexWrapper, } from '../../../components/RelationInput/components/RelationItem'; -import { LinkEllipsis, DisconnectButton } from '../../../components/RelationInput'; +import { PUBLICATION_STATES } from '../../../components/RelationInputDataManager/constants'; +import { getTrad } from '../../../utils'; export const RelationDragPreview = ({ status, displayedValue, width }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/pages/App/index.js b/packages/core/admin/admin/src/content-manager/pages/App/index.js index 4d13a8f6b0..0f94e8b73a 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/index.js @@ -1,32 +1,33 @@ import React, { useEffect, useRef } from 'react'; -import { Helmet } from 'react-helmet'; -import { Switch, Route, useRouteMatch, Redirect, useLocation } from 'react-router-dom'; + +import { HeaderLayout, Layout, Main } from '@strapi/design-system'; import { + AnErrorOccurred, CheckPagePermissions, LoadingIndicatorPage, - AnErrorOccurred, useGuidedTour, } from '@strapi/helper-plugin'; -import { Layout, HeaderLayout, Main } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; import sortBy from 'lodash/sortBy'; -import permissions from '../../../permissions'; -import getTrad from '../../utils/getTrad'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; +import { Redirect, Route, Switch, useLocation, useRouteMatch } from 'react-router-dom'; + import { DragLayer } from '../../../components/DragLayer'; +import permissions from '../../../permissions'; import ModelsContext from '../../contexts/ModelsContext'; +import getTrad from '../../utils/getTrad'; +import ItemTypes from '../../utils/ItemTypes'; import CollectionTypeRecursivePath from '../CollectionTypeRecursivePath'; import ComponentSettingsView from '../ComponentSetttingsView'; import NoContentType from '../NoContentType'; import NoPermissions from '../NoPermissions'; import SingleTypeRecursivePath from '../SingleTypeRecursivePath'; -import LeftMenu from './LeftMenu'; -import useContentManagerInitData from './useContentManagerInitData'; - -import ItemTypes from '../../utils/ItemTypes'; import { CardDragPreview } from './components/CardDragPreview'; import { ComponentDragPreview } from './components/ComponentDragPreview'; import { RelationDragPreview } from './components/RelationDragPreview'; +import LeftMenu from './LeftMenu'; +import useContentManagerInitData from './useContentManagerInitData'; const cmPermissions = permissions.contentManager; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/reducer.js b/packages/core/admin/admin/src/content-manager/pages/App/reducer.js index e3dbd20f2f..fdc3ba4f24 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/reducer.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/reducer.js @@ -4,6 +4,7 @@ */ /* eslint-disable consistent-return */ import produce from 'immer'; + import { GET_INIT_DATA, RESET_INIT_DATA, SET_INIT_DATA } from './constants'; const initialState = { diff --git a/packages/core/admin/admin/src/content-manager/pages/App/selectors.js b/packages/core/admin/admin/src/content-manager/pages/App/selectors.js index 8096c8e87a..17f9d642d9 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/selectors.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/selectors.js @@ -1,4 +1,5 @@ import { createSelector } from 'reselect'; + import { initialState } from './reducer'; const selectAppDomain = () => (state) => { @@ -30,6 +31,6 @@ export { makeSelectModelAndComponentSchemas, makeSelectModelLinks, makeSelectModels, - selectFieldSizes, selectAppDomain, + selectFieldSizes, }; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js index 1a9d244088..3e4ae0c003 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js @@ -1,17 +1,19 @@ /* eslint-disable no-irregular-whitespace */ import React from 'react'; -import { createStore, combineReducers } from 'redux'; -import { Router } from 'react-router-dom'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { act, render, screen } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import { Provider } from 'react-redux'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; -import { act, render, screen } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Provider } from 'react-redux'; +import { Router } from 'react-router-dom'; +import { combineReducers, createStore } from 'redux'; + +import { App as ContentManagerApp } from '..'; import Theme from '../../../../components/Theme'; import ThemeToggleProvider from '../../../../components/ThemeToggleProvider'; -import { App as ContentManagerApp } from '..'; import cmReducers from '../../../../reducers'; import useContentManagerInitData from '../useContentManagerInitData'; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/tests/reducer.test.js b/packages/core/admin/admin/src/content-manager/pages/App/tests/reducer.test.js index de21071bff..7848a8c338 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/tests/reducer.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/tests/reducer.test.js @@ -1,5 +1,6 @@ import produce from 'immer'; -import { getInitData, setInitData, resetInitData } from '../actions'; + +import { getInitData, resetInitData, setInitData } from '../actions'; import mainReducer from '../reducer'; describe('Content Manager | App | reducer', () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/App/tests/selectors.test.js b/packages/core/admin/admin/src/content-manager/pages/App/tests/selectors.test.js index ef87d82c6f..83523366d1 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/tests/selectors.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/tests/selectors.test.js @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import { makeSelectModels } from '../selectors'; describe('Content Manager | App | selectors', () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/App/useContentManagerInitData.js b/packages/core/admin/admin/src/content-manager/pages/App/useContentManagerInitData.js index 6d5a679974..27f69a6137 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/useContentManagerInitData.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/useContentManagerInitData.js @@ -1,16 +1,19 @@ +import { useEffect, useRef } from 'react'; + +import { useNotifyAT } from '@strapi/design-system'; import { + useFetchClient, useNotification, useRBACProvider, useStrapiApp, - useFetchClient, } from '@strapi/helper-plugin'; -import { useEffect, useRef } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; -import { useNotifyAT } from '@strapi/design-system'; import axios from 'axios'; import { useIntl } from 'react-intl'; +import { useDispatch, useSelector } from 'react-redux'; + import { MUTATE_COLLECTION_TYPES_LINKS, MUTATE_SINGLE_TYPES_LINKS } from '../../../exposedHooks'; import { getTrad } from '../../utils'; + import { getInitData, resetInitData, setInitData } from './actions'; import { selectAppDomain } from './selectors'; import getContentTypeLinks from './utils/getContentTypeLinks'; diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/getContentTypeLinks.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/getContentTypeLinks.js index 44a5084740..c52e0344f6 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/utils/getContentTypeLinks.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/getContentTypeLinks.js @@ -1,8 +1,10 @@ import { getFetchClient } from '@strapi/helper-plugin'; -import generateModelsLinks from './generateModelsLinks'; -import checkPermissions from './checkPermissions'; + import { getRequestUrl } from '../../../utils'; +import checkPermissions from './checkPermissions'; +import generateModelsLinks from './generateModelsLinks'; + const getContentTypeLinks = async ({ models, userPermissions, toggleNotification }) => { const { get } = getFetchClient(); try { diff --git a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.test.js b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.test.js index 71a65d5f02..841e4b8eda 100644 --- a/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/App/utils/tests/getContentTypeLinks.test.js @@ -1,4 +1,5 @@ import { getFetchClient, hasPermissions } from '@strapi/helper-plugin'; + import getContentTypeLinks from '../getContentTypeLinks'; // FIXME diff --git a/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/components/ErrorFallback.js b/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/components/ErrorFallback.js index 924d39a5d4..b232d1e4a3 100644 --- a/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/components/ErrorFallback.js +++ b/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/components/ErrorFallback.js @@ -1,6 +1,7 @@ import React from 'react'; -import { AnErrorOccurred } from '@strapi/helper-plugin'; + import { Box } from '@strapi/design-system'; +import { AnErrorOccurred } from '@strapi/helper-plugin'; const ErrorFallback = () => { return ( diff --git a/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js b/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js index ad04169ecf..412d06a388 100644 --- a/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js @@ -1,16 +1,19 @@ import React, { memo, useMemo } from 'react'; -import { Switch, Route } from 'react-router-dom'; -import { ErrorBoundary } from 'react-error-boundary'; + +import { CheckPagePermissions, LoadingIndicatorPage } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import { LoadingIndicatorPage, CheckPagePermissions } from '@strapi/helper-plugin'; +import { ErrorBoundary } from 'react-error-boundary'; +import { Route, Switch } from 'react-router-dom'; + import permissions from '../../../permissions'; import { ContentTypeLayoutContext } from '../../contexts'; import { useFetchContentTypeLayout } from '../../hooks'; import { formatLayoutToApi } from '../../utils'; -import EditViewLayoutManager from '../EditViewLayoutManager'; import EditSettingsView from '../EditSettingsView'; -import ListViewLayout from '../ListViewLayoutManager'; +import EditViewLayoutManager from '../EditViewLayoutManager'; import ListSettingsView from '../ListSettingsView'; +import ListViewLayout from '../ListViewLayoutManager'; + import ErrorFallback from './components/ErrorFallback'; const cmPermissions = permissions.contentManager; diff --git a/packages/core/admin/admin/src/content-manager/pages/ComponentSetttingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/ComponentSetttingsView/index.js index 3b6810d5f8..51bb0b961c 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ComponentSetttingsView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ComponentSetttingsView/index.js @@ -1,13 +1,15 @@ import React, { memo, useEffect, useMemo, useReducer } from 'react'; -import { useParams } from 'react-router-dom'; + import { CheckPagePermissions, LoadingIndicatorPage, useFetchClient } from '@strapi/helper-plugin'; -import { useSelector, shallowEqual } from 'react-redux'; import axios from 'axios'; +import { shallowEqual, useSelector } from 'react-redux'; +import { useParams } from 'react-router-dom'; + +import permissions from '../../../permissions'; +import { getData, getDataSucceeded } from '../../sharedReducers/crudReducer/actions'; +import crudReducer, { crudInitialState } from '../../sharedReducers/crudReducer/reducer'; import { mergeMetasWithSchema } from '../../utils'; import { makeSelectModelAndComponentSchemas } from '../App/selectors'; -import permissions from '../../../permissions'; -import crudReducer, { crudInitialState } from '../../sharedReducers/crudReducer/reducer'; -import { getData, getDataSucceeded } from '../../sharedReducers/crudReducer/actions'; import EditSettingsView from '../EditSettingsView'; const cmPermissions = permissions.contentManager; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ComponentFieldList.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ComponentFieldList.js index 94be7071bf..59061382d6 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ComponentFieldList.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ComponentFieldList.js @@ -1,12 +1,14 @@ import React from 'react'; -import PropTypes from 'prop-types'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import { Link } from '@strapi/helper-plugin'; -import { Box, Flex, Typography, Grid, GridItem } from '@strapi/design-system'; import { Cog } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import get from 'lodash/get'; -import { useLayoutDnd } from '../hooks/useLayoutDnd'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; +import { useLayoutDnd } from '../hooks/useLayoutDnd'; const ComponentFieldList = ({ componentUid }) => { const { componentLayouts } = useLayoutDnd(); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFieldButton.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFieldButton.js index 96fe848610..4a9793785e 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFieldButton.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFieldButton.js @@ -1,14 +1,17 @@ -import React, { useRef, useEffect, useState } from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { useDrop, useDrag } from 'react-dnd'; -import { getEmptyImage } from 'react-dnd-html5-backend'; -import { Flex, Box, GridItem } from '@strapi/design-system'; +import React, { useEffect, useRef, useState } from 'react'; + +import { Box, Flex, GridItem } from '@strapi/design-system'; import { Drag } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useDrag, useDrop } from 'react-dnd'; +import { getEmptyImage } from 'react-dnd-html5-backend'; +import styled from 'styled-components'; + import { ItemTypes } from '../../../utils'; -import FieldButtonContent from './FieldButtonContent'; import { useLayoutDnd } from '../hooks/useLayoutDnd'; +import FieldButtonContent from './FieldButtonContent'; + const Wrapper = styled(Flex)` position: relative; ${({ isFirst, isLast, hasHorizontalPadding }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFields.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFields.js index b74cb935e1..bf678e3861 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFields.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DisplayedFields.js @@ -1,11 +1,14 @@ import React from 'react'; + +import { Box, Button, Flex, MenuItem, SimpleMenu, Typography } from '@strapi/design-system'; +import { Plus } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button, Box, Typography, Flex, SimpleMenu, MenuItem } from '@strapi/design-system'; -import { Plus } from '@strapi/icons'; + import { getTrad } from '../../../utils'; -import RowsLayout from './RowsLayout'; + import LinkToCTB from './LinkToCTB'; +import RowsLayout from './RowsLayout'; const DisplayedFields = ({ editLayout, fields, onRemoveField, onAddField }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js index ce0b5dd500..c082e5af87 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/DynamicZoneList.js @@ -1,8 +1,9 @@ import React from 'react'; -import styled from 'styled-components'; -import { Link } from 'react-router-dom'; -import PropTypes from 'prop-types'; + import { Box, Flex, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; import { ComponentIcon } from '../../../components/ComponentIcon'; import { useLayoutDnd } from '../hooks/useLayoutDnd'; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js index b92fdc16af..9ad4820f7b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js @@ -1,10 +1,13 @@ import React from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Box, Flex, IconButton, Typography } from '@strapi/design-system'; import { Pencil, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { getTrad } from '../../../utils'; + import ComponentFieldList from './ComponentFieldList'; import DynamicZoneList from './DynamicZoneList'; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FormModal.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FormModal.js index fcc2dae6ad..57fb018096 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FormModal.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FormModal.js @@ -1,21 +1,24 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import upperFirst from 'lodash/upperFirst'; + import { - ModalLayout, - ModalHeader, - ModalFooter, - ModalBody, - Typography, Button, Flex, Grid, + ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, + Typography, } from '@strapi/design-system'; +import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import styled from 'styled-components'; + +import FieldTypeIcon from '../../../components/FieldTypeIcon'; import { getTrad } from '../../../utils'; import { useLayoutDnd } from '../hooks/useLayoutDnd'; -import FieldTypeIcon from '../../../components/FieldTypeIcon'; + import ModalForm from './ModalForm'; const HeaderContainer = styled(Flex)` diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/GenericInput.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/GenericInput.js index 4aa41925c5..8ecfd6ae8a 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/GenericInput.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/GenericInput.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { Option, Select, TextInput, ToggleInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { TextInput, ToggleInput, Select, Option } from '@strapi/design-system'; import { useIntl } from 'react-intl'; const GenericInput = ({ type, options, onChange, value, name, ...inputProps }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LayoutDndProvider/index.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LayoutDndProvider/index.js index 3835cb9fa9..223d0e412b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LayoutDndProvider/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LayoutDndProvider/index.js @@ -1,4 +1,5 @@ import React from 'react'; + import PropTypes from 'prop-types'; export const LayoutDndContext = React.createContext(); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LinkToCTB.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LinkToCTB.js index c0e776137f..58686d1144 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LinkToCTB.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/LinkToCTB.js @@ -5,10 +5,12 @@ */ import React from 'react'; -import { useTracking, CheckPermissions, LinkButton } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import get from 'lodash/get'; + +import { CheckPermissions, LinkButton, useTracking } from '@strapi/helper-plugin'; import { Pencil } from '@strapi/icons'; +import get from 'lodash/get'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; import { useLayoutDnd } from '../hooks/useLayoutDnd'; 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 d00553f433..b4d86a9db3 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 @@ -1,13 +1,16 @@ -import React, { useMemo, useCallback } from 'react'; -import PropTypes from 'prop-types'; +import React, { useCallback, useMemo } from 'react'; + +import { GridItem, Option, Select } from '@strapi/design-system'; import get from 'lodash/get'; -import { GridItem, Select, Option } from '@strapi/design-system'; -import { useSelector, shallowEqual } from 'react-redux'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import { shallowEqual, useSelector } from 'react-redux'; + +import getTrad from '../../../utils/getTrad'; +import { makeSelectModelAndComponentSchemas, selectFieldSizes } from '../../App/selectors'; import { useLayoutDnd } from '../hooks/useLayoutDnd'; import { createPossibleMainFieldsForModelsAndComponents, getInputProps } from '../utils'; -import { makeSelectModelAndComponentSchemas, selectFieldSizes } from '../../App/selectors'; -import getTrad from '../../../utils/getTrad'; + import GenericInput from './GenericInput'; const FIELD_SIZES = [ diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowItemsLayout.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowItemsLayout.js index 349beef53b..4d056dc1c0 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowItemsLayout.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowItemsLayout.js @@ -1,7 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import get from 'lodash/get'; +import PropTypes from 'prop-types'; + import { useLayoutDnd } from '../hooks/useLayoutDnd'; + import DisplayedFieldButton from './DisplayedFieldButton'; const RowItemsLayout = ({ rowItem, onRemoveField, rowId, rowIndex, index, lastIndex }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowsLayout.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowsLayout.js index 044cb2dd90..e8473596a6 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowsLayout.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/RowsLayout.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Grid } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import RowItemsLayout from './RowItemsLayout'; const RowsLayout = ({ row, onRemoveField, rowIndex }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/hooks/useLayoutDnd.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/hooks/useLayoutDnd.js index 95072fd39d..99a02bf638 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/hooks/useLayoutDnd.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/hooks/useLayoutDnd.js @@ -1,4 +1,5 @@ import * as React from 'react'; + import { LayoutDndContext } from '../components/LayoutDndProvider'; export function useLayoutDnd() { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js index 4df66dd71f..f96f0ed41a 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js @@ -1,41 +1,44 @@ import React, { useReducer, useState } from 'react'; + +import { + Box, + Button, + ContentLayout, + Divider, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + Option, + Select, + Typography, +} from '@strapi/design-system'; +import { ConfirmDialog, Link, useNotification, useTracking } from '@strapi/helper-plugin'; +import { ArrowLeft, Check } from '@strapi/icons'; +import cloneDeep from 'lodash/cloneDeep'; +import flatMap from 'lodash/flatMap'; +import get from 'lodash/get'; +import isEqual from 'lodash/isEqual'; +import pick from 'lodash/pick'; +import set from 'lodash/set'; +import upperFirst from 'lodash/upperFirst'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import { useMutation } from 'react-query'; -import upperFirst from 'lodash/upperFirst'; -import pick from 'lodash/pick'; -import cloneDeep from 'lodash/cloneDeep'; -import flatMap from 'lodash/flatMap'; -import isEqual from 'lodash/isEqual'; -import get from 'lodash/get'; -import set from 'lodash/set'; -import { useNotification, useTracking, ConfirmDialog, Link } from '@strapi/helper-plugin'; -import { useHistory } from 'react-router-dom'; -import { - Main, - HeaderLayout, - ContentLayout, - Button, - Box, - Typography, - Grid, - GridItem, - Select, - Option, - Flex, - Divider, -} from '@strapi/design-system'; -import { ArrowLeft, Check } from '@strapi/icons'; import { useSelector } from 'react-redux'; +import { useHistory } from 'react-router-dom'; + import { getTrad } from '../../utils'; -import reducer, { initialState } from './reducer'; -import init from './init'; +import { selectFieldSizes } from '../App/selectors'; + import DisplayedFields from './components/DisplayedFields'; import ModalForm from './components/FormModal'; import { LayoutDndProvider } from './components/LayoutDndProvider'; -import { unformatLayout } from './utils/layout'; +import init from './init'; +import reducer, { initialState } from './reducer'; import putCMSettingsEV from './utils/api'; -import { selectFieldSizes } from '../App/selectors'; +import { unformatLayout } from './utils/layout'; const EditSettingsView = ({ mainLayout, components, isContentTypeView, slug, updateLayout }) => { const [reducerState, dispatch] = useReducer(reducer, initialState, () => diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/reducer.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/reducer.js index d9cad8c5f8..5e796bc907 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/reducer.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/reducer.js @@ -1,8 +1,10 @@ import produce from 'immer'; -import set from 'lodash/set'; -import get from 'lodash/get'; import cloneDeep from 'lodash/cloneDeep'; +import get from 'lodash/get'; +import set from 'lodash/set'; + import { arrayMoveItem } from '../../utils'; + import { formatLayout, getFieldSize, setFieldSize } from './utils/layout'; const DEFAULT_FIELD_SIZE = 6; 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 a29bb43f60..d9823fcfe6 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 @@ -1,16 +1,18 @@ import React from 'react'; -import { render, waitFor, screen, fireEvent } from '@testing-library/react'; -import { Router } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import { IntlProvider } from 'react-intl'; -import { QueryClient, QueryClientProvider } from 'react-query'; -import { combineReducers, createStore } from 'redux'; -import { Provider } from 'react-redux'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import EditSettingsView from '../index'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Provider } from 'react-redux'; +import { Router } from 'react-router-dom'; +import { combineReducers, createStore } from 'redux'; + import cmReducers from '../../../../reducers'; +import EditSettingsView from '../index'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/api.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/api.js index a91cbd6ecf..bf4e1df272 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/api.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { getRequestUrl } from '../../../utils'; const putCMSettingsEV = (body, slug, isContentTypeView) => { 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 8db770aa50..2d369e5387 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 @@ -103,4 +103,4 @@ const setFieldSize = (name, size, layouts = []) => { }); }; -export { createLayout, formatLayout, getFieldSize, setFieldSize, getRowSize, unformatLayout }; +export { createLayout, formatLayout, getFieldSize, getRowSize, setFieldSize, unformatLayout }; 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 2ba8730b57..ee2499622e 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 @@ -2,8 +2,8 @@ import { createLayout, formatLayout, getFieldSize, - setFieldSize, getRowSize, + setFieldSize, unformatLayout, } from '../layout'; 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 80213e5a18..d6003e526d 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 @@ -1,11 +1,14 @@ import React, { memo, useState } from 'react'; -import { useIntl } from 'react-intl'; -import isEqual from 'lodash/isEqual'; + import { Button } from '@strapi/design-system'; +import { ConfirmDialog, useAPIErrorHandler, useNotification } from '@strapi/helper-plugin'; import { Trash } from '@strapi/icons'; -import { ConfirmDialog, useNotification, useAPIErrorHandler } from '@strapi/helper-plugin'; +import isEqual from 'lodash/isEqual'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../../utils'; + import { connect, select } from './utils'; const DeleteLink = ({ onDelete, trackerProperty }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/utils/select.js b/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/utils/select.js index bf90714945..43bad41e9d 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/utils/select.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/DeleteLink/utils/select.js @@ -1,5 +1,5 @@ -import isEmpty from 'lodash/isEmpty'; import { useCMEditViewDataManager } from '@strapi/helper-plugin'; +import isEmpty from 'lodash/isEmpty'; function useSelect() { const { hasDraftAndPublish, modifiedData } = useCMEditViewDataManager(); 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 4395814daa..239e4d9a14 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 @@ -1,11 +1,14 @@ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { Dot } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Box, Flex, Typography } from '@strapi/design-system'; -import { Dot } from '@strapi/icons'; -import { pxToRem } from '@strapi/helper-plugin'; + import { getTrad } from '../../../utils'; + import { connect, select } from './utils'; const CustomBullet = styled(Dot)` diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/tests/index.test.js index faf76b8a87..b0d4681c0c 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/DraftAndPublishBadge/tests/index.test.js @@ -7,9 +7,11 @@ /* eslint-disable no-irregular-whitespace */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; + import { DraftAndPublishBadge } from '../index'; const makeApp = (props) => ( diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/GridRow/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/GridRow/index.js index 732cc0bf26..b9d91a4b84 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/GridRow/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/GridRow/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Grid, GridItem } from '@strapi/design-system'; -import Inputs from '../../../components/Inputs'; +import PropTypes from 'prop-types'; + import FieldComponent from '../../../components/FieldComponent'; +import Inputs from '../../../components/Inputs'; const GridRow = ({ columns, customFieldInputs }) => { return ( diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js index cdd27193c8..7395074924 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js @@ -1,25 +1,28 @@ import React, { memo, useState } from 'react'; -import { useIntl } from 'react-intl'; -import { useHistory } from 'react-router-dom'; -import PropTypes from 'prop-types'; -import isEqualFastCompare from 'lodash/isEqual'; -import get from 'lodash/get'; -import isEqual from 'lodash/isEqual'; -import isEmpty from 'lodash/isEmpty'; -import { ArrowLeft, Check, ExclamationMarkCircle } from '@strapi/icons'; -import { Link } from '@strapi/helper-plugin'; + import { - HeaderLayout, Box, Button, Dialog, DialogBody, DialogFooter, Flex, + HeaderLayout, Typography, } from '@strapi/design-system'; +import { Link } from '@strapi/helper-plugin'; +import { ArrowLeft, Check, ExclamationMarkCircle } from '@strapi/icons'; +import get from 'lodash/get'; +import isEmpty from 'lodash/isEmpty'; +import isEqualFastCompare from 'lodash/isEqual'; +import isEqual from 'lodash/isEqual'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; + import { getTrad } from '../../../utils'; + import { connect, select } from './utils'; // TODO: replace with textAlign Typography props when available diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js index edbaee84dd..aab4881791 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/tests/index.test.js @@ -5,13 +5,16 @@ */ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { MemoryRouter } from 'react-router-dom'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + import Theme from '../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../components/ThemeToggleProvider'; import { Header } from '../index'; + import ct from './data/ct-schema.json'; const defaultProps = { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js index 1ff45308ff..a08e251b5f 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Information/index.js @@ -1,12 +1,14 @@ import React, { useRef } from 'react'; + +import { Box, Divider, Flex, Typography } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { Box, Divider, Flex, Typography } from '@strapi/design-system'; -import { getTrad } from '../../../utils'; -import getUnits from './utils/getUnits'; import { getFullName } from '../../../../utils'; +import { getTrad } from '../../../utils'; + +import getUnits from './utils/getUnits'; const Title = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Information/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Information/tests/index.test.js index d1818a26aa..1017fe3286 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Information/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Information/tests/index.test.js @@ -5,10 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import Information from '..'; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/InformationBox/tests/InformationBoxCe.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/InformationBox/tests/InformationBoxCe.test.js index 629b65859f..9023b92bef 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/InformationBox/tests/InformationBoxCe.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/InformationBox/tests/InformationBoxCe.test.js @@ -5,10 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { InformationBoxCE } from '../InformationBoxCE'; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js index 16dca54fd8..3b4df1a7ad 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js @@ -1,30 +1,33 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; -import { useSelector } from 'react-redux'; + +import { Box, ContentLayout, Flex, Grid, GridItem, Main } from '@strapi/design-system'; import { CheckPermissions, - useTracking, LinkButton, LoadingIndicatorPage, + useTracking, } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import { ContentLayout, Box, Flex, Grid, GridItem, Main } from '@strapi/design-system'; -import { Pencil, Layer } from '@strapi/icons'; +import { Layer, Pencil } from '@strapi/icons'; import InformationBox from 'ee_else_ce/content-manager/pages/EditView/InformationBox'; -import { InjectionZone } from '../../../shared/components'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useSelector } from 'react-redux'; + import permissions from '../../../permissions'; -import { DynamicZone } from '../../components/DynamicZone'; +import { InjectionZone } from '../../../shared/components'; import CollectionTypeFormWrapper from '../../components/CollectionTypeFormWrapper'; +import { DynamicZone } from '../../components/DynamicZone'; import EditViewDataManagerProvider from '../../components/EditViewDataManagerProvider'; import SingleTypeFormWrapper from '../../components/SingleTypeFormWrapper'; -import { getTrad } from '../../utils'; import useLazyComponents from '../../hooks/useLazyComponents'; -import DraftAndPublishBadge from './DraftAndPublishBadge'; -import Header from './Header'; -import { getFieldsActionMatchingPermissions } from './utils'; +import { getTrad } from '../../utils'; + import DeleteLink from './DeleteLink'; +import DraftAndPublishBadge from './DraftAndPublishBadge'; import GridRow from './GridRow'; -import { selectCurrentLayout, selectAttributesLayout, selectCustomFieldUids } from './selectors'; +import Header from './Header'; +import { selectAttributesLayout, selectCurrentLayout, selectCustomFieldUids } from './selectors'; +import { getFieldsActionMatchingPermissions } from './utils'; const cmPermissions = permissions.contentManager; const ctbPermissions = [{ action: 'plugin::content-type-builder.read', subject: null }]; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/selectors.js b/packages/core/admin/admin/src/content-manager/pages/EditView/selectors.js index 648c2c8dee..cd7231ad71 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/selectors.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/selectors.js @@ -1,4 +1,5 @@ import { createSelector } from 'reselect'; + import { createAttributesLayout, getCustomFieldUidsFromLayout } from './utils'; const selectCurrentLayout = (state) => state['content-manager_editViewLayoutManager'].currentLayout; @@ -11,4 +12,4 @@ const selectCustomFieldUids = createSelector(selectCurrentLayout, (layout) => getCustomFieldUidsFromLayout(layout) ); -export { selectCurrentLayout, selectAttributesLayout, selectCustomFieldUids }; +export { selectAttributesLayout, selectCurrentLayout, selectCustomFieldUids }; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/getFieldsActionMatchingPermissions.js b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/getFieldsActionMatchingPermissions.js index c2067a1fe6..a6ff0eb08f 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/getFieldsActionMatchingPermissions.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/getFieldsActionMatchingPermissions.js @@ -1,6 +1,6 @@ -import uniq from 'lodash/uniq'; -import flatMap from 'lodash/flatMap'; import { findMatchingPermissions } from '@strapi/helper-plugin'; +import flatMap from 'lodash/flatMap'; +import uniq from 'lodash/uniq'; const getFieldsActionMatchingPermissions = (userPermissions, slug) => { const getMatchingPermissions = (action) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/index.js index c408b5b3a4..3eb59a7ca3 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/index.js @@ -1,4 +1,4 @@ // eslint-disable-next-line import/prefer-default-export export { default as createAttributesLayout } from './createAttributesLayout'; -export { default as getFieldsActionMatchingPermissions } from './getFieldsActionMatchingPermissions'; export { default as getCustomFieldUidsFromLayout } from './getCustomFieldUidsFromLayout'; +export { default as getFieldsActionMatchingPermissions } from './getFieldsActionMatchingPermissions'; diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/tests/getFieldsActionMatchingPermissions.test.js b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/tests/getFieldsActionMatchingPermissions.test.js index cc5f14d49a..b90b4cf2ea 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/utils/tests/getFieldsActionMatchingPermissions.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/utils/tests/getFieldsActionMatchingPermissions.test.js @@ -1,5 +1,5 @@ -import getFieldsActionMatchingPermissions from '../getFieldsActionMatchingPermissions'; import { permissions } from '../../../../testUtils'; +import getFieldsActionMatchingPermissions from '../getFieldsActionMatchingPermissions'; describe('CONTENT MANAGER | CONTAINERS | EditView | utils | getFieldsActionMatchingPermissions', () => { it('should return an object with all the allowed action for the fields', () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/Permissions.js b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/Permissions.js index fefbe2629b..2ea49049e1 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/Permissions.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/Permissions.js @@ -1,9 +1,11 @@ import React, { memo, useMemo } from 'react'; -import PropTypes from 'prop-types'; -import { useRBAC, LoadingIndicatorPage } from '@strapi/helper-plugin'; + +import { LoadingIndicatorPage, useRBAC } from '@strapi/helper-plugin'; import isEqual from 'lodash/isEqual'; -import EditView from '../EditView'; +import PropTypes from 'prop-types'; + import { generatePermissionsObject } from '../../utils'; +import EditView from '../EditView'; const Permissions = (props) => { const viewPermissions = useMemo(() => generatePermissionsObject(props.slug), [props.slug]); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/index.js b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/index.js index 89bfe81446..c811983301 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/index.js @@ -1,12 +1,15 @@ import React, { useEffect } from 'react'; + +import { LoadingIndicatorPage, useQueryParams, useStrapiApp } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useDispatch, useSelector } from 'react-redux'; -import { LoadingIndicatorPage, useQueryParams, useStrapiApp } from '@strapi/helper-plugin'; + import { MUTATE_EDIT_VIEW_LAYOUT } from '../../../exposedHooks'; import { useSyncRbac } from '../../hooks'; + import { resetProps, setLayout } from './actions'; -import selectLayout from './selectors'; import Permissions from './Permissions'; +import selectLayout from './selectors'; const EditViewLayoutManager = ({ layout, ...rest }) => { const currentLayout = useSelector(selectLayout); diff --git a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/reducer.js b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/reducer.js index d37d87e4c2..775a60b5fe 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/reducer.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditViewLayoutManager/reducer.js @@ -4,6 +4,7 @@ */ import produce from 'immer'; + import { RESET_PROPS, SET_LAYOUT } from './constants'; export const initialState = { diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js index da97957363..9f734d10b8 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/DraggableCard.js @@ -1,14 +1,15 @@ import React, { useEffect, useRef, useState } from 'react'; -import styled from 'styled-components'; + +import { Box, Flex, Typography } from '@strapi/design-system'; +import { Cross, Drag, Pencil } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useDrag, useDrop } from 'react-dnd'; import { getEmptyImage } from 'react-dnd-html5-backend'; import { useIntl } from 'react-intl'; -import { Flex, Box, Typography } from '@strapi/design-system'; -import { Pencil, Cross, Drag } from '@strapi/icons'; +import styled from 'styled-components'; -import { CardDragPreview } from '../../App/components/CardDragPreview'; import { getTrad, ItemTypes } from '../../../utils'; +import { CardDragPreview } from '../../App/components/CardDragPreview'; const ActionButton = styled.button` display: flex; diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js index 9e85d41342..d9456e0390 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js @@ -1,23 +1,25 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import upperFirst from 'lodash/upperFirst'; -import styled from 'styled-components'; + import { - ModalLayout, - ModalHeader, - ModalFooter, - ModalBody, - Typography, Button, Flex, Grid, GridItem, + ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, TextInput, ToggleInput, + Typography, } from '@strapi/design-system'; -import { getTrad } from '../../../utils'; +import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import FieldTypeIcon from '../../../components/FieldTypeIcon'; +import { getTrad } from '../../../utils'; const HeaderContainer = styled(Flex)` svg { diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/Settings.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/Settings.js index 9140c52332..e301e0d4fd 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/Settings.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/Settings.js @@ -1,16 +1,18 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Box, + Flex, Grid, GridItem, - Select, Option, + Select, ToggleInput, Typography, - Flex, } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../../utils'; const Settings = ({ modifiedData, onChange, sortOptions }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js index 4bf99efa53..d94c03ac10 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/SortDisplayedFields.js @@ -1,12 +1,15 @@ -import React, { useState, useRef, useEffect } from 'react'; -import styled from 'styled-components'; +import React, { useEffect, useRef, useState } from 'react'; + +import { Box, Flex, IconButton, MenuItem, SimpleMenu, Typography } from '@strapi/design-system'; +import { Plus } from '@strapi/icons'; import { PropTypes } from 'prop-types'; import { useIntl } from 'react-intl'; -import { Box, Flex, Typography, SimpleMenu, MenuItem, IconButton } from '@strapi/design-system'; -import { Plus } from '@strapi/icons'; -import DraggableCard from './DraggableCard'; +import styled from 'styled-components'; + import { getTrad } from '../../../utils'; +import DraggableCard from './DraggableCard'; + const FlexWrapper = styled(Box)` flex: ${({ size }) => size}; `; diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js index b23d6e5032..1ed1cbfc96 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js @@ -1,40 +1,42 @@ import React, { memo, useContext, useReducer, useState } from 'react'; -import PropTypes from 'prop-types'; -import { useMutation } from 'react-query'; -import isEqual from 'lodash/isEqual'; -import upperFirst from 'lodash/upperFirst'; -import pick from 'lodash/pick'; -import get from 'lodash/get'; -import isEmpty from 'lodash/isEmpty'; -import { stringify } from 'qs'; + +import { + Box, + Button, + ContentLayout, + Divider, + HeaderLayout, + Layout, + Main, +} from '@strapi/design-system'; import { - useNotification, - useTracking, ConfirmDialog, Link, useFetchClient, + useNotification, + useTracking, } from '@strapi/helper-plugin'; +import { ArrowLeft, Check } from '@strapi/icons'; +import get from 'lodash/get'; +import isEmpty from 'lodash/isEmpty'; +import isEqual from 'lodash/isEqual'; +import pick from 'lodash/pick'; +import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; +import { stringify } from 'qs'; import { useIntl } from 'react-intl'; -import { - Box, - Divider, - Layout, - HeaderLayout, - ContentLayout, - Main, - Button, -} from '@strapi/design-system'; -import { Check, ArrowLeft } from '@strapi/icons'; +import { useMutation } from 'react-query'; -import { checkIfAttributeIsDisplayable, getTrad } from '../../utils'; import ModelsContext from '../../contexts/ModelsContext'; import { usePluginsQueryParams } from '../../hooks'; +import { checkIfAttributeIsDisplayable, getTrad } from '../../utils'; + +import EditFieldForm from './components/EditFieldForm'; import Settings from './components/Settings'; import SortDisplayedFields from './components/SortDisplayedFields'; -import EditFieldForm from './components/EditFieldForm'; +import { EXCLUDED_SORT_ATTRIBUTE_TYPES } from './constants'; import init from './init'; import reducer, { initialState } from './reducer'; -import { EXCLUDED_SORT_ATTRIBUTE_TYPES } from './constants'; const ListSettingsView = ({ layout, slug }) => { const { put } = useFetchClient(); diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/reducer.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/reducer.js index cb9d38ef12..b2ffb191f4 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/reducer.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/reducer.js @@ -1,6 +1,7 @@ import produce from 'immer'; // current -import set from 'lodash/set'; import get from 'lodash/get'; +import set from 'lodash/set'; + import { arrayMoveItem } from '../../utils'; const initialState = { diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js index 08a8819a8c..ac966c09b6 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js @@ -1,14 +1,16 @@ import React from 'react'; -import { act, render, waitFor, screen, fireEvent } from '@testing-library/react'; -import { Router } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import { IntlProvider } from 'react-intl'; -import { QueryClient, QueryClientProvider } from 'react-query'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import ListSettingsView from '../index'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Router } from 'react-router-dom'; + import ModelsContext from '../../../contexts/ModelsContext'; +import ListSettingsView from '../index'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js index 0fe4b373f7..afc474ca9d 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/FieldPicker/index.js @@ -1,13 +1,16 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; -import { useDispatch, useSelector } from 'react-redux'; -import { useIntl } from 'react-intl'; -import { Select, Option, Box } from '@strapi/design-system'; + +import { Box, Option, Select } from '@strapi/design-system'; import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useDispatch, useSelector } from 'react-redux'; + +import getTrad from '../../../utils/getTrad'; import { onChangeListHeaders } from '../actions'; import { selectDisplayedHeaders } from '../selectors'; + import getAllAllowedHeaders from './utils/getAllAllowedHeader'; -import getTrad from '../../../utils/getTrad'; const FieldPicker = ({ layout }) => { const dispatch = useDispatch(); diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/PaginationFooter/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/PaginationFooter/index.js index f613b47de7..c1fa281ee1 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/PaginationFooter/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/PaginationFooter/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; -import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin'; +import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; const PaginationFooter = ({ pagination }) => { return ( 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 6202a8c4d7..a975000e89 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 @@ -1,54 +1,50 @@ import React, { memo, useCallback, useEffect, useRef } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { connect } from 'react-redux'; -import isEqual from 'lodash/isEqual'; -import { bindActionCreators, compose } from 'redux'; -import { useIntl } from 'react-intl'; -import { useHistory, useLocation, Link as ReactRouterLink } from 'react-router-dom'; -import { stringify } from 'qs'; -import axios from 'axios'; import { - NoPermissions, - CheckPermissions, - SearchURLQuery, - useFetchClient, - useFocusWhenNavigate, - useQueryParams, - useNotification, - useRBACProvider, - useTracking, - Link, - useAPIErrorHandler, - getYupInnerErrors, -} from '@strapi/helper-plugin'; - -import { - IconButton, - Main, - Box, ActionLayout, + Box, + Button, ContentLayout, HeaderLayout, + IconButton, + Main, useNotifyAT, - Button, } from '@strapi/design-system'; - -import { ArrowLeft, Plus, Cog } from '@strapi/icons'; +import { + CheckPermissions, + getYupInnerErrors, + Link, + NoPermissions, + SearchURLQuery, + useAPIErrorHandler, + useFetchClient, + useFocusWhenNavigate, + useNotification, + useQueryParams, + useRBACProvider, + useTracking, +} from '@strapi/helper-plugin'; +import { ArrowLeft, Cog, Plus } from '@strapi/icons'; +import axios from 'axios'; +import isEqual from 'lodash/isEqual'; +import PropTypes from 'prop-types'; +import { stringify } from 'qs'; +import { useIntl } from 'react-intl'; import { useMutation } from 'react-query'; - -import DynamicTable from '../../components/DynamicTable'; -import AttributeFilter from '../../components/AttributeFilter'; -import { InjectionZone } from '../../../shared/components'; +import { connect } from 'react-redux'; +import { Link as ReactRouterLink, useHistory, useLocation } from 'react-router-dom'; +import { bindActionCreators, compose } from 'redux'; +import styled from 'styled-components'; import permissions from '../../../permissions'; - +import { InjectionZone } from '../../../shared/components'; +import AttributeFilter from '../../components/AttributeFilter'; +import DynamicTable from '../../components/DynamicTable'; import { createYupSchema, getRequestUrl, getTrad } from '../../utils'; +import { getData, getDataSucceeded, onChangeListHeaders, onResetListHeaders } from './actions'; import FieldPicker from './FieldPicker'; import PaginationFooter from './PaginationFooter'; -import { getData, getDataSucceeded, onChangeListHeaders, onResetListHeaders } from './actions'; import makeSelectListView from './selectors'; import { buildQueryString } from './utils'; diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/reducer.js b/packages/core/admin/admin/src/content-manager/pages/ListView/reducer.js index 566881165c..61f32dc7e8 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/reducer.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/reducer.js @@ -5,12 +5,13 @@ import produce from 'immer'; import get from 'lodash/get'; + import { GET_DATA, GET_DATA_SUCCEEDED, - RESET_PROPS, ON_CHANGE_LIST_HEADERS, ON_RESET_LIST_HEADERS, + RESET_PROPS, SET_LIST_LAYOUT, } from './constants'; 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 96f4406423..b7e1cf7e76 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 @@ -1,4 +1,5 @@ import { createSelector } from 'reselect'; + import { initialState } from './reducer'; /** diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/tests/reducer.test.js b/packages/core/admin/admin/src/content-manager/pages/ListView/tests/reducer.test.js index 6585646e87..06eaaa5509 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/tests/reducer.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/tests/reducer.test.js @@ -1,6 +1,6 @@ import produce from 'immer'; -import { getData, getDataSucceeded } from '../actions'; +import { getData, getDataSucceeded } from '../actions'; import reducer from '../reducer'; describe('CONTENT MANAGER | CONTAINERS | ListView | reducer', () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/utils/buildQueryString.js b/packages/core/admin/admin/src/content-manager/pages/ListView/utils/buildQueryString.js index 68981a6356..6fe2ad8f3b 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/utils/buildQueryString.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/utils/buildQueryString.js @@ -1,5 +1,6 @@ -import { stringify } from 'qs'; import set from 'lodash/set'; +import { stringify } from 'qs'; + import createPluginsFilter from './createPluginsFilter'; /** diff --git a/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/Permissions.js b/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/Permissions.js index 5038761b57..fbee02b5dc 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/Permissions.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/Permissions.js @@ -1,9 +1,10 @@ import React, { memo, useMemo } from 'react'; -import PropTypes from 'prop-types'; -import { useRBAC, LoadingIndicatorPage, difference } from '@strapi/helper-plugin'; -import ListView from '../ListView'; +import { difference, LoadingIndicatorPage, useRBAC } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import { generatePermissionsObject } from '../../utils'; +import ListView from '../ListView'; const Permissions = (props) => { const viewPermissions = useMemo(() => generatePermissionsObject(props.slug), [props.slug]); diff --git a/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/index.js b/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/index.js index ffcc1c7876..870de7b975 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListViewLayoutManager/index.js @@ -1,10 +1,13 @@ import React, { useEffect } from 'react'; -import { useDispatch } from 'react-redux'; -import PropTypes from 'prop-types'; -import { useHistory } from 'react-router-dom'; + import { useQueryParams } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useDispatch } from 'react-redux'; +import { useHistory } from 'react-router-dom'; + import { useFindRedirectionLink, useSyncRbac } from '../../hooks'; import { resetProps, setLayout } from '../ListView/actions'; + import Permissions from './Permissions'; const ListViewLayout = ({ layout, ...props }) => { diff --git a/packages/core/admin/admin/src/content-manager/pages/NoContentType/index.js b/packages/core/admin/admin/src/content-manager/pages/NoContentType/index.js index 4094837610..117c8e46a8 100644 --- a/packages/core/admin/admin/src/content-manager/pages/NoContentType/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/NoContentType/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import { useFocusWhenNavigate, LinkButton } from '@strapi/helper-plugin'; -import { Main, ContentLayout, HeaderLayout, EmptyStateLayout } from '@strapi/design-system'; -import { Plus, EmptyDocuments } from '@strapi/icons'; + +import { ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system'; +import { LinkButton, useFocusWhenNavigate } from '@strapi/helper-plugin'; +import { EmptyDocuments, Plus } from '@strapi/icons'; import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; const NoContentType = () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js index f896175ae8..fca9b1786c 100644 --- a/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/NoContentType/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { render } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + import Theme from '../../../../components/Theme'; import ThemeToggleProvider from '../../../../components/ThemeToggleProvider'; import NoContentType from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/pages/NoPermissions/index.js b/packages/core/admin/admin/src/content-manager/pages/NoPermissions/index.js index a15ba98d25..cf21c1d736 100644 --- a/packages/core/admin/admin/src/content-manager/pages/NoPermissions/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/NoPermissions/index.js @@ -1,7 +1,9 @@ import React from 'react'; -import { useFocusWhenNavigate, NoPermissions as NoPermissionsCompo } from '@strapi/helper-plugin'; -import { Main, ContentLayout, HeaderLayout } from '@strapi/design-system'; + +import { ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; +import { NoPermissions as NoPermissionsCompo, useFocusWhenNavigate } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; const NoPermissions = () => { diff --git a/packages/core/admin/admin/src/content-manager/pages/NoPermissions/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/NoPermissions/tests/index.test.js index c1c624b038..cb50174020 100644 --- a/packages/core/admin/admin/src/content-manager/pages/NoPermissions/tests/index.test.js +++ b/packages/core/admin/admin/src/content-manager/pages/NoPermissions/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + import Theme from '../../../../components/Theme'; import ThemeToggleProvider from '../../../../components/ThemeToggleProvider'; import NoPermissions from '../index'; diff --git a/packages/core/admin/admin/src/content-manager/pages/SingleTypeRecursivePath/index.js b/packages/core/admin/admin/src/content-manager/pages/SingleTypeRecursivePath/index.js index cca5838216..f13304e8b4 100644 --- a/packages/core/admin/admin/src/content-manager/pages/SingleTypeRecursivePath/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/SingleTypeRecursivePath/index.js @@ -1,13 +1,15 @@ import React, { memo, useMemo } from 'react'; -import { Switch, Route } from 'react-router-dom'; + +import { CheckPagePermissions, LoadingIndicatorPage } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import { LoadingIndicatorPage, CheckPagePermissions } from '@strapi/helper-plugin'; +import { Route, Switch } from 'react-router-dom'; + import permissions from '../../../permissions'; import { ContentTypeLayoutContext } from '../../contexts'; import { useFetchContentTypeLayout } from '../../hooks'; import { formatLayoutToApi } from '../../utils'; -import EditViewLayoutManager from '../EditViewLayoutManager'; import EditSettingsView from '../EditSettingsView'; +import EditViewLayoutManager from '../EditViewLayoutManager'; const cmPermissions = permissions.contentManager; diff --git a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/actions.js b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/actions.js index 6ab1651c05..bccfd30ac2 100644 --- a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/actions.js +++ b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/actions.js @@ -1,4 +1,5 @@ import { + CLEAR_SET_MODIFIED_DATA_ONLY, GET_DATA, GET_DATA_SUCCEEDED, INIT_FORM, @@ -6,7 +7,6 @@ import { SET_DATA_STRUCTURES, SET_STATUS, SUBMIT_SUCCEEDED, - CLEAR_SET_MODIFIED_DATA_ONLY, } from './constants'; export const getData = () => { diff --git a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/reducer.js b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/reducer.js index ba6d2106b1..1fc2d508d6 100644 --- a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/reducer.js +++ b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/reducer.js @@ -6,7 +6,6 @@ import produce from 'immer'; // and force us to either disable the linter for the hooks dependencies array rule or // require us to add the dispatch to the array wich is not wanted. This refacto does not require us to // to do any of this. - import { CLEAR_SET_MODIFIED_DATA_ONLY, GET_DATA, diff --git a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/tests/crudReducer.test.js b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/tests/crudReducer.test.js index df6a724ba5..688f8b3d29 100644 --- a/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/tests/crudReducer.test.js +++ b/packages/core/admin/admin/src/content-manager/sharedReducers/crudReducer/tests/crudReducer.test.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import { GET_DATA, GET_DATA_SUCCEEDED, diff --git a/packages/core/admin/admin/src/content-manager/testUtils/index.js b/packages/core/admin/admin/src/content-manager/testUtils/index.js index 7af64950a3..bf330bd6b4 100644 --- a/packages/core/admin/admin/src/content-manager/testUtils/index.js +++ b/packages/core/admin/admin/src/content-manager/testUtils/index.js @@ -1,3 +1,3 @@ import testData, { permissions } from './data'; -export { testData, permissions }; +export { permissions, testData }; diff --git a/packages/core/admin/admin/src/content-manager/utils/index.js b/packages/core/admin/admin/src/content-manager/utils/index.js index d7acba69a7..299703b1ab 100644 --- a/packages/core/admin/admin/src/content-manager/utils/index.js +++ b/packages/core/admin/admin/src/content-manager/utils/index.js @@ -1,22 +1,15 @@ export { default as arrayMoveItem } from './arrayMoveItem'; - export { default as checkIfAttributeIsDisplayable } from './checkIfAttributeIsDisplayable'; export { composeRefs } from './composeRefs'; export { default as createDefaultForm } from './createDefaultForm'; - export { default as formatLayoutToApi } from './formatLayoutToApi'; - export { default as generatePermissionsObject } from './generatePermissionsObject'; export { default as getFieldName } from './getFieldName'; export { default as getMaxTempKey } from './getMaxTempKey'; export { default as getRequestUrl } from './getRequestUrl'; export { default as getTrad } from './getTrad'; - export { default as ItemTypes } from './ItemTypes'; - export { default as mergeMetasWithSchema } from './mergeMetasWithSchema'; - export { default as removeKeyInObject } from './removeKeyInObject'; export { default as removePasswordFieldsFromData } from './removePasswordFieldsFromData'; - export { default as createYupSchema } from './schema'; diff --git a/packages/core/admin/admin/src/content-manager/utils/removePasswordFieldsFromData.js b/packages/core/admin/admin/src/content-manager/utils/removePasswordFieldsFromData.js index 39bd8a5011..850142efb4 100644 --- a/packages/core/admin/admin/src/content-manager/utils/removePasswordFieldsFromData.js +++ b/packages/core/admin/admin/src/content-manager/utils/removePasswordFieldsFromData.js @@ -1,5 +1,5 @@ +import { getOtherInfos, getType } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import { getType, getOtherInfos } from '@strapi/helper-plugin'; const removePasswordFieldsFromData = (data, contentTypeSchema, componentSchema) => { const recursiveCleanData = (data, schema) => { diff --git a/packages/core/admin/admin/src/content-manager/utils/schema.js b/packages/core/admin/admin/src/content-manager/utils/schema.js index d58e4bdd50..a42e2b4c6d 100644 --- a/packages/core/admin/admin/src/content-manager/utils/schema.js +++ b/packages/core/admin/admin/src/content-manager/utils/schema.js @@ -1,11 +1,10 @@ +import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; import get from 'lodash/get'; import isBoolean from 'lodash/isBoolean'; import isEmpty from 'lodash/isEmpty'; import isNaN from 'lodash/isNaN'; import toNumber from 'lodash/toNumber'; - import * as yup from 'yup'; -import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; import isFieldTypeNumber from './isFieldTypeNumber'; diff --git a/packages/core/admin/admin/src/contexts/ApiTokenPermissions/index.js b/packages/core/admin/admin/src/contexts/ApiTokenPermissions/index.js index 3697825046..e41506aae4 100644 --- a/packages/core/admin/admin/src/contexts/ApiTokenPermissions/index.js +++ b/packages/core/admin/admin/src/contexts/ApiTokenPermissions/index.js @@ -1,4 +1,5 @@ import React, { createContext, useContext } from 'react'; + import PropTypes from 'prop-types'; const ApiTokenPermissionsContext = createContext({}); diff --git a/packages/core/admin/admin/src/contexts/MarketPlace/index.js b/packages/core/admin/admin/src/contexts/MarketPlace/index.js index 830222b934..30b2b9370b 100644 --- a/packages/core/admin/admin/src/contexts/MarketPlace/index.js +++ b/packages/core/admin/admin/src/contexts/MarketPlace/index.js @@ -1,4 +1,5 @@ import React, { createContext, useContext } from 'react'; + import PropTypes from 'prop-types'; const MarketPlaceContext = createContext({}); diff --git a/packages/core/admin/admin/src/core/apis/index.js b/packages/core/admin/admin/src/core/apis/index.js index 621ebdf8d9..cd77555b27 100644 --- a/packages/core/admin/admin/src/core/apis/index.js +++ b/packages/core/admin/admin/src/core/apis/index.js @@ -1,6 +1,6 @@ -export { default as Fields } from './Fields'; export { default as Components } from './Components'; +export { default as customFields } from './CustomFields'; +export { default as Fields } from './Fields'; export { default as Middlewares } from './Middlewares'; export { default as Plugin } from './Plugin'; export { default as Reducers } from './Reducers'; -export { default as customFields } from './CustomFields'; diff --git a/packages/core/admin/admin/src/core/store/configureStore.js b/packages/core/admin/admin/src/core/store/configureStore.js index a25be1a4f5..f881dbebcf 100644 --- a/packages/core/admin/admin/src/core/store/configureStore.js +++ b/packages/core/admin/admin/src/core/store/configureStore.js @@ -1,4 +1,4 @@ -import { createStore, applyMiddleware, compose, combineReducers } from 'redux'; +import { applyMiddleware, combineReducers, compose, createStore } from 'redux'; const configureStore = (appMiddlewares, appReducers) => { let composeEnhancers = compose; diff --git a/packages/core/admin/admin/src/hooks/index.js b/packages/core/admin/admin/src/hooks/index.js index c740cd9d75..d315aac478 100644 --- a/packages/core/admin/admin/src/hooks/index.js +++ b/packages/core/admin/admin/src/hooks/index.js @@ -2,13 +2,13 @@ export { default as useConfigurations } from './useConfigurations'; export { useContentTypes } from './useContentTypes'; export { default as useFetchPermissionsLayout } from './useFetchPermissionsLayout'; export { default as useFetchRole } from './useFetchRole'; -export { default as useMenu } from './useMenu'; -export { default as useRolesList } from './useRolesList'; -export { default as useSettingsMenu } from './useSettingsMenu'; -export { default as useSettingsForm } from './useSettingsForm'; -export { default as usePermissionsDataManager } from './usePermissionsDataManager'; -export { default as useReleaseNotification } from './useReleaseNotification'; -export { default as useThemeToggle } from './useThemeToggle'; -export { default as useRegenerate } from './useRegenerate'; -export { default as useLicenseLimit } from './useLicenseLimits'; export { default as useLicenseLimitNotification } from './useLicenseLimitNotification'; +export { default as useLicenseLimit } from './useLicenseLimits'; +export { default as useMenu } from './useMenu'; +export { default as usePermissionsDataManager } from './usePermissionsDataManager'; +export { default as useRegenerate } from './useRegenerate'; +export { default as useReleaseNotification } from './useReleaseNotification'; +export { default as useRolesList } from './useRolesList'; +export { default as useSettingsForm } from './useSettingsForm'; +export { default as useSettingsMenu } from './useSettingsMenu'; +export { default as useThemeToggle } from './useThemeToggle'; diff --git a/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplacePlugins/index.js b/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplacePlugins/index.js index 75a39fd7cb..5731e6dc97 100644 --- a/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplacePlugins/index.js +++ b/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplacePlugins/index.js @@ -1,6 +1,7 @@ -import { useQuery } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; import qs from 'qs'; +import { useQuery } from 'react-query'; + import { MARKETPLACE_API_URL } from '../constants'; const fetchMarketplacePlugins = async (params = {}) => { diff --git a/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplaceProviders/index.js b/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplaceProviders/index.js index bb67bc83c8..613ddce059 100644 --- a/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplaceProviders/index.js +++ b/packages/core/admin/admin/src/hooks/marketplace/useFetchMarketplaceProviders/index.js @@ -1,6 +1,7 @@ -import { useQuery } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; import qs from 'qs'; +import { useQuery } from 'react-query'; + import { MARKETPLACE_API_URL } from '../constants'; const fetchMarketplaceProviders = async (params = {}) => { diff --git a/packages/core/admin/admin/src/hooks/useAdminUsers/tests/useAdminUsers.test.js b/packages/core/admin/admin/src/hooks/useAdminUsers/tests/useAdminUsers.test.js index 4a465f10cf..d289c6d635 100644 --- a/packages/core/admin/admin/src/hooks/useAdminUsers/tests/useAdminUsers.test.js +++ b/packages/core/admin/admin/src/hooks/useAdminUsers/tests/useAdminUsers.test.js @@ -1,7 +1,8 @@ import * as React from 'react'; -import { setupServer } from 'msw/node'; -import { rest } from 'msw'; + import { renderHook, waitFor } from '@testing-library/react'; +import { rest } from 'msw'; +import { setupServer } from 'msw/node'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; diff --git a/packages/core/admin/admin/src/hooks/useAdminUsers/useAdminUsers.js b/packages/core/admin/admin/src/hooks/useAdminUsers/useAdminUsers.js index 89bd5e0547..6ee7e79693 100644 --- a/packages/core/admin/admin/src/hooks/useAdminUsers/useAdminUsers.js +++ b/packages/core/admin/admin/src/hooks/useAdminUsers/useAdminUsers.js @@ -1,6 +1,6 @@ -import { useQuery } from 'react-query'; import { useFetchClient } from '@strapi/helper-plugin'; import { stringify } from 'qs'; +import { useQuery } from 'react-query'; export function useAdminUsers(params = {}, queryOptions = {}) { const { id = '', ...queryParams } = params; diff --git a/packages/core/admin/admin/src/hooks/useConfigurations/index.js b/packages/core/admin/admin/src/hooks/useConfigurations/index.js index 2c276eed65..6ef64a6a56 100644 --- a/packages/core/admin/admin/src/hooks/useConfigurations/index.js +++ b/packages/core/admin/admin/src/hooks/useConfigurations/index.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import { ConfigurationsContext } from '../../contexts'; const useConfigurations = () => { diff --git a/packages/core/admin/admin/src/hooks/useContentTypes/tests/index.test.js b/packages/core/admin/admin/src/hooks/useContentTypes/tests/index.test.js index 5eed3b6b58..5e9e3665c2 100644 --- a/packages/core/admin/admin/src/hooks/useContentTypes/tests/index.test.js +++ b/packages/core/admin/admin/src/hooks/useContentTypes/tests/index.test.js @@ -1,7 +1,8 @@ import * as React from 'react'; -import { setupServer } from 'msw/node'; -import { rest } from 'msw'; + import { renderHook, waitFor } from '@testing-library/react'; +import { rest } from 'msw'; +import { setupServer } from 'msw/node'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; diff --git a/packages/core/admin/admin/src/hooks/useDebounce/index.js b/packages/core/admin/admin/src/hooks/useDebounce/index.js index 34257f7879..a03e8f6290 100644 --- a/packages/core/admin/admin/src/hooks/useDebounce/index.js +++ b/packages/core/admin/admin/src/hooks/useDebounce/index.js @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; const useDebounce = (value, delay) => { const [debouncedValue, setDebouncedValue] = useState(value); diff --git a/packages/core/admin/admin/src/hooks/useFetchEnabledPlugins/index.js b/packages/core/admin/admin/src/hooks/useFetchEnabledPlugins/index.js index fbf4d84ddf..2e43a0427e 100644 --- a/packages/core/admin/admin/src/hooks/useFetchEnabledPlugins/index.js +++ b/packages/core/admin/admin/src/hooks/useFetchEnabledPlugins/index.js @@ -1,5 +1,6 @@ -import { useQuery } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; +import { useQuery } from 'react-query'; + import { fetchEnabledPlugins } from './utils/api'; const useFetchEnabledPlugins = (notifyLoad) => { diff --git a/packages/core/admin/admin/src/hooks/useFetchPermissionsLayout/index.js b/packages/core/admin/admin/src/hooks/useFetchPermissionsLayout/index.js index e38f7fc9a0..5db7e0a78c 100644 --- a/packages/core/admin/admin/src/hooks/useFetchPermissionsLayout/index.js +++ b/packages/core/admin/admin/src/hooks/useFetchPermissionsLayout/index.js @@ -1,4 +1,5 @@ import { useEffect, useReducer } from 'react'; + import { useFetchClient } from '@strapi/helper-plugin'; import reducer, { initialState } from './reducer'; diff --git a/packages/core/admin/admin/src/hooks/useFetchRole/index.js b/packages/core/admin/admin/src/hooks/useFetchRole/index.js index 633126ee66..c50649fb65 100644 --- a/packages/core/admin/admin/src/hooks/useFetchRole/index.js +++ b/packages/core/admin/admin/src/hooks/useFetchRole/index.js @@ -1,5 +1,7 @@ -import { useCallback, useReducer, useEffect } from 'react'; +import { useCallback, useEffect, useReducer } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; + import reducer, { initialState } from './reducer'; const useFetchRole = (id) => { diff --git a/packages/core/admin/admin/src/hooks/useInjectReducer/tests/useInjectReducer.test.js b/packages/core/admin/admin/src/hooks/useInjectReducer/tests/useInjectReducer.test.js index 49292b1b09..4510852a39 100644 --- a/packages/core/admin/admin/src/hooks/useInjectReducer/tests/useInjectReducer.test.js +++ b/packages/core/admin/admin/src/hooks/useInjectReducer/tests/useInjectReducer.test.js @@ -1,6 +1,7 @@ import React from 'react'; -import { Provider } from 'react-redux'; + import { renderHook } from '@testing-library/react'; +import { Provider } from 'react-redux'; import configureStore from '../../../core/store/configureStore'; import { useInjectReducer } from '../useInjectReducer'; diff --git a/packages/core/admin/admin/src/hooks/useInjectReducer/useInjectReducer.js b/packages/core/admin/admin/src/hooks/useInjectReducer/useInjectReducer.js index 0229250ec5..6ada2674ba 100644 --- a/packages/core/admin/admin/src/hooks/useInjectReducer/useInjectReducer.js +++ b/packages/core/admin/admin/src/hooks/useInjectReducer/useInjectReducer.js @@ -1,4 +1,5 @@ import { useEffect } from 'react'; + import { useStore } from 'react-redux'; /** diff --git a/packages/core/admin/admin/src/hooks/useMenu/index.js b/packages/core/admin/admin/src/hooks/useMenu/index.js index 4bf7c5f5bf..f216f691fe 100644 --- a/packages/core/admin/admin/src/hooks/useMenu/index.js +++ b/packages/core/admin/admin/src/hooks/useMenu/index.js @@ -1,8 +1,10 @@ import { useEffect, useReducer, useRef } from 'react'; -import { useRBACProvider, useAppInfo, useStrapiApp } from '@strapi/helper-plugin'; -import getPluginSectionLinks from './utils/getPluginSectionLinks'; -import getGeneralLinks from './utils/getGeneralLinks'; + +import { useAppInfo, useRBACProvider, useStrapiApp } from '@strapi/helper-plugin'; + import reducer, { initialState } from './reducer'; +import getGeneralLinks from './utils/getGeneralLinks'; +import getPluginSectionLinks from './utils/getPluginSectionLinks'; const useMenu = () => { const [state, dispatch] = useReducer(reducer, initialState); diff --git a/packages/core/admin/admin/src/hooks/useMenu/reducer.js b/packages/core/admin/admin/src/hooks/useMenu/reducer.js index 77d27379e2..cbc9577d37 100644 --- a/packages/core/admin/admin/src/hooks/useMenu/reducer.js +++ b/packages/core/admin/admin/src/hooks/useMenu/reducer.js @@ -1,6 +1,7 @@ /* eslint-disable consistent-return */ -import produce from 'immer'; import { Cog, Puzzle, ShoppingCart } from '@strapi/icons'; +import produce from 'immer'; + import adminPermissions from '../../permissions'; const initialState = { diff --git a/packages/core/admin/admin/src/hooks/useMenu/utils/getGeneralLinks.js b/packages/core/admin/admin/src/hooks/useMenu/utils/getGeneralLinks.js index a7e30f8a01..7e1a37d7b1 100644 --- a/packages/core/admin/admin/src/hooks/useMenu/utils/getGeneralLinks.js +++ b/packages/core/admin/admin/src/hooks/useMenu/utils/getGeneralLinks.js @@ -1,4 +1,5 @@ import cloneDeep from 'lodash/cloneDeep'; + import checkPermissions from './checkPermissions'; const getGeneralLinks = async (permissions, generalSectionRawLinks, shouldUpdateStrapi) => { diff --git a/packages/core/admin/admin/src/hooks/useMenu/utils/tests/getGeneralLinks.test.js b/packages/core/admin/admin/src/hooks/useMenu/utils/tests/getGeneralLinks.test.js index 59f0f35245..1f58125c5b 100644 --- a/packages/core/admin/admin/src/hooks/useMenu/utils/tests/getGeneralLinks.test.js +++ b/packages/core/admin/admin/src/hooks/useMenu/utils/tests/getGeneralLinks.test.js @@ -1,4 +1,5 @@ import { hasPermissions } from '@strapi/helper-plugin'; + import getGeneralLinks from '../getGeneralLinks'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/hooks/useNavigatorOnLine/tests/index.test.js b/packages/core/admin/admin/src/hooks/useNavigatorOnLine/tests/index.test.js index 353d6b9e65..4b08738f0a 100644 --- a/packages/core/admin/admin/src/hooks/useNavigatorOnLine/tests/index.test.js +++ b/packages/core/admin/admin/src/hooks/useNavigatorOnLine/tests/index.test.js @@ -1,4 +1,5 @@ -import { renderHook, act, waitFor } from '@testing-library/react'; +import { act, renderHook, waitFor } from '@testing-library/react'; + import useNavigatorOnLine from '../index'; describe('useNavigatorOnLine', () => { diff --git a/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js b/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js index de407e5227..39f4d2c5f7 100644 --- a/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js +++ b/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import { PermissionsDataManagerContext } from '../../contexts'; const usePermissionsDataManager = () => useContext(PermissionsDataManagerContext); diff --git a/packages/core/admin/admin/src/hooks/useRegenerate/index.js b/packages/core/admin/admin/src/hooks/useRegenerate/index.js index bb64fbd436..b8b7e34285 100644 --- a/packages/core/admin/admin/src/hooks/useRegenerate/index.js +++ b/packages/core/admin/admin/src/hooks/useRegenerate/index.js @@ -1,5 +1,6 @@ import { useState } from 'react'; -import { useFetchClient, useNotification, useAPIErrorHandler } from '@strapi/helper-plugin'; + +import { useAPIErrorHandler, useFetchClient, useNotification } from '@strapi/helper-plugin'; const useRegenerate = (url, id, onRegenerate, onError) => { const [isLoadingConfirmation, setIsLoadingConfirmation] = useState(false); diff --git a/packages/core/admin/admin/src/hooks/useRegenerate/tests/index.test.js b/packages/core/admin/admin/src/hooks/useRegenerate/tests/index.test.js index ecf6478bd5..8b698f257c 100644 --- a/packages/core/admin/admin/src/hooks/useRegenerate/tests/index.test.js +++ b/packages/core/admin/admin/src/hooks/useRegenerate/tests/index.test.js @@ -1,6 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; + import { renderHook } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; + import useRegenerate from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js b/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js index 26e4db1b2a..bd3a0ffb81 100644 --- a/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js +++ b/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js @@ -1,4 +1,5 @@ import { useEffect } from 'react'; + import { useAppInfo, useNotification } from '@strapi/helper-plugin'; const showUpdateNotif = !JSON.parse(localStorage.getItem('STRAPI_UPDATE_NOTIF')); diff --git a/packages/core/admin/admin/src/hooks/useRolesList/index.js b/packages/core/admin/admin/src/hooks/useRolesList/index.js index f35c1692de..42df7617d7 100644 --- a/packages/core/admin/admin/src/hooks/useRolesList/index.js +++ b/packages/core/admin/admin/src/hooks/useRolesList/index.js @@ -1,6 +1,8 @@ -import { useEffect, useReducer, useCallback } from 'react'; +import { useCallback, useEffect, useReducer } from 'react'; + import { getFetchClient, useNotification } from '@strapi/helper-plugin'; import get from 'lodash/get'; + import init from './init'; import reducer, { initialState } from './reducer'; diff --git a/packages/core/admin/admin/src/hooks/useSettingsForm/index.js b/packages/core/admin/admin/src/hooks/useSettingsForm/index.js index ce832d47ad..fe1d05911b 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsForm/index.js +++ b/packages/core/admin/admin/src/hooks/useSettingsForm/index.js @@ -1,9 +1,12 @@ import { useEffect, useReducer } from 'react'; + import { useFetchClient, useNotification, useOverlayBlocker } from '@strapi/helper-plugin'; import omit from 'lodash/omit'; + import { checkFormValidity, formatAPIErrors } from '../../utils'; -import { initialState, reducer } from './reducer'; + import init from './init'; +import { initialState, reducer } from './reducer'; /** * TODO: refactor this, it's confusing and hard to read. diff --git a/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js b/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js index 35891fae23..8e436fb4ea 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js +++ b/packages/core/admin/admin/src/hooks/useSettingsForm/tests/index.test.js @@ -1,6 +1,7 @@ -import { setupServer } from 'msw/node'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { rest } from 'msw'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { setupServer } from 'msw/node'; + import useSettingsForm from '../index'; const toggleNotification = jest.fn(); diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/index.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/index.js index 442eadecbc..d561063838 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/index.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/index.js @@ -1,8 +1,9 @@ import { useEffect, useReducer } from 'react'; -import { hasPermissions, useRBACProvider, useStrapiApp, useAppInfo } from '@strapi/helper-plugin'; -import reducer, { initialState } from './reducer'; +import { hasPermissions, useAppInfo, useRBACProvider, useStrapiApp } from '@strapi/helper-plugin'; + import init from './init'; +import reducer, { initialState } from './reducer'; const useSettingsMenu = (noCheck = false) => { const { allPermissions: permissions } = useRBACProvider(); diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js index a017f6d7c3..b4bcf97c74 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js @@ -1,8 +1,9 @@ import omit from 'lodash/omit'; -import sortLinks from './utils/sortLinks'; -import formatLinks from './utils/formatLinks'; + import adminLinks from './utils/adminLinks'; +import formatLinks from './utils/formatLinks'; import globalLinks from './utils/globalLinks'; +import sortLinks from './utils/sortLinks'; const init = (initialState, { settings, shouldUpdateStrapi }) => { // Retrieve the links that will be injected into the global section diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js index b4a2b02cf1..9accbe36fa 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js @@ -1,4 +1,5 @@ import customAdminLinks from 'ee_else_ce/hooks/useSettingsMenu/utils/customAdminLinks'; + import defaultAdminLinks from './defaultAdminLinks'; export default [...customAdminLinks, ...defaultAdminLinks]; diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/globalLinks.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/globalLinks.js index 32c1aef5cd..2af1c7708f 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/globalLinks.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/globalLinks.js @@ -1,4 +1,5 @@ import customGlobalLinks from 'ee_else_ce/hooks/useSettingsMenu/utils/customGlobalLinks'; + import defaultGlobalLinks from './defaultGlobalLinks'; export default [...defaultGlobalLinks, ...customGlobalLinks]; diff --git a/packages/core/admin/admin/src/hooks/useThemeToggle/index.js b/packages/core/admin/admin/src/hooks/useThemeToggle/index.js index f58821c628..b78226b3e0 100644 --- a/packages/core/admin/admin/src/hooks/useThemeToggle/index.js +++ b/packages/core/admin/admin/src/hooks/useThemeToggle/index.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import { ThemeToggleContext } from '../../contexts'; const useThemeToggle = () => { diff --git a/packages/core/admin/admin/src/index.js b/packages/core/admin/admin/src/index.js index fe95c7a121..65efa9596f 100644 --- a/packages/core/admin/admin/src/index.js +++ b/packages/core/admin/admin/src/index.js @@ -1,5 +1,6 @@ import { getFetchClient } from '@strapi/helper-plugin'; import { createRoot } from 'react-dom/client'; + import appCustomisations from './app'; import { Components, Fields, Middlewares, Reducers } from './core/apis'; // eslint-disable-next-line import/extensions diff --git a/packages/core/admin/admin/src/layouts/AppLayout/index.js b/packages/core/admin/admin/src/layouts/AppLayout/index.js index ab38827530..e8b44639ec 100644 --- a/packages/core/admin/admin/src/layouts/AppLayout/index.js +++ b/packages/core/admin/admin/src/layouts/AppLayout/index.js @@ -1,8 +1,9 @@ import React from 'react'; + import { Box, Flex, SkipToContent } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const FlexBox = styled(Box)` flex: 1; diff --git a/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/LocaleToggle/index.js b/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/LocaleToggle/index.js index 2fc7aefbb3..2228f517b2 100644 --- a/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/LocaleToggle/index.js +++ b/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/LocaleToggle/index.js @@ -5,8 +5,10 @@ */ import React from 'react'; + +import { MenuItem, SimpleMenu } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import { SimpleMenu, MenuItem } from '@strapi/design-system'; + import useLocalesProvider from '../../../components/LocalesProvider/useLocalesProvider'; const LocaleToggle = () => { diff --git a/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/index.js b/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/index.js index e302298fb8..d1a599e835 100644 --- a/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/index.js +++ b/packages/core/admin/admin/src/layouts/UnauthenticatedLayout/index.js @@ -1,7 +1,9 @@ import React from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; + import LocaleToggle from './LocaleToggle'; const Wrapper = styled(Box)` diff --git a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js index e0f25a7207..054249f958 100644 --- a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js +++ b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js @@ -1,22 +1,24 @@ import React, { useRef, useState } from 'react'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { useAppInfo } from '@strapi/helper-plugin'; + import { Box, Button, Divider, Flex, Icon, - Portal, PopoverPrimitives, + Portal, Typography, VisuallyHidden, } from '@strapi/design-system'; +import { useAppInfo } from '@strapi/helper-plugin'; import { Cross, Message, Play, Question } from '@strapi/icons'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import onboardingPreview from '../../../assets/images/onboarding-preview.png'; -import { VIDEO_LINKS, DOCUMENTATION_LINKS, WATCH_MORE } from './constants'; + +import { DOCUMENTATION_LINKS, VIDEO_LINKS, WATCH_MORE } from './constants'; // TODO: use new Button props derived from Box props with next DS release const HelperButton = styled(Button)` diff --git a/packages/core/admin/admin/src/pages/Admin/Onboarding/tests/index.test.js b/packages/core/admin/admin/src/pages/Admin/Onboarding/tests/index.test.js index 5efe4e0e2d..f0fc382f8d 100644 --- a/packages/core/admin/admin/src/pages/Admin/Onboarding/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/Admin/Onboarding/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useAppInfo } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; -import { useAppInfo } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import Onboarding from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/pages/Admin/index.js b/packages/core/admin/admin/src/pages/Admin/index.js index f9264d2118..9b22045af3 100644 --- a/packages/core/admin/admin/src/pages/Admin/index.js +++ b/packages/core/admin/admin/src/pages/Admin/index.js @@ -4,19 +4,21 @@ * */ -import React, { Suspense, useEffect, useMemo, lazy } from 'react'; -import { Switch, Route } from 'react-router-dom'; -import { useTracking, LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin'; -import { useDispatch, useSelector } from 'react-redux'; +import React, { lazy, Suspense, useEffect, useMemo } from 'react'; + +import { LoadingIndicatorPage, useStrapiApp, useTracking } from '@strapi/helper-plugin'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { useDispatch, useSelector } from 'react-redux'; +import { Route, Switch } from 'react-router-dom'; import GuidedTourModal from '../../components/GuidedTour/Modal'; import LeftMenu from '../../components/LeftMenu'; +import { useConfigurations, useMenu } from '../../hooks'; import AppLayout from '../../layouts/AppLayout'; -import { useMenu, useConfigurations } from '../../hooks'; import { createRoute } from '../../utils'; import { SET_APP_RUNTIME_STATUS } from '../App/constants'; + import Onboarding from './Onboarding'; const CM = lazy(() => diff --git a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js index 86a29c05a4..7bab863979 100644 --- a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; -import { Router } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useStrapiApp } from '@strapi/helper-plugin'; import { render, screen, waitFor } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; -import { useStrapiApp } from '@strapi/helper-plugin'; +import { Router } from 'react-router-dom'; + import { useMenu } from '../../../hooks'; import Admin from '../index'; diff --git a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js index 47e25a0ddb..196db07a35 100644 --- a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js +++ b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js @@ -1,4 +1,5 @@ import { renderHook } from '@testing-library/react'; + import { useTrackUsage } from '../index'; const trackUsageMock = jest.fn(); diff --git a/packages/core/admin/admin/src/pages/App/index.js b/packages/core/admin/admin/src/pages/App/index.js index 438c3d800a..711aa401b3 100644 --- a/packages/core/admin/admin/src/pages/App/index.js +++ b/packages/core/admin/admin/src/pages/App/index.js @@ -4,27 +4,30 @@ * */ -import React, { useEffect, useState, useMemo, lazy, Suspense } from 'react'; -import { Switch, Route } from 'react-router-dom'; +import React, { lazy, Suspense, useEffect, useMemo, useState } from 'react'; + +import { SkipToContent } from '@strapi/design-system'; import { - LoadingIndicatorPage, auth, - useNotification, - TrackingProvider, + LoadingIndicatorPage, prefixFileUrlWithBackendUrl, + TrackingProvider, useAppInfo, useFetchClient, + useNotification, } from '@strapi/helper-plugin'; -import { SkipToContent } from '@strapi/design-system'; import { useIntl } from 'react-intl'; +import { Route, Switch } from 'react-router-dom'; + import PrivateRoute from '../../components/PrivateRoute'; +import { useConfigurations } from '../../hooks'; import { createRoute, makeUniqueRoutes } from '../../utils'; import AuthPage from '../AuthPage'; import NotFoundPage from '../NotFoundPage'; import UseCasePage from '../UseCasePage'; + import { getUID } from './utils'; import routes from './utils/routes'; -import { useConfigurations } from '../../hooks'; const AuthenticatedApp = lazy(() => import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp') diff --git a/packages/core/admin/admin/src/pages/App/reducer.js b/packages/core/admin/admin/src/pages/App/reducer.js index 6e4a54a887..117ed9f6d8 100644 --- a/packages/core/admin/admin/src/pages/App/reducer.js +++ b/packages/core/admin/admin/src/pages/App/reducer.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import { SET_APP_RUNTIME_STATUS } from './constants'; const initialState = { diff --git a/packages/core/admin/admin/src/pages/App/utils/index.js b/packages/core/admin/admin/src/pages/App/utils/index.js index e554a192a4..34ffa1453d 100644 --- a/packages/core/admin/admin/src/pages/App/utils/index.js +++ b/packages/core/admin/admin/src/pages/App/utils/index.js @@ -1,3 +1,3 @@ /* eslint-disable import/prefer-default-export */ -export { default as getUID } from './unique-identifier'; export { default as routes } from './routes'; +export { default as getUID } from './unique-identifier'; diff --git a/packages/core/admin/admin/src/pages/App/utils/routes.js b/packages/core/admin/admin/src/pages/App/utils/routes.js index 11d425c416..79ecbbf3bf 100644 --- a/packages/core/admin/admin/src/pages/App/utils/routes.js +++ b/packages/core/admin/admin/src/pages/App/utils/routes.js @@ -1,4 +1,5 @@ import customRoutes from 'ee_else_ce/pages/App/utils/customRoutes'; + import defaultRoutes from './defaultRoutes'; export default [...customRoutes, ...defaultRoutes]; diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/FieldActionWrapper/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/FieldActionWrapper/index.js index f3f6623524..ccaccf4080 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/FieldActionWrapper/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/FieldActionWrapper/index.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { FieldAction } from '@strapi/design-system'; +import styled from 'styled-components'; const FieldActionWrapper = styled(FieldAction)` svg { diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js index 00e3ea407d..3871e6c7e2 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPassword/index.js @@ -1,14 +1,16 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + +import { Box, Button, Flex, Main, TextInput, Typography } from '@strapi/design-system'; import { Form, Link } from '@strapi/helper-plugin'; -import { Box, Flex, Main, Button, TextInput, Typography } from '@strapi/design-system'; import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + +import Logo from '../../../../components/UnauthenticatedLogo'; import UnauthenticatedLayout, { Column, LayoutContent, } from '../../../../layouts/UnauthenticatedLayout'; -import Logo from '../../../../components/UnauthenticatedLogo'; const ForgotPassword = ({ onSubmit, schema }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js index 49428c0146..40c8dd23a6 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js @@ -1,12 +1,14 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Main, Typography } from '@strapi/design-system'; import { Link } from '@strapi/helper-plugin'; -import { Box, Main, Flex, Typography } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + +import Logo from '../../../../components/UnauthenticatedLogo'; import UnauthenticatedLayout, { Column, LayoutContent, } from '../../../../layouts/UnauthenticatedLayout'; -import Logo from '../../../../components/UnauthenticatedLogo'; const ForgotPasswordSuccess = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js index 811a1a9492..66f21f3e90 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js @@ -1,13 +1,15 @@ import React, { useState } from 'react'; + +import { Box, Button, Checkbox, Flex, Main, TextInput, Typography } from '@strapi/design-system'; import { Form, Link } from '@strapi/helper-plugin'; -import { EyeStriked, Eye } from '@strapi/icons'; -import { Box, Main, Flex, Button, TextInput, Checkbox, Typography } from '@strapi/design-system'; +import { Eye, EyeStriked } from '@strapi/icons'; +import { Formik } from 'formik'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Formik } from 'formik'; -import { Column, LayoutContent } from '../../../../layouts/UnauthenticatedLayout'; + import Logo from '../../../../components/UnauthenticatedLogo'; +import { Column, LayoutContent } from '../../../../layouts/UnauthenticatedLayout'; import FieldActionWrapper from '../FieldActionWrapper'; const PasswordInput = styled(TextInput)` diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/index.js index 84c066ecf6..37fef863ca 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/index.js @@ -1,8 +1,11 @@ import React from 'react'; + import PropTypes from 'prop-types'; -import BaseLogin from './BaseLogin'; + import UnauthenticatedLayout from '../../../../layouts/UnauthenticatedLayout'; +import BaseLogin from './BaseLogin'; + const Login = (loginProps) => { return ( diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js index 56f789e427..404d1aacfb 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/tests/BaseLogin.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import * as yup from 'yup'; import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; +import * as yup from 'yup'; + import BaseLogin from '../BaseLogin'; jest.mock('../../../../../hooks/useConfigurations', () => () => ({ diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js index 8450e363f6..b618816f30 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/index.js @@ -1,12 +1,14 @@ import React from 'react'; + +import { Box, Flex, Main, Typography } from '@strapi/design-system'; +import { Link, useQuery } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; -import { useQuery, Link } from '@strapi/helper-plugin'; -import { Box, Main, Flex, Typography } from '@strapi/design-system'; + +import Logo from '../../../../components/UnauthenticatedLogo'; import UnauthenticatedLayout, { Column, LayoutContent, } from '../../../../layouts/UnauthenticatedLayout'; -import Logo from '../../../../components/UnauthenticatedLogo'; const Oops = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js index b2f9e5aae5..f5f4c3912d 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Oops/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; + import Oops from '..'; jest.mock('../../../../../components/LocalesProvider/useLocalesProvider', () => () => ({ diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js index ecb58da7de..02112b26c0 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js @@ -1,34 +1,36 @@ -import React, { useState, useEffect } from 'react'; -import { useIntl } from 'react-intl'; -import styled from 'styled-components'; -import omit from 'lodash/omit'; -import { useHistory } from 'react-router-dom'; -import PropTypes from 'prop-types'; -import { Formik } from 'formik'; +import React, { useEffect, useState } from 'react'; + +import { + Box, + Button, + Checkbox, + Flex, + Grid, + GridItem, + Main, + TextInput, + Typography, +} from '@strapi/design-system'; import { Form, - useQuery, - useNotification, - useTracking, getYupInnerErrors, Link, useAPIErrorHandler, useFetchClient, + useNotification, + useQuery, + useTracking, } from '@strapi/helper-plugin'; -import { - Box, - Main, - Flex, - Button, - TextInput, - Checkbox, - Grid, - GridItem, - Typography, -} from '@strapi/design-system'; -import { EyeStriked, Eye } from '@strapi/icons'; -import UnauthenticatedLayout, { LayoutContent } from '../../../../layouts/UnauthenticatedLayout'; +import { Eye, EyeStriked } from '@strapi/icons'; +import { Formik } from 'formik'; +import omit from 'lodash/omit'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useHistory } from 'react-router-dom'; +import styled from 'styled-components'; + import Logo from '../../../../components/UnauthenticatedLogo'; +import UnauthenticatedLayout, { LayoutContent } from '../../../../layouts/UnauthenticatedLayout'; import FieldActionWrapper from '../FieldActionWrapper'; const A = styled.a` diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js index a69ee3ac8f..958269c15c 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/tests/index.test.js @@ -1,14 +1,15 @@ import React from 'react'; -import { act, render, waitFor, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider, useNotification, useQuery } from '@strapi/helper-plugin'; +import { act, fireEvent, render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router } from 'react-router-dom'; -import { TrackingProvider, useQuery, useNotification } from '@strapi/helper-plugin'; import { createMemoryHistory } from 'history'; -import * as yup from 'yup'; -import { IntlProvider } from 'react-intl'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; +import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; +import * as yup from 'yup'; import Register from '..'; diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js index 9af6cbbb29..0632d6818f 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js @@ -1,16 +1,18 @@ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Formik } from 'formik'; + +import { Box, Button, Flex, Main, TextInput, Typography } from '@strapi/design-system'; import { Form, Link } from '@strapi/helper-plugin'; -import { Box, Main, Flex, Button, TextInput, Typography } from '@strapi/design-system'; -import { EyeStriked, Eye } from '@strapi/icons'; +import { Eye, EyeStriked } from '@strapi/icons'; +import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import Logo from '../../../../components/UnauthenticatedLogo'; import UnauthenticatedLayout, { Column, LayoutContent, } from '../../../../layouts/UnauthenticatedLayout'; -import Logo from '../../../../components/UnauthenticatedLogo'; import FieldActionWrapper from '../FieldActionWrapper'; const PasswordInput = styled(TextInput)` diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js index 95a17c90ac..6b012b4b66 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; -import * as yup from 'yup'; import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; +import * as yup from 'yup'; + import ResetPassword from '..'; jest.mock('../../../../../components/LocalesProvider/useLocalesProvider', () => () => ({ diff --git a/packages/core/admin/admin/src/pages/AuthPage/index.js b/packages/core/admin/admin/src/pages/AuthPage/index.js index 361e114e5c..0d859cf1c5 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/index.js @@ -1,15 +1,18 @@ import React, { useEffect, useReducer } from 'react'; + +import { auth, useFetchClient, useGuidedTour, useQuery, useTracking } from '@strapi/helper-plugin'; import axios from 'axios'; +import forms from 'ee_else_ce/pages/AuthPage/utils/forms'; import camelCase from 'lodash/camelCase'; import get from 'lodash/get'; import omit from 'lodash/omit'; -import { Redirect, useRouteMatch, useHistory } from 'react-router-dom'; -import { auth, useQuery, useGuidedTour, useTracking, useFetchClient } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import forms from 'ee_else_ce/pages/AuthPage/utils/forms'; +import { Redirect, useHistory, useRouteMatch } from 'react-router-dom'; + import persistStateToLocaleStorage from '../../components/GuidedTour/utils/persistStateToLocaleStorage'; import useLocalesProvider from '../../components/LocalesProvider/useLocalesProvider'; import formatAPIErrors from '../../utils/formatAPIErrors'; + import init from './init'; import { initialState, reducer } from './reducer'; diff --git a/packages/core/admin/admin/src/pages/AuthPage/utils/forms.js b/packages/core/admin/admin/src/pages/AuthPage/utils/forms.js index ec4239ee34..a58d1dfa2c 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/utils/forms.js +++ b/packages/core/admin/admin/src/pages/AuthPage/utils/forms.js @@ -1,6 +1,7 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; import Login from 'ee_else_ce/pages/AuthPage/components/Login'; +import * as yup from 'yup'; + import ForgotPassword from '../components/ForgotPassword'; import ForgotPasswordSuccess from '../components/ForgotPasswordSuccess'; import Oops from '../components/Oops'; diff --git a/packages/core/admin/admin/src/pages/HomePage/CloudBox.js b/packages/core/admin/admin/src/pages/HomePage/CloudBox.js index c05aada847..f67b7a0a7c 100644 --- a/packages/core/admin/admin/src/pages/HomePage/CloudBox.js +++ b/packages/core/admin/admin/src/pages/HomePage/CloudBox.js @@ -1,11 +1,13 @@ import React from 'react'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { useTracking, pxToRem } from '@strapi/helper-plugin'; + import { Box, Flex, Typography } from '@strapi/design-system'; +import { pxToRem, useTracking } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import cloudIconBackgroundImage from './assets/strapi-cloud-background.png'; -import cloudIcon from './assets/strapi-cloud-icon.svg'; import cloudFlagsImage from './assets/strapi-cloud-flags.svg'; +import cloudIcon from './assets/strapi-cloud-icon.svg'; const BlockLink = styled.a` text-decoration: none; diff --git a/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js b/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js index a1cb3c8183..84ec0ac4fe 100644 --- a/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js +++ b/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { ContentBox, useTracking } from '@strapi/helper-plugin'; + import { Flex } from '@strapi/design-system'; -import { InformationSquare, CodeSquare, PlaySquare, FeatherSquare } from '@strapi/icons'; +import { ContentBox, useTracking } from '@strapi/helper-plugin'; +import { CodeSquare, FeatherSquare, InformationSquare, PlaySquare } from '@strapi/icons'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import CloudBox from './CloudBox'; const BlockLink = styled.a` diff --git a/packages/core/admin/admin/src/pages/HomePage/HomeHeader.js b/packages/core/admin/admin/src/pages/HomePage/HomeHeader.js index 1ec96b456d..8fb94c5a9e 100644 --- a/packages/core/admin/admin/src/pages/HomePage/HomeHeader.js +++ b/packages/core/admin/admin/src/pages/HomePage/HomeHeader.js @@ -1,10 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { Typography, Box, Button, Flex } from '@strapi/design-system'; + +import { Box, Button, Flex, Typography } from '@strapi/design-system'; import { Link } from '@strapi/design-system/v2'; import { ArrowRight } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const WordWrap = styled(Typography)` word-break: break-word; diff --git a/packages/core/admin/admin/src/pages/HomePage/SocialLinks.js b/packages/core/admin/admin/src/pages/HomePage/SocialLinks.js index affc7304f4..e290ab2c42 100644 --- a/packages/core/admin/admin/src/pages/HomePage/SocialLinks.js +++ b/packages/core/admin/admin/src/pages/HomePage/SocialLinks.js @@ -4,12 +4,13 @@ */ import React from 'react'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { useAppInfo } from '@strapi/helper-plugin'; -import { Typography, Box, Flex, Grid, GridItem } from '@strapi/design-system'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import { Link, LinkButton } from '@strapi/design-system/v2'; -import { ExternalLink, Github, Discord, Reddit, Strapi, Twitter, Discourse } from '@strapi/icons'; +import { useAppInfo } from '@strapi/helper-plugin'; +import { Discord, Discourse, ExternalLink, Github, Reddit, Strapi, Twitter } from '@strapi/icons'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const StyledDiscord = styled(Discord)` path { diff --git a/packages/core/admin/admin/src/pages/HomePage/index.js b/packages/core/admin/admin/src/pages/HomePage/index.js index af0b084c04..2d44595f5c 100644 --- a/packages/core/admin/admin/src/pages/HomePage/index.js +++ b/packages/core/admin/admin/src/pages/HomePage/index.js @@ -4,21 +4,23 @@ */ import React, { memo, useMemo } from 'react'; -import { FormattedMessage } from 'react-intl'; -import styled from 'styled-components'; -import { Helmet } from 'react-helmet'; -import { useHistory } from 'react-router-dom'; + +import { Box, Grid, GridItem, Layout, Main } from '@strapi/design-system'; import { LoadingIndicatorPage, useGuidedTour } from '@strapi/helper-plugin'; -import { Layout, Main, Box, Grid, GridItem } from '@strapi/design-system'; import useLicenseLimitNotification from 'ee_else_ce/hooks/useLicenseLimitNotification'; +import { Helmet } from 'react-helmet'; +import { FormattedMessage } from 'react-intl'; +import { useHistory } from 'react-router-dom'; +import styled from 'styled-components'; + +import GuidedTourHomepage from '../../components/GuidedTour/Homepage'; +import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted'; +import { useContentTypes } from '../../hooks/useContentTypes'; import cornerOrnamentPath from './assets/corner-ornament.svg'; -import { useContentTypes } from '../../hooks/useContentTypes'; -import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted'; -import GuidedTourHomepage from '../../components/GuidedTour/Homepage'; -import SocialLinks from './SocialLinks'; -import HomeHeader from './HomeHeader'; import ContentBlocks from './ContentBlocks'; +import HomeHeader from './HomeHeader'; +import SocialLinks from './SocialLinks'; const LogoContainer = styled(Box)` position: absolute; diff --git a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js index d7628fa989..6fe68eaea2 100644 --- a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js @@ -1,12 +1,14 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useAppInfo } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; -import { useAppInfo } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import HomePage from '../index'; +import { Router } from 'react-router-dom'; + import { useContentTypes } from '../../../hooks/useContentTypes'; +import HomePage from '../index'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/core/admin/admin/src/pages/InstalledPluginsPage/Plugins.js b/packages/core/admin/admin/src/pages/InstalledPluginsPage/Plugins.js index 06dfbf5027..4dfc60a9ba 100644 --- a/packages/core/admin/admin/src/pages/InstalledPluginsPage/Plugins.js +++ b/packages/core/admin/admin/src/pages/InstalledPluginsPage/Plugins.js @@ -1,20 +1,22 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { LoadingIndicatorPage, useFocusWhenNavigate } from '@strapi/helper-plugin'; + import { - useNotifyAT, - Layout, - HeaderLayout, ContentLayout, + HeaderLayout, + Layout, Main, - Typography, Table, - Thead, Tbody, - Tr, Td, Th, + Thead, + Tr, + Typography, + useNotifyAT, } from '@strapi/design-system'; +import { LoadingIndicatorPage, useFocusWhenNavigate } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; + import useFetchEnabledPlugins from '../../hooks/useFetchEnabledPlugins'; const Plugins = () => { diff --git a/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js b/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js index 5a9932b349..f158486493 100644 --- a/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js +++ b/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js @@ -1,8 +1,11 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; import { Helmet } from 'react-helmet'; import { useIntl } from 'react-intl'; + import adminPermissions from '../../permissions'; + import Plugins from './Plugins'; const InstalledPluginsPage = () => { diff --git a/packages/core/admin/admin/src/pages/InternalErrorPage/index.js b/packages/core/admin/admin/src/pages/InternalErrorPage/index.js index 8444c2a285..030b408e49 100644 --- a/packages/core/admin/admin/src/pages/InternalErrorPage/index.js +++ b/packages/core/admin/admin/src/pages/InternalErrorPage/index.js @@ -5,9 +5,10 @@ * */ import React from 'react'; -import { useFocusWhenNavigate, LinkButton } from '@strapi/helper-plugin'; -import { Main, ContentLayout, HeaderLayout, EmptyStateLayout } from '@strapi/design-system'; -import { EmptyPictures, ArrowRight } from '@strapi/icons'; + +import { ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system'; +import { LinkButton, useFocusWhenNavigate } from '@strapi/helper-plugin'; +import { ArrowRight, EmptyPictures } from '@strapi/icons'; import { useIntl } from 'react-intl'; const InternalErrorPage = () => { diff --git a/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js b/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js index 3104f41cad..a0ea8beddd 100644 --- a/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/InternalErrorPage/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { Router } from 'react-router-dom'; + import InternalErrorPage from '../index'; const history = createMemoryHistory(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/EmptyNpmPackageGrid.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/EmptyNpmPackageGrid.js index 68a8aafd2b..47b58fb633 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/EmptyNpmPackageGrid.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/EmptyNpmPackageGrid.js @@ -1,6 +1,7 @@ import React from 'react'; -import styled from 'styled-components'; + import { Box, GridLayout } from '@strapi/design-system'; +import styled from 'styled-components'; const EmptyPluginCard = styled(Box)` background: ${({ theme }) => diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/index.js index 674c0d4d85..9ee608e02d 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/index.js @@ -1,7 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Typography, Box, Flex, Icon } from '@strapi/design-system'; + +import { Box, Flex, Icon, Typography } from '@strapi/design-system'; import { EmptyDocuments } from '@strapi/icons'; +import PropTypes from 'prop-types'; + import { EmptyNpmPackageGrid } from './EmptyNpmPackageGrid'; const EmptyNpmPackageSearch = ({ content }) => { diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/MissingPluginBanner/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/MissingPluginBanner/index.js index b1782b5a49..1a2ecd84b6 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/MissingPluginBanner/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/MissingPluginBanner/index.js @@ -1,8 +1,9 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { ContentBox, useTracking } from '@strapi/helper-plugin'; -import { GlassesSquare, ExternalLink } from '@strapi/icons'; + import { Icon } from '@strapi/design-system'; +import { ContentBox, useTracking } from '@strapi/helper-plugin'; +import { ExternalLink, GlassesSquare } from '@strapi/icons'; +import { useIntl } from 'react-intl'; const MissingPluginBanner = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/CardButton.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/CardButton.js index 77c9b75a3d..9555e1ce3c 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/CardButton.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/CardButton.js @@ -1,9 +1,10 @@ import React from 'react'; -import semver from 'semver'; + +import { Box, Button, Tooltip } from '@strapi/design-system'; +import { Duplicate } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Tooltip, Button, Box } from '@strapi/design-system'; -import { Duplicate } from '@strapi/icons'; +import semver from 'semver'; const TooltipButton = ({ description, installMessage, disabled, handleCopy, pluginName }) => ( diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/InstallPluginButton.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/InstallPluginButton.js index 6450c627fe..40fd5ae5df 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/InstallPluginButton.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/InstallPluginButton.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { Box, Icon, Typography } from '@strapi/design-system'; +import { useClipboard, useNotification, useTracking } from '@strapi/helper-plugin'; +import { Check } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useNotification, useTracking, useClipboard } from '@strapi/helper-plugin'; -import { Box, Icon, Typography } from '@strapi/design-system'; -import { Check } from '@strapi/icons'; + import CardButton from './CardButton'; const InstallPluginButton = ({ diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/PackageStats.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/PackageStats.js index 78505aee89..0e6254e092 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/PackageStats.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/PackageStats.js @@ -1,10 +1,11 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { Typography, Icon, Divider, Flex } from '@strapi/design-system'; -import { Github, Download, Star } from '@strapi/icons'; + +import { Divider, Flex, Icon, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; +import { Download, Github, Star } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const VerticalDivider = styled(Divider)` width: ${pxToRem(12)}; diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js index b4d9e59dd4..e9cb6ebe54 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js @@ -1,13 +1,16 @@ import React from 'react'; + +import { Box, Flex, Icon, Tooltip, Typography } from '@strapi/design-system'; +import { LinkButton } from '@strapi/design-system/v2'; +import { useTracking } from '@strapi/helper-plugin'; +import { CheckCircle, ExternalLink } from '@strapi/icons'; +import pluralize from 'pluralize'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import pluralize from 'pluralize'; -import { Box, Typography, Flex, Icon, Tooltip } from '@strapi/design-system'; -import { LinkButton } from '@strapi/design-system/v2'; -import { ExternalLink, CheckCircle } from '@strapi/icons'; -import { useTracking } from '@strapi/helper-plugin'; + import StrapiLogo from '../../../../assets/images/logo-strapi-2022.svg'; + import InstallPluginButton from './InstallPluginButton'; import PackageStats from './PackageStats'; diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js index eb716a1ed8..384cf169b1 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FilterSelect.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Select, Option } from '@strapi/design-system'; const FilterSelect = ({ message, value, onChange, possibleFilters, onClear, customizeContent }) => { const computeFilterMessage = (filterName, count) => { diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FiltersPopover.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FiltersPopover.js index 48e131d010..1a49ee16b7 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FiltersPopover.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/FiltersPopover.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { Flex, Popover } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Popover, Flex } from '@strapi/design-system'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import FilterSelect from './FilterSelect'; const FiltersPopover = ({ diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js index 4134658bd6..082d5aac47 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesFilters/index.js @@ -1,9 +1,11 @@ -import React, { useState, useRef } from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; +import React, { useRef, useState } from 'react'; + import { Box, Button, Tag } from '@strapi/design-system'; import { Cross, Filter } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import FiltersPopover from './FiltersPopover'; const FilterTag = ({ name, handleRemove }) => { diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesGrid/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesGrid/index.js index dbbf8f5862..633402b4a1 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesGrid/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesGrid/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Grid, GridItem, Flex, Loader } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Flex, Grid, GridItem, Loader } from '@strapi/design-system'; import { AnErrorOccurred } from '@strapi/helper-plugin'; -import NpmPackageCard from '../NpmPackageCard'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import EmptyNpmPackageSearch from '../EmptyNpmPackageSearch'; +import NpmPackageCard from '../NpmPackageCard'; const NpmPackagesGrid = ({ status, diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesPagination/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesPagination/index.js index 5850b8c744..a23fff2de3 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesPagination/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackagesPagination/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; -import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin'; +import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; const NpmPackagesPagination = ({ pagination }) => { return ( diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/OfflineLayout/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/OfflineLayout/index.js index 1a8983c20f..c9046ccc56 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/OfflineLayout/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/OfflineLayout/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Layout, Main, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; -import { Box, Flex, Typography, Layout, Main } from '@strapi/design-system'; -import PageHeader from '../PageHeader'; +import { useIntl } from 'react-intl'; + import offlineCloud from '../../../../assets/images/icon_offline-cloud.svg'; +import PageHeader from '../PageHeader'; const OfflineLayout = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/PageHeader/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/PageHeader/index.js index dd964ba412..759cafc0d6 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/PageHeader/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/PageHeader/index.js @@ -1,10 +1,11 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { HeaderLayout } from '@strapi/design-system'; import { LinkButton } from '@strapi/design-system/v2'; -import { Upload } from '@strapi/icons'; import { useTracking } from '@strapi/helper-plugin'; +import { Upload } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const PageHeader = ({ isOnline, npmPackageType }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/SortSelect/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/SortSelect/index.js index 0d2ca89744..a07e76b0ea 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/SortSelect/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/SortSelect/index.js @@ -1,8 +1,9 @@ import React from 'react'; -import styled from 'styled-components'; -import { Select, Option, Box } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Box, Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const SelectWrapper = styled(Box)` font-weight: ${({ theme }) => theme.fontWeights.semiBold}; diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/index.js index 74a3253050..ec2b3ceda1 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/index.js @@ -1,38 +1,40 @@ import React, { useEffect, useRef, useState } from 'react'; -import { useIntl } from 'react-intl'; -import { Helmet } from 'react-helmet'; + import { - CheckPagePermissions, - useFocusWhenNavigate, - useTracking, - useNotification, - useAppInfo, - useQueryParams, -} from '@strapi/helper-plugin'; -import { - Layout, + Box, ContentLayout, + Flex, + Layout, Main, Searchbar, - Box, - Flex, - Tabs, Tab, TabGroup, - TabPanels, TabPanel, + TabPanels, + Tabs, } from '@strapi/design-system'; +import { + CheckPagePermissions, + useAppInfo, + useFocusWhenNavigate, + useNotification, + useQueryParams, + useTracking, +} from '@strapi/helper-plugin'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; -import PageHeader from './components/PageHeader'; -import adminPermissions from '../../permissions'; -import useNavigatorOnLine from '../../hooks/useNavigatorOnLine'; -import MissingPluginBanner from './components/MissingPluginBanner'; -import NpmPackagesGrid from './components/NpmPackagesGrid'; -import SortSelect from './components/SortSelect'; -import NpmPackagesFilters from './components/NpmPackagesFilters'; -import NpmPackagesPagination from './components/NpmPackagesPagination'; import useDebounce from '../../hooks/useDebounce'; +import useNavigatorOnLine from '../../hooks/useNavigatorOnLine'; +import adminPermissions from '../../permissions'; + +import MissingPluginBanner from './components/MissingPluginBanner'; +import NpmPackagesFilters from './components/NpmPackagesFilters'; +import NpmPackagesGrid from './components/NpmPackagesGrid'; +import NpmPackagesPagination from './components/NpmPackagesPagination'; import OfflineLayout from './components/OfflineLayout'; +import PageHeader from './components/PageHeader'; +import SortSelect from './components/SortSelect'; import useMarketplaceData from './utils/useMarketplaceData'; const MarketPlacePage = () => { diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js index 2f7237a815..4280fabff3 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js @@ -1,14 +1,17 @@ import React from 'react'; -import { render, screen, fireEvent, within } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider, useAppInfo, useTracking } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useTracking, useAppInfo, TrackingProvider } from '@strapi/helper-plugin'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; + import useNavigatorOnLine from '../../../hooks/useNavigatorOnLine'; import MarketPlacePage from '../index'; + import server from './server'; const toggleNotification = jest.fn(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js index 3836938df5..75baacedf8 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js @@ -1,13 +1,16 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider } from '@strapi/helper-plugin'; import { render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { TrackingProvider } from '@strapi/helper-plugin'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; + import MarketPlacePage from '../index'; + import server from './server'; // Increase the jest timeout to accommodate long running tests diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js index 489cdf7530..b32edc81ad 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js @@ -1,15 +1,16 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider } from '@strapi/helper-plugin'; import { render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { TrackingProvider } from '@strapi/helper-plugin'; - import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; import MarketPlacePage from '../index'; + import server from './server'; // Increase the jest timeout to accommodate long running tests diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/server.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/server.js index 57e94c26d4..09c9d84fff 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/server.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/server.js @@ -1,6 +1,7 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; import qs from 'qs'; + import { responses as pluginResponses } from './mocks/plugins'; import { responses as providerResponses } from './mocks/providers'; diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/utils/useMarketplaceData.js b/packages/core/admin/admin/src/pages/MarketplacePage/utils/useMarketplaceData.js index 983200c6ca..e338ec0ae2 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/utils/useMarketplaceData.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/utils/useMarketplaceData.js @@ -1,6 +1,8 @@ -import { useState, useEffect } from 'react'; -import { useIntl } from 'react-intl'; +import { useEffect, useState } from 'react'; + import { useNotifyAT } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import useFetchMarketplacePlugins from '../../../hooks/marketplace/useFetchMarketplacePlugins'; import useFetchMarketplaceProviders from '../../../hooks/marketplace/useFetchMarketplaceProviders'; diff --git a/packages/core/admin/admin/src/pages/NotFoundPage/index.js b/packages/core/admin/admin/src/pages/NotFoundPage/index.js index 739658ba9e..a48d81b1b2 100644 --- a/packages/core/admin/admin/src/pages/NotFoundPage/index.js +++ b/packages/core/admin/admin/src/pages/NotFoundPage/index.js @@ -5,9 +5,10 @@ * */ import React from 'react'; -import { useFocusWhenNavigate, LinkButton } from '@strapi/helper-plugin'; -import { Main, ContentLayout, HeaderLayout, EmptyStateLayout } from '@strapi/design-system'; -import { EmptyPictures, ArrowRight } from '@strapi/icons'; + +import { ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system'; +import { LinkButton, useFocusWhenNavigate } from '@strapi/helper-plugin'; +import { ArrowRight, EmptyPictures } from '@strapi/icons'; import { useIntl } from 'react-intl'; const NoContentType = () => { diff --git a/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js b/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js index 3b563eac6f..028c91b616 100644 --- a/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/NotFoundPage/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { Router } from 'react-router-dom'; import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { Router } from 'react-router-dom'; + import NotFoundPage from '../index'; const history = createMemoryHistory(); diff --git a/packages/core/admin/admin/src/pages/ProfilePage/components/Password/index.js b/packages/core/admin/admin/src/pages/ProfilePage/components/Password/index.js index 9a42ee9691..1a44387205 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/components/Password/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/components/Password/index.js @@ -1,18 +1,19 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; + import { - Typography, Box, + FieldAction, + Flex, Grid, GridItem, - Flex, - FieldAction, TextInput, + Typography, } from '@strapi/design-system'; -import { Eye, EyeStriked } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import { pxToRem } from '@strapi/helper-plugin'; +import { Eye, EyeStriked } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const PasswordInput = styled(TextInput)` ::-ms-reveal { diff --git a/packages/core/admin/admin/src/pages/ProfilePage/components/Preferences/index.js b/packages/core/admin/admin/src/pages/ProfilePage/components/Preferences/index.js index 9ce72a602e..fc39f4fc01 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/components/Preferences/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/components/Preferences/index.js @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Typography, Box, Grid, GridItem, Flex, Select, Option } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Grid, GridItem, Option, Select, Typography } from '@strapi/design-system'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const Preferences = ({ onChange, values, localeNames, allApplicationThemes }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/ProfilePage/components/UserInfo/index.js b/packages/core/admin/admin/src/pages/ProfilePage/components/UserInfo/index.js index 670f1b592a..739d589623 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/components/UserInfo/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/components/UserInfo/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import { GenericInput } from '@strapi/helper-plugin'; -import { Typography, Box, Grid, GridItem, Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; const UserInfo = ({ errors, onChange, values }) => { diff --git a/packages/core/admin/admin/src/pages/ProfilePage/index.js b/packages/core/admin/admin/src/pages/ProfilePage/index.js index eb0dd53731..4382f2f4ef 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/index.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/index.js @@ -1,37 +1,40 @@ import React from 'react'; + import { + Box, + Button, + ContentLayout, + Flex, + HeaderLayout, + Main, + useNotifyAT, +} from '@strapi/design-system'; +import { + auth, Form, LoadingIndicatorPage, useAppInfo, + useFetchClient, useFocusWhenNavigate, useNotification, useOverlayBlocker, - auth, useTracking, - useFetchClient, } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import { Formik } from 'formik'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { Helmet } from 'react-helmet'; -import { - Main, - Box, - ContentLayout, - HeaderLayout, - Button, - Flex, - useNotifyAT, -} from '@strapi/design-system'; import { Check } from '@strapi/icons'; -import UserInfo from './components/UserInfo'; -import Preferences from './components/Preferences'; -import Password from './components/Password'; +import { Formik } from 'formik'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; + import useLocalesProvider from '../../components/LocalesProvider/useLocalesProvider'; import { useThemeToggle } from '../../hooks'; -import schema from './utils/schema'; import { getFullName } from '../../utils'; +import Password from './components/Password'; +import Preferences from './components/Preferences'; +import UserInfo from './components/UserInfo'; +import schema from './utils/schema'; + const ProfilePage = () => { const { changeLocale, localeNames } = useLocalesProvider(); const { setUserDisplayName } = useAppInfo(); diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js index 33a4a47ea8..7bc06d6cce 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js @@ -1,13 +1,16 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + +import Theme from '../../../components/Theme'; +import ThemeToggleProvider from '../../../components/ThemeToggleProvider'; import ProfilePage from '../index'; + import server from './utils/server'; import serverLockedSSO from './utils/serverLockedSSO'; -import ThemeToggleProvider from '../../../components/ThemeToggleProvider'; -import Theme from '../../../components/Theme'; jest.mock('../../../components/LocalesProvider/useLocalesProvider'); diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/server.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/server.js index e91c9ac520..1f52b32791 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/server.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/me', (req, res, ctx) => { diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/serverLockedSSO.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/serverLockedSSO.js index dfc1cdfc24..ec1b2ba569 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/serverLockedSSO.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/utils/serverLockedSSO.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/me', (req, res, ctx) => { diff --git a/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js b/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js index c9d0f6963c..dba5a0d276 100644 --- a/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js +++ b/packages/core/admin/admin/src/pages/ProfilePage/utils/schema.js @@ -1,4 +1,5 @@ import * as yup from 'yup'; + import { profileValidation } from '../../SettingsPage/pages/Users/utils/validations/users'; const schema = yup.object().shape(profileValidation); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Filters/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Filters/index.js index 48e851f492..4232fddd8d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Filters/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Filters/index.js @@ -1,9 +1,10 @@ import React, { useRef, useState } from 'react'; + +import { Box, Button } from '@strapi/design-system'; +import { FilterListURLQuery, FilterPopoverURLQuery } from '@strapi/helper-plugin'; +import { Filter } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button, Box } from '@strapi/design-system'; -import { Filter } from '@strapi/icons'; -import { FilterListURLQuery, FilterPopoverURLQuery } from '@strapi/helper-plugin'; const Filters = ({ displayedFilters }) => { const [isVisible, setIsVisible] = useState(false); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js index 73511c98fa..1ceea2a1ad 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js @@ -1,15 +1,17 @@ import React from 'react'; -import { NavLink, useLocation } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { useTracking } from '@strapi/helper-plugin'; + import { SubNav, SubNavHeader, + SubNavLink, SubNavSection, SubNavSections, - SubNavLink, } from '@strapi/design-system/v2'; +import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { NavLink, useLocation } from 'react-router-dom'; + import { getSectionsToDisplay } from '../../utils'; const SettingsNav = ({ menu }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js index c503ff095a..fe32c197da 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import SettingsNav from '../index'; const menu = [ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js index deb1df8307..a62118928e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + +import { Button, Flex, HeaderLayout } from '@strapi/design-system'; import { Link } from '@strapi/helper-plugin'; import { ArrowLeft, Check } from '@strapi/icons'; -import { Button, HeaderLayout, Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import Regenerate from '../Regenerate'; const FormHead = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/LifeSpanInput/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/LifeSpanInput/index.js index 45492e2b88..72b901ddb8 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/LifeSpanInput/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/LifeSpanInput/index.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { Option, Select, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option, Typography } from '@strapi/design-system'; + import { getDateOfExpiration } from '../../../pages/ApiTokens/EditView/utils'; const LifeSpanInput = ({ token, errors, values, onChange, isCreating }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Regenerate/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Regenerate/index.js index 33fb99ddac..e232566eb3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Regenerate/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Regenerate/index.js @@ -1,9 +1,11 @@ import React, { useState } from 'react'; + +import { Button } from '@strapi/design-system'; +import { ConfirmDialog } from '@strapi/helper-plugin'; +import { Refresh } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button } from '@strapi/design-system'; -import { Refresh } from '@strapi/icons'; -import { ConfirmDialog } from '@strapi/helper-plugin'; + import { useRegenerate } from '../../../../../hooks'; export const Regenerate = ({ onRegenerate, idToRegenerate, backUrl, onError }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DefaultButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DefaultButton/index.js index e49dd1de84..121e31433b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DefaultButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DefaultButton/index.js @@ -1,9 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Link } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { Link } from '@strapi/helper-plugin'; const MESSAGES_MAP = { edit: { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/index.js index 926c70a373..8803f70bc8 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/index.js @@ -1,9 +1,10 @@ import React, { useState } from 'react'; + +import { Box, IconButton } from '@strapi/design-system'; +import { ConfirmDialog, useTracking } from '@strapi/helper-plugin'; import { Trash } from '@strapi/icons'; -import { IconButton, Box } from '@strapi/design-system'; -import { useTracking, ConfirmDialog } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const DeleteButton = ({ tokenName, onClickDelete, tokenType }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js index 3a4ba74cee..1ae78f0ec5 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js @@ -1,8 +1,9 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider } from '@strapi/helper-plugin'; import { act, fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { NotificationsProvider } from '@strapi/helper-plugin'; import DeleteButton from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/ReadButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/ReadButton/index.js index c94a763ce9..b018d85762 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/ReadButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/ReadButton/index.js @@ -1,6 +1,8 @@ import React from 'react'; + import { Eye } from '@strapi/icons'; import PropTypes from 'prop-types'; + import DefaultButton from '../DefaultButton'; const ReadButton = ({ tokenName, tokenId }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/UpdateButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/UpdateButton/index.js index f732c32c3d..73ef82fb22 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/UpdateButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/UpdateButton/index.js @@ -1,6 +1,8 @@ import React from 'react'; + import { Pencil } from '@strapi/icons'; import PropTypes from 'prop-types'; + import DefaultButton from '../DefaultButton'; const UpdateButton = ({ tokenName, tokenId }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js index f46a0765a3..d585534f75 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js @@ -1,18 +1,20 @@ import React from 'react'; -import { useHistory } from 'react-router-dom'; -import PropTypes from 'prop-types'; -import { Typography, Flex, Tbody, Tr, Td } from '@strapi/design-system'; + +import { Flex, Tbody, Td, Tr, Typography } from '@strapi/design-system'; import { - RelativeTime, + DynamicTable, onRowClick, pxToRem, - DynamicTable, + RelativeTime, useQueryParams, useTracking, } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useHistory } from 'react-router-dom'; + import DeleteButton from './DeleteButton'; -import UpdateButton from './UpdateButton'; import ReadButton from './ReadButton'; +import UpdateButton from './UpdateButton'; const Table = ({ permissions, diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenBox/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenBox/index.js index 62b24d4ff2..b624ef1f06 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenBox/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenBox/index.js @@ -1,9 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { ContentBox, useNotification, useTracking, useClipboard } from '@strapi/helper-plugin'; + import { IconButton } from '@strapi/design-system'; +import { ContentBox, useClipboard, useNotification, useTracking } from '@strapi/helper-plugin'; import { Duplicate, Key } from '@strapi/icons'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const TokenBox = ({ token, tokenType }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenDescription/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenDescription/index.js index a329e5452e..59b22bbb07 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenDescription/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenDescription/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Textarea } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Textarea } from '@strapi/design-system'; const TokenDescription = ({ errors, values, onChange, canEditInputs }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenName/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenName/index.js index 47cc2b8f6a..942f1065f6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenName/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenName/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { TextInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { TextInput } from '@strapi/design-system'; const TokenName = ({ errors, values, onChange, canEditInputs }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenTypeSelect/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenTypeSelect/index.js index 83ef6cb546..85637a356e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenTypeSelect/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/TokenTypeSelect/index.js @@ -1,9 +1,9 @@ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option } from '@strapi/design-system'; - const TokenTypeSelect = ({ name, errors, values, onChange, canEditInputs, options, label }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/index.js index 4c01daca6a..6f76be3f9e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/index.js @@ -10,16 +10,19 @@ // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED import React, { memo, useMemo } from 'react'; -import { LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin'; -import { Switch, Redirect, Route, useParams } from 'react-router-dom'; + import { Layout } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; +import { LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin'; import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; +import { Redirect, Route, Switch, useParams } from 'react-router-dom'; + import { useSettingsMenu } from '../../hooks'; import { createRoute, makeUniqueRoutes } from '../../utils'; + +import SettingsNav from './components/SettingsNav'; import ApplicationInfosPage from './pages/ApplicationInfosPage'; import { createSectionsRoutes, routes } from './utils'; -import SettingsNav from './components/SettingsNav'; function SettingsPage() { const { settingId } = useParams(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js index 5217eb4662..75542b39ac 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { Flex, GridItem, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import { Typography, Flex, GridItem } from '@strapi/design-system'; -import BoundRoute from '../BoundRoute'; + import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions'; +import BoundRoute from '../BoundRoute'; const ActionBoundRoutes = () => { const { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/index.js index 8168db7da3..0f3467bc5a 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/BoundRoute/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import styled from 'styled-components'; -import { Flex, Box, Typography } from '@strapi/design-system'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import map from 'lodash/map'; import tail from 'lodash/tail'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import getMethodColor from './getMethodColor'; const MethodBox = styled(Box)` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js index 5a1b456336..e3165e258d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/CheckBoxWrapper.js @@ -1,5 +1,5 @@ -import styled, { css } from 'styled-components'; import { Box } from '@strapi/design-system'; +import styled, { css } from 'styled-components'; const activeCheckboxWrapperStyles = css` background: ${(props) => props.theme.colors.primary100}; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js index 87288b7484..147720b84e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js @@ -1,21 +1,24 @@ -import React, { useState, useEffect } from 'react'; -import capitalize from 'lodash/capitalize'; -import { useIntl } from 'react-intl'; +import React, { useEffect, useState } from 'react'; + import { Accordion, - AccordionToggle, AccordionContent, + AccordionToggle, + Box, Checkbox, + Flex, Grid, GridItem, Typography, - Box, - Flex, } from '@strapi/design-system'; import { Cog } from '@strapi/icons'; -import styled from 'styled-components'; +import capitalize from 'lodash/capitalize'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions'; + import CheckboxWrapper from './CheckBoxWrapper'; const Border = styled.div` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContenTypesSection/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContenTypesSection/index.js index 5339c7d550..c9e4383654 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContenTypesSection/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ContenTypesSection/index.js @@ -1,6 +1,8 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import CollapsableContentType from '../CollapsableContentType'; const ContentTypesSection = ({ section, ...props }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js index 3994cdc415..f0bfe1ea20 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/FormApiTokenContainer/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, Grid, GridItem, Flex, Typography } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import LifeSpanInput from '../../../../../components/Tokens/LifeSpanInput'; -import TokenName from '../../../../../components/Tokens/TokenName'; import TokenDescription from '../../../../../components/Tokens/TokenDescription'; +import TokenName from '../../../../../components/Tokens/TokenName'; import TokenTypeSelect from '../../../../../components/Tokens/TokenTypeSelect'; const FormApiTokenContainer = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js index 92d8157bf1..6c01c069b7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js @@ -1,13 +1,14 @@ import React from 'react'; + +import { Button, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; import { - SettingsPageTitle, LoadingIndicatorPage, + SettingsPageTitle, useFocusWhenNavigate, } from '@strapi/helper-plugin'; -import { HeaderLayout, ContentLayout, Main, Button } from '@strapi/design-system'; import { Check } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const LoadingView = ({ apiTokenName }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js index 2d13a5c889..11bc80363a 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js @@ -1,9 +1,11 @@ import React, { memo } from 'react'; + +import { Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import { Typography, Flex, Grid, GridItem } from '@strapi/design-system'; -import ContentTypesSection from '../ContenTypesSection'; -import ActionBoundRoutes from '../ActionBoundRoutes'; + import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions'; +import ActionBoundRoutes from '../ActionBoundRoutes'; +import ContentTypesSection from '../ContenTypesSection'; const Permissions = ({ ...props }) => { const { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js index fc2cfa6df9..99a56a9f04 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Regenerate/index.js @@ -1,9 +1,11 @@ import React, { useState } from 'react'; + +import { Button } from '@strapi/design-system'; +import { ConfirmDialog } from '@strapi/helper-plugin'; +import { Refresh } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button } from '@strapi/design-system'; -import { Refresh } from '@strapi/icons'; -import { ConfirmDialog } from '@strapi/helper-plugin'; + import { useRegenerate } from '../../../../../../../hooks'; export const Regenerate = ({ onRegenerate, idToRegenerate }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js index 1445e1e7a2..06481fe9be 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js @@ -1,32 +1,35 @@ -import React, { useEffect, useState, useRef, useReducer } from 'react'; -import { useIntl } from 'react-intl'; +import React, { useEffect, useReducer, useRef, useState } from 'react'; + +import { ContentLayout, Flex, Main } from '@strapi/design-system'; import { - SettingsPageTitle, - useFocusWhenNavigate, Form, - useOverlayBlocker, - useNotification, - useTracking, - useGuidedTour, - useRBAC, + SettingsPageTitle, useFetchClient, + useFocusWhenNavigate, + useGuidedTour, + useNotification, + useOverlayBlocker, + useRBAC, + useTracking, } from '@strapi/helper-plugin'; -import { Main, ContentLayout, Flex } from '@strapi/design-system'; import { Formik } from 'formik'; -import { useRouteMatch, useHistory } from 'react-router-dom'; +import { useIntl } from 'react-intl'; import { useQuery } from 'react-query'; -import { formatAPIErrors } from '../../../../../utils'; -import { schema } from './utils'; -import LoadingView from './components/LoadingView'; -import adminPermissions from '../../../../../permissions'; +import { useHistory, useRouteMatch } from 'react-router-dom'; + import { ApiTokenPermissionsContextProvider } from '../../../../../contexts/ApiTokenPermissions'; +import adminPermissions from '../../../../../permissions'; +import { formatAPIErrors } from '../../../../../utils'; +import { API_TOKEN_TYPE } from '../../../components/Tokens/constants'; +import FormHead from '../../../components/Tokens/FormHead'; +import TokenBox from '../../../components/Tokens/TokenBox'; + +import FormApiTokenContainer from './components/FormApiTokenContainer'; +import LoadingView from './components/LoadingView'; +import Permissions from './components/Permissions'; import init from './init'; import reducer, { initialState } from './reducer'; -import Permissions from './components/Permissions'; -import FormApiTokenContainer from './components/FormApiTokenContainer'; -import TokenBox from '../../../components/Tokens/TokenBox'; -import FormHead from '../../../components/Tokens/FormHead'; -import { API_TOKEN_TYPE } from '../../../components/Tokens/constants'; +import { schema } from './utils'; const MSG_ERROR_NAME_TAKEN = 'Name already taken'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js index d094d822d4..160a505186 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js @@ -1,6 +1,7 @@ /* eslint-disable consistent-return */ import produce from 'immer'; import pull from 'lodash/pull'; + import { transformPermissionsData } from './utils'; export const initialState = { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js index 45b2b0b0b6..668bcef1c0 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { act, render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Route } from 'react-router-dom'; import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Route, Router } from 'react-router-dom'; + import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; import EditView from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/reducer.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/reducer.test.js index b026d2781c..bf0690f65b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/reducer.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/reducer.test.js @@ -1,6 +1,6 @@ +import init from '../init'; import reducer from '../reducer'; import { data } from '../utils/tests/dataMock'; -import init from '../init'; describe('ADMIN | Pages | API TOKENS | EditView | reducer', () => { const initialState = init({}, data.data); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js index 626080eef1..5e1621102f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string(translatedErrors.string).max(100).required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/tests/transformPermissionsData.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/tests/transformPermissionsData.test.js index a9f82074ef..af7f99984d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/tests/transformPermissionsData.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/tests/transformPermissionsData.test.js @@ -1,4 +1,5 @@ import transformPermissionsData from '../transformPermissionsData'; + import { data } from './dataMock'; describe('ADMIN | Container | SettingsPage | ApiTokens | EditView | utils | transformPermissionsData', () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js index ba8437c608..f54788c6d4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/index.js @@ -1,28 +1,29 @@ import React, { useEffect, useRef } from 'react'; -import { useIntl } from 'react-intl'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useHistory } from 'react-router-dom'; -import qs from 'qs'; +import { Button, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; import { - SettingsPageTitle, - useFocusWhenNavigate, - useNotification, - NoPermissions, - useRBAC, - NoContent, - useTracking, - useGuidedTour, - useFetchClient, LinkButton, + NoContent, + NoPermissions, + SettingsPageTitle, + useFetchClient, + useFocusWhenNavigate, + useGuidedTour, + useNotification, + useRBAC, + useTracking, } from '@strapi/helper-plugin'; -import { HeaderLayout, ContentLayout, Main, Button } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import qs from 'qs'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; +import { useHistory } from 'react-router-dom'; import adminPermissions from '../../../../../permissions'; -import tableHeaders from './utils/tableHeaders'; -import Table from '../../../components/Tokens/Table'; import { API_TOKEN_TYPE } from '../../../components/Tokens/constants'; +import Table from '../../../components/Tokens/Table'; + +import tableHeaders from './utils/tableHeaders'; const ApiTokenListView = () => { useFocusWhenNavigate(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js index 8c641b1535..40be385278 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js @@ -1,11 +1,13 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { act, render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Route } from 'react-router-dom'; import { createMemoryHistory } from 'history'; -import { useRBAC, TrackingProvider } from '@strapi/helper-plugin'; +import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Route, Router } from 'react-router-dom'; + import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; import ListView from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedCreateView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedCreateView/index.js index 447ecda79c..2360543456 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedCreateView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedCreateView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedEditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedEditView/index.js index b4ed12240d..1fae7471f6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedEditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedEditView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedListView/index.js index b73a6fe69f..6483ef73c7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ProtectedListView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import ListView from '../ListView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/index.js index 9e7ae414f0..7ed6b7f0e9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/index.js @@ -1,13 +1,16 @@ -import React, { useReducer, forwardRef, useImperativeHandle } from 'react'; +import React, { forwardRef, useImperativeHandle, useReducer } from 'react'; + +import { Box, Grid, GridItem, Typography } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useTracking } from '@strapi/helper-plugin'; -import { Grid, GridItem, Box, Typography } from '@strapi/design-system'; + import { useConfigurations } from '../../../../../../hooks'; import { DIMENSION, SIZE } from '../../utils/constants'; import LogoInput from '../LogoInput'; -import reducer, { initialState } from './reducer'; + import init from './init'; +import reducer, { initialState } from './reducer'; const CustomizationInfos = forwardRef(({ canUpdate, projectSettingsStored }, ref) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js index 46e3a2fbf7..4a2134e120 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; import CustomizationInfos from '..'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js index bb5cee5e5e..f29e8170ae 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/index.js @@ -1,15 +1,18 @@ import React, { useReducer } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { + Box, + CarouselActions, CarouselInput, CarouselSlide, - CarouselActions, IconButton, - Box, } from '@strapi/design-system'; import { Plus, Refresh } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import LogoModalStepper from '../LogoModalStepper'; + import reducer, { initialState } from './reducer'; import stepper from './stepper'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/index.test.js index daebbd969c..f04101b1ec 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoInput/tests/index.test.js @@ -1,8 +1,9 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { render as renderTL, fireEvent, screen, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { getFetchClient } from '@strapi/helper-plugin'; +import { fireEvent, render as renderTL, screen, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; import LogoInput from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/AddLogoDialog.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/AddLogoDialog.js index 5068f78343..53a4b5588b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/AddLogoDialog.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/AddLogoDialog.js @@ -1,7 +1,9 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Box, Divider, Tab, TabGroup, TabPanel, TabPanels, Tabs } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Tabs, Tab, TabGroup, TabPanels, TabPanel, Box, Divider } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import FromComputerForm from './FromComputerForm'; import FromUrlForm from './FromUrlForm'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromComputerForm.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromComputerForm.js index 5dd0c20c92..ff22e1462b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromComputerForm.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromComputerForm.js @@ -1,21 +1,23 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import styled from 'styled-components'; +import React, { useRef, useState } from 'react'; + import { Box, - Flex, - Icon, - Typography, - ModalFooter, Button, Field, FieldError, FieldInput, + Flex, + Icon, + ModalFooter, + Typography, } from '@strapi/design-system'; import { PicturePlus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import { ACCEPTED_FORMAT, DIMENSION, SIZE } from '../../utils/constants'; import { parseFileMetadatas } from '../../utils/parseFileMetadatas'; -import { ACCEPTED_FORMAT, SIZE, DIMENSION } from '../../utils/constants'; const FileInput = styled(FieldInput)` opacity: 0; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromUrlForm.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromUrlForm.js index 3086d8b82f..3fdbed7439 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromUrlForm.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/FromUrlForm.js @@ -1,10 +1,12 @@ import React, { useState } from 'react'; + +import { Box, Button, ModalFooter, TextInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Box, Button, TextInput, ModalFooter } from '@strapi/design-system'; -import urlToFile from '../../utils/urlToFile'; + +import { DIMENSION, SIZE } from '../../utils/constants'; import { parseFileMetadatas } from '../../utils/parseFileMetadatas'; -import { SIZE, DIMENSION } from '../../utils/constants'; +import urlToFile from '../../utils/urlToFile'; const FromUrlForm = ({ goTo, next, onClose, setLocalImage }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/ImageCardAsset.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/ImageCardAsset.js index 77376aeec6..89b53132d7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/ImageCardAsset.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/ImageCardAsset.js @@ -1,6 +1,5 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Card, CardAsset, @@ -8,9 +7,11 @@ import { CardBody, CardContent, CardHeader, - CardTitle, CardSubtitle, + CardTitle, } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const ImageCardAsset = ({ asset }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/PendingLogoDialog.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/PendingLogoDialog.js index 0b11708d5b..c4f71eb490 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/PendingLogoDialog.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/PendingLogoDialog.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { Box, Button, Flex, ModalFooter, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { pxToRem } from '@strapi/helper-plugin'; -import { Box, Flex, Button, ModalFooter, Typography } from '@strapi/design-system'; + import ImageCardAsset from './ImageCardAsset'; const PendingLogoDialog = ({ onClose, asset, prev, next, goTo, setLocalImage, onChangeLogo }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/index.js index e9a28ac0d0..2b173562d4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/index.js @@ -1,7 +1,9 @@ import React, { useReducer } from 'react'; + +import { ModalHeader, ModalLayout, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { ModalLayout, ModalHeader, Typography } from '@strapi/design-system'; + import reducer, { initialState } from './reducer'; const LogoModalStepper = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/AddLogoDialog.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/AddLogoDialog.test.js index d5c642f8f6..49af2a4268 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/AddLogoDialog.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/AddLogoDialog.test.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render as renderTL } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { render as renderTL, fireEvent } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import AddLogoDialog from '../AddLogoDialog'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/ImageCardAsset.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/ImageCardAsset.test.js index 1c150e1957..7185860872 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/ImageCardAsset.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/ImageCardAsset.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; import ImageCardAsset from '../ImageCardAsset'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/PendingLogoDialog.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/PendingLogoDialog.test.js index 3d0a6e2526..2b09bc2b55 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/PendingLogoDialog.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/LogoModalStepper/tests/PendingLogoDialog.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render as renderTL } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; import PendingLogoDialog from '../PendingLogoDialog'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js index c951df3203..0ffbb6b3d8 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js @@ -1,14 +1,5 @@ import React, { useRef } from 'react'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useIntl } from 'react-intl'; -import { - useAppInfo, - SettingsPageTitle, - useFocusWhenNavigate, - useNotification, - useRBAC, - useTracking, -} from '@strapi/helper-plugin'; + import { Button, ContentLayout, @@ -21,11 +12,22 @@ import { Main, Typography, } from '@strapi/design-system'; -import { ExternalLink, Check } from '@strapi/icons'; +import { + SettingsPageTitle, + useAppInfo, + useFocusWhenNavigate, + useNotification, + useRBAC, + useTracking, +} from '@strapi/helper-plugin'; +import { Check, ExternalLink } from '@strapi/icons'; import AdminSeatInfo from 'ee_else_ce/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; -import adminPermissions from '../../../../permissions'; import { useConfigurations } from '../../../../hooks'; +import adminPermissions from '../../../../permissions'; + import CustomizationInfos from './components/CustomizationInfos'; import { fetchProjectSettings, postProjectSettings } from './utils/api'; import getFormData from './utils/getFormData'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js index 413c7497df..f785a38ee1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/index.test.js @@ -1,10 +1,13 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider, useAppInfo, useRBAC } from '@strapi/helper-plugin'; import { fireEvent, render, screen, waitFor } from '@testing-library/react'; -import { QueryClientProvider, QueryClient } from 'react-query'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useAppInfo, useRBAC, TrackingProvider } from '@strapi/helper-plugin'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import ApplicationInfosPage from '../index'; + import server from './server'; const updateProjectSettingsSpy = jest.fn(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/server.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/server.js index d32d4fbca8..cbd74bffef 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/server.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/project-settings', (req, res, ctx) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js index e6ad1ef604..e82ae1ae3a 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import prefixAllUrls from './prefixAllUrls'; const fetchProjectSettings = async () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/parseFileMetadatas.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/parseFileMetadatas.js index c2e20f7e48..105e6bc00c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/parseFileMetadatas.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/parseFileMetadatas.js @@ -1,4 +1,4 @@ -import { DIMENSION, SIZE, ACCEPTED_FORMAT } from './constants'; +import { ACCEPTED_FORMAT, DIMENSION, SIZE } from './constants'; const FILE_FORMAT_ERROR_MESSAGE = { id: 'Settings.application.customization.modal.upload.error-format', diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js index d820fd3a9a..b4836a3312 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js @@ -1,5 +1,5 @@ -import transform from 'lodash/transform'; import { prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin'; +import transform from 'lodash/transform'; const prefixAllUrls = (data) => transform( diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/index.js index 407c79ca68..a14b1456bc 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/index.js @@ -1,39 +1,42 @@ import React, { useRef, useState } from 'react'; -import { format } from 'date-fns'; + +import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + Textarea, + TextInput, + Typography, +} from '@strapi/design-system'; import { CheckPagePermissions, Form, + Link, LoadingIndicatorPage, SettingsPageTitle, useFetchClient, useNotification, useOverlayBlocker, useTracking, - Link, } from '@strapi/helper-plugin'; -import { - Box, - Button, - ContentLayout, - HeaderLayout, - Grid, - GridItem, - Main, - Flex, - Typography, - TextInput, - Textarea, -} from '@strapi/design-system'; import { ArrowLeft } from '@strapi/icons'; +import { format } from 'date-fns'; import { Formik } from 'formik'; import get from 'lodash/get'; import isEmpty from 'lodash/isEmpty'; import { useIntl } from 'react-intl'; import { useHistory, useRouteMatch } from 'react-router-dom'; import styled from 'styled-components'; -import Permissions from '../EditPage/components/Permissions'; + import { useFetchPermissionsLayout, useFetchRole } from '../../../../../hooks'; import adminPermissions from '../../../../../permissions'; +import Permissions from '../EditPage/components/Permissions'; + import schema from './utils/schema'; const UsersRoleNumber = styled.div` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js index 7d7fbb7239..0e13ba1678 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js @@ -5,11 +5,12 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { MemoryRouter, Switch, Route } from 'react-router-dom'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { NotificationsProvider } from '@strapi/helper-plugin'; +import { MemoryRouter, Route, Switch } from 'react-router-dom'; import { CreatePage } from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/utils/schema.js index 5e2ac5c5af..c3bcd9cf28 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string().required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/CollapseLabel/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/CollapseLabel/index.js index c03814209c..7ec3f6ac7d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/CollapseLabel/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/CollapseLabel/index.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { Flex } from '@strapi/design-system'; +import styled from 'styled-components'; const CollapseLabel = styled(Flex)` padding-right: ${({ theme }) => theme.spaces[2]}; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js index e92f1a82ec..c26c1e76e9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Cog } from '@strapi/icons'; + import { Button } from '@strapi/design-system'; +import { Cog } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js index 697304e51d..35de800aea 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/index.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Box, Flex, MultiSelectNested, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, Flex, Typography, MultiSelectNested } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import { getNestedOptions, getSelectedValues, getNewStateFromChangedValues } from './utils/options'; +import { getNestedOptions, getNewStateFromChangedValues, getSelectedValues } from './utils/options'; const ActionRow = ({ arrayOfOptionsGroupedByCategory, diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/options.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/options.js index 16dac1dad6..4a5cedb8f8 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/options.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/options.js @@ -28,4 +28,4 @@ const getNewStateFromChangedValues = (options, changedValues) => .flat() .reduce((acc, curr) => ({ [curr.id]: changedValues.includes(curr.id), ...acc }), {}); -export { getNestedOptions, getSelectedValues, getNewStateFromChangedValues }; +export { getNestedOptions, getNewStateFromChangedValues, getSelectedValues }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/tests/options.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/tests/options.test.js index 93ce0fa98b..5327394435 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/tests/options.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/ActionRow/utils/tests/options.test.js @@ -1,4 +1,4 @@ -import { getSelectedValues, getNestedOptions, getNewStateFromChangedValues } from '../options'; +import { getNestedOptions, getNewStateFromChangedValues, getSelectedValues } from '../options'; describe('ActionRow | utils | getSelectedValues', () => { test('should reduce the default values to a flat array', () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js index 86e732f63c..b1cd781b5f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js @@ -1,11 +1,11 @@ import React, { useMemo, useState } from 'react'; -import PropTypes from 'prop-types'; + import { Button, + ModalBody, ModalFooter, ModalHeader, ModalLayout, - ModalBody, Typography, } from '@strapi/design-system'; import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; @@ -13,8 +13,11 @@ import produce from 'immer'; import get from 'lodash/get'; import groupBy from 'lodash/groupBy'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import { usePermissionsDataManager } from '../../../../../../../hooks'; + import ActionRow from './ActionRow'; import createDefaultConditionsForm from './utils/createDefaultConditionsForm'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js index 8d30cb1c66..95c07b46e1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/createDefaultConditionsForm.js @@ -44,4 +44,4 @@ const createDefaultConditionsForm = ( }; export default createDefaultConditionsForm; -export { createConditionsForm, createCategoryForm }; +export { createCategoryForm, createConditionsForm }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js index eea4a19278..1a9fc3ad05 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/utils/tests/createDefaultConditionsForm.test.js @@ -1,6 +1,6 @@ import createDefaultConditionsForm, { - createConditionsForm, createCategoryForm, + createConditionsForm, } from '../createDefaultConditionsForm'; describe('ADMIN | COMPONENTS | Roles | ConditionsModale | utils ', () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js index 93db5b5a3c..689c8a9cfb 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js @@ -1,11 +1,13 @@ import React, { useMemo, useState } from 'react'; -import PropTypes from 'prop-types'; -import { ChevronDown, ChevronUp } from '@strapi/icons'; + import { BaseCheckbox, Box, Flex } from '@strapi/design-system'; +import { ChevronDown, ChevronUp } from '@strapi/icons'; import get from 'lodash/get'; import omit from 'lodash/omit'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; + import { usePermissionsDataManager } from '../../../../../../../../hooks'; import ConditionsButton from '../../ConditionsButton'; import ConditionsModal from '../../ConditionsModal'; @@ -13,9 +15,10 @@ import HiddenAction from '../../HiddenAction'; import { cellWidth, rowHeight } from '../../Permissions/utils/constants'; import RowLabelWithCheckbox from '../../RowLabelWithCheckbox'; import { getCheckboxState } from '../../utils'; -import generateCheckboxesActions from './utils/generateCheckboxesActions'; import activeStyle from '../utils/activeStyle'; +import generateCheckboxesActions from './utils/generateCheckboxesActions'; + const activeRowStyle = (theme, isActive) => ` ${Wrapper} { background-color: ${theme.colors.primary100}; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js index 1aed3b9d54..84c5461fc4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/utils/generateCheckboxesActions.js @@ -1,5 +1,6 @@ import get from 'lodash/get'; import isEmpty from 'lodash/isEmpty'; + import { createArrayOfValues, getCheckboxState } from '../../../utils'; const generateCheckboxesActions = (availableActions, modifiedData, pathToData) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js index a9c4a6c8b6..da4a6ef581 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js @@ -1,9 +1,11 @@ import React, { memo, useCallback, useMemo, useState } from 'react'; + +import { BaseCheckbox, Flex } from '@strapi/design-system'; +import get from 'lodash/get'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { BaseCheckbox, Flex } from '@strapi/design-system'; -import get from 'lodash/get'; + import { usePermissionsDataManager } from '../../../../../../../../../hooks'; import HiddenAction from '../../../HiddenAction'; import { cellWidth, rowHeight } from '../../../Permissions/utils/constants'; @@ -13,6 +15,7 @@ import { getCheckboxState } from '../../../utils'; import { activeStyle } from '../../utils'; import CarretIcon from '../CarretIcon'; import SubActionRow from '../SubActionRow'; + import getRowLabelCheckboxeState from './utils/getRowLabelCheckboxeState'; const Cell = styled(Flex)` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js index 9dd9ccea62..3800a4db5e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/CarretIcon/index.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { CarretDown } from '@strapi/icons'; +import styled from 'styled-components'; const CarretIcon = styled(CarretDown)` display: none; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js index da8064940d..c40e31890c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/Header/index.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Flex, Typography } from '@strapi/design-system'; + import { cellWidth, firstRowWidth, rowHeight } from '../../../Permissions/utils/constants'; const HeaderLabel = styled(Flex)` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js index bc7e456d12..656f46900e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js @@ -1,10 +1,12 @@ import React, { memo, useMemo, useState } from 'react'; -import PropTypes from 'prop-types'; + +import { BaseCheckbox, Box, Flex, Typography } from '@strapi/design-system'; import get from 'lodash/get'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { BaseCheckbox, Box, Flex, Typography } from '@strapi/design-system'; + import { usePermissionsDataManager } from '../../../../../../../../../hooks'; import CollapseLabel from '../../../CollapseLabel'; import Curve from '../../../Curve'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js index a05dd12fcb..84db09bce1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/index.js @@ -1,10 +1,12 @@ import React, { useMemo } from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; -import generateHeadersFromActions from './utils/generateHeadersFromActions'; -import Header from './Header'; + import ActionRow from './ActionRow'; +import Header from './Header'; +import generateHeadersFromActions from './utils/generateHeadersFromActions'; const Wrapper = styled.div` display: inline-flex; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/index.js index 3f4f98b4ea..80b0124084 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/index.js @@ -1,6 +1,8 @@ -import PropTypes from 'prop-types'; import React, { useCallback, useMemo } from 'react'; + +import PropTypes from 'prop-types'; import styled from 'styled-components'; + import Collapse from './Collapse'; import CollapsePropertyMatrix from './CollapsePropertyMatrix'; import { getAvailableActions } from './utils'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js index 2ad6aceda6..276bf7734b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/utils/activeStyle.js @@ -1,4 +1,5 @@ import { Typography } from '@strapi/design-system'; + import CarretIcon from '../CollapsePropertyMatrix/CarretIcon'; const activeStyle = (theme) => ` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapses/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapses/index.js index ca12e2f6f2..4f7cd4a065 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapses/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapses/index.js @@ -1,5 +1,7 @@ import React, { memo, useState } from 'react'; + import PropTypes from 'prop-types'; + import ContentTypeCollapse from '../ContentTypeCollapse'; const ContentTypeCollapses = ({ actions, isFormDisabled, pathToData, subjects }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js index 5a86350c4a..ecb08ca370 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypes/index.js @@ -1,8 +1,10 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; -import styled from 'styled-components'; import sortBy from 'lodash/sortBy'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; + import ContentTypeCollapses from '../ContentTypeCollapses'; import GlobalActions from '../GlobalActions'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Curve/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Curve/index.js index de5b5bbbec..9578e8975b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Curve/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Curve/index.js @@ -1,7 +1,8 @@ import React, { memo } from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; const StyledBox = styled(Box)` transform: translate(-4px, -12px); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js index cea8626830..a033b2dcb5 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js @@ -1,11 +1,14 @@ import React, { memo, useMemo } from 'react'; -import PropTypes from 'prop-types'; + import { BaseCheckbox, Box, Flex, Typography } from '@strapi/design-system'; -import styled from 'styled-components'; import get from 'lodash/get'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { usePermissionsDataManager } from '../../../../../../../hooks'; import { cellWidth, firstRowWidth } from '../Permissions/utils/constants'; + import { findDisplayedActions, getCheckboxesState } from './utils'; const CenteredStack = styled(Flex)` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js index 36c5222936..a61bbff15c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/utils/getRowLabelCheckboxesState.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import { getCheckboxState, removeConditionKeyFromData } from '../../utils'; const getActionsIds = (array) => array.map(({ actionId }) => actionId); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/HiddenAction/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/HiddenAction/index.js index d796f48457..a3525831dd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/HiddenAction/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/HiddenAction/index.js @@ -1,4 +1,5 @@ import styled from 'styled-components'; + import { cellWidth } from '../Permissions/utils/constants'; const HiddenAction = styled.div` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/index.js index 48cf188e9e..04b0264922 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/index.js @@ -1,13 +1,16 @@ import React, { forwardRef, memo, useCallback, useImperativeHandle, useReducer } from 'react'; -import PropTypes from 'prop-types'; -import { difference } from '@strapi/helper-plugin'; + import { Tab, TabGroup, TabPanel, TabPanels, Tabs } from '@strapi/design-system'; +import { difference } from '@strapi/helper-plugin'; import has from 'lodash/has'; import isEmpty from 'lodash/isEmpty'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import ContentTypes from '../ContentTypes'; import PermissionsDataManagerProvider from '../PermissionsDataManagerProvider'; import PluginsAndSettings from '../PluginsAndSettings'; + import init from './init'; import reducer, { initialState } from './reducer'; import formatPermissionsToAPI from './utils/formatPermissionsToAPI'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/reducer.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/reducer.js index 75f00cb306..cc8eb57fde 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/reducer.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/reducer.js @@ -1,8 +1,8 @@ import produce from 'immer'; import cloneDeep from 'lodash/cloneDeep'; +import get from 'lodash/get'; import has from 'lodash/has'; import isObject from 'lodash/isObject'; -import get from 'lodash/get'; import set from 'lodash/set'; import updateConditionsToFalse from './utils/updateConditionsToFalse'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js index 317ad7bc18..b9a49e8ade 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultCTFormFromLayout.js @@ -176,7 +176,7 @@ const createDefaultCTFormFromLayout = ( export default createDefaultCTFormFromLayout; export { createDefaultConditionsForm, - createDefaultPropertyForms, createDefaultPropertiesForm, + createDefaultPropertyForms, findLayouts, }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js index abc665a375..68136cf642 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/createDefaultPluginsFormFromLayout.js @@ -45,4 +45,4 @@ const createDefaultPluginsFormFromLayout = (pluginsLayout, conditions, initialPe }; export default createDefaultPluginsFormFromLayout; -export { createSubCategoryForm, createChildrenDefaultForm }; +export { createChildrenDefaultForm, createSubCategoryForm }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js index b1d48cbb33..518566593c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/formatContentTypesPermissionToAPI.js @@ -1,5 +1,7 @@ import isObject from 'lodash/isObject'; + import { createArrayOfValues } from '../../utils'; + import { createConditionsArray } from './formatSettingsPermissionsToAPI'; /** @@ -119,4 +121,4 @@ const formatContentTypesPermissionToAPI = (contentTypesPermissions) => { }; export default formatContentTypesPermissionToAPI; -export { createPropertyArray, createPermissionWithProperties }; +export { createPermissionWithProperties, createPropertyArray }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js index 8c83e2ae48..bb6a6cb5f9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultCTFormFromLayout.test.js @@ -1,7 +1,7 @@ import createDefaultCTFormFromLayout, { createDefaultConditionsForm, - createDefaultPropertyForms, createDefaultPropertiesForm, + createDefaultPropertyForms, findLayouts, } from '../createDefaultCTFormFromLayout'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js index 792a50f2a9..4099205b83 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/createDefaultPluginsFormFromLayout.test.js @@ -1,6 +1,6 @@ import createDefaultPluginsFormFromLayout, { - createSubCategoryForm, createChildrenDefaultForm, + createSubCategoryForm, } from '../createDefaultPluginsFormFromLayout'; const conditions = [ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js index 1ff77e9e62..9bca80a9c4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/tests/formatLayoutForSettingsAndPlugins.test.js @@ -1,4 +1,5 @@ import formatLayoutForSettingsAndPlugins from '../formatLayoutForSettingsAndPlugins'; + import permissionsLayout from './data'; describe('ADMIN | COMPONENTS | ROLE | PluginsAndSettings | formatLayoutForSettingsAndPlugins', () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js index 19fbabcf88..9ebbb7cbf0 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/Permissions/utils/updateConditionsToFalse.js @@ -1,5 +1,5 @@ -import isObject from 'lodash/isObject'; import has from 'lodash/has'; +import isObject from 'lodash/isObject'; import omit from 'lodash/omit'; import { createArrayOfValues } from '../../utils'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js index 6522a6484b..2ce8e94b0b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import PropTypes from 'prop-types'; + import { PermissionsDataManagerContext } from '../../../../../../../contexts'; const PermissionsDataManagerProvider = ({ children, value }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js index c112684a2e..78ec7ab0b0 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/Row/index.js @@ -1,8 +1,10 @@ import React, { useMemo } from 'react'; -import PropTypes from 'prop-types'; + import { Accordion, AccordionContent, AccordionToggle, Box } from '@strapi/design-system'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import SubCategory from '../SubCategory'; const PermissionRow = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js index 9a81fff6d1..68599d849b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js @@ -1,13 +1,16 @@ import React, { useMemo, useState } from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { Grid, GridItem, Box, Checkbox, Flex, Typography } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Box, Checkbox, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import get from 'lodash/get'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { usePermissionsDataManager } from '../../../../../../../../hooks'; -import { getCheckboxState, removeConditionKeyFromData } from '../../utils'; import ConditionsButton from '../../ConditionsButton'; import ConditionsModal from '../../ConditionsModal'; +import { getCheckboxState, removeConditionKeyFromData } from '../../utils'; + import { formatActions, getConditionsButtonState } from './utils'; const Border = styled.div` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js index ba202954db..f1811b16ac 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/utils/formatActions.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import { createArrayOfValues } from '../../../utils'; /** diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/index.js index a668ecce5a..8326ab27d1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/index.js @@ -1,6 +1,8 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import PermissionRow from './Row'; const PluginsAndSettingsPermissions = ({ isFormDisabled, kind, layout }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RequiredSign/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RequiredSign/index.js index 4d3bfa3ed5..b6443f0772 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RequiredSign/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RequiredSign/index.js @@ -1,4 +1,5 @@ import React from 'react'; + import styled from 'styled-components'; const Required = styled.span` diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js index 8e077d2ba5..866338179f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js @@ -1,13 +1,14 @@ import React from 'react'; + import { Box, + Button, + Flex, Grid, GridItem, - Flex, - Typography, Textarea, TextInput, - Button, + Typography, } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js index 36aafd12f0..8aff106547 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RowLabelWithCheckbox/index.js @@ -1,8 +1,10 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; + import { BaseCheckbox, Box, Flex, Typography } from '@strapi/design-system'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import CollapseLabel from '../CollapseLabel'; import { firstRowWidth } from '../Permissions/utils/constants'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/utils/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/utils/index.js index b972a728f1..e043770098 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/utils/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/utils/index.js @@ -1,3 +1,3 @@ -export { default as getCheckboxState } from './getCheckboxState'; export { default as createArrayOfValues } from './createArrayOfValues'; +export { default as getCheckboxState } from './getCheckboxState'; export { default as removeConditionKeyFromData } from './removeConditionKeyFromData'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/index.js index 8ba6a28e6f..642f3edca1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/index.js @@ -1,21 +1,24 @@ import React, { useRef, useState } from 'react'; + +import { Box, Button, ContentLayout, Flex, HeaderLayout, Main } from '@strapi/design-system'; import { + Link, + LoadingIndicatorPage, + SettingsPageTitle, useFetchClient, useNotification, useOverlayBlocker, useTracking, - LoadingIndicatorPage, - SettingsPageTitle, - Link, } from '@strapi/helper-plugin'; -import { Box, Button, ContentLayout, HeaderLayout, Main, Flex } from '@strapi/design-system'; -import { Formik } from 'formik'; import { ArrowLeft } from '@strapi/icons'; +import { Formik } from 'formik'; import get from 'lodash/get'; import { useIntl } from 'react-intl'; import { useRouteMatch } from 'react-router-dom'; -import { Permissions, RoleForm } from './components'; + import { useFetchPermissionsLayout, useFetchRole } from '../../../../../hooks'; + +import { Permissions, RoleForm } from './components'; import schema from './utils/schema'; const EditPage = () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js index 1bfa81fb5d..778932fff6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js @@ -5,14 +5,15 @@ */ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { act, render } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Switch, Route } from 'react-router-dom'; import { createMemoryHistory } from 'history'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; +import { Route, Router, Switch } from 'react-router-dom'; + import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; - import EditPage from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/utils/schema.js index 7fc1ec4d10..ce269199b4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string().required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js index 8d8042e164..990656846e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Box, Flex, IconButton, Td, Tr, Typography } from '@strapi/design-system'; +import { onRowClick, pxToRem, stopPropagation } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import { Box, Flex, Td, Tr, Typography, IconButton } from '@strapi/design-system'; -import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; const RoleRow = ({ id, name, description, usersCount, icons, rowIndex, canUpdate }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js index a421df11bb..a559521381 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js @@ -1,38 +1,41 @@ import React, { useCallback, useEffect, useReducer, useState } from 'react'; + import { - ConfirmDialog, - LoadingIndicatorPage, - SearchURLQuery, - SettingsPageTitle, - getFetchClient, - useNotification, - useQueryParams, - useRBAC, - useFocusWhenNavigate, - useFilter, - useCollator, -} from '@strapi/helper-plugin'; -import { Plus, Trash, Duplicate, Pencil } from '@strapi/icons'; -import { - Button, ActionLayout, + Button, ContentLayout, HeaderLayout, Main, Table, Tbody, TFooter, - Thead, Th, + Thead, Tr, Typography, VisuallyHidden, } from '@strapi/design-system'; +import { + ConfirmDialog, + getFetchClient, + LoadingIndicatorPage, + SearchURLQuery, + SettingsPageTitle, + useCollator, + useFilter, + useFocusWhenNavigate, + useNotification, + useQueryParams, + useRBAC, +} from '@strapi/helper-plugin'; +import { Duplicate, Pencil, Plus, Trash } from '@strapi/icons'; import get from 'lodash/get'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; + import { useRolesList } from '../../../../../hooks'; import adminPermissions from '../../../../../permissions'; + import EmptyRole from './components/EmptyRole'; import BaseRoleRow from './components/RoleRow'; import reducer, { initialState } from './reducer'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/tests/index.test.js index 3272054d19..d15c664f17 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/tests/index.test.js @@ -5,16 +5,17 @@ */ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { render, screen } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import { Router } from 'react-router-dom'; import { IntlProvider } from 'react-intl'; -import { useRBAC, TrackingProvider } from '@strapi/helper-plugin'; -import { lightTheme, darkTheme } from '@strapi/design-system'; -import { useRolesList } from '../../../../../../hooks'; +import { Router } from 'react-router-dom'; import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; +import { useRolesList } from '../../../../../../hooks'; import ListPage from '../index'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedEditPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedEditPage/index.js index c5aba5cb81..f4ab8ecb2f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedEditPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedEditPage/index.js @@ -1,6 +1,8 @@ import React, { useMemo } from 'react'; -import { useRBAC, LoadingIndicatorPage } from '@strapi/helper-plugin'; + +import { LoadingIndicatorPage, useRBAC } from '@strapi/helper-plugin'; import { Redirect } from 'react-router-dom'; + import adminPermissions from '../../../../../permissions'; import EditPage from '../EditPage'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedListPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedListPage/index.js index 0747478537..084fa74caf 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedListPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ProtectedListPage/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import ListPage from '../ListPage'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/FormTransferTokenContainer/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/FormTransferTokenContainer/index.js index b84b609cbe..b560bea0f3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/FormTransferTokenContainer/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/FormTransferTokenContainer/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, Grid, GridItem, Flex, Typography } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import LifeSpanInput from '../../../../../components/Tokens/LifeSpanInput'; -import TokenName from '../../../../../components/Tokens/TokenName'; import TokenDescription from '../../../../../components/Tokens/TokenDescription'; +import TokenName from '../../../../../components/Tokens/TokenName'; import TokenTypeSelect from '../../../../../components/Tokens/TokenTypeSelect'; const FormTransferTokenContainer = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/LoadingView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/LoadingView/index.js index c8af253616..b80b300b07 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/LoadingView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/components/LoadingView/index.js @@ -1,13 +1,14 @@ import React from 'react'; + +import { Button, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; import { - SettingsPageTitle, LoadingIndicatorPage, + SettingsPageTitle, useFocusWhenNavigate, } from '@strapi/helper-plugin'; -import { HeaderLayout, ContentLayout, Main, Button } from '@strapi/design-system'; import { Check } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const LoadingView = ({ transferTokenName }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js index 6c46562bfe..feed282045 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js @@ -1,29 +1,32 @@ -import React, { useState, useRef, useEffect } from 'react'; -import { useIntl } from 'react-intl'; -import { Formik } from 'formik'; -import { useRouteMatch, useHistory } from 'react-router-dom'; -import { useQuery } from 'react-query'; +import React, { useEffect, useRef, useState } from 'react'; + +import { ContentLayout, Flex, Main } from '@strapi/design-system'; import { - SettingsPageTitle, - useFocusWhenNavigate, Form, - useOverlayBlocker, - useNotification, - useTracking, - useGuidedTour, - useRBAC, - useFetchClient, + SettingsPageTitle, useAPIErrorHandler, + useFetchClient, + useFocusWhenNavigate, + useGuidedTour, + useNotification, + useOverlayBlocker, + useRBAC, + useTracking, } from '@strapi/helper-plugin'; -import { ContentLayout, Main, Flex } from '@strapi/design-system'; -import { formatAPIErrors } from '../../../../../utils'; -import { schema } from './utils'; -import LoadingView from './components/LoadingView'; +import { Formik } from 'formik'; +import { useIntl } from 'react-intl'; +import { useQuery } from 'react-query'; +import { useHistory, useRouteMatch } from 'react-router-dom'; + import adminPermissions from '../../../../../permissions'; -import FormTransferTokenContainer from './components/FormTransferTokenContainer'; -import TokenBox from '../../../components/Tokens/TokenBox'; -import FormHead from '../../../components/Tokens/FormHead'; +import { formatAPIErrors } from '../../../../../utils'; import { TRANSFER_TOKEN_TYPE } from '../../../components/Tokens/constants'; +import FormHead from '../../../components/Tokens/FormHead'; +import TokenBox from '../../../components/Tokens/TokenBox'; + +import FormTransferTokenContainer from './components/FormTransferTokenContainer'; +import LoadingView from './components/LoadingView'; +import { schema } from './utils'; const MSG_ERROR_NAME_TAKEN = 'Name already taken'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js index 7b171277c1..f7ff016c86 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Route } from 'react-router-dom'; import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Route, Router } from 'react-router-dom'; + import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; import EditView from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js index de47da07c7..f212ed8d1f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string(translatedErrors.string).max(100).required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js index fa7196ddf5..ea9f76a8ba 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/index.js @@ -1,28 +1,29 @@ import React, { useEffect, useRef } from 'react'; -import { useIntl } from 'react-intl'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useHistory } from 'react-router-dom'; -import qs from 'qs'; +import { Button, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; import { - SettingsPageTitle, - useFocusWhenNavigate, - useNotification, - NoPermissions, - useRBAC, - NoContent, - useTracking, - useGuidedTour, LinkButton, + NoContent, + NoPermissions, + SettingsPageTitle, useFetchClient, + useFocusWhenNavigate, + useGuidedTour, + useNotification, + useRBAC, + useTracking, } from '@strapi/helper-plugin'; -import { HeaderLayout, ContentLayout, Main, Button } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import qs from 'qs'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; +import { useHistory } from 'react-router-dom'; import adminPermissions from '../../../../../permissions'; -import tableHeaders from './utils/tableHeaders'; -import Table from '../../../components/Tokens/Table'; import { TRANSFER_TOKEN_TYPE } from '../../../components/Tokens/constants'; +import Table from '../../../components/Tokens/Table'; + +import tableHeaders from './utils/tableHeaders'; const TransferTokenListView = () => { useFocusWhenNavigate(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js index 892d0d65db..95a01a14bf 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js @@ -1,11 +1,13 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Route } from 'react-router-dom'; import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { useRBAC, TrackingProvider } from '@strapi/helper-plugin'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Route, Router } from 'react-router-dom'; + import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; import ListView from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedCreateView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedCreateView/index.js index 04c7e6efc5..f4a5b17af7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedCreateView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedCreateView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedEditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedEditView/index.js index 9fc9feaf06..ff665e31d3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedEditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedEditView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedListView/index.js index e749f6176c..f2a00b43c8 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ProtectedListView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import ListView from '../ListView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js index 9996782c6d..dbfec9e2f5 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js @@ -1,43 +1,45 @@ import React from 'react'; -import { useRouteMatch, useHistory } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import pick from 'lodash/pick'; -import get from 'lodash/get'; -import omit from 'lodash/omit'; + import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + Typography, +} from '@strapi/design-system'; +import { + auth, Form, GenericInput, + Link, + LoadingIndicatorPage, SettingsPageTitle, - auth, useAppInfo, useFocusWhenNavigate, useNotification, useOverlayBlocker, - LoadingIndicatorPage, - Link, } from '@strapi/helper-plugin'; -import { Formik } from 'formik'; -import { - Box, - Button, - Grid, - GridItem, - HeaderLayout, - ContentLayout, - Typography, - Main, - Flex, -} from '@strapi/design-system'; import { ArrowLeft, Check } from '@strapi/icons'; import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink'; +import { Formik } from 'formik'; +import get from 'lodash/get'; +import omit from 'lodash/omit'; +import pick from 'lodash/pick'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useHistory, useRouteMatch } from 'react-router-dom'; +import { useAdminUsers } from '../../../../../hooks/useAdminUsers'; import { formatAPIErrors, getFullName } from '../../../../../utils'; +import SelectRoles from '../components/SelectRoles'; +import { editValidation } from '../utils/validations/users'; + import { putUser } from './utils/api'; import layout from './utils/layout'; -import { editValidation } from '../utils/validations/users'; -import SelectRoles from '../components/SelectRoles'; -import { useAdminUsers } from '../../../../../hooks/useAdminUsers'; const fieldsToPick = ['email', 'firstname', 'lastname', 'username', 'isActive', 'roles']; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js index c51dbaa419..85f045cefb 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js @@ -1,8 +1,9 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Button } from '@strapi/design-system'; import { Envelop } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const CreateAction = ({ onClick }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/tests/index.test.js index dddb6dd5ec..06a5bec5e4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/CreateAction/tests/index.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import CreateAction from '..'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js index 75e1eeaf53..b4d44601d7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js @@ -1,19 +1,21 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { BaseCheckbox, Box, - IconButton, Flex, - Typography, + IconButton, Tbody, Td, Tr, + Typography, } from '@strapi/design-system'; +import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; import { Pencil, Trash } from '@strapi/icons'; -import { useHistory } from 'react-router-dom'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { stopPropagation, onRowClick } from '@strapi/helper-plugin'; +import { useHistory } from 'react-router-dom'; + import { getFullName } from '../../../../../../../utils'; const TableRows = ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js index 7b4a7df28e..3d65d81798 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/index.js @@ -1,34 +1,35 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { - ModalLayout, - ModalHeader, - ModalFooter, - ModalBody, - Grid, - GridItem, Box, Button, Flex, + Grid, + GridItem, + ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, Typography, } from '@strapi/design-system'; import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; -import { Formik } from 'formik'; import { Form, GenericInput, + useFetchClient, useNotification, useOverlayBlocker, - useFetchClient, } from '@strapi/helper-plugin'; -import { useMutation } from 'react-query'; - +import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink'; import formDataModel from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/formDataModel'; import roleSettingsForm from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/roleSettingsForm'; -import MagicLink from 'ee_else_ce/pages/SettingsPage/pages/Users/components/MagicLink'; +import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useMutation } from 'react-query'; import SelectRoles from '../../components/SelectRoles'; + import layout from './utils/layout'; import schema from './utils/schema'; import stepper from './utils/stepper'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js index adf046691b..f35757e80e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/ModalForm/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ firstname: yup.string().trim().required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/index.js index 489d9644e2..3acb87b598 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; -import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin'; +import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; const PaginationFooter = ({ pagination }) => { return ( diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/index.test.js index a91248f80a..06c3eb991a 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; -import { act, render } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { createMemoryHistory } from 'history'; -import { Router, Route } from 'react-router-dom'; -import { lightTheme, darkTheme } from '@strapi/design-system'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; import { TrackingProvider } from '@strapi/helper-plugin'; +import { act, render } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; +import { Route, Router } from 'react-router-dom'; + import Theme from '../../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../../components/ThemeToggleProvider'; import PaginationFooter from '../index'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js index 9a168f78c9..fb60fdbd35 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/index.js @@ -1,27 +1,29 @@ import React, { useState } from 'react'; -import qs from 'qs'; + +import { ActionLayout, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; import { DynamicTable, + NoPermissions, SearchURLQuery, SettingsPageTitle, - useRBAC, - useNotification, - useFocusWhenNavigate, - NoPermissions, useAPIErrorHandler, useFetchClient, + useFocusWhenNavigate, + useNotification, + useRBAC, } from '@strapi/helper-plugin'; -import { ActionLayout, ContentLayout, HeaderLayout, Main } from '@strapi/design-system'; -import { useLocation } from 'react-router-dom'; +import useLicenseLimitNotification from 'ee_else_ce/hooks/useLicenseLimitNotification'; +import CreateAction from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/CreateAction'; +import qs from 'qs'; import { useIntl } from 'react-intl'; import { useMutation, useQueryClient } from 'react-query'; -import CreateAction from 'ee_else_ce/pages/SettingsPage/pages/Users/ListPage/CreateAction'; -import useLicenseLimitNotification from 'ee_else_ce/hooks/useLicenseLimitNotification'; +import { useLocation } from 'react-router-dom'; import { useAdminUsers } from '../../../../../hooks/useAdminUsers'; import adminPermissions from '../../../../../permissions'; -import TableRows from './DynamicTable/TableRows'; import Filters from '../../../components/Filters'; + +import TableRows from './DynamicTable/TableRows'; import ModalForm from './ModalForm'; import PaginationFooter from './PaginationFooter'; import displayedFilters from './utils/displayedFilters'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js index d39d538c75..f779a1d005 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js @@ -1,11 +1,12 @@ import React from 'react'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { act, render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Router, Route } from 'react-router-dom'; -import { QueryClient, QueryClientProvider } from 'react-query'; import { createMemoryHistory } from 'history'; -import { useRBAC, TrackingProvider } from '@strapi/helper-plugin'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Route, Router } from 'react-router-dom'; import Theme from '../../../../../../components/Theme'; import ThemeToggleProvider from '../../../../../../components/ThemeToggleProvider'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/utils/tableHeaders.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/utils/tableHeaders.js index 203d1873ad..e846a82f06 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/utils/tableHeaders.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/utils/tableHeaders.js @@ -1,4 +1,5 @@ import React from 'react'; + import { Flex, Typography } from '@strapi/design-system'; import { Status } from '@strapi/helper-plugin'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedEditPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedEditPage/index.js index 5e0357d693..c74c2c35bb 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedEditPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedEditPage/index.js @@ -1,5 +1,6 @@ import React, { useEffect, useMemo } from 'react'; -import { useRBAC, LoadingIndicatorPage, useNotification } from '@strapi/helper-plugin'; + +import { LoadingIndicatorPage, useNotification, useRBAC } from '@strapi/helper-plugin'; import { Redirect, useLocation } from 'react-router-dom'; import adminPermissions from '../../../../../permissions'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedListPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedListPage/index.js index 74bede9b9b..99d2953665 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedListPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ProtectedListPage/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import ListPage from '../ListPage'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper.js index 3e9d3667df..ef283c58ff 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper.js @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { IconButton } from '@strapi/design-system'; -import { useNotification, ContentBox, useClipboard } from '@strapi/helper-plugin'; +import { ContentBox, useClipboard, useNotification } from '@strapi/helper-plugin'; import { Duplicate } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; const MagicLinkWrapper = ({ children, target }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/index.js index e7bd4f7294..f7ba8435c7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/MagicLink/index.js @@ -1,7 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import basename from '../../../../../../core/utils/basename'; + import MagicLinkWrapper from './MagicLinkWrapper'; const MagicLink = ({ registrationToken }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js index 92f200207b..e58e895aee 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/components/SelectRoles/index.js @@ -1,11 +1,12 @@ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; +import { getFetchClient } from '@strapi/helper-plugin'; +import { Loader as LoadingIcon } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option } from '@strapi/design-system'; import { useQuery } from 'react-query'; import styled, { keyframes } from 'styled-components'; -import { Loader as LoadingIcon } from '@strapi/icons'; -import { getFetchClient } from '@strapi/helper-plugin'; const rotation = keyframes` from { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/edit.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/edit.js index 80db038e7c..9a4372e5c6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/edit.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/edit.js @@ -1,4 +1,5 @@ import * as yup from 'yup'; + import { commonUserSchema } from './profile'; import rolesValidation from './roles'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js index 69b5a14668..d4bdb006f3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/profile.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; export const commonUserSchema = { firstname: yup.string().trim().required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/roles.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/roles.js index 879cd04b7f..acfe69a94f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/roles.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/utils/validations/users/roles.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = { roles: yup.array().min(1, translatedErrors.required).required(translatedErrors.required), diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/Events/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/Events/index.js index 34082ed4e9..2433e64c48 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/Events/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/Events/index.js @@ -1,24 +1,24 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; -import { useFormikContext } from 'formik'; -import { useIntl } from 'react-intl'; -import styled from 'styled-components'; import { - FieldLabel, - Flex, - Typography, BaseCheckbox, Checkbox, + FieldLabel, + Flex, Loader, RawTable as Table, - RawTh as Th, - RawTd as Td, - RawTr as Tr, - RawThead as Thead, RawTbody as Tbody, + RawTd as Td, + RawTh as Th, + RawThead as Thead, + RawTr as Tr, + Typography, VisuallyHidden, } from '@strapi/design-system'; +import { useFormikContext } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { useContentTypes } from '../../../../../../../hooks/useContentTypes'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/Combobox.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/Combobox.js index ff35616073..68e5dbdbcd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/Combobox.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/Combobox.js @@ -1,7 +1,8 @@ -import React, { useState, useEffect } from 'react'; -import PropTypes from 'prop-types'; -import { useFormikContext } from 'formik'; +import React, { useEffect, useState } from 'react'; + import { ComboboxOption, CreatableCombobox } from '@strapi/design-system'; +import { useFormikContext } from 'formik'; +import PropTypes from 'prop-types'; const HTTP_HEADERS = [ 'A-IM', diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/index.js index e52ba006ad..b440611f04 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/HeadersInput/index.js @@ -1,17 +1,19 @@ import React from 'react'; -import { RemoveRoundedButton } from '@strapi/helper-plugin'; -import { Plus } from '@strapi/icons'; + import { Box, FieldLabel, + Flex, Grid, GridItem, - Flex, - TextInput, TextButton, + TextInput, } from '@strapi/design-system'; +import { RemoveRoundedButton } from '@strapi/helper-plugin'; +import { Plus } from '@strapi/icons'; import { Field, FieldArray, useFormikContext } from 'formik'; import { useIntl } from 'react-intl'; + import Combobox from './Combobox'; const HeadersInput = () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/TriggerContainer/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/TriggerContainer/index.js index cc1c538d7f..74f0fe0c5d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/TriggerContainer/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/TriggerContainer/index.js @@ -1,10 +1,11 @@ import React from 'react'; + +import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { Check, Cross, Loader } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { pxToRem } from '@strapi/helper-plugin'; -import { Check, Cross, Loader } from '@strapi/icons'; -import { Box, Flex, Typography, Grid, GridItem } from '@strapi/design-system'; // Being discussed in Notion: create a component in Parts const Icon = styled.svg( diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js index 35c2fae81a..466dbba526 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/index.js @@ -1,25 +1,27 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { Field, FormikProvider, useFormik } from 'formik'; -import { useIntl } from 'react-intl'; -import { Form, Link } from '@strapi/helper-plugin'; -import { ArrowLeft, Check, Play as Publish } from '@strapi/icons'; + import { + Box, + Button, + ContentLayout, + Flex, Grid, GridItem, - Button, - Flex, - TextInput, HeaderLayout, - ContentLayout, - Box, + TextInput, } from '@strapi/design-system'; - +import { Form, Link } from '@strapi/helper-plugin'; +import { ArrowLeft, Check, Play as Publish } from '@strapi/icons'; import EventTable from 'ee_else_ce/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable'; -import { makeWebhookValidationSchema } from './utils/makeWebhookValidationSchema'; +import { Field, FormikProvider, useFormik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import HeadersInput from '../HeadersInput'; import TriggerContainer from '../TriggerContainer'; +import { makeWebhookValidationSchema } from './utils/makeWebhookValidationSchema'; + const WebhookForm = ({ handleSubmit, triggerWebhook, diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/tests/index.test.js index d14861692e..cf453e09b7 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/tests/index.test.js @@ -1,13 +1,14 @@ -import { render, screen, waitFor, fireEvent } from '@testing-library/react'; import React from 'react'; -import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { QueryClientProvider, QueryClient } from 'react-query'; + import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { NotificationsProvider } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Router } from 'react-router-dom'; -import en from '../../../../../../../../translations/en.json'; import LanguageProvider from '../../../../../../../../components/LanguageProvider'; +import en from '../../../../../../../../translations/en.json'; import WebhookForm from '../index'; jest.mock('../../../../../../../../hooks/useContentTypes'); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/utils/makeWebhookValidationSchema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/utils/makeWebhookValidationSchema.js index f333902db7..778a8e99c3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/utils/makeWebhookValidationSchema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/WebhookForm/utils/makeWebhookValidationSchema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const NAME_REGEX = /(^$)|(^[A-Za-z][_0-9A-Za-z ]*$)/; const URL_REGEX = /(^$)|((https?:\/\/.*)(d*)\/?(.*))/; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/index.js index 69e534c653..b270181621 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/EditView/index.js @@ -1,15 +1,18 @@ import * as React from 'react'; + +import { Main } from '@strapi/design-system'; import { LoadingIndicatorPage, SettingsPageTitle, - useNotification, - useFetchClient, useAPIErrorHandler, + useFetchClient, + useNotification, } from '@strapi/helper-plugin'; -import { Main } from '@strapi/design-system'; import { useMutation, useQuery, useQueryClient } from 'react-query'; import { useHistory, useRouteMatch } from 'react-router-dom'; + import { useContentTypes } from '../../../../../hooks/useContentTypes'; + import WebhookForm from './components/WebhookForm'; const cleanData = (data) => ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js index 4f9ec37202..6898a6d9e6 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/index.js @@ -1,47 +1,48 @@ /* eslint-disable no-nested-ternary */ -import React, { useState, useEffect } from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import { useQuery, useMutation } from 'react-query'; +import React, { useEffect, useState } from 'react'; import { - useFetchClient, - useRBAC, - LoadingIndicatorPage, - useNotification, - useFocusWhenNavigate, - SettingsPageTitle, - ConfirmDialog, - onRowClick, - stopPropagation, - LinkButton, - useAPIErrorHandler, -} from '@strapi/helper-plugin'; -import { - HeaderLayout, - Layout, - ContentLayout, ActionLayout, + BaseCheckbox, + Box, + Button, + ContentLayout, EmptyStateLayout, Flex, + HeaderLayout, IconButton, - BaseCheckbox, + Layout, + Main, + Switch, Table, - Thead, - Tr, - Th, Tbody, Td, TFooter, + Th, + Thead, + Tr, Typography, - Button, - Switch, - Main, useNotifyAT, - Box, VisuallyHidden, } from '@strapi/design-system'; -import { Plus, Pencil, Trash, EmptyDocuments } from '@strapi/icons'; +import { + ConfirmDialog, + LinkButton, + LoadingIndicatorPage, + onRowClick, + SettingsPageTitle, + stopPropagation, + useAPIErrorHandler, + useFetchClient, + useFocusWhenNavigate, + useNotification, + useRBAC, +} from '@strapi/helper-plugin'; +import { EmptyDocuments, Pencil, Plus, Trash } from '@strapi/icons'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery } from 'react-query'; +import { useHistory, useLocation } from 'react-router-dom'; + import adminPermissions from '../../../../../permissions'; const ListView = () => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/index.test.js index c009578fb8..0e08afb499 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/index.test.js @@ -1,4 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useRBAC } from '@strapi/helper-plugin'; import { fireEvent, render as renderRTL, @@ -7,12 +10,11 @@ import { } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { MemoryRouter } from 'react-router-dom'; -import { useRBAC } from '@strapi/helper-plugin'; -import { QueryClientProvider, QueryClient } from 'react-query'; import ListView from '../index'; + import server, { resetWebhooks } from './server'; const toggleNotification = jest.fn(); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/server.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/server.js index bef2f24dc2..0990005b96 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/server.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ListView/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const initialWebhooks = [ { id: 1, isEnabled: true, name: 'test', url: 'http:://strapi.io' }, diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedCreateView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedCreateView/index.js index f6b04b82cd..3537269de4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedCreateView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedCreateView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedEditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedEditView/index.js index 8212704d98..ad58f51445 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedEditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedEditView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import EditView from '../EditView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedListView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedListView/index.js index 83b00d6584..1c2b2a1c57 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedListView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Webhooks/ProtectedListView/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../permissions'; import ListView from '../ListView'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js index 7de3bf8e3c..90cdeff3dd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/tests/index.test.js @@ -1,13 +1,15 @@ import React from 'react'; -import { Router, Route } from 'react-router-dom'; -import { StrapiAppProvider, AppInfosContext, TrackingProvider } from '@strapi/helper-plugin'; + +import { darkTheme, lightTheme } from '@strapi/design-system'; +import { AppInfosContext, StrapiAppProvider, TrackingProvider } from '@strapi/helper-plugin'; import { act, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { createMemoryHistory } from 'history'; -import { lightTheme, darkTheme } from '@strapi/design-system'; +import { Route, Router } from 'react-router-dom'; + +import { SettingsPage } from '..'; import Theme from '../../../components/Theme'; import ThemeToggleProvider from '../../../components/ThemeToggleProvider'; -import { SettingsPage } from '..'; import { useSettingsMenu } from '../../../hooks'; jest.mock('../../../hooks', () => ({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/utils/createSectionsRoutes.js b/packages/core/admin/admin/src/pages/SettingsPage/utils/createSectionsRoutes.js index 9c78b4b42e..38dd49bb5c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/utils/createSectionsRoutes.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/utils/createSectionsRoutes.js @@ -1,4 +1,5 @@ import flatMap from 'lodash/flatMap'; + import { createRoute } from '../../../utils'; const createSectionsRoutes = (settings) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/utils/index.js b/packages/core/admin/admin/src/pages/SettingsPage/utils/index.js index 3ea369d8c3..ca968308d9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/utils/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/utils/index.js @@ -1,4 +1,3 @@ export { default as createSectionsRoutes } from './createSectionsRoutes'; export { default as getSectionsToDisplay } from './getSectionsToDisplay'; - export { default as routes } from './routes'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/utils/routes.js b/packages/core/admin/admin/src/pages/SettingsPage/utils/routes.js index 856e205ae9..663fd8cbdc 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/utils/routes.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/utils/routes.js @@ -1,5 +1,6 @@ // This file makes it easier to make the difference between the ee and ce version import customRoutes from 'ee_else_ce/pages/SettingsPage/utils/customRoutes'; + import defaultRoutes from './defaultRoutes'; export default [...customRoutes, ...defaultRoutes]; diff --git a/packages/core/admin/admin/src/pages/UseCasePage/index.js b/packages/core/admin/admin/src/pages/UseCasePage/index.js index 97d16cfd3a..40e08fea9d 100644 --- a/packages/core/admin/admin/src/pages/UseCasePage/index.js +++ b/packages/core/admin/admin/src/pages/UseCasePage/index.js @@ -1,20 +1,22 @@ import React, { useState } from 'react'; + +import { + Box, + Button, + Flex, + Main, + Option, + Select, + TextButton, + TextInput, + Typography, +} from '@strapi/design-system'; +import { auth, pxToRem, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { parse } from 'qs'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { parse } from 'qs'; -import { pxToRem, useFetchClient, useNotification, auth } from '@strapi/helper-plugin'; -import { - Main, - Flex, - Box, - Typography, - Select, - Option, - TextInput, - TextButton, - Button, -} from '@strapi/design-system'; + import Logo from '../../components/UnauthenticatedLogo'; import UnauthenticatedLayout, { LayoutContent } from '../../layouts/UnauthenticatedLayout'; diff --git a/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js b/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js index cf08fd08cb..993f7ee147 100644 --- a/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/UseCasePage/tests/index.test.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import UseCasePage from '../index'; jest.mock('../../../components/LocalesProvider/useLocalesProvider', () => () => ({ diff --git a/packages/core/admin/admin/src/permissions/index.js b/packages/core/admin/admin/src/permissions/index.js index 83742a9995..dae81642a2 100644 --- a/packages/core/admin/admin/src/permissions/index.js +++ b/packages/core/admin/admin/src/permissions/index.js @@ -1,5 +1,6 @@ -import merge from 'lodash/merge'; import customPermissions from 'ee_else_ce/permissions/customPermissions'; +import merge from 'lodash/merge'; + import defaultPermissions from './defaultPermissions'; const permissions = merge(defaultPermissions, customPermissions); diff --git a/packages/core/admin/admin/src/reducers.js b/packages/core/admin/admin/src/reducers.js index 2dc6180ec1..912cbff289 100644 --- a/packages/core/admin/admin/src/reducers.js +++ b/packages/core/admin/admin/src/reducers.js @@ -1,10 +1,10 @@ -import appReducer from './pages/App/reducer'; import rbacProviderReducer from './components/RBACProvider/reducer'; +import rbacManagerReducer from './content-manager/hooks/useSyncRbac/reducer'; import cmAppReducer from './content-manager/pages/App/reducer'; import editViewLayoutManagerReducer from './content-manager/pages/EditViewLayoutManager/reducer'; import listViewReducer from './content-manager/pages/ListView/reducer'; -import rbacManagerReducer from './content-manager/hooks/useSyncRbac/reducer'; import editViewCrudReducer from './content-manager/sharedReducers/crudReducer/reducer'; +import appReducer from './pages/App/reducer'; const contentManagerReducers = { 'content-manager_app': cmAppReducer, diff --git a/packages/core/admin/admin/src/shared/components/InjectionZone/index.js b/packages/core/admin/admin/src/shared/components/InjectionZone/index.js index 7451cc1d3e..36bb011a79 100644 --- a/packages/core/admin/admin/src/shared/components/InjectionZone/index.js +++ b/packages/core/admin/admin/src/shared/components/InjectionZone/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import PropTypes from 'prop-types'; + import { useInjectionZone } from '../../hooks'; const InjectionZone = ({ area, ...props }) => { diff --git a/packages/core/admin/admin/src/shared/hooks/useAdminProvider/index.js b/packages/core/admin/admin/src/shared/hooks/useAdminProvider/index.js index bb562542a6..418d7baf14 100644 --- a/packages/core/admin/admin/src/shared/hooks/useAdminProvider/index.js +++ b/packages/core/admin/admin/src/shared/hooks/useAdminProvider/index.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import { AdminContext } from '../../../contexts'; const useAdminProvider = () => { diff --git a/packages/core/admin/admin/src/tests/StrapiApp.test.js b/packages/core/admin/admin/src/tests/StrapiApp.test.js index 8056169895..e11d67efd8 100644 --- a/packages/core/admin/admin/src/tests/StrapiApp.test.js +++ b/packages/core/admin/admin/src/tests/StrapiApp.test.js @@ -1,8 +1,9 @@ -import { render } from '@testing-library/react'; import { fixtures } from '@strapi/admin-test-utils'; +import { render } from '@testing-library/react'; + import { Components, Fields } from '../core/apis'; -import StrapiApp from '../StrapiApp'; import appReducers from '../reducers'; +import StrapiApp from '../StrapiApp'; const library = { fields: Fields(), components: Components() }; const middlewares = { middlewares: [] }; diff --git a/packages/core/admin/admin/src/translations/tests/index.test.js b/packages/core/admin/admin/src/translations/tests/index.test.js index 230ee1dba7..12e9ae6b00 100644 --- a/packages/core/admin/admin/src/translations/tests/index.test.js +++ b/packages/core/admin/admin/src/translations/tests/index.test.js @@ -1,5 +1,6 @@ const fs = require('fs-extra'); const path = require('path'); + const languageNativeNames = require('../languageNativeNames').default; const languages = fs diff --git a/packages/core/admin/admin/src/utils/createRoute.js b/packages/core/admin/admin/src/utils/createRoute.js index e30f47517c..3481a7e456 100644 --- a/packages/core/admin/admin/src/utils/createRoute.js +++ b/packages/core/admin/admin/src/utils/createRoute.js @@ -1,7 +1,8 @@ import React, { useEffect, useState } from 'react'; + +import { LoadingIndicatorPage } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { Route } from 'react-router-dom'; -import { LoadingIndicatorPage } from '@strapi/helper-plugin'; const LazyCompo = ({ loadComponent }) => { const [Compo, setCompo] = useState(null); diff --git a/packages/core/admin/admin/src/utils/index.js b/packages/core/admin/admin/src/utils/index.js index 0dddd94e0e..39787a6bde 100644 --- a/packages/core/admin/admin/src/utils/index.js +++ b/packages/core/admin/admin/src/utils/index.js @@ -2,9 +2,9 @@ export { default as checkFormValidity } from './checkFormValidity'; export { default as createRoute } from './createRoute'; export { default as formatAPIErrors } from './formatAPIErrors'; export { default as getAttributesToDisplay } from './getAttributesToDisplay'; +export { default as getExistingActions } from './getExistingActions'; +export { default as getFullName } from './getFullName'; +export { default as getRequestUrl } from './getRequestUrl'; export { default as makeUniqueRoutes } from './makeUniqueRoutes'; export { default as sortLinks } from './sortLinks'; -export { default as getExistingActions } from './getExistingActions'; -export { default as getRequestUrl } from './getRequestUrl'; -export { default as getFullName } from './getFullName'; export { default as hashAdminUserEmail } from './uniqueAdminHash'; diff --git a/packages/core/admin/admin/src/utils/tests/getExistingActions.test.js b/packages/core/admin/admin/src/utils/tests/getExistingActions.test.js index 66da4a5867..81228d9eef 100644 --- a/packages/core/admin/admin/src/utils/tests/getExistingActions.test.js +++ b/packages/core/admin/admin/src/utils/tests/getExistingActions.test.js @@ -1,4 +1,5 @@ import getExistingActions from '../getExistingActions'; + import data from './data'; describe('ADMIN | utils | getExistingActions', () => { diff --git a/packages/core/admin/admin/src/utils/tests/uniqueAdminHash.test.js b/packages/core/admin/admin/src/utils/tests/uniqueAdminHash.test.js index e305835b37..c609b10076 100644 --- a/packages/core/admin/admin/src/utils/tests/uniqueAdminHash.test.js +++ b/packages/core/admin/admin/src/utils/tests/uniqueAdminHash.test.js @@ -1,5 +1,6 @@ import crypto from 'crypto'; import { TextEncoder } from 'util'; + import hashAdminUserEmail, { utils } from '../uniqueAdminHash'; const testHashValue = '8544bf5b5389959462912699664f03ed664a4b6d24f03b13bdbc362efc147873'; diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js index 830e760b96..d10767b7f7 100644 --- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js +++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import { getStageColorByHex } from '../../../../../pages/SettingsPage/pages/ReviewWorkflows/utils/colors'; diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js index 685fe7c455..c5afe6c8de 100644 --- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js +++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js @@ -1,11 +1,13 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { Typography } from '@strapi/design-system'; -import ReviewWorkflowsStage from '.'; +import { Typography } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../../../../../admin/src/content-manager/utils/getTrad'; import { STAGE_COLOR_DEFAULT } from '../../../../../pages/SettingsPage/pages/ReviewWorkflows/constants'; +import ReviewWorkflowsStage from '.'; + export default (layout) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js index ff92710118..76ec2a92a4 100644 --- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js +++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; import ReviewWorkflowsStage from '..'; diff --git a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js index d297db2745..1840f7849e 100644 --- a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js +++ b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js @@ -1,16 +1,17 @@ import React from 'react'; + +import { Flex, Loader, SingleSelect, SingleSelectOption, Typography } from '@strapi/design-system'; import { - useCMEditViewDataManager, useAPIErrorHandler, + useCMEditViewDataManager, useFetchClient, useNotification, } from '@strapi/helper-plugin'; -import { Flex, Loader, SingleSelect, SingleSelectOption, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; import { useMutation } from 'react-query'; -import { useReviewWorkflows } from '../../../../pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows'; import Information from '../../../../../../admin/src/content-manager/pages/EditView/Information'; +import { useReviewWorkflows } from '../../../../pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows'; import { getStageColorByHex } from '../../../../pages/SettingsPage/pages/ReviewWorkflows/utils/colors'; const ATTRIBUTE_NAME = 'strapi_reviewWorkflows_stage'; diff --git a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js index cd75366216..31a37c0652 100644 --- a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js +++ b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js @@ -1,10 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useCMEditViewDataManager } from '@strapi/helper-plugin'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; -import { useCMEditViewDataManager } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider } from 'react-redux'; import { createStore } from 'redux'; diff --git a/packages/core/admin/ee/admin/hooks/useAuthProviders/index.js b/packages/core/admin/ee/admin/hooks/useAuthProviders/index.js index b1396773a2..842ce5c709 100644 --- a/packages/core/admin/ee/admin/hooks/useAuthProviders/index.js +++ b/packages/core/admin/ee/admin/hooks/useAuthProviders/index.js @@ -1,7 +1,9 @@ -import { useReducer, useEffect } from 'react'; +import { useEffect, useReducer } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { getRequestUrl } from '../../../../admin/src/utils'; + import reducer, { initialState } from './reducer'; const useAuthProviders = ({ ssoEnabled }) => { diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js index 5c3d1b63d9..7768ba4fc7 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/index.js @@ -4,10 +4,12 @@ * */ import { useEffect } from 'react'; -import { useIntl } from 'react-intl'; -import { useLocation } from 'react-router-dom'; + import { useNotification } from '@strapi/helper-plugin'; import isNil from 'lodash/isNil'; +import { useIntl } from 'react-intl'; +import { useLocation } from 'react-router-dom'; + import useLicenseLimits from '../useLicenseLimits'; const STORAGE_KEY_PREFIX = 'strapi-notification-seat-limit'; diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/tests/index.test.js b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/tests/index.test.js index 8f9e7c1662..0570e986aa 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/tests/index.test.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimitNotification/tests/index.test.js @@ -1,4 +1,5 @@ import { renderHook } from '@testing-library/react'; + import useLicenseLimitNotification from '..'; import useLicenseLimits from '../../useLicenseLimits'; diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimits/index.js b/packages/core/admin/ee/admin/hooks/useLicenseLimits/index.js index a927403b4f..90b52192fd 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimits/index.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimits/index.js @@ -1,5 +1,6 @@ import { useFetchClient, useRBAC } from '@strapi/helper-plugin'; import { useQuery } from 'react-query'; + import adminPermissions from '../../../../admin/src/permissions'; const useLicenseLimits = () => { diff --git a/packages/core/admin/ee/admin/hooks/useLicenseLimits/tests/index.test.js b/packages/core/admin/ee/admin/hooks/useLicenseLimits/tests/index.test.js index e525f62f5f..806bae3b77 100644 --- a/packages/core/admin/ee/admin/hooks/useLicenseLimits/tests/index.test.js +++ b/packages/core/admin/ee/admin/hooks/useLicenseLimits/tests/index.test.js @@ -1,6 +1,7 @@ -import { renderHook } from '@testing-library/react'; import { useFetchClient } from '@strapi/helper-plugin'; +import { renderHook } from '@testing-library/react'; import { useQuery } from 'react-query'; + import useLicenseLimits from '..'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js index 30c6407012..f625f3ae3b 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Login/index.js @@ -1,11 +1,13 @@ import React from 'react'; + +import { Box, Divider, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Box, Flex, Divider, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import UnauthenticatedLayout from '../../../../../../admin/src/layouts/UnauthenticatedLayout'; import BaseLogin from '../../../../../../admin/src/pages/AuthPage/components/Login/BaseLogin'; import { useAuthProviders } from '../../../../hooks'; -import UnauthenticatedLayout from '../../../../../../admin/src/layouts/UnauthenticatedLayout'; import SSOProviders from '../Providers/SSOProviders'; const DividerFull = styled(Divider)` diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js index 404fefe0b2..674aedbf9b 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/SSOProviders.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Flex, Grid, GridItem, Tooltip, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Grid, GridItem, Flex, Typography, Tooltip } from '@strapi/design-system'; -import styled from 'styled-components'; import { useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; +import styled from 'styled-components'; const SSOButton = styled.a` width: ${136 / 16}rem; diff --git a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js index 03c259c02b..30e726dd55 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/components/Providers/index.js @@ -1,16 +1,19 @@ import React from 'react'; + +import { Box, Button, Divider, Flex, Loader, Main, Typography } from '@strapi/design-system'; +import { Link } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; import { Redirect, useHistory } from 'react-router-dom'; import styled from 'styled-components'; -import { Link } from '@strapi/helper-plugin'; -import { Divider, Flex, Box, Button, Loader, Typography, Main } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; -import { useAuthProviders } from '../../../../hooks'; + +import Logo from '../../../../../../admin/src/components/UnauthenticatedLogo'; import UnauthenticatedLayout, { Column, LayoutContent, } from '../../../../../../admin/src/layouts/UnauthenticatedLayout'; +import { useAuthProviders } from '../../../../hooks'; + import SSOProviders from './SSOProviders'; -import Logo from '../../../../../../admin/src/components/UnauthenticatedLogo'; const DividerFull = styled(Divider)` flex: 1; diff --git a/packages/core/admin/ee/admin/pages/AuthPage/utils/forms.js b/packages/core/admin/ee/admin/pages/AuthPage/utils/forms.js index d2d9eb5bde..3b562561da 100644 --- a/packages/core/admin/ee/admin/pages/AuthPage/utils/forms.js +++ b/packages/core/admin/ee/admin/pages/AuthPage/utils/forms.js @@ -1,5 +1,5 @@ -import Providers from '../components/Providers'; import baseForms from '../../../../../admin/src/pages/AuthPage/utils/forms'; +import Providers from '../components/Providers'; const forms = { ...baseForms, diff --git a/packages/core/admin/ee/admin/pages/AuthResponse/index.js b/packages/core/admin/ee/admin/pages/AuthResponse/index.js index dc1b8a7108..b6c8081280 100644 --- a/packages/core/admin/ee/admin/pages/AuthResponse/index.js +++ b/packages/core/admin/ee/admin/pages/AuthResponse/index.js @@ -1,8 +1,10 @@ -import React, { useEffect, useRef, useCallback } from 'react'; -import { useHistory, useRouteMatch } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import Cookies from 'js-cookie'; +import React, { useCallback, useEffect, useRef } from 'react'; + import { auth, LoadingIndicatorPage, useFetchClient } from '@strapi/helper-plugin'; +import Cookies from 'js-cookie'; +import { useIntl } from 'react-intl'; +import { useHistory, useRouteMatch } from 'react-router-dom'; + import { getRequestUrl } from '../../../../admin/src/utils'; const AuthResponse = () => { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js index 7741a221f6..019acddc83 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { Flex, Tooltip, Icon, GridItem, Typography } from '@strapi/design-system'; + +import { Flex, GridItem, Icon, Tooltip, Typography } from '@strapi/design-system'; import { Link } from '@strapi/design-system/v2'; -import { ExternalLink, ExclamationMarkCircle } from '@strapi/icons'; import { pxToRem } from '@strapi/helper-plugin'; +import { ExclamationMarkCircle, ExternalLink } from '@strapi/icons'; +import { useIntl } from 'react-intl'; + import { useLicenseLimits } from '../../../../../../hooks'; const BILLING_STRAPI_CLOUD_URL = 'https://cloud.strapi.io/profile/billing'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/tests/index.test.js index c6ee77f685..1ed7896758 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/tests/index.test.js @@ -1,10 +1,11 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useLicenseLimits } from '../../../../../../../hooks'; import AdminSeatInfo from '..'; +import { useLicenseLimits } from '../../../../../../../hooks'; const LICENSE_MOCK = { license: { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/ComboboxFilter/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/ComboboxFilter/index.js index d6d525c663..95958b3fe8 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/ComboboxFilter/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/ComboboxFilter/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Combobox, ComboboxOption } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Combobox, ComboboxOption } from '@strapi/design-system'; const ComboboxFilter = ({ value, options, onChange }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js index 307d83bd81..b1c95079ec 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js @@ -1,8 +1,11 @@ import React from 'react'; + +import { Box, Flex, Grid, JSONInput, Loader, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Loader, Grid, Box, Flex, Typography, JSONInput } from '@strapi/design-system'; + import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages'; + import ActionItem from './ActionItem'; const ActionBody = ({ status, data, formattedDate }) => { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionItem.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionItem.js index ad874268f7..14ab202bc3 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionItem.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionItem.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Flex, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; const ActionItem = ({ actionLabel, actionName }) => { return ( diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/index.js index 68c5a53fca..b945d9c733 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/index.js @@ -1,10 +1,13 @@ import React from 'react'; + +import { ModalBody, ModalHeader, ModalLayout } from '@strapi/design-system'; +import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useQuery } from 'react-query'; -import { ModalLayout, ModalHeader, ModalBody } from '@strapi/design-system'; -import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; + import useFormatTimeStamp from '../hooks/useFormatTimeStamp'; + import ActionBody from './ActionBody'; const Modal = ({ handleClose, logId }) => { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/PaginationFooter/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/PaginationFooter/index.js index 83b0ffabd6..03e921300d 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/PaginationFooter/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/PaginationFooter/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; -import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin'; +import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; const PaginationFooter = ({ pagination }) => { return ( diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js index 9a41d46047..a4b7512831 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { Flex, IconButton, Tbody, Td, Tr, Typography } from '@strapi/design-system'; +import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; +import { Eye } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { IconButton, Flex, Typography, Tbody, Td, Tr } from '@strapi/design-system'; -import { Eye } from '@strapi/icons'; -import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; + import useFormatTimeStamp from '../hooks/useFormatTimeStamp'; import { getDefaultMessage } from '../utils/getActionTypesDefaultMessages'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/tests/index.test.js index 7d4d22bba8..0c3efd57f6 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; -import { Router } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import { createMemoryHistory } from 'history'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render, screen } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; + import TableRows from '..'; const history = createMemoryHistory(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js index b7e098f322..943e496501 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js @@ -1,5 +1,5 @@ +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useQuery } from 'react-query'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; import { useLocation } from 'react-router-dom'; import { useAdminUsers } from '../../../../../../../../admin/src/hooks/useAdminUsers'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useFormatTimeStamp.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useFormatTimeStamp.js index 6c6951619a..2e985c5b26 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useFormatTimeStamp.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useFormatTimeStamp.js @@ -1,5 +1,5 @@ -import { useIntl } from 'react-intl'; import parseISO from 'date-fns/parseISO'; +import { useIntl } from 'react-intl'; const useFormatTimeStamp = () => { const { formatDate } = useIntl(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js index 8393560089..a28cb66581 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js @@ -1,29 +1,32 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import { - SettingsPageTitle, - DynamicTable, - useRBAC, - useFocusWhenNavigate, - useQueryParams, - AnErrorOccurred, -} from '@strapi/helper-plugin'; -import { - Box, - HeaderLayout, - ContentLayout, ActionLayout, + Box, + ContentLayout, + HeaderLayout, Layout, Main, } from '@strapi/design-system'; -import adminPermissions from '../../../../../../../admin/src/permissions'; -import TableRows from './TableRows'; -import tableHeaders from './utils/tableHeaders'; -import PaginationFooter from './PaginationFooter'; -import Modal from './Modal'; +import { + AnErrorOccurred, + DynamicTable, + SettingsPageTitle, + useFocusWhenNavigate, + useQueryParams, + useRBAC, +} from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; + import Filters from '../../../../../../../admin/src/pages/SettingsPage/components/Filters'; -import getDisplayedFilters from './utils/getDisplayedFilters'; +import adminPermissions from '../../../../../../../admin/src/permissions'; + import useAuditLogsData from './hooks/useAuditLogsData'; +import Modal from './Modal'; +import PaginationFooter from './PaginationFooter'; +import TableRows from './TableRows'; +import getDisplayedFilters from './utils/getDisplayedFilters'; +import tableHeaders from './utils/tableHeaders'; const auditLogsPermissions = { ...adminPermissions.settings.auditLogs, diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js index 5f358d8556..a4148c8285 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js @@ -1,14 +1,17 @@ import React from 'react'; -import { Router } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import { createMemoryHistory } from 'history'; -import { render, screen, waitFor, within, fireEvent } from '@testing-library/react'; -import { QueryClient, QueryClientProvider } from 'react-query'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { createMemoryHistory } from 'history'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Router } from 'react-router-dom'; + import useAuditLogsData from '../hooks/useAuditLogsData'; import ListView from '../index'; -import { TEST_PAGE_DATA, TEST_SINGLE_DATA, getBigTestPageData } from './utils/data'; + +import { getBigTestPageData, TEST_PAGE_DATA, TEST_SINGLE_DATA } from './utils/data'; const history = createMemoryHistory(); const user = userEvent.setup(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js index bdf72b388b..b5a59f2db9 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js @@ -70,4 +70,4 @@ const getBigTestPageData = (quantity) => { return data; }; -export { TEST_PAGE_DATA, TEST_SINGLE_DATA, getBigTestPageData }; +export { getBigTestPageData, TEST_PAGE_DATA, TEST_SINGLE_DATA }; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js index 2ab5224600..9f05861805 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js @@ -1,5 +1,6 @@ import ComboboxFilter from '../ComboboxFilter'; -import { getDefaultMessage, actionTypes } from './getActionTypesDefaultMessages'; + +import { actionTypes, getDefaultMessage } from './getActionTypesDefaultMessages'; const customOperators = [ { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js index 8c13833b37..6df441287a 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import adminPermissions from '../../../../../../../admin/src/permissions'; import ListView from '../ListView'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js index 174dd397d2..beaee8e358 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js @@ -1,9 +1,6 @@ import React, { useEffect, useState } from 'react'; -import { FormikProvider, useFormik, Form } from 'formik'; -import { useIntl } from 'react-intl'; -import { useSelector, useDispatch } from 'react-redux'; -import { useMutation } from 'react-query'; +import { Button, ContentLayout, HeaderLayout, Layout, Loader, Main } from '@strapi/design-system'; import { CheckPagePermissions, ConfirmDialog, @@ -13,19 +10,23 @@ import { useNotification, useTracking, } from '@strapi/helper-plugin'; -import { Button, ContentLayout, HeaderLayout, Layout, Loader, Main } from '@strapi/design-system'; import { Check } from '@strapi/icons'; +import { Form, FormikProvider, useFormik } from 'formik'; +import { useIntl } from 'react-intl'; +import { useMutation } from 'react-query'; +import { useDispatch, useSelector } from 'react-redux'; -import { Stages } from './components/Stages'; -import { reducer, initialState } from './reducer'; -import { REDUX_NAMESPACE, DRAG_DROP_TYPES } from './constants'; -import { useInjectReducer } from '../../../../../../admin/src/hooks/useInjectReducer'; -import { useReviewWorkflows } from './hooks/useReviewWorkflows'; -import { setWorkflows } from './actions'; -import { getWorkflowValidationSchema } from './utils/getWorkflowValidationSchema'; -import adminPermissions from '../../../../../../admin/src/permissions'; -import { StageDragPreview } from './components/StageDragPreview'; import { DragLayer } from '../../../../../../admin/src/components/DragLayer'; +import { useInjectReducer } from '../../../../../../admin/src/hooks/useInjectReducer'; +import adminPermissions from '../../../../../../admin/src/permissions'; + +import { setWorkflows } from './actions'; +import { StageDragPreview } from './components/StageDragPreview'; +import { Stages } from './components/Stages'; +import { DRAG_DROP_TYPES, REDUX_NAMESPACE } from './constants'; +import { useReviewWorkflows } from './hooks/useReviewWorkflows'; +import { initialState, reducer } from './reducer'; +import { getWorkflowValidationSchema } from './utils/getWorkflowValidationSchema'; function renderDragLayerItem({ type, item }) { switch (type) { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/index.js index 59d294d830..20353a4e81 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/index.js @@ -1,7 +1,7 @@ import { - ACTION_SET_WORKFLOWS, - ACTION_DELETE_STAGE, ACTION_ADD_STAGE, + ACTION_DELETE_STAGE, + ACTION_SET_WORKFLOWS, ACTION_UPDATE_STAGE, ACTION_UPDATE_STAGE_POSITION, } from '../constants'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/tests/index.test.js index 0edaf00262..51d48b3d11 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/tests/index.test.js @@ -1,9 +1,8 @@ -import { setWorkflows, deleteStage, updateStage, addStage } from '..'; - +import { addStage, deleteStage, setWorkflows, updateStage } from '..'; import { - ACTION_SET_WORKFLOWS, - ACTION_DELETE_STAGE, ACTION_ADD_STAGE, + ACTION_DELETE_STAGE, + ACTION_SET_WORKFLOWS, ACTION_UPDATE_STAGE, } from '../../constants'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/AddStage.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/AddStage.js index 84f4883009..ad15f81d71 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/AddStage.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/AddStage.js @@ -1,9 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { Box, Flex, Typography } from '@strapi/design-system'; import { PlusCircle } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; const StyledAddIcon = styled(PlusCircle)` > circle { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/tests/AddStage.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/tests/AddStage.test.js index 98d08af1cd..5dd2e423e2 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/tests/AddStage.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/tests/AddStage.test.js @@ -1,7 +1,7 @@ import React from 'react'; -import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { render } from '@testing-library/react'; import { AddStage } from '../AddStage'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/StageDragPreview/StageDragPreview.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/StageDragPreview/StageDragPreview.js index 18c08f1fd4..257cef10ee 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/StageDragPreview/StageDragPreview.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/StageDragPreview/StageDragPreview.js @@ -1,9 +1,10 @@ import * as React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { CarretDown } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Flex, Typography } from '@strapi/design-system'; -import { CarretDown } from '@strapi/icons'; -import { pxToRem } from '@strapi/helper-plugin'; const Toggle = styled(Flex)` svg path { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js index 99cbabae96..9558770e6d 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js @@ -1,31 +1,32 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; -import { useField } from 'formik'; -import { useIntl } from 'react-intl'; -import { useDispatch } from 'react-redux'; + import { Accordion, - AccordionToggle, AccordionContent, + AccordionToggle, Box, Flex, Grid, GridItem, IconButton, - TextInput, - VisuallyHidden, SingleSelect, SingleSelectOption, + TextInput, + VisuallyHidden, } from '@strapi/design-system'; import { useTracking } from '@strapi/helper-plugin'; import { Drag, Trash } from '@strapi/icons'; +import { useField } from 'formik'; +import PropTypes from 'prop-types'; import { getEmptyImage } from 'react-dnd-html5-backend'; +import { useIntl } from 'react-intl'; +import { useDispatch } from 'react-redux'; -import { deleteStage, updateStagePosition, updateStage } from '../../../actions'; -import { getAvailableStageColors, getStageColorByHex } from '../../../utils/colors'; import { useDragAndDrop } from '../../../../../../../../../admin/src/content-manager/hooks'; import { composeRefs } from '../../../../../../../../../admin/src/content-manager/utils'; +import { deleteStage, updateStage, updateStagePosition } from '../../../actions'; import { DRAG_DROP_TYPES } from '../../../constants'; +import { getAvailableStageColors, getStageColorByHex } from '../../../utils/colors'; const AVAILABLE_COLORS = getAvailableStageColors(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js index 34858d61eb..b2f2e578fe 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js @@ -1,19 +1,18 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { IntlProvider } from 'react-intl'; import { FormikProvider, useFormik } from 'formik'; -import { Provider } from 'react-redux'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; +import { Provider } from 'react-redux'; import configureStore from '../../../../../../../../../../admin/src/core/store/configureStore'; -import { Stage } from '../Stage'; -import { reducer } from '../../../../reducer'; - import { STAGE_COLOR_DEFAULT } from '../../../../constants'; +import { reducer } from '../../../../reducer'; +import { Stage } from '../Stage'; const STAGES_FIXTURE = { id: 1, diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stages.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stages.js index 3bb55d8459..da7cfffb02 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stages.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stages.js @@ -1,13 +1,15 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { useDispatch } from 'react-redux'; + import { Box, Flex } from '@strapi/design-system'; import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useDispatch } from 'react-redux'; +import styled from 'styled-components'; import { addStage } from '../../actions'; import { AddStage } from '../AddStage'; + import { Stage } from './Stage'; const StagesContainer = styled(Box)` diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js index 5efca68741..ec3c9b688c 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js @@ -1,19 +1,19 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Provider } from 'react-redux'; -import { FormikProvider, useFormik } from 'formik'; import userEvent from '@testing-library/user-event'; +import { FormikProvider, useFormik } from 'formik'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; +import { Provider } from 'react-redux'; import configureStore from '../../../../../../../../../admin/src/core/store/configureStore'; -import { Stages } from '../Stages'; -import { reducer } from '../../../reducer'; -import { ACTION_SET_WORKFLOWS, STAGE_COLOR_DEFAULT } from '../../../constants'; import * as actions from '../../../actions'; +import { ACTION_SET_WORKFLOWS, STAGE_COLOR_DEFAULT } from '../../../constants'; +import { reducer } from '../../../reducer'; +import { Stages } from '../Stages'; // without mocking actions as ESM it is impossible to spy on named exports jest.mock('../../../actions', () => ({ diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/tests/useReviewWorkflows.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/tests/useReviewWorkflows.test.js index b2e2cc01c7..530f2b381d 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/tests/useReviewWorkflows.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/tests/useReviewWorkflows.test.js @@ -1,9 +1,10 @@ import React from 'react'; -import { QueryClientProvider, QueryClient } from 'react-query'; + import { renderHook, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { useReviewWorkflows } from '../useReviewWorkflows'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js index 1ed17aa141..9d186bdc55 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js @@ -1,6 +1,6 @@ -import { useQuery } from 'react-query'; import { useFetchClient } from '@strapi/helper-plugin'; import { stringify } from 'qs'; +import { useQuery } from 'react-query'; export function useReviewWorkflows(params = {}) { const { id = '', ...queryParams } = params; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js index 7a9d6db2bc..ae24cb0145 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js @@ -2,9 +2,9 @@ import { current, produce } from 'immer'; import isEqual from 'lodash/isEqual'; import { - ACTION_SET_WORKFLOWS, - ACTION_DELETE_STAGE, ACTION_ADD_STAGE, + ACTION_DELETE_STAGE, + ACTION_SET_WORKFLOWS, ACTION_UPDATE_STAGE, ACTION_UPDATE_STAGE_POSITION, STAGE_COLOR_DEFAULT, diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js index 083708ea9a..450b317154 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js @@ -1,9 +1,8 @@ import { initialState, reducer } from '..'; - import { - ACTION_SET_WORKFLOWS, - ACTION_DELETE_STAGE, ACTION_ADD_STAGE, + ACTION_DELETE_STAGE, + ACTION_SET_WORKFLOWS, ACTION_UPDATE_STAGE, ACTION_UPDATE_STAGE_POSITION, } from '../../constants'; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js index 4d4d406152..57efcb109c 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js @@ -1,18 +1,19 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useNotification } from '@strapi/helper-plugin'; import { fireEvent, render, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { Provider } from 'react-redux'; -import { QueryClientProvider, QueryClient } from 'react-query'; import userEvent from '@testing-library/user-event'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; -import { useNotification } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { Provider } from 'react-redux'; -import configureStore from '../../../../../../../admin/src/core/store/configureStore'; import ReviewWorkflowsPage from '..'; +import configureStore from '../../../../../../../admin/src/core/store/configureStore'; import { reducer } from '../reducer'; const notificationMock = jest.fn(); diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js index 79d5d20dbb..0c4fb5ad53 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js @@ -1,33 +1,36 @@ import React, { useEffect } from 'react'; + import { - CheckPagePermissions, - SettingsPageTitle, - useRBAC, - LoadingIndicatorPage, - useFocusWhenNavigate, -} from '@strapi/helper-plugin'; -import { Check } from '@strapi/icons'; -import { - ContentLayout, - HeaderLayout, - Layout, Button, - Main, - Typography, - ToggleInput, - Select, - Option, + ContentLayout, + Flex, Grid, GridItem, - Flex, + HeaderLayout, + Layout, + Main, MultiSelect, MultiSelectOption, + Option, + Select, + ToggleInput, + Typography, } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; +import { + CheckPagePermissions, + LoadingIndicatorPage, + SettingsPageTitle, + useFocusWhenNavigate, + useRBAC, +} from '@strapi/helper-plugin'; +import { Check } from '@strapi/icons'; import isEqual from 'lodash/isEqual'; -import { getRequestUrl } from '../../../../../../admin/src/utils'; +import { useIntl } from 'react-intl'; + import { useRolesList, useSettingsForm } from '../../../../../../admin/src/hooks'; import adminPermissions from '../../../../../../admin/src/permissions'; +import { getRequestUrl } from '../../../../../../admin/src/utils'; + import schema from './utils/schema'; const ssoPermissions = { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js index 94b31c2b43..22b52ea2ff 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js @@ -1,12 +1,14 @@ import React from 'react'; -import { getByLabelText, render, screen, waitFor, fireEvent } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { useRBAC } from '@strapi/helper-plugin'; -import server from './server'; +import { fireEvent, getByLabelText, render, screen, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; + import { SingleSignOn } from '../index'; +import server from './server'; + jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), useNotification: jest.fn().mockImplementation(() => jest.fn()), diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/server.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/server.js index 63241f11ec..db1d5c366e 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/server.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/providers/options', (req, res, ctx) => { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js index 59ad790f9e..0ab9df51d5 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { Flex, Button, Tooltip, Icon } from '@strapi/design-system'; + +import { Button, Flex, Icon, Tooltip } from '@strapi/design-system'; import { Envelop, ExclamationMarkCircle } from '@strapi/icons'; import isNil from 'lodash/isNil'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { useLicenseLimits } from '../../../../../../hooks'; const CreateAction = ({ onClick }) => { diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js index 51723368aa..7450915c6a 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js @@ -1,6 +1,8 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import basename from '../../../../../../../../admin/src/core/utils/basename'; import MagicLinkWrapper from '../../../../../../../../admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper'; diff --git a/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js b/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js index b647d2decf..0b183be031 100644 --- a/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js +++ b/packages/core/content-type-builder/admin/src/components/AllowedTypesSelect/index.js @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { MultiSelectNested } from '@strapi/design-system'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const options = [ { diff --git a/packages/core/content-type-builder/admin/src/components/AttributeIcon/index.js b/packages/core/content-type-builder/admin/src/components/AttributeIcon/index.js index dc4fc27f04..a0bd9747d8 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeIcon/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeIcon/index.js @@ -1,26 +1,27 @@ import React from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import { pxToRem, useCustomFields } from '@strapi/helper-plugin'; import { - Component, - CollectionType, - Date, Boolean, + CollectionType, + Component, + Date, DynamicZone, Email, Enumeration, Json, - RichText, Media, + Number, Password, Relation, + RichText, SingleType, Text, Uid, - Number, } from '@strapi/icons'; -import { pxToRem, useCustomFields } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; const iconByTypes = { biginteger: Number, diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeList/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeList/index.js index 1f14ec9d6c..02e70e6259 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeList/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeList/index.js @@ -1,6 +1,8 @@ import React from 'react'; + +import { Box, Flex, Grid, GridItem, KeyboardNavigable } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, Grid, GridItem, KeyboardNavigable, Flex } from '@strapi/design-system'; + import AttributeOption from '../AttributeOption'; import getPadding from '../utils/getPadding'; diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js index 710e4cd055..997d4c55b4 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/AttributeOption/index.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Box, Flex, Typography } from '@strapi/design-system'; + import useFormModalNavigation from '../../../hooks/useFormModalNavigation'; import getTrad from '../../../utils/getTrad'; import AttributeIcon from '../../AttributeIcon'; diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldOption/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldOption/index.js index 8ec76d90ae..20b6e535d8 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldOption/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldOption/index.js @@ -5,12 +5,14 @@ */ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Box, Flex, Typography } from '@strapi/design-system'; -import OptionBoxWrapper from '../OptionBoxWrapper'; -import AttributeIcon from '../../AttributeIcon'; + import useFormModalNavigation from '../../../hooks/useFormModalNavigation'; +import AttributeIcon from '../../AttributeIcon'; +import OptionBoxWrapper from '../OptionBoxWrapper'; const CustomFieldOption = ({ customFieldUid, customField }) => { const { type, intlLabel, intlDescription } = customField; diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldsList/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldsList/index.js index 624359081e..c28af76bac 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldsList/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/CustomFieldsList/index.js @@ -1,11 +1,13 @@ import React from 'react'; + +import { Box, Flex, Grid, GridItem, KeyboardNavigable, Link } from '@strapi/design-system'; import { useCustomFields } from '@strapi/helper-plugin'; -import { Box, Grid, GridItem, KeyboardNavigable, Flex, Link } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import EmptyAttributes from '../EmptyAttributes'; -import CustomFieldOption from '../CustomFieldOption'; -import getPadding from '../utils/getPadding'; + import { getTrad } from '../../../utils'; +import CustomFieldOption from '../CustomFieldOption'; +import EmptyAttributes from '../EmptyAttributes'; +import getPadding from '../utils/getPadding'; const CustomFieldsList = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes/index.js index d07ba8c617..ce0318372c 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; + +import { Box, Flex, Icon, LinkButton, Typography } from '@strapi/design-system'; +import { EmptyDocuments, Plus } from '@strapi/icons'; import qs from 'qs'; -import { Box, Flex, Typography, LinkButton, Icon } from '@strapi/design-system'; -import { Plus, EmptyDocuments } from '@strapi/icons'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { getTrad } from '../../../utils'; const EmptyCard = styled(Box)` diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/OptionBoxWrapper/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/OptionBoxWrapper/index.js index db17bac88b..b8fdafb1df 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/OptionBoxWrapper/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/OptionBoxWrapper/index.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { Box } from '@strapi/design-system'; +import styled from 'styled-components'; const BoxWrapper = styled(Box)` width: 100%; diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/index.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/index.js index d3774f91f8..ab33774994 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/index.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/index.js @@ -5,21 +5,24 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Box, Divider, - ModalBody, Flex, - Typography, - Tabs, + ModalBody, Tab, TabGroup, - TabPanels, TabPanel, + TabPanels, + Tabs, + Typography, } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; + import AttributeList from './AttributeList'; import CustomFieldsList from './CustomFieldsList'; diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js index 181cca5591..dcab8ed0d5 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; -import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { render, screen, fireEvent } from '@testing-library/react'; + import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; + import FormModalNavigationProvider from '../../FormModalNavigationProvider'; import AttributeOptions from '../index'; diff --git a/packages/core/content-type-builder/admin/src/components/BooleanDefaultValueSelect/index.js b/packages/core/content-type-builder/admin/src/components/BooleanDefaultValueSelect/index.js index bf53dd5dfd..5c86668695 100644 --- a/packages/core/content-type-builder/admin/src/components/BooleanDefaultValueSelect/index.js +++ b/packages/core/content-type-builder/admin/src/components/BooleanDefaultValueSelect/index.js @@ -5,9 +5,10 @@ */ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option } from '@strapi/design-system'; const BooleanDefaultValueSelect = ({ intlLabel, name, options, onChange, value }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/BooleanRadioGroup/index.js b/packages/core/content-type-builder/admin/src/components/BooleanRadioGroup/index.js index 5ebc5386c2..1364f9b16e 100644 --- a/packages/core/content-type-builder/admin/src/components/BooleanRadioGroup/index.js +++ b/packages/core/content-type-builder/admin/src/components/BooleanRadioGroup/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import PropTypes from 'prop-types'; + import CustomRadioGroup from '../CustomRadioGroup'; const BooleanRadioGroup = ({ onChange, name, ...rest }) => { diff --git a/packages/core/content-type-builder/admin/src/components/CheckboxWithNumberField/index.js b/packages/core/content-type-builder/admin/src/components/CheckboxWithNumberField/index.js index 82a792cb6d..dd7c6f9dc7 100644 --- a/packages/core/content-type-builder/admin/src/components/CheckboxWithNumberField/index.js +++ b/packages/core/content-type-builder/admin/src/components/CheckboxWithNumberField/index.js @@ -5,9 +5,10 @@ */ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Box, Checkbox, Flex, NumberInput, TextInput } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const CheckboxWithNumberField = ({ error, intlLabel, modifiedData, name, onChange, value }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/ComponentCard/ComponentIcon/ComponentIcon.js b/packages/core/content-type-builder/admin/src/components/ComponentCard/ComponentIcon/ComponentIcon.js index 8d8b389af9..6c5a9e4bfa 100644 --- a/packages/core/content-type-builder/admin/src/components/ComponentCard/ComponentIcon/ComponentIcon.js +++ b/packages/core/content-type-builder/admin/src/components/ComponentCard/ComponentIcon/ComponentIcon.js @@ -1,7 +1,8 @@ -import PropTypes from 'prop-types'; import React from 'react'; import { Flex, Icon } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import { COMPONENT_ICONS } from '../../IconPicker/constants'; export function ComponentIcon({ isActive, icon }) { diff --git a/packages/core/content-type-builder/admin/src/components/ComponentCard/index.js b/packages/core/content-type-builder/admin/src/components/ComponentCard/index.js index 3f83bcad12..738edaeb92 100644 --- a/packages/core/content-type-builder/admin/src/components/ComponentCard/index.js +++ b/packages/core/content-type-builder/admin/src/components/ComponentCard/index.js @@ -5,17 +5,18 @@ */ import React from 'react'; -import get from 'lodash/get'; -import PropTypes from 'prop-types'; + import { Box, Flex, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; import { Cross } from '@strapi/icons'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { ComponentIcon } from './ComponentIcon'; - import useDataManager from '../../hooks/useDataManager'; +import { ComponentIcon } from './ComponentIcon'; + const CloseButton = styled(Box)` position: absolute; display: none; diff --git a/packages/core/content-type-builder/admin/src/components/ComponentList/index.js b/packages/core/content-type-builder/admin/src/components/ComponentList/index.js index 586e397887..fcf93b75a4 100644 --- a/packages/core/content-type-builder/admin/src/components/ComponentList/index.js +++ b/packages/core/content-type-builder/admin/src/components/ComponentList/index.js @@ -5,10 +5,12 @@ */ /* eslint-disable import/no-cycle */ import React from 'react'; + import get from 'lodash/get'; import PropTypes from 'prop-types'; -import List from '../List'; + import useDataManager from '../../hooks/useDataManager'; +import List from '../List'; import Tr from '../Tr'; function ComponentList({ diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js index 9e5384aa37..3fbf4fdedd 100644 --- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js +++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js @@ -1,8 +1,5 @@ import React from 'react'; -import upperFirst from 'lodash/upperFirst'; -import { useIntl } from 'react-intl'; -import { NavLink } from 'react-router-dom'; -import { Plus } from '@strapi/icons'; + import { Box, Icon, TextButton } from '@strapi/design-system'; import { SubNav, @@ -13,9 +10,14 @@ import { SubNavSections, } from '@strapi/design-system/v2'; import { pxToRem } from '@strapi/helper-plugin'; +import { Plus } from '@strapi/icons'; +import upperFirst from 'lodash/upperFirst'; +import { useIntl } from 'react-intl'; +import { NavLink } from 'react-router-dom'; + +import getTrad from '../../utils/getTrad'; import useContentTypeBuilderMenu from './useContentTypeBuilderMenu'; -import getTrad from '../../utils/getTrad'; const ContentTypeBuilderNav = () => { const { menu, searchValue, onSearchChange } = useContentTypeBuilderMenu(); diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/tests/index.test.js index c983699cb6..21c0242cb2 100644 --- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/tests/index.test.js +++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/tests/index.test.js @@ -4,13 +4,16 @@ * */ +import React from 'react'; + import { Layout, lightTheme, ThemeProvider } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; import { render } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import React from 'react'; +import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; + import ContentTypeBuilderNav from '../index'; + import mockData from './mockData'; jest.mock('../useContentTypeBuilderMenu.js', () => { diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/useContentTypeBuilderMenu.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/useContentTypeBuilderMenu.js index 34e50edffb..4f338a397f 100644 --- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/useContentTypeBuilderMenu.js +++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/useContentTypeBuilderMenu.js @@ -1,11 +1,11 @@ import { useState } from 'react'; -import { useNotification, useTracking, useFilter, useCollator } from '@strapi/helper-plugin'; + +import { useCollator, useFilter, useNotification, useTracking } from '@strapi/helper-plugin'; import isEqual from 'lodash/isEqual'; import { useIntl } from 'react-intl'; import useDataManager from '../../hooks/useDataManager'; import useFormModalNavigation from '../../hooks/useFormModalNavigation'; - import pluginId from '../../pluginId'; import getTrad from '../../utils/getTrad'; diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeRadioGroup/index.js b/packages/core/content-type-builder/admin/src/components/ContentTypeRadioGroup/index.js index a05e8ddc0d..aa82baa94c 100644 --- a/packages/core/content-type-builder/admin/src/components/ContentTypeRadioGroup/index.js +++ b/packages/core/content-type-builder/admin/src/components/ContentTypeRadioGroup/index.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { useNotification } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import { getTrad } from '../../utils'; import CustomRadioGroup from '../CustomRadioGroup'; diff --git a/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/components.js b/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/components.js index 30cb232e99..cf5e1c8852 100644 --- a/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/components.js +++ b/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/components.js @@ -1,5 +1,5 @@ +import { Flex, inputFocusStyle, Typography } from '@strapi/design-system'; import styled from 'styled-components'; -import { Flex, Typography, inputFocusStyle } from '@strapi/design-system'; const Wrapper = styled(Flex)` position: relative; diff --git a/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/index.js b/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/index.js index 5b6ecda640..4448e59cce 100644 --- a/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/index.js +++ b/packages/core/content-type-builder/admin/src/components/CustomRadioGroup/index.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Typography, Box, Flex } from '@strapi/design-system'; + import { Wrapper } from './components'; const CustomRadioGroup = ({ intlLabel, name, onChange, radios, value }) => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/index.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/index.js index 46ca2bce3a..83c12d569e 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/index.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/index.js @@ -1,60 +1,62 @@ import React, { memo, useEffect, useMemo, useRef } from 'react'; -import PropTypes from 'prop-types'; + +import { + LoadingIndicatorPage, + useAppInfo, + useAutoReloadOverlayBlocker, + useFetchClient, + useGuidedTour, + useNotification, + useRBACProvider, + useStrapiApp, + useTracking, +} from '@strapi/helper-plugin'; import get from 'lodash/get'; import groupBy from 'lodash/groupBy'; import set from 'lodash/set'; import size from 'lodash/size'; -import { - LoadingIndicatorPage, - useTracking, - useNotification, - useStrapiApp, - useAutoReloadOverlayBlocker, - useAppInfo, - useRBACProvider, - useGuidedTour, - useFetchClient, -} from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useLocation, useRouteMatch, Redirect } from 'react-router-dom'; import { connect, useDispatch } from 'react-redux'; +import { Redirect, useLocation, useRouteMatch } from 'react-router-dom'; import { compose } from 'redux'; + import DataManagerContext from '../../contexts/DataManagerContext'; import useFormModalNavigation from '../../hooks/useFormModalNavigation'; +import pluginId from '../../pluginId'; import getTrad from '../../utils/getTrad'; import makeUnique from '../../utils/makeUnique'; -import pluginId from '../../pluginId'; import FormModal from '../FormModal'; -import createDataObject from './utils/createDataObject'; -import createModifiedDataSchema from './utils/createModifiedDataSchema'; -import retrieveSpecificInfoFromComponents from './utils/retrieveSpecificInfoFromComponents'; -import retrieveComponentsFromSchema from './utils/retrieveComponentsFromSchema'; -import retrieveNestedComponents from './utils/retrieveNestedComponents'; -import { retrieveComponentsThatHaveComponents } from './utils/retrieveComponentsThatHaveComponents'; -import { getComponentsToPost, formatMainDataType, sortContentType } from './utils/cleanData'; -import serverRestartWatcher from './utils/serverRestartWatcher'; -import validateSchema from './utils/validateSchema'; import { ADD_ATTRIBUTE, - ADD_CUSTOM_FIELD_ATTRIBUTE, ADD_CREATED_COMPONENT_TO_DYNAMIC_ZONE, + ADD_CUSTOM_FIELD_ATTRIBUTE, CHANGE_DYNAMIC_ZONE_COMPONENTS, - CREATE_SCHEMA, CREATE_COMPONENT_SCHEMA, + CREATE_SCHEMA, DELETE_NOT_SAVED_TYPE, EDIT_ATTRIBUTE, EDIT_CUSTOM_FIELD_ATTRIBUTE, GET_DATA_SUCCEEDED, RELOAD_PLUGIN, - REMOVE_FIELD_FROM_DISPLAYED_COMPONENT, REMOVE_COMPONENT_FROM_DYNAMIC_ZONE, REMOVE_FIELD, + REMOVE_FIELD_FROM_DISPLAYED_COMPONENT, SET_MODIFIED_DATA, UPDATE_SCHEMA, } from './constants'; import makeSelectDataManagerProvider from './selectors'; +import { formatMainDataType, getComponentsToPost, sortContentType } from './utils/cleanData'; +import createDataObject from './utils/createDataObject'; +import createModifiedDataSchema from './utils/createModifiedDataSchema'; import formatSchemas from './utils/formatSchemas'; +import retrieveComponentsFromSchema from './utils/retrieveComponentsFromSchema'; +import { retrieveComponentsThatHaveComponents } from './utils/retrieveComponentsThatHaveComponents'; +import retrieveNestedComponents from './utils/retrieveNestedComponents'; +import retrieveSpecificInfoFromComponents from './utils/retrieveSpecificInfoFromComponents'; +import serverRestartWatcher from './utils/serverRestartWatcher'; +import validateSchema from './utils/validateSchema'; const DataManagerProvider = ({ children, diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/reducer.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/reducer.js index a16c2fd627..5e5a5e88bc 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/reducer.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/reducer.js @@ -1,10 +1,12 @@ import produce, { current } from 'immer'; import get from 'lodash/get'; import set from 'lodash/set'; -import makeUnique from '../../utils/makeUnique'; + import getRelationType from '../../utils/getRelationType'; -import retrieveComponentsFromSchema from './utils/retrieveComponentsFromSchema'; +import makeUnique from '../../utils/makeUnique'; + import * as actions from './constants'; +import retrieveComponentsFromSchema from './utils/retrieveComponentsFromSchema'; const initialState = { components: {}, diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/selectors.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/selectors.js index fe2c51005a..dcc5f10b24 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/selectors.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/selectors.js @@ -1,5 +1,7 @@ import { createSelector } from 'reselect'; + import pluginId from '../../pluginId'; + import { initialState } from './reducer'; /** diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_attribute_action.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_attribute_action.test.js index d20aaba7c5..83a760bd1a 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_attribute_action.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_attribute_action.test.js @@ -1,5 +1,5 @@ -import reducer, { initialState } from '../reducer'; import { ADD_ATTRIBUTE } from '../constants'; +import reducer, { initialState } from '../reducer'; describe('CTB | components | DataManagerProvider | reducer | ADD_ATTRIBUTE', () => { describe('Adding a common field that is not a relation', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_custom_field_attribute_action.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_custom_field_attribute_action.test.js index 8df41618d0..7d30bd886f 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_custom_field_attribute_action.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_add_custom_field_attribute_action.test.js @@ -1,6 +1,7 @@ import cloneDeep from 'lodash/cloneDeep'; -import reducer, { initialState } from '../reducer'; + import { ADD_CUSTOM_FIELD_ATTRIBUTE } from '../constants'; +import reducer, { initialState } from '../reducer'; describe('CTB | components | DataManagerProvider | reducer | ADD_CUSTOM_FIELD_ATTRIBUTE', () => { it('adds a custom field to a contentType', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_basic_actions.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_basic_actions.test.js index e24269e5d1..1235a7f0ac 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_basic_actions.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_basic_actions.test.js @@ -1,7 +1,9 @@ import get from 'lodash/get'; -import reducer, { initialState } from '../reducer'; -import testData from './data'; + import * as actions from '../constants'; +import reducer, { initialState } from '../reducer'; + +import testData from './data'; describe('CTB | components | DataManagerProvider | reducer | basics actions ', () => { it('Should return the initial state', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_attribute_action.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_attribute_action.test.js index b0564f1013..cad1463bfe 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_attribute_action.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_attribute_action.test.js @@ -1,5 +1,5 @@ -import reducer, { initialState } from '../reducer'; import { EDIT_ATTRIBUTE } from '../constants'; +import reducer, { initialState } from '../reducer'; describe('CTB | components | DataManagerProvider | reducer | EDIT_ATTRIBUTE', () => { describe('Editing a common attribute (string, integer, json, media, ...)', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_custom_field_attribute_action.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_custom_field_attribute_action.test.js index f7a39ca2c3..5444669530 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_custom_field_attribute_action.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_edit_custom_field_attribute_action.test.js @@ -1,6 +1,7 @@ import cloneDeep from 'lodash/cloneDeep'; -import reducer, { initialState } from '../reducer'; + import { EDIT_CUSTOM_FIELD_ATTRIBUTE } from '../constants'; +import reducer, { initialState } from '../reducer'; describe('CTB | components | DataManagerProvider | reducer | EDIT_CUSTOM_FIELD_ATTRIBUTE', () => { it('edits a custom field attribute on a content type', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_remove_field_action.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_remove_field_action.test.js index afe9664412..80a48f34e3 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_remove_field_action.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/tests/reducer_remove_field_action.test.js @@ -1,6 +1,7 @@ -import reducer, { initialState } from '../reducer'; -import testData from './data'; import { REMOVE_FIELD } from '../constants'; +import reducer, { initialState } from '../reducer'; + +import testData from './data'; describe('CTB | components | DataManagerProvider | reducer | REMOVE_FIELD', () => { describe('Removing a field that is not a relation', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/cleanData.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/cleanData.js index 5e31863aa9..f5480d0d66 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/cleanData.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/cleanData.js @@ -1,8 +1,8 @@ +import camelCase from 'lodash/camelCase'; import get from 'lodash/get'; import isEqual from 'lodash/isEqual'; import omit from 'lodash/omit'; import sortBy from 'lodash/sortBy'; -import camelCase from 'lodash/camelCase'; import pluginId from '../../../pluginId'; import makeUnique from '../../../utils/makeUnique'; @@ -155,8 +155,8 @@ const sortContentType = (types) => export { formatComponent, + formatMainDataType, getComponentsToPost, getCreatedAndModifiedComponents, - formatMainDataType, sortContentType, }; diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsFromSchema.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsFromSchema.js index bb5ffab657..4cac93cfa0 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsFromSchema.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsFromSchema.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import makeUnique from '../../../utils/makeUnique'; const retrieveComponentsFromSchema = (attributes, allComponentsData) => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsThatHaveComponents.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsThatHaveComponents.js index 2cf8f2b599..97f3be7861 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsThatHaveComponents.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveComponentsThatHaveComponents.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import makeUnique from '../../../utils/makeUnique'; const retrieveComponentsThatHaveComponents = (allComponents) => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveSpecificInfoFromComponents.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveSpecificInfoFromComponents.js index e5185ea2eb..a0ba3935ca 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveSpecificInfoFromComponents.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/retrieveSpecificInfoFromComponents.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import makeUnique from '../../../utils/makeUnique'; const retrieveSpecificInfoFromComponents = (allComponents, keysToRetrieve) => { diff --git a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/tests/cleanData.test.js b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/tests/cleanData.test.js index dbb3ba63c5..e1d3d2f241 100644 --- a/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/tests/cleanData.test.js +++ b/packages/core/content-type-builder/admin/src/components/DataManagerProvider/utils/tests/cleanData.test.js @@ -5,8 +5,9 @@ import { getCreatedAndModifiedComponents, sortContentType, } from '../cleanData'; -import rawData from './rawData'; + import expectedData from './expectedFormattedData'; +import rawData from './rawData'; describe('CleanData utils', () => { describe('FormatComponent', () => { diff --git a/packages/core/content-type-builder/admin/src/components/DraftAndPublishToggle/index.js b/packages/core/content-type-builder/admin/src/components/DraftAndPublishToggle/index.js index 2badda3293..71a1550b8b 100644 --- a/packages/core/content-type-builder/admin/src/components/DraftAndPublishToggle/index.js +++ b/packages/core/content-type-builder/admin/src/components/DraftAndPublishToggle/index.js @@ -5,10 +5,12 @@ */ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Checkbox } from '@strapi/design-system'; import { ConfirmDialog } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; const DraftAndPublishToggle = ({ diff --git a/packages/core/content-type-builder/admin/src/components/DynamicZoneList/index.js b/packages/core/content-type-builder/admin/src/components/DynamicZoneList/index.js index 541569e6b7..74091e0ee9 100644 --- a/packages/core/content-type-builder/admin/src/components/DynamicZoneList/index.js +++ b/packages/core/content-type-builder/admin/src/components/DynamicZoneList/index.js @@ -6,12 +6,14 @@ /* eslint-disable import/no-cycle */ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; import { Plus } from '@strapi/icons'; -import { Box, Flex, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; + import useDataManager from '../../hooks/useDataManager'; import getTrad from '../../utils/getTrad'; import ComponentCard from '../ComponentCard'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js index beb3a10fd0..e27b832949 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/advancedForm.js @@ -3,6 +3,7 @@ // import isEmpty from 'lodash/isEmpty'; import getTrad from '../../../utils/getTrad'; import { componentForm } from '../component'; + import options from './attributeOptions'; const advancedForm = { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/baseForm.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/baseForm.js index 7e32398928..f34ba0e34b 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/baseForm.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/baseForm.js @@ -2,6 +2,7 @@ // import { FormattedMessage } from 'react-intl'; import getTrad from '../../../utils/getTrad'; import { componentField, componentForm } from '../component'; + import { nameField } from './nameField'; const baseForm = { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/index.js index 96d8bae11f..171a832176 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/index.js @@ -1,4 +1,4 @@ // eslint-disable-next-line import/prefer-default-export -export { default as attributesForm } from './form'; export { default as commonBaseForm } from './commonBaseForm'; +export { default as attributesForm } from './form'; export { default as attributeTypes } from './types'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/types.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/types.js index f02cb07b76..9094359ed7 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/types.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/types.js @@ -1,16 +1,18 @@ +import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; import uniq from 'lodash/uniq'; import * as yup from 'yup'; -import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; -import getTrad from '../../../utils/getTrad'; + import getRelationType from '../../../utils/getRelationType'; +import getTrad from '../../../utils/getTrad'; import toRegressedEnumValue from '../../../utils/toRegressedEnumValue'; + import { alreadyUsedAttributeNames, createTextShape, isMinSuperiorThanMax, isNameAllowed, - validators, NAME_REGEX, + validators, } from './validation/common'; const types = { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/validation/common.js b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/validation/common.js index d71fc1b0a9..8b647db479 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/attributes/validation/common.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/attributes/validation/common.js @@ -1,6 +1,6 @@ -import * as yup from 'yup'; -import toNumber from 'lodash/toNumber'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import toNumber from 'lodash/toNumber'; +import * as yup from 'yup'; import getTrad from '../../../../utils/getTrad'; @@ -140,6 +140,6 @@ export { getUsedContentTypeAttributeNames, isMinSuperiorThanMax, isNameAllowed, - validators, NAME_REGEX, + validators, }; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/category/createCategorySchema.js b/packages/core/content-type-builder/admin/src/components/FormModal/category/createCategorySchema.js index 7c081f3369..f016e04571 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/category/createCategorySchema.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/category/createCategorySchema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import * as yup from 'yup'; import CATEGORY_NAME_REGEX from './regex'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/category/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/category/index.js index 59260d60f9..e10078131b 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/category/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/category/index.js @@ -1,3 +1,3 @@ -export { default as categoryForm } from './form'; export { default as createCategorySchema } from './createCategorySchema'; +export { default as categoryForm } from './form'; export { default as CATEGORY_NAME_REGEX } from './regex'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/component/createComponentSchema.js b/packages/core/content-type-builder/admin/src/components/FormModal/component/createComponentSchema.js index 3a6b6f14e9..38be82a4c1 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/component/createComponentSchema.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/component/createComponentSchema.js @@ -1,9 +1,9 @@ -import * as yup from 'yup'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import * as yup from 'yup'; import getTrad from '../../../utils/getTrad'; -import { createComponentUid } from '../utils/createUid'; import { CATEGORY_NAME_REGEX } from '../category'; +import { createComponentUid } from '../utils/createUid'; const createComponentSchema = (usedComponentNames, reservedNames, category) => { const shape = { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/component/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/component/index.js index af3142a565..8a0043ccdf 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/component/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/component/index.js @@ -1,4 +1,4 @@ // eslint-disable-next-line import/prefer-default-export -export { default as createComponentSchema } from './createComponentSchema'; export { default as componentField } from './componentField'; +export { default as createComponentSchema } from './createComponentSchema'; export { default as componentForm } from './form'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/contentType/createContentTypeSchema.js b/packages/core/content-type-builder/admin/src/components/FormModal/contentType/createContentTypeSchema.js index 96a445414c..fb76dc0ce4 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/contentType/createContentTypeSchema.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/contentType/createContentTypeSchema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import * as yup from 'yup'; import getTrad from '../../../utils/getTrad'; import { createUid } from '../utils/createUid'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/contentType/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/contentType/index.js index 89caa271e5..6635fd2b91 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/contentType/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/contentType/index.js @@ -1,2 +1,2 @@ -export { default as contentTypeForm } from './form'; export { default as createContentTypeSchema } from './createContentTypeSchema'; +export { default as contentTypeForm } from './form'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js index dafeaea375..42daa91940 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/forms/index.js @@ -1,12 +1,13 @@ +import getTrad from '../../../utils/getTrad'; import { attributesForm, attributeTypes, commonBaseForm } from '../attributes'; -import { categoryForm, createCategorySchema } from '../category'; -import { contentTypeForm, createContentTypeSchema } from '../contentType'; -import { createComponentSchema, componentForm } from '../component'; -import { dynamiczoneForm } from '../dynamicZone'; import { nameField } from '../attributes/nameField'; +import { categoryForm, createCategorySchema } from '../category'; +import { componentForm, createComponentSchema } from '../component'; +import { contentTypeForm, createContentTypeSchema } from '../contentType'; +import { dynamiczoneForm } from '../dynamicZone'; + import addItemsToFormSection from './utils/addItemsToFormSection'; import getUsedAttributeNames from './utils/getUsedAttributeNames'; -import getTrad from '../../../utils/getTrad'; const forms = { customField: { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/forms/tests/customField.test.js b/packages/core/content-type-builder/admin/src/components/FormModal/forms/tests/customField.test.js index 6c1d542716..b0b5e99a3b 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/forms/tests/customField.test.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/forms/tests/customField.test.js @@ -1,4 +1,5 @@ import * as yup from 'yup'; + import forms from '..'; import ctbFormsAPI from '../../../../utils/formAPI'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/index.js b/packages/core/content-type-builder/admin/src/components/FormModal/index.js index 11a86f78e5..306bfc7cdf 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/index.js @@ -1,53 +1,56 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; -import { - getYupInnerErrors, - useTracking, - useNotification, - useStrapiApp, - useCustomFields, -} from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import { useHistory } from 'react-router-dom'; -import get from 'lodash/get'; -import has from 'lodash/has'; -import set from 'lodash/set'; -import toLower from 'lodash/toLower'; -import { useSelector, useDispatch, shallowEqual } from 'react-redux'; + import { Box, Button, Divider, - ModalLayout, + Flex, ModalBody, ModalFooter, - Tabs, + ModalLayout, Tab, TabGroup, - TabPanels, TabPanel, - Flex, + TabPanels, + Tabs, } from '@strapi/design-system'; +import { + getYupInnerErrors, + useCustomFields, + useNotification, + useStrapiApp, + useTracking, +} from '@strapi/helper-plugin'; +import get from 'lodash/get'; +import has from 'lodash/has'; import isEqual from 'lodash/isEqual'; -import pluginId from '../../pluginId'; +import set from 'lodash/set'; +import toLower from 'lodash/toLower'; +import { useIntl } from 'react-intl'; +import { shallowEqual, useDispatch, useSelector } from 'react-redux'; +import { useHistory } from 'react-router-dom'; + import useDataManager from '../../hooks/useDataManager'; import useFormModalNavigation from '../../hooks/useFormModalNavigation'; +import pluginId from '../../pluginId'; +import { getTrad, isAllowedContentTypesForRelations } from '../../utils'; +import findAttribute from '../../utils/findAttribute'; // New compos import AllowedTypesSelect from '../AllowedTypesSelect'; import AttributeOptions from '../AttributeOptions'; -import DraftAndPublishToggle from '../DraftAndPublishToggle'; -import ReviewWorkflowsToggle from '../ReviewWorkflowsToggle'; -import FormModalHeader from '../FormModalHeader'; -import FormModalEndActions from '../FormModalEndActions'; -import FormModalSubHeader from '../FormModalSubHeader'; - import BooleanDefaultValueSelect from '../BooleanDefaultValueSelect'; import BooleanRadioGroup from '../BooleanRadioGroup'; import CheckboxWithNumberField from '../CheckboxWithNumberField'; -import CustomRadioGroup from '../CustomRadioGroup'; import ContentTypeRadioGroup from '../ContentTypeRadioGroup'; +import CustomRadioGroup from '../CustomRadioGroup'; +import DraftAndPublishToggle from '../DraftAndPublishToggle'; +import FormModalEndActions from '../FormModalEndActions'; +import FormModalHeader from '../FormModalHeader'; +import FormModalSubHeader from '../FormModalSubHeader'; import IconPicker from '../IconPicker'; -import Relation from '../Relation'; import PluralName from '../PluralName'; +import Relation from '../Relation'; +import ReviewWorkflowsToggle from '../ReviewWorkflowsToggle'; import SelectCategory from '../SelectCategory'; import SelectComponent from '../SelectComponent'; import SelectComponents from '../SelectComponents'; @@ -56,25 +59,23 @@ import SelectNumber from '../SelectNumber'; import SingularName from '../SingularName'; import TabForm from '../TabForm'; import TextareaEnum from '../TextareaEnum'; -import findAttribute from '../../utils/findAttribute'; -import { getTrad, isAllowedContentTypesForRelations } from '../../utils'; -import { canEditContentType, getAttributesToDisplay, getFormInputNames } from './utils'; -import forms from './forms'; -import { createComponentUid, createUid } from './utils/createUid'; -import makeSelectFormModal from './selectors'; import { - SET_DATA_TO_EDIT, - SET_DYNAMIC_ZONE_DATA_SCHEMA, + ON_CHANGE, + RESET_PROPS, + RESET_PROPS_AND_SAVE_CURRENT_DATA, + RESET_PROPS_AND_SET_FORM_FOR_ADDING_AN_EXISTING_COMPO, + RESET_PROPS_AND_SET_THE_FORM_FOR_ADDING_A_COMPO_TO_A_DZ, SET_ATTRIBUTE_DATA_SCHEMA, SET_CUSTOM_FIELD_DATA_SCHEMA, + SET_DATA_TO_EDIT, + SET_DYNAMIC_ZONE_DATA_SCHEMA, SET_ERRORS, - ON_CHANGE, - RESET_PROPS_AND_SET_THE_FORM_FOR_ADDING_A_COMPO_TO_A_DZ, - RESET_PROPS_AND_SET_FORM_FOR_ADDING_AN_EXISTING_COMPO, - RESET_PROPS_AND_SAVE_CURRENT_DATA, - RESET_PROPS, } from './constants'; +import forms from './forms'; +import makeSelectFormModal from './selectors'; +import { canEditContentType, getAttributesToDisplay, getFormInputNames } from './utils'; +import { createComponentUid, createUid } from './utils/createUid'; /* eslint-disable indent */ /* eslint-disable react/no-array-index-key */ diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/reducer.js b/packages/core/content-type-builder/admin/src/components/FormModal/reducer.js index c85f4e8898..4ae6578ab7 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/reducer.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/reducer.js @@ -1,14 +1,15 @@ import produce from 'immer'; -import pluralize from 'pluralize'; import set from 'lodash/set'; import snakeCase from 'lodash/snakeCase'; +import pluralize from 'pluralize'; import getRelationType from '../../utils/getRelationType'; import nameToSlug from '../../utils/nameToSlug'; -import { createComponentUid } from './utils/createUid'; -import { shouldPluralizeName, shouldPluralizeTargetAttribute } from './utils/relations'; + import * as actions from './constants'; +import { createComponentUid } from './utils/createUid'; import { customFieldDefaultOptionsReducer } from './utils/customFieldDefaultOptionsReducer'; +import { shouldPluralizeName, shouldPluralizeTargetAttribute } from './utils/relations'; const initialState = { formErrors: {}, diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/selectors.js b/packages/core/content-type-builder/admin/src/components/FormModal/selectors.js index 35eef699fa..6337e80f9e 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/selectors.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/selectors.js @@ -1,5 +1,7 @@ import { createSelector } from 'reselect'; + import pluginId from '../../pluginId'; + import { initialState } from './reducer'; /** diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.set-custom-field-data-schema.test.js b/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.set-custom-field-data-schema.test.js index aad09a3bd7..629503dd79 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.set-custom-field-data-schema.test.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.set-custom-field-data-schema.test.js @@ -1,5 +1,5 @@ -import reducer, { initialState } from '../reducer'; import * as actions from '../constants'; +import reducer, { initialState } from '../reducer'; const mockCustomField = { type: 'string', diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.test.js b/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.test.js index 69e894bbf4..e2a285ebce 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.test.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/tests/reducer.test.js @@ -1,5 +1,5 @@ -import reducer, { initialState } from '../reducer'; import * as actions from '../constants'; +import reducer, { initialState } from '../reducer'; describe('CTB | components | FormModal | reducer | actions', () => { describe(actions.ON_CHANGE, () => { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/utils/canEditContentType.js b/packages/core/content-type-builder/admin/src/components/FormModal/utils/canEditContentType.js index f6dd3d552e..153a9438b5 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/utils/canEditContentType.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/utils/canEditContentType.js @@ -1,4 +1,5 @@ import get from 'lodash/get'; + import getRelationType from '../../../utils/getRelationType'; const canEditContentType = (data, modifiedData) => { diff --git a/packages/core/content-type-builder/admin/src/components/FormModal/utils/tests/canEditContentType.test.js b/packages/core/content-type-builder/admin/src/components/FormModal/utils/tests/canEditContentType.test.js index 4ca0cbc7de..6d37745b0f 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModal/utils/tests/canEditContentType.test.js +++ b/packages/core/content-type-builder/admin/src/components/FormModal/utils/tests/canEditContentType.test.js @@ -1,4 +1,5 @@ import canEditContentType from '../canEditContentType'; + import rawData from './rawData'; describe('canEditContentType', () => { diff --git a/packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js b/packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js index 92c72d4a87..eb2c6603d5 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModalEndActions/index.js @@ -5,10 +5,12 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Button } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; const FormModalEndActions = ({ diff --git a/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js b/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js index b0444859da..ea3ec6f489 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModalHeader/index.js @@ -5,11 +5,13 @@ */ import React from 'react'; + +import { Box, Flex, ModalHeader, Typography } from '@strapi/design-system'; +import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; +import upperFirst from 'lodash/upperFirst'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import upperFirst from 'lodash/upperFirst'; -import { ModalHeader, Box, Flex, Typography } from '@strapi/design-system'; -import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; + import useDataManager from '../../hooks/useDataManager'; import getTrad from '../../utils/getTrad'; import AttributeIcon from '../AttributeIcon'; diff --git a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js index a02b018a44..f89e47d7ef 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/index.js @@ -1,7 +1,10 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import FormModalNavigationContext from '../../contexts/FormModalNavigationContext'; + import { INITIAL_STATE_DATA } from './constants'; const FormModalNavigationProvider = ({ children }) => { diff --git a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js index b79ade450d..261b5687b3 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js +++ b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js @@ -1,7 +1,8 @@ -import { renderHook, act } from '@testing-library/react'; +import { act, renderHook } from '@testing-library/react'; + +import useFormModalNavigation from '../../../hooks/useFormModalNavigation'; import { INITIAL_STATE_DATA } from '../constants'; import FormModalNavigationProvider from '../index'; -import useFormModalNavigation from '../../../hooks/useFormModalNavigation'; const removeFunctionsFromObject = (state) => { const stringified = JSON.stringify(state); diff --git a/packages/core/content-type-builder/admin/src/components/FormModalSubHeader/index.js b/packages/core/content-type-builder/admin/src/components/FormModalSubHeader/index.js index 7753b4956d..4295f45fb6 100644 --- a/packages/core/content-type-builder/admin/src/components/FormModalSubHeader/index.js +++ b/packages/core/content-type-builder/admin/src/components/FormModalSubHeader/index.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; +import upperFirst from 'lodash/upperFirst'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import upperFirst from 'lodash/upperFirst'; -import { Flex, Typography } from '@strapi/design-system'; import { getTrad } from '../../utils'; diff --git a/packages/core/content-type-builder/admin/src/components/IconPicker/index.js b/packages/core/content-type-builder/admin/src/components/IconPicker/index.js index ee0dda8d52..adafada8c1 100644 --- a/packages/core/content-type-builder/admin/src/components/IconPicker/index.js +++ b/packages/core/content-type-builder/admin/src/components/IconPicker/index.js @@ -1,24 +1,26 @@ -import React, { useState, useRef, useEffect } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; + import { Box, + Field, + FieldInput, + FieldLabel, Flex, Icon, - Typography, - Searchbar, IconButton, inputFocusStyle, - VisuallyHidden, - Field, - FieldLabel, - FieldInput, + Searchbar, Tooltip, + Typography, + VisuallyHidden, } from '@strapi/design-system'; -import { Trash, Search } from '@strapi/icons'; +import { Search, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import PropTypes from 'prop-types'; import { getTrad } from '../../utils'; + import { COMPONENT_ICONS } from './constants'; const IconPickerWrapper = styled(Flex)` diff --git a/packages/core/content-type-builder/admin/src/components/IconPicker/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/IconPicker/tests/index.test.js index 4d86884a23..71f91510f8 100644 --- a/packages/core/content-type-builder/admin/src/components/IconPicker/tests/index.test.js +++ b/packages/core/content-type-builder/admin/src/components/IconPicker/tests/index.test.js @@ -1,9 +1,11 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; -import { render, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { IntlProvider } from 'react-intl'; import { MemoryRouter } from 'react-router-dom'; + import IconPicker from '../index'; const defaultProps = { diff --git a/packages/core/content-type-builder/admin/src/components/List/index.js b/packages/core/content-type-builder/admin/src/components/List/index.js index 3156b64ea7..dbc16cae59 100644 --- a/packages/core/content-type-builder/admin/src/components/List/index.js +++ b/packages/core/content-type-builder/admin/src/components/List/index.js @@ -6,19 +6,22 @@ /* eslint-disable import/no-cycle */ import React from 'react'; -import PropTypes from 'prop-types'; + +import { Box, Button, Table, TFooter, Th, Thead, Tr, Typography } from '@strapi/design-system'; import { EmptyBodyTable, useTracking } from '@strapi/helper-plugin'; -import { Box, Button, Typography, Table, Thead, Tr, Th, TFooter } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import useFormModalNavigation from '../../hooks/useFormModalNavigation'; + import useDataManager from '../../hooks/useDataManager'; -import DynamicZoneList from '../DynamicZoneList'; -import ComponentList from '../ComponentList'; -import BoxWrapper from './BoxWrapper'; +import useFormModalNavigation from '../../hooks/useFormModalNavigation'; import getTrad from '../../utils/getTrad'; +import ComponentList from '../ComponentList'; +import DynamicZoneList from '../DynamicZoneList'; import NestedTFooter from '../NestedTFooter'; +import BoxWrapper from './BoxWrapper'; + /* eslint-disable jsx-a11y/click-events-have-key-events */ /* eslint-disable jsx-a11y/no-static-element-interactions */ diff --git a/packages/core/content-type-builder/admin/src/components/ListRow/BoxWrapper.js b/packages/core/content-type-builder/admin/src/components/ListRow/BoxWrapper.js index 356fec98c8..6f98eb0578 100644 --- a/packages/core/content-type-builder/admin/src/components/ListRow/BoxWrapper.js +++ b/packages/core/content-type-builder/admin/src/components/ListRow/BoxWrapper.js @@ -4,8 +4,8 @@ * */ -import styled from 'styled-components'; import { Box } from '@strapi/design-system'; +import styled from 'styled-components'; const BoxWrapper = styled(Box)` position: relative; diff --git a/packages/core/content-type-builder/admin/src/components/ListRow/DisplayedType.js b/packages/core/content-type-builder/admin/src/components/ListRow/DisplayedType.js index 4dcde9428c..675c801ee0 100644 --- a/packages/core/content-type-builder/admin/src/components/ListRow/DisplayedType.js +++ b/packages/core/content-type-builder/admin/src/components/ListRow/DisplayedType.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Typography } from '@strapi/design-system'; + import getTrad from '../../utils/getTrad'; const DisplayedType = ({ type, customField, repeatable }) => { diff --git a/packages/core/content-type-builder/admin/src/components/ListRow/index.js b/packages/core/content-type-builder/admin/src/components/ListRow/index.js index 00a63422d9..99050b64fa 100644 --- a/packages/core/content-type-builder/admin/src/components/ListRow/index.js +++ b/packages/core/content-type-builder/admin/src/components/ListRow/index.js @@ -1,16 +1,19 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; -import get from 'lodash/get'; -import { useIntl } from 'react-intl'; -import { IconButton, Flex, Typography, Box } from '@strapi/design-system'; + +import { Box, Flex, IconButton, Typography } from '@strapi/design-system'; +import { onRowClick, pxToRem, stopPropagation } from '@strapi/helper-plugin'; import { Lock, Pencil, Trash } from '@strapi/icons'; -import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import useDataManager from '../../hooks/useDataManager'; -import getTrad from '../../utils/getTrad'; import Curve from '../../icons/Curve'; -import UpperFist from '../UpperFirst'; -import BoxWrapper from './BoxWrapper'; +import getTrad from '../../utils/getTrad'; import AttributeIcon from '../AttributeIcon'; +import UpperFist from '../UpperFirst'; + +import BoxWrapper from './BoxWrapper'; import DisplayedType from './DisplayedType'; function ListRow({ diff --git a/packages/core/content-type-builder/admin/src/components/NestedTFooter/index.js b/packages/core/content-type-builder/admin/src/components/NestedTFooter/index.js index 02cb19fa0e..888551c55c 100644 --- a/packages/core/content-type-builder/admin/src/components/NestedTFooter/index.js +++ b/packages/core/content-type-builder/admin/src/components/NestedTFooter/index.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Flex, Box, Typography } from '@strapi/design-system'; import styled from 'styled-components'; const IconBox = styled(Box)` diff --git a/packages/core/content-type-builder/admin/src/components/PluginIcon/index.js b/packages/core/content-type-builder/admin/src/components/PluginIcon/index.js index 8c7f27a277..75e66b0541 100644 --- a/packages/core/content-type-builder/admin/src/components/PluginIcon/index.js +++ b/packages/core/content-type-builder/admin/src/components/PluginIcon/index.js @@ -5,6 +5,7 @@ */ import React from 'react'; + import { Layout } from '@strapi/icons'; const PluginIcon = () => ; diff --git a/packages/core/content-type-builder/admin/src/components/PluralName/index.js b/packages/core/content-type-builder/admin/src/components/PluralName/index.js index 220d861bd1..62b640d980 100644 --- a/packages/core/content-type-builder/admin/src/components/PluralName/index.js +++ b/packages/core/content-type-builder/admin/src/components/PluralName/index.js @@ -5,10 +5,12 @@ */ import React, { useEffect, useRef } from 'react'; + +import { TextInput } from '@strapi/design-system'; +import pluralize from 'pluralize'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import pluralize from 'pluralize'; -import { TextInput } from '@strapi/design-system'; + import nameToSlug from '../../utils/nameToSlug'; const PluralName = ({ description, error, intlLabel, modifiedData, name, onChange, value }) => { diff --git a/packages/core/content-type-builder/admin/src/components/Relation/RelationField/RelationTargetPicker/index.js b/packages/core/content-type-builder/admin/src/components/Relation/RelationField/RelationTargetPicker/index.js index 203211b30a..a670579a24 100644 --- a/packages/core/content-type-builder/admin/src/components/Relation/RelationField/RelationTargetPicker/index.js +++ b/packages/core/content-type-builder/admin/src/components/Relation/RelationField/RelationTargetPicker/index.js @@ -1,11 +1,13 @@ import React from 'react'; + +import { MenuItem, SimpleMenu } from '@strapi/design-system'; +import get from 'lodash/get'; import PropTypes from 'prop-types'; import { useDispatch } from 'react-redux'; -import get from 'lodash/get'; -import { MenuItem, SimpleMenu } from '@strapi/design-system'; + import useDataManager from '../../../../hooks/useDataManager'; -import { ON_CHANGE_RELATION_TARGET } from '../../../FormModal/constants'; import { isAllowedContentTypesForRelations } from '../../../../utils'; +import { ON_CHANGE_RELATION_TARGET } from '../../../FormModal/constants'; const RelationTargetPicker = ({ oneThatIsCreatingARelationWithAnother, target }) => { const { contentTypes, sortedContentTypesList } = useDataManager(); diff --git a/packages/core/content-type-builder/admin/src/components/Relation/RelationField/index.js b/packages/core/content-type-builder/admin/src/components/Relation/RelationField/index.js index 9ae3a17bd3..49ab1e8064 100644 --- a/packages/core/content-type-builder/admin/src/components/Relation/RelationField/index.js +++ b/packages/core/content-type-builder/admin/src/components/Relation/RelationField/index.js @@ -1,8 +1,11 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Box, Flex, Divider, Typography } from '@strapi/design-system'; + +import { Box, Divider, Flex, Typography } from '@strapi/design-system'; import { GenericInput } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import getTrad from '../../../utils/getTrad'; + import RelationTargetPicker from './RelationTargetPicker'; const RelationFormBox = ({ diff --git a/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/components.js b/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/components.js index 3775ff9eb5..04f3d8c8f0 100644 --- a/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/components.js +++ b/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/components.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { Box, Flex } from '@strapi/design-system'; +import styled from 'styled-components'; const Wrapper = styled(Box)` position: relative; diff --git a/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/index.js b/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/index.js index 89d0a69171..0b746c0897 100644 --- a/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/index.js +++ b/packages/core/content-type-builder/admin/src/components/Relation/RelationNaturePicker/index.js @@ -1,22 +1,25 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { useDispatch } from 'react-redux'; + +import { Flex, KeyboardNavigable, Typography } from '@strapi/design-system'; +import { + ManyToMany, + ManyToOne, + ManyWays as ManyWay, + OneToMany, + OneToOne, + OneWay, +} from '@strapi/icons'; import get from 'lodash/get'; import truncate from 'lodash/truncate'; import pluralize from 'pluralize'; -import { - OneToOne, - OneWay, - ManyWays as ManyWay, - OneToMany, - ManyToOne, - ManyToMany, -} from '@strapi/icons'; -import { Flex, Typography, KeyboardNavigable } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useDispatch } from 'react-redux'; + import useDataManager from '../../../hooks/useDataManager'; -import { ON_CHANGE_RELATION_TYPE } from '../../FormModal/constants'; import getTrad from '../../../utils/getTrad'; +import { ON_CHANGE_RELATION_TYPE } from '../../FormModal/constants'; + import { IconWrapper, InfosWrapper, Wrapper } from './components'; const relations = { diff --git a/packages/core/content-type-builder/admin/src/components/Relation/index.js b/packages/core/content-type-builder/admin/src/components/Relation/index.js index df2ad300ab..bcc618f409 100644 --- a/packages/core/content-type-builder/admin/src/components/Relation/index.js +++ b/packages/core/content-type-builder/admin/src/components/Relation/index.js @@ -5,9 +5,12 @@ */ import React from 'react'; -import PropTypes from 'prop-types'; + import { Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import getRelationType from '../../utils/getRelationType'; + import RelationField from './RelationField'; import RelationNaturePicker from './RelationNaturePicker'; diff --git a/packages/core/content-type-builder/admin/src/components/ReviewWorkflowsToggle/index.js b/packages/core/content-type-builder/admin/src/components/ReviewWorkflowsToggle/index.js index e794087187..9e57835be5 100644 --- a/packages/core/content-type-builder/admin/src/components/ReviewWorkflowsToggle/index.js +++ b/packages/core/content-type-builder/admin/src/components/ReviewWorkflowsToggle/index.js @@ -1,8 +1,9 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Checkbox } from '@strapi/design-system'; import { ConfirmDialog, useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { getTrad } from '../../utils'; diff --git a/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js b/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js index a1093e9817..662b8a4a8b 100644 --- a/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js +++ b/packages/core/content-type-builder/admin/src/components/SelectCategory/index.js @@ -5,9 +5,11 @@ */ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { ComboboxOption, CreatableCombobox } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import useDataManager from '../../hooks/useDataManager'; const SelectCategory = ({ error, intlLabel, name, onChange, value }) => { diff --git a/packages/core/content-type-builder/admin/src/components/SelectComponent/index.js b/packages/core/content-type-builder/admin/src/components/SelectComponent/index.js index f7824f66ad..b90f090a90 100644 --- a/packages/core/content-type-builder/admin/src/components/SelectComponent/index.js +++ b/packages/core/content-type-builder/admin/src/components/SelectComponent/index.js @@ -5,9 +5,11 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Select, Option } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; + import useDataManager from '../../hooks/useDataManager'; const SelectComponent = ({ diff --git a/packages/core/content-type-builder/admin/src/components/SelectComponents/index.js b/packages/core/content-type-builder/admin/src/components/SelectComponents/index.js index 629a82e976..f6d70cd94d 100644 --- a/packages/core/content-type-builder/admin/src/components/SelectComponents/index.js +++ b/packages/core/content-type-builder/admin/src/components/SelectComponents/index.js @@ -5,12 +5,14 @@ */ import React from 'react'; -import PropTypes from 'prop-types'; + import { MultiSelectNested } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import useDataManager from '../../hooks/useDataManager'; -import findAttribute from '../../utils/findAttribute'; import { getTrad } from '../../utils'; +import findAttribute from '../../utils/findAttribute'; const SelectComponents = ({ dynamicZoneTarget, intlLabel, name, onChange, value }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/SelectDateType/index.js b/packages/core/content-type-builder/admin/src/components/SelectDateType/index.js index 41fbc2c347..7df1cfcd63 100644 --- a/packages/core/content-type-builder/admin/src/components/SelectDateType/index.js +++ b/packages/core/content-type-builder/admin/src/components/SelectDateType/index.js @@ -5,9 +5,10 @@ */ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option } from '@strapi/design-system'; const SelectDateType = ({ intlLabel, error, modifiedData, name, onChange, options, value }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/SelectNumber/index.js b/packages/core/content-type-builder/admin/src/components/SelectNumber/index.js index 62a71e0e72..79c4824735 100644 --- a/packages/core/content-type-builder/admin/src/components/SelectNumber/index.js +++ b/packages/core/content-type-builder/admin/src/components/SelectNumber/index.js @@ -5,9 +5,10 @@ */ import React from 'react'; + +import { Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Select, Option } from '@strapi/design-system'; const SelectNumber = ({ intlLabel, error, modifiedData, name, onChange, options, value }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/content-type-builder/admin/src/components/SingularName/index.js b/packages/core/content-type-builder/admin/src/components/SingularName/index.js index ef11a55339..31b6d7f393 100644 --- a/packages/core/content-type-builder/admin/src/components/SingularName/index.js +++ b/packages/core/content-type-builder/admin/src/components/SingularName/index.js @@ -5,9 +5,11 @@ */ import React, { useEffect, useRef } from 'react'; + +import { TextInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { TextInput } from '@strapi/design-system'; + import nameToSlug from '../../utils/nameToSlug'; const SingularName = ({ description, error, intlLabel, modifiedData, name, onChange, value }) => { diff --git a/packages/core/content-type-builder/admin/src/components/TabForm/index.js b/packages/core/content-type-builder/admin/src/components/TabForm/index.js index ec1dac92c2..cf17f02e59 100644 --- a/packages/core/content-type-builder/admin/src/components/TabForm/index.js +++ b/packages/core/content-type-builder/admin/src/components/TabForm/index.js @@ -5,11 +5,12 @@ */ import React from 'react'; + +import { Box, Grid, GridItem, Typography } from '@strapi/design-system'; +import { GenericInput } from '@strapi/helper-plugin'; +import get from 'lodash/get'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import get from 'lodash/get'; -import { GenericInput } from '@strapi/helper-plugin'; -import { Box, Grid, GridItem, Typography } from '@strapi/design-system'; /* eslint-disable react/no-array-index-key */ const TabForm = ({ form, formErrors, genericInputProps, modifiedData, onChange }) => { diff --git a/packages/core/content-type-builder/admin/src/components/TextareaEnum/index.js b/packages/core/content-type-builder/admin/src/components/TextareaEnum/index.js index fb607f67d8..d7f584d284 100644 --- a/packages/core/content-type-builder/admin/src/components/TextareaEnum/index.js +++ b/packages/core/content-type-builder/admin/src/components/TextareaEnum/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Textarea } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Textarea } from '@strapi/design-system'; const TextareaEnum = ({ description, diff --git a/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js b/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js index 606d51b3a6..32182a7f32 100644 --- a/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js +++ b/packages/core/content-type-builder/admin/src/components/UpperFirst/index.js @@ -1,5 +1,5 @@ -import PropTypes from 'prop-types'; import upperFirst from 'lodash/upperFirst'; +import PropTypes from 'prop-types'; const UpperFirst = ({ content }) => upperFirst(content); diff --git a/packages/core/content-type-builder/admin/src/hooks/useDataManager.js b/packages/core/content-type-builder/admin/src/hooks/useDataManager.js index baf8bef63e..a9b61e8636 100644 --- a/packages/core/content-type-builder/admin/src/hooks/useDataManager.js +++ b/packages/core/content-type-builder/admin/src/hooks/useDataManager.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import DataManagerContext from '../contexts/DataManagerContext'; const useDataManager = () => useContext(DataManagerContext); diff --git a/packages/core/content-type-builder/admin/src/hooks/useFormModalNavigation.js b/packages/core/content-type-builder/admin/src/hooks/useFormModalNavigation.js index 765e8f94b3..b309922b4e 100644 --- a/packages/core/content-type-builder/admin/src/hooks/useFormModalNavigation.js +++ b/packages/core/content-type-builder/admin/src/hooks/useFormModalNavigation.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import FormModalNavigationContext from '../contexts/FormModalNavigationContext'; const useFormModalNavigation = () => useContext(FormModalNavigationContext); diff --git a/packages/core/content-type-builder/admin/src/icons/Curve.js b/packages/core/content-type-builder/admin/src/icons/Curve.js index a3a2761744..719e9fe04d 100644 --- a/packages/core/content-type-builder/admin/src/icons/Curve.js +++ b/packages/core/content-type-builder/admin/src/icons/Curve.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; const StyledBox = styled(Box)` position: absolute; diff --git a/packages/core/content-type-builder/admin/src/index.js b/packages/core/content-type-builder/admin/src/index.js index eb1e0374a1..b2bd0f173a 100644 --- a/packages/core/content-type-builder/admin/src/index.js +++ b/packages/core/content-type-builder/admin/src/index.js @@ -1,7 +1,9 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; -import pluginPermissions from './permissions'; + import PluginIcon from './components/PluginIcon'; +import pluginPermissions from './permissions'; import pluginId from './pluginId'; import reducers from './reducers'; import formsAPI from './utils/formAPI'; diff --git a/packages/core/content-type-builder/admin/src/pages/App/Wrapper.js b/packages/core/content-type-builder/admin/src/pages/App/Wrapper.js index 56930d7b48..df8d841c3f 100644 --- a/packages/core/content-type-builder/admin/src/pages/App/Wrapper.js +++ b/packages/core/content-type-builder/admin/src/pages/App/Wrapper.js @@ -1,6 +1,5 @@ -import styled from 'styled-components'; - import { sizes } from '@strapi/helper-plugin'; +import styled from 'styled-components'; const Wrapper = styled.div` min-height: calc(100vh - ${sizes.header.height}); diff --git a/packages/core/content-type-builder/admin/src/pages/App/index.js b/packages/core/content-type-builder/admin/src/pages/App/index.js index 425848da04..d8289e205e 100644 --- a/packages/core/content-type-builder/admin/src/pages/App/index.js +++ b/packages/core/content-type-builder/admin/src/pages/App/index.js @@ -4,18 +4,20 @@ * */ -import React, { Suspense, lazy, useEffect, useRef } from 'react'; -import { Switch, Route } from 'react-router-dom'; +import React, { lazy, Suspense, useEffect, useRef } from 'react'; + +import { Layout } from '@strapi/design-system'; +import { CheckPagePermissions, LoadingIndicatorPage, useGuidedTour } from '@strapi/helper-plugin'; import { Helmet } from 'react-helmet'; import { useIntl } from 'react-intl'; -import { LoadingIndicatorPage, CheckPagePermissions, useGuidedTour } from '@strapi/helper-plugin'; -import { Layout } from '@strapi/design-system'; -import pluginPermissions from '../../permissions'; -import pluginId from '../../pluginId'; +import { Route, Switch } from 'react-router-dom'; + +import ContentTypeBuilderNav from '../../components/ContentTypeBuilderNav'; import DataManagerProvider from '../../components/DataManagerProvider'; import FormModalNavigationProvider from '../../components/FormModalNavigationProvider'; +import pluginPermissions from '../../permissions'; +import pluginId from '../../pluginId'; import RecursivePath from '../RecursivePath'; -import ContentTypeBuilderNav from '../../components/ContentTypeBuilderNav'; const ListView = lazy(() => import(/* webpackChunkName: "content-type-builder-list-view" */ '../ListView') diff --git a/packages/core/content-type-builder/admin/src/pages/ListView/LinkToCMSettingsView/index.js b/packages/core/content-type-builder/admin/src/pages/ListView/LinkToCMSettingsView/index.js index 1e4354c0f4..0106fe956d 100644 --- a/packages/core/content-type-builder/admin/src/pages/ListView/LinkToCMSettingsView/index.js +++ b/packages/core/content-type-builder/admin/src/pages/ListView/LinkToCMSettingsView/index.js @@ -1,10 +1,11 @@ import React, { memo } from 'react'; -import PropTypes from 'prop-types'; -import { CheckPermissions } from '@strapi/helper-plugin'; + import { Button } from '@strapi/design-system'; +import { CheckPermissions } from '@strapi/helper-plugin'; import { Layer } from '@strapi/icons'; -import { useHistory } from 'react-router-dom'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import { useHistory } from 'react-router-dom'; const cmPermissions = { collectionTypesConfigurations: [ diff --git a/packages/core/content-type-builder/admin/src/pages/ListView/index.js b/packages/core/content-type-builder/admin/src/pages/ListView/index.js index 84337458b6..750fe7879e 100644 --- a/packages/core/content-type-builder/admin/src/pages/ListView/index.js +++ b/packages/core/content-type-builder/admin/src/pages/ListView/index.js @@ -1,19 +1,22 @@ import React from 'react'; -import { useTracking, Link } from '@strapi/helper-plugin'; -import { Plus, ArrowLeft, Check, Pencil } from '@strapi/icons'; -import { Button, Flex, Box, ContentLayout, HeaderLayout } from '@strapi/design-system'; + +import { Box, Button, ContentLayout, Flex, HeaderLayout } from '@strapi/design-system'; +import { Link, useTracking } from '@strapi/helper-plugin'; +import { ArrowLeft, Check, Pencil, Plus } from '@strapi/icons'; import get from 'lodash/get'; import has from 'lodash/has'; import isEqual from 'lodash/isEqual'; import upperFirst from 'lodash/upperFirst'; import { useIntl } from 'react-intl'; import { Prompt, useRouteMatch } from 'react-router-dom'; + import List from '../../components/List'; import ListRow from '../../components/ListRow'; import useDataManager from '../../hooks/useDataManager'; import useFormModalNavigation from '../../hooks/useFormModalNavigation'; import getAttributeDisplayedType from '../../utils/getAttributeDisplayedType'; import getTrad from '../../utils/getTrad'; + import LinkToCMSettingsView from './LinkToCMSettingsView'; /* eslint-disable indent */ diff --git a/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js b/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js index b9170e0ca1..9b64e239a9 100644 --- a/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js +++ b/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js @@ -4,17 +4,19 @@ * */ +import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { createMemoryHistory } from 'history'; -import React from 'react'; -import { Router } from 'react-router-dom'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; + import FormModalNavigationProvider from '../../../components/FormModalNavigationProvider'; import pluginEn from '../../../translations/en.json'; import getTrad from '../../../utils/getTrad'; - import ListView from '../index'; + import mockData from './mockData'; jest.mock('../../../hooks/useDataManager', () => { diff --git a/packages/core/content-type-builder/admin/src/pages/RecursivePath/index.js b/packages/core/content-type-builder/admin/src/pages/RecursivePath/index.js index b382a3e393..7261c41ffe 100644 --- a/packages/core/content-type-builder/admin/src/pages/RecursivePath/index.js +++ b/packages/core/content-type-builder/admin/src/pages/RecursivePath/index.js @@ -1,6 +1,7 @@ -import React, { Suspense, lazy } from 'react'; -import { Switch, Route, useRouteMatch, useParams } from 'react-router-dom'; +import React, { lazy, Suspense } from 'react'; + import { LoadingIndicatorPage } from '@strapi/helper-plugin'; +import { Route, Switch, useParams, useRouteMatch } from 'react-router-dom'; const ListView = lazy(() => import(/* webpackChunkName: "content-type-builder-recursive-path" */ '../ListView') diff --git a/packages/core/content-type-builder/admin/src/reducers.js b/packages/core/content-type-builder/admin/src/reducers.js index 27c34fb13e..33cb043850 100644 --- a/packages/core/content-type-builder/admin/src/reducers.js +++ b/packages/core/content-type-builder/admin/src/reducers.js @@ -1,5 +1,5 @@ -import formModalReducer from './components/FormModal/reducer'; import dataManagerProvider from './components/DataManagerProvider/reducer'; +import formModalReducer from './components/FormModal/reducer'; import pluginId from './pluginId'; const reducers = { diff --git a/packages/core/content-type-builder/admin/src/utils/tests/formAPI.test.js b/packages/core/content-type-builder/admin/src/utils/tests/formAPI.test.js index 1018c4e77c..5fc9acdd31 100644 --- a/packages/core/content-type-builder/admin/src/utils/tests/formAPI.test.js +++ b/packages/core/content-type-builder/admin/src/utils/tests/formAPI.test.js @@ -1,4 +1,5 @@ import * as yup from 'yup'; + import formsAPI from '../formAPI'; describe('formsAPI', () => { diff --git a/packages/core/email/admin/src/index.js b/packages/core/email/admin/src/index.js index 656e713943..eac130f8a8 100644 --- a/packages/core/email/admin/src/index.js +++ b/packages/core/email/admin/src/index.js @@ -6,9 +6,11 @@ // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; -import pluginId from './pluginId'; + import pluginPermissions from './permissions'; +import pluginId from './pluginId'; import getTrad from './utils/getTrad'; const name = pluginPkg.strapi.name; diff --git a/packages/core/email/admin/src/pages/Settings/components/Configuration.js b/packages/core/email/admin/src/pages/Settings/components/Configuration.js index 4b80f73fbe..004b810070 100644 --- a/packages/core/email/admin/src/pages/Settings/components/Configuration.js +++ b/packages/core/email/admin/src/pages/Settings/components/Configuration.js @@ -1,10 +1,12 @@ /* eslint-disable no-useless-escape */ import React from 'react'; + +import { Flex, Grid, GridItem, Option, Select, TextInput, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { useIntl } from 'react-intl'; -import { Flex, Grid, GridItem, Typography, TextInput, Select, Option } from '@strapi/design-system'; +import styled from 'styled-components'; + import getTrad from '../../../utils/getTrad'; const DocumentationLink = styled.a` diff --git a/packages/core/email/admin/src/pages/Settings/components/EmailHeader.js b/packages/core/email/admin/src/pages/Settings/components/EmailHeader.js index ec736959f0..28debe9108 100644 --- a/packages/core/email/admin/src/pages/Settings/components/EmailHeader.js +++ b/packages/core/email/admin/src/pages/Settings/components/EmailHeader.js @@ -1,7 +1,9 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { SettingsPageTitle } from '@strapi/helper-plugin'; + import { HeaderLayout } from '@strapi/design-system'; +import { SettingsPageTitle } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; const EmailHeader = () => { diff --git a/packages/core/email/admin/src/pages/Settings/index.js b/packages/core/email/admin/src/pages/Settings/index.js index e8dfdeedac..d31b3e5391 100644 --- a/packages/core/email/admin/src/pages/Settings/index.js +++ b/packages/core/email/admin/src/pages/Settings/index.js @@ -1,32 +1,35 @@ -import React, { useState, useEffect } from 'react'; -import { useIntl } from 'react-intl'; +import React, { useEffect, useState } from 'react'; + import { - getYupInnerErrors, - CheckPagePermissions, - useNotification, - LoadingIndicatorPage, - useOverlayBlocker, - useFocusWhenNavigate, -} from '@strapi/helper-plugin'; -import { - Main, - ContentLayout, Box, + Button, + ContentLayout, + Flex, Grid, GridItem, - Typography, + Main, TextInput, - Button, - Flex, + Typography, useNotifyAT, } from '@strapi/design-system'; +import { + CheckPagePermissions, + getYupInnerErrors, + LoadingIndicatorPage, + useFocusWhenNavigate, + useNotification, + useOverlayBlocker, +} from '@strapi/helper-plugin'; import { Envelop } from '@strapi/icons'; -import Configuration from './components/Configuration'; -import schema from '../../utils/schema'; +import { useIntl } from 'react-intl'; + import pluginPermissions from '../../permissions'; -import { fetchEmailSettings, postEmailTest } from './utils/api'; -import EmailHeader from './components/EmailHeader'; import getTrad from '../../utils/getTrad'; +import schema from '../../utils/schema'; + +import Configuration from './components/Configuration'; +import EmailHeader from './components/EmailHeader'; +import { fetchEmailSettings, postEmailTest } from './utils/api'; const ProtectedSettingsPage = () => ( diff --git a/packages/core/email/admin/src/pages/Settings/tests/index.test.js b/packages/core/email/admin/src/pages/Settings/tests/index.test.js index 6b91864f91..ad0aa549bb 100644 --- a/packages/core/email/admin/src/pages/Settings/tests/index.test.js +++ b/packages/core/email/admin/src/pages/Settings/tests/index.test.js @@ -1,10 +1,13 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import server from './utils/server'; + import ProtectedSettingsPage from '../index'; +import server from './utils/server'; + jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), useNotification: jest.fn(), diff --git a/packages/core/email/admin/src/pages/Settings/tests/utils/server.js b/packages/core/email/admin/src/pages/Settings/tests/utils/server.js index d0b707eb0d..bf59abaea6 100644 --- a/packages/core/email/admin/src/pages/Settings/tests/utils/server.js +++ b/packages/core/email/admin/src/pages/Settings/tests/utils/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/email/settings', (req, res, ctx) => { diff --git a/packages/core/email/admin/src/utils/schema.js b/packages/core/email/admin/src/utils/schema.js index 13705a3f17..c2b870cd2f 100644 --- a/packages/core/email/admin/src/utils/schema.js +++ b/packages/core/email/admin/src/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ email: yup.string().email(translatedErrors.email).required(translatedErrors.required), diff --git a/packages/core/helper-plugin/src/components/AnErrorOccurred/index.js b/packages/core/helper-plugin/src/components/AnErrorOccurred/index.js index c268bb533d..ba70f79ec5 100644 --- a/packages/core/helper-plugin/src/components/AnErrorOccurred/index.js +++ b/packages/core/helper-plugin/src/components/AnErrorOccurred/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import { ExclamationMarkCircle } from '@strapi/icons'; + import { EmptyStateLayout } from '@strapi/design-system'; +import { ExclamationMarkCircle } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; diff --git a/packages/core/helper-plugin/src/components/CheckPagePermissions/index.js b/packages/core/helper-plugin/src/components/CheckPagePermissions/index.js index c2b21ab266..4b77290b51 100644 --- a/packages/core/helper-plugin/src/components/CheckPagePermissions/index.js +++ b/packages/core/helper-plugin/src/components/CheckPagePermissions/index.js @@ -1,6 +1,8 @@ import React, { useEffect, useRef, useState } from 'react'; -import { Redirect } from 'react-router-dom'; + import PropTypes from 'prop-types'; +import { Redirect } from 'react-router-dom'; + import { useNotification } from '../../features/Notifications'; import { useRBACProvider } from '../../features/RBAC'; import hasPermissions from '../../utils/hasPermissions'; diff --git a/packages/core/helper-plugin/src/components/CheckPermissions/index.js b/packages/core/helper-plugin/src/components/CheckPermissions/index.js index e62ed28183..83e25e4c36 100644 --- a/packages/core/helper-plugin/src/components/CheckPermissions/index.js +++ b/packages/core/helper-plugin/src/components/CheckPermissions/index.js @@ -1,9 +1,10 @@ import { useEffect, useRef, useState } from 'react'; -import PropTypes from 'prop-types'; -import { useNotification } from '../../features/Notifications'; -import hasPermissions from '../../utils/hasPermissions'; +import PropTypes from 'prop-types'; + +import { useNotification } from '../../features/Notifications'; import { useRBACProvider } from '../../features/RBAC'; +import hasPermissions from '../../utils/hasPermissions'; // NOTE: this component is very similar to the CheckPagePermissions // except that it does not handle redirections nor loading state diff --git a/packages/core/helper-plugin/src/components/ConfirmDialog/index.js b/packages/core/helper-plugin/src/components/ConfirmDialog/index.js index 9b7a9a665c..44ecd4022b 100644 --- a/packages/core/helper-plugin/src/components/ConfirmDialog/index.js +++ b/packages/core/helper-plugin/src/components/ConfirmDialog/index.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Button, Dialog, DialogBody, DialogFooter, Flex, Typography } from '@strapi/design-system'; +import { ExclamationMarkCircle, Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Dialog, DialogBody, DialogFooter, Flex, Typography, Button } from '@strapi/design-system'; -import { ExclamationMarkCircle, Trash } from '@strapi/icons'; const ConfirmDialog = ({ bodyText, diff --git a/packages/core/helper-plugin/src/components/ConfirmDialog/tests/index.test.js b/packages/core/helper-plugin/src/components/ConfirmDialog/tests/index.test.js index 3b1f66c7f6..0661feea86 100644 --- a/packages/core/helper-plugin/src/components/ConfirmDialog/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/ConfirmDialog/tests/index.test.js @@ -1,7 +1,9 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import ConfirmDialog from '../index'; const App = ( diff --git a/packages/core/helper-plugin/src/components/ContentBox/index.js b/packages/core/helper-plugin/src/components/ContentBox/index.js index fde8c77070..36ba8688b5 100644 --- a/packages/core/helper-plugin/src/components/ContentBox/index.js +++ b/packages/core/helper-plugin/src/components/ContentBox/index.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Flex, Typography } from '@strapi/design-system'; const IconWrapper = styled(Flex)` margin-right: ${({ theme }) => theme.spaces[6]}; diff --git a/packages/core/helper-plugin/src/components/ContentBox/tests/index.test.js b/packages/core/helper-plugin/src/components/ContentBox/tests/index.test.js index 084911453a..83f195dc48 100644 --- a/packages/core/helper-plugin/src/components/ContentBox/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/ContentBox/tests/index.test.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import ContentBox from '../index'; const App = ( diff --git a/packages/core/helper-plugin/src/components/DateTimePicker/index.js b/packages/core/helper-plugin/src/components/DateTimePicker/index.js index bc9c6476b1..ce5e3d3e63 100644 --- a/packages/core/helper-plugin/src/components/DateTimePicker/index.js +++ b/packages/core/helper-plugin/src/components/DateTimePicker/index.js @@ -1,4 +1,5 @@ import React, { useEffect } from 'react'; + import { DateTimePicker } from '@strapi/design-system'; // TODO: remove DateTimePicker component from the helper-plugin in V5 diff --git a/packages/core/helper-plugin/src/components/DateTimePicker/tests/index.test.js b/packages/core/helper-plugin/src/components/DateTimePicker/tests/index.test.js index be2bfd4ace..5974e2c386 100644 --- a/packages/core/helper-plugin/src/components/DateTimePicker/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/DateTimePicker/tests/index.test.js @@ -1,6 +1,8 @@ import * as React from 'react'; -import { render as renderRTL } from '@testing-library/react'; + import { DesignSystemProvider } from '@strapi/design-system'; +import { render as renderRTL } from '@testing-library/react'; + import DateTimePicker from '../index'; const render = (props) => diff --git a/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js b/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js index 4f0b75401d..51fddef185 100644 --- a/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js +++ b/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js @@ -1,18 +1,20 @@ import React from 'react'; + import { BaseCheckbox, IconButton, - Tooltip, - Typography, Th, Thead, + Tooltip, Tr, + Typography, VisuallyHidden, } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import SortIcon from '../../../icons/SortIcon'; + import useQueryParams from '../../../hooks/useQueryParams'; +import SortIcon from '../../../icons/SortIcon'; const TableHead = ({ areAllEntriesSelected, diff --git a/packages/core/helper-plugin/src/components/DynamicTable/index.js b/packages/core/helper-plugin/src/components/DynamicTable/index.js index eff3226ac1..786ce8380c 100644 --- a/packages/core/helper-plugin/src/components/DynamicTable/index.js +++ b/packages/core/helper-plugin/src/components/DynamicTable/index.js @@ -1,13 +1,15 @@ import React, { Children, cloneElement, useState } from 'react'; -import PropTypes from 'prop-types'; -import { Box, Flex, Button, Typography, Table as TableCompo } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; -import { Trash } from '@strapi/icons'; -import useQueryParams from '../../hooks/useQueryParams'; +import { Box, Button, Flex, Table as TableCompo, Typography } from '@strapi/design-system'; +import { Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { useTracking } from '../../features/Tracking'; +import useQueryParams from '../../hooks/useQueryParams'; import ConfirmDialog from '../ConfirmDialog'; import EmptyBodyTable from '../EmptyBodyTable'; + import TableHead from './TableHead'; const Table = ({ diff --git a/packages/core/helper-plugin/src/components/EmptyBodyTable/index.js b/packages/core/helper-plugin/src/components/EmptyBodyTable/index.js index d44a16f47b..0f50de3a1b 100644 --- a/packages/core/helper-plugin/src/components/EmptyBodyTable/index.js +++ b/packages/core/helper-plugin/src/components/EmptyBodyTable/index.js @@ -1,6 +1,8 @@ import React from 'react'; -import { Tbody, Tr, Td, Box, Flex, Loader } from '@strapi/design-system'; + +import { Box, Flex, Loader, Tbody, Td, Tr } from '@strapi/design-system'; import PropTypes from 'prop-types'; + import EmptyStateLayout from '../EmptyStateLayout'; const EmptyBodyTable = ({ colSpan, isLoading, ...rest }) => { diff --git a/packages/core/helper-plugin/src/components/EmptyStateLayout/index.js b/packages/core/helper-plugin/src/components/EmptyStateLayout/index.js index 7df619b94c..109b0af737 100644 --- a/packages/core/helper-plugin/src/components/EmptyStateLayout/index.js +++ b/packages/core/helper-plugin/src/components/EmptyStateLayout/index.js @@ -1,8 +1,9 @@ import React from 'react'; + import { EmptyStateLayout as Layout } from '@strapi/design-system'; import { EmptyDocuments, EmptyPermissions, EmptyPictures } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const icons = { document: EmptyDocuments, diff --git a/packages/core/helper-plugin/src/components/FilterListURLQuery/AttributeTag.js b/packages/core/helper-plugin/src/components/FilterListURLQuery/AttributeTag.js index 2dc6dca9cc..81799da920 100644 --- a/packages/core/helper-plugin/src/components/FilterListURLQuery/AttributeTag.js +++ b/packages/core/helper-plugin/src/components/FilterListURLQuery/AttributeTag.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Tag } from '@strapi/design-system'; import { Cross } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; const AttributeTag = ({ attribute, filter, onClick, operator, value }) => { diff --git a/packages/core/helper-plugin/src/components/FilterListURLQuery/index.js b/packages/core/helper-plugin/src/components/FilterListURLQuery/index.js index e556a1c927..6d37008b20 100644 --- a/packages/core/helper-plugin/src/components/FilterListURLQuery/index.js +++ b/packages/core/helper-plugin/src/components/FilterListURLQuery/index.js @@ -5,8 +5,11 @@ */ import React from 'react'; + import PropTypes from 'prop-types'; + import useQueryParams from '../../hooks/useQueryParams'; + import AttributeTag from './AttributeTag'; const FilterListURLQuery = ({ filtersSchema }) => { diff --git a/packages/core/helper-plugin/src/components/FilterListURLQuery/tests/index.test.js b/packages/core/helper-plugin/src/components/FilterListURLQuery/tests/index.test.js index e111987764..9b48567e2e 100644 --- a/packages/core/helper-plugin/src/components/FilterListURLQuery/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/FilterListURLQuery/tests/index.test.js @@ -5,12 +5,14 @@ */ import React from 'react'; -import { render, screen, act } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, render, screen } from '@testing-library/react'; import { createMemoryHistory } from 'history'; import qs from 'qs'; +import { IntlProvider } from 'react-intl'; +import { Router } from 'react-router-dom'; + import FilterListURLQuery from '../index'; // TO BE REMOVED: we have added this mock to prevent errors in the snapshots caused by the Unicode space character diff --git a/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/Inputs.js b/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/Inputs.js index 503765818c..7f22a2e6dd 100644 --- a/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/Inputs.js +++ b/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/Inputs.js @@ -1,17 +1,18 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import parseISO from 'date-fns/parseISO'; -import formatISO from 'date-fns/formatISO'; + import { DatePicker, DateTimePicker, Field, - NumberInput, - TimePicker, - Select, FieldInput, + NumberInput, Option, + Select, + TimePicker, } from '@strapi/design-system'; +import formatISO from 'date-fns/formatISO'; +import parseISO from 'date-fns/parseISO'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; const Inputs = ({ label, onChange, options, type, value }) => { diff --git a/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/index.js b/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/index.js index 0243e78392..1962764fb5 100644 --- a/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/index.js +++ b/packages/core/helper-plugin/src/components/FilterPopoverURLQuery/index.js @@ -5,13 +5,16 @@ */ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Button, Flex, Box, Popover, Select, Option } from '@strapi/design-system'; + +import { Box, Button, Flex, Option, Popover, Select } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import useQueryParams from '../../hooks/useQueryParams'; +import styled from 'styled-components'; + import { useTracking } from '../../features/Tracking'; +import useQueryParams from '../../hooks/useQueryParams'; + import DefaultInputs from './Inputs'; import getFilterList from './utils/getFilterList'; diff --git a/packages/core/helper-plugin/src/components/Form/index.js b/packages/core/helper-plugin/src/components/Form/index.js index c208e30a0f..2e66dea391 100644 --- a/packages/core/helper-plugin/src/components/Form/index.js +++ b/packages/core/helper-plugin/src/components/Form/index.js @@ -1,4 +1,5 @@ import React, { useEffect, useRef } from 'react'; + import { Form, useFormikContext } from 'formik'; const FormWithFocus = (props) => { diff --git a/packages/core/helper-plugin/src/components/GenericInput/NotSupported.js b/packages/core/helper-plugin/src/components/GenericInput/NotSupported.js index 4853915707..d77cdfb957 100644 --- a/packages/core/helper-plugin/src/components/GenericInput/NotSupported.js +++ b/packages/core/helper-plugin/src/components/GenericInput/NotSupported.js @@ -5,6 +5,7 @@ */ import React from 'react'; + import { TextInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; diff --git a/packages/core/helper-plugin/src/components/GenericInput/index.js b/packages/core/helper-plugin/src/components/GenericInput/index.js index 1d8bbfe8cf..2494f365f4 100644 --- a/packages/core/helper-plugin/src/components/GenericInput/index.js +++ b/packages/core/helper-plugin/src/components/GenericInput/index.js @@ -5,31 +5,32 @@ */ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import parseISO from 'date-fns/parseISO'; -import formatISO from 'date-fns/formatISO'; -import { useIntl } from 'react-intl'; import { Checkbox, DatePicker, DateTimePicker, Icon, + JSONInput, NumberInput, + Option, Select, Textarea, TextInput, TimePicker, ToggleInput, - JSONInput, - Option, } from '@strapi/design-system'; -import { EyeStriked, Eye } from '@strapi/icons'; +import { Eye, EyeStriked } from '@strapi/icons'; +import formatISO from 'date-fns/formatISO'; +import parseISO from 'date-fns/parseISO'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; -import NotSupported from './NotSupported'; import useFieldHint from '../../hooks/useFieldHint'; import pxToRem from '../../utils/pxToRem'; +import NotSupported from './NotSupported'; + const GenericInput = ({ autoComplete, customInputs, diff --git a/packages/core/helper-plugin/src/components/GenericInput/tests/index.test.js b/packages/core/helper-plugin/src/components/GenericInput/tests/index.test.js index db7ac76146..72532dfb11 100644 --- a/packages/core/helper-plugin/src/components/GenericInput/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/GenericInput/tests/index.test.js @@ -1,8 +1,9 @@ import React from 'react'; + import { DesignSystemProvider } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; -import { render, fireEvent } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { IntlProvider } from 'react-intl'; import GenericInput from '../index'; diff --git a/packages/core/helper-plugin/src/components/InjectionZone/InjectionZone.js b/packages/core/helper-plugin/src/components/InjectionZone/InjectionZone.js index a1df272b4e..48452a4064 100644 --- a/packages/core/helper-plugin/src/components/InjectionZone/InjectionZone.js +++ b/packages/core/helper-plugin/src/components/InjectionZone/InjectionZone.js @@ -1,5 +1,7 @@ import React from 'react'; + import PropTypes from 'prop-types'; + import useInjectionZone from './useInjectionZone'; const InjectionZone = ({ area, ...props }) => { diff --git a/packages/core/helper-plugin/src/components/Link/index.js b/packages/core/helper-plugin/src/components/Link/index.js index 88c555a18c..b9386184fc 100644 --- a/packages/core/helper-plugin/src/components/Link/index.js +++ b/packages/core/helper-plugin/src/components/Link/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import { NavLink } from 'react-router-dom'; + import { Link as DSLink } from '@strapi/design-system/v2'; +import { NavLink } from 'react-router-dom'; const Link = (props) => ; diff --git a/packages/core/helper-plugin/src/components/LinkButton/index.js b/packages/core/helper-plugin/src/components/LinkButton/index.js index 32e7b7a93c..0a8bdc35bb 100644 --- a/packages/core/helper-plugin/src/components/LinkButton/index.js +++ b/packages/core/helper-plugin/src/components/LinkButton/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import { NavLink } from 'react-router-dom'; + import { LinkButton as DSLinkButton } from '@strapi/design-system/v2'; +import { NavLink } from 'react-router-dom'; const LinkButton = (props) => ; diff --git a/packages/core/helper-plugin/src/components/LoadingIndicatorPage/index.js b/packages/core/helper-plugin/src/components/LoadingIndicatorPage/index.js index eb94a1eb1e..1145c3c8b8 100644 --- a/packages/core/helper-plugin/src/components/LoadingIndicatorPage/index.js +++ b/packages/core/helper-plugin/src/components/LoadingIndicatorPage/index.js @@ -1,5 +1,6 @@ import React from 'react'; -import { Loader, Flex } from '@strapi/design-system'; + +import { Flex, Loader } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; diff --git a/packages/core/helper-plugin/src/components/NoContent/index.js b/packages/core/helper-plugin/src/components/NoContent/index.js index 61eb04efc0..96c18270c3 100644 --- a/packages/core/helper-plugin/src/components/NoContent/index.js +++ b/packages/core/helper-plugin/src/components/NoContent/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import { EmptyDocuments } from '@strapi/icons'; + import { EmptyStateLayout } from '@strapi/design-system'; +import { EmptyDocuments } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; diff --git a/packages/core/helper-plugin/src/components/NoMedia/index.js b/packages/core/helper-plugin/src/components/NoMedia/index.js index fbe638f19d..3ccb7d510c 100644 --- a/packages/core/helper-plugin/src/components/NoMedia/index.js +++ b/packages/core/helper-plugin/src/components/NoMedia/index.js @@ -1,6 +1,7 @@ import React from 'react'; -import { EmptyPictures } from '@strapi/icons'; + import { EmptyStateLayout } from '@strapi/design-system'; +import { EmptyPictures } from '@strapi/icons'; const NoMedia = (props) => { return } {...props} />; diff --git a/packages/core/helper-plugin/src/components/NoPermissions/index.js b/packages/core/helper-plugin/src/components/NoPermissions/index.js index f1442eef45..620a37b33d 100644 --- a/packages/core/helper-plugin/src/components/NoPermissions/index.js +++ b/packages/core/helper-plugin/src/components/NoPermissions/index.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { EmptyStateLayout } from '@strapi/design-system'; +import { EmptyPermissions } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { EmptyPermissions } from '@strapi/icons'; -import { EmptyStateLayout } from '@strapi/design-system'; const NoPermissions = ({ action }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/helper-plugin/src/components/NotAllowedInput/index.js b/packages/core/helper-plugin/src/components/NotAllowedInput/index.js index e60b07e3c6..f7fa55fb6c 100644 --- a/packages/core/helper-plugin/src/components/NotAllowedInput/index.js +++ b/packages/core/helper-plugin/src/components/NotAllowedInput/index.js @@ -5,11 +5,12 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; + import { TextInput } from '@strapi/design-system'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { EyeStriked } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const StyledIcon = styled(EyeStriked)` > path { diff --git a/packages/core/helper-plugin/src/components/NotAllowedInput/tests/index.test.js b/packages/core/helper-plugin/src/components/NotAllowedInput/tests/index.test.js index bd57392934..1d804ed978 100644 --- a/packages/core/helper-plugin/src/components/NotAllowedInput/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/NotAllowedInput/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; + import NotAllowedInput from '../index'; const messages = { diff --git a/packages/core/helper-plugin/src/components/PageSizeURLQuery/index.js b/packages/core/helper-plugin/src/components/PageSizeURLQuery/index.js index 527ce4559f..9c2edb2481 100644 --- a/packages/core/helper-plugin/src/components/PageSizeURLQuery/index.js +++ b/packages/core/helper-plugin/src/components/PageSizeURLQuery/index.js @@ -5,11 +5,13 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import { Box, Flex, Select, Option, Typography } from '@strapi/design-system'; + +import { Box, Flex, Option, Select, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import useQueryParams from '../../hooks/useQueryParams'; +import { useIntl } from 'react-intl'; + import { useTracking } from '../../features/Tracking'; +import useQueryParams from '../../hooks/useQueryParams'; const PageSizeURLQuery = ({ trackedEvent, options, defaultValue }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/helper-plugin/src/components/PageSizeURLQuery/tests/index.test.js b/packages/core/helper-plugin/src/components/PageSizeURLQuery/tests/index.test.js index de7df47c10..12d96d733b 100644 --- a/packages/core/helper-plugin/src/components/PageSizeURLQuery/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/PageSizeURLQuery/tests/index.test.js @@ -5,11 +5,13 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import PageSizeURLQuery from '../index'; jest.mock('../../../features/Tracking', () => ({ diff --git a/packages/core/helper-plugin/src/components/PaginationURLQuery/index.js b/packages/core/helper-plugin/src/components/PaginationURLQuery/index.js index 3e9e3c12df..216df4df31 100644 --- a/packages/core/helper-plugin/src/components/PaginationURLQuery/index.js +++ b/packages/core/helper-plugin/src/components/PaginationURLQuery/index.js @@ -15,11 +15,13 @@ */ import React from 'react'; -import { NextLink, Pagination, PreviousLink, Dots, PageLink } from '@strapi/design-system'; + +import { Dots, NextLink, PageLink, Pagination, PreviousLink } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { useLocation, NavLink } from 'react-router-dom'; -import { useIntl } from 'react-intl'; import { stringify } from 'qs'; +import { useIntl } from 'react-intl'; +import { NavLink, useLocation } from 'react-router-dom'; + import useQueryParams from '../../hooks/useQueryParams'; const PaginationURLQuery = ({ pagination: { pageCount } }) => { diff --git a/packages/core/helper-plugin/src/components/PaginationURLQuery/tests/index.test.js b/packages/core/helper-plugin/src/components/PaginationURLQuery/tests/index.test.js index aff19a9c5e..1c07e82324 100644 --- a/packages/core/helper-plugin/src/components/PaginationURLQuery/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/PaginationURLQuery/tests/index.test.js @@ -5,11 +5,13 @@ */ import React from 'react'; -import { act, render, screen, fireEvent, waitFor } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import PaginationURLQuery from '../index'; const messages = { diff --git a/packages/core/helper-plugin/src/components/ReactSelect/ReactSelect.js b/packages/core/helper-plugin/src/components/ReactSelect/ReactSelect.js index 6ae52785ff..bd8986915d 100644 --- a/packages/core/helper-plugin/src/components/ReactSelect/ReactSelect.js +++ b/packages/core/helper-plugin/src/components/ReactSelect/ReactSelect.js @@ -1,12 +1,12 @@ -import PropTypes from 'prop-types'; import React from 'react'; + +import PropTypes from 'prop-types'; import Select from 'react-select'; import { useTheme } from 'styled-components'; import ClearIndicator from './components/ClearIndicator'; import DropdownIndicator from './components/DropdownIndicator'; import IndicatorSeparator from './components/IndicatorSeparator'; - import getSelectStyles from './utils/getSelectStyles'; const ReactSelect = ({ components, styles, error, ariaErrorMessage, ...props }) => { diff --git a/packages/core/helper-plugin/src/components/ReactSelect/components/ClearIndicator.js b/packages/core/helper-plugin/src/components/ReactSelect/components/ClearIndicator.js index 25294fc160..1128f80235 100644 --- a/packages/core/helper-plugin/src/components/ReactSelect/components/ClearIndicator.js +++ b/packages/core/helper-plugin/src/components/ReactSelect/components/ClearIndicator.js @@ -1,6 +1,8 @@ import React from 'react'; -import { components } from 'react-select'; + import { Cross } from '@strapi/icons'; +import { components } from 'react-select'; + import IconBox from './IconBox'; const ClearIndicator = (props) => { diff --git a/packages/core/helper-plugin/src/components/ReactSelect/components/DropdownIndicator.js b/packages/core/helper-plugin/src/components/ReactSelect/components/DropdownIndicator.js index bc0911c49b..ef99588548 100644 --- a/packages/core/helper-plugin/src/components/ReactSelect/components/DropdownIndicator.js +++ b/packages/core/helper-plugin/src/components/ReactSelect/components/DropdownIndicator.js @@ -1,6 +1,8 @@ import React from 'react'; -import styled from 'styled-components'; + import { CarretDown } from '@strapi/icons'; +import styled from 'styled-components'; + import IconBox from './IconBox'; export const CarretBox = styled(IconBox)` diff --git a/packages/core/helper-plugin/src/components/ReactSelect/components/IconBox.js b/packages/core/helper-plugin/src/components/ReactSelect/components/IconBox.js index b5c41e9a55..517faab4f0 100644 --- a/packages/core/helper-plugin/src/components/ReactSelect/components/IconBox.js +++ b/packages/core/helper-plugin/src/components/ReactSelect/components/IconBox.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { Box } from '@strapi/design-system'; +import styled from 'styled-components'; export const IconBox = styled(Box)` background: transparent; diff --git a/packages/core/helper-plugin/src/components/RelativeTime/index.js b/packages/core/helper-plugin/src/components/RelativeTime/index.js index a3d71ab78e..899f5d15be 100644 --- a/packages/core/helper-plugin/src/components/RelativeTime/index.js +++ b/packages/core/helper-plugin/src/components/RelativeTime/index.js @@ -1,7 +1,8 @@ import React from 'react'; + import { intervalToDuration, isPast } from 'date-fns'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const RelativeTime = ({ timestamp }) => { const { formatRelativeTime, formatDate, formatTime } = useIntl(); diff --git a/packages/core/helper-plugin/src/components/RelativeTime/tests/index.test.js b/packages/core/helper-plugin/src/components/RelativeTime/tests/index.test.js index 90e4c84b52..326640fe47 100644 --- a/packages/core/helper-plugin/src/components/RelativeTime/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/RelativeTime/tests/index.test.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen } from '@testing-library/react'; import { IntlProvider, useIntl } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import RelativeTime from '../index'; const App = ( diff --git a/packages/core/helper-plugin/src/components/SearchURLQuery/index.js b/packages/core/helper-plugin/src/components/SearchURLQuery/index.js index 54f79c2b42..54f08d3ec1 100644 --- a/packages/core/helper-plugin/src/components/SearchURLQuery/index.js +++ b/packages/core/helper-plugin/src/components/SearchURLQuery/index.js @@ -1,10 +1,12 @@ -import React, { useLayoutEffect, useState, useRef } from 'react'; +import React, { useLayoutEffect, useRef, useState } from 'react'; + +import { Icon, IconButton, Searchbar, SearchForm } from '@strapi/design-system'; +import { Search as SearchIcon } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Search as SearchIcon } from '@strapi/icons'; -import { Searchbar, SearchForm, IconButton, Icon } from '@strapi/design-system'; -import useQueryParams from '../../hooks/useQueryParams'; + import { useTracking } from '../../features/Tracking'; +import useQueryParams from '../../hooks/useQueryParams'; const SearchURLQuery = ({ label, placeholder, trackedEvent, trackedEventDetails }) => { const wrapperRef = useRef(null); diff --git a/packages/core/helper-plugin/src/components/SearchURLQuery/tests/index.test.js b/packages/core/helper-plugin/src/components/SearchURLQuery/tests/index.test.js index a834478c28..707c063257 100644 --- a/packages/core/helper-plugin/src/components/SearchURLQuery/tests/index.test.js +++ b/packages/core/helper-plugin/src/components/SearchURLQuery/tests/index.test.js @@ -5,11 +5,13 @@ */ import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import SearchURLQuery from '../index'; const trackUsage = jest.fn(); diff --git a/packages/core/helper-plugin/src/components/SettingsPageTitle/index.js b/packages/core/helper-plugin/src/components/SettingsPageTitle/index.js index bb31cc4c8e..8a1792d1a7 100644 --- a/packages/core/helper-plugin/src/components/SettingsPageTitle/index.js +++ b/packages/core/helper-plugin/src/components/SettingsPageTitle/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import PropTypes from 'prop-types'; import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; const SettingsPageTitle = ({ name }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/helper-plugin/src/components/Status/index.js b/packages/core/helper-plugin/src/components/Status/index.js index e4e4e8f1cf..d12ad1ec66 100644 --- a/packages/core/helper-plugin/src/components/Status/index.js +++ b/packages/core/helper-plugin/src/components/Status/index.js @@ -1,4 +1,5 @@ import React from 'react'; + import PropTypes from 'prop-types'; import styled from 'styled-components'; diff --git a/packages/core/helper-plugin/src/content-manager/hooks/useCMEditViewDataManager/index.js b/packages/core/helper-plugin/src/content-manager/hooks/useCMEditViewDataManager/index.js index 01ac0ff8ef..a632208bdf 100644 --- a/packages/core/helper-plugin/src/content-manager/hooks/useCMEditViewDataManager/index.js +++ b/packages/core/helper-plugin/src/content-manager/hooks/useCMEditViewDataManager/index.js @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import ContentManagerEditViewDataManagerContext from '../../contexts/ContentManagerEditViewDataManagerContext'; const useCMEditViewDataManager = () => { diff --git a/packages/core/helper-plugin/src/content-manager/utils/contentManagementUtilRemoveFieldsFromData.js b/packages/core/helper-plugin/src/content-manager/utils/contentManagementUtilRemoveFieldsFromData.js index 54cf1061f1..3718d7607d 100644 --- a/packages/core/helper-plugin/src/content-manager/utils/contentManagementUtilRemoveFieldsFromData.js +++ b/packages/core/helper-plugin/src/content-manager/utils/contentManagementUtilRemoveFieldsFromData.js @@ -1,6 +1,6 @@ import get from 'lodash/get'; -import { getType, getOtherInfos } from './getAttributeInfos'; +import { getOtherInfos, getType } from './getAttributeInfos'; const defaultFields = ['createdBy', 'updatedBy', 'publishedAt', 'id', '_id']; diff --git a/packages/core/helper-plugin/src/content-manager/utils/formatContentTypeData.js b/packages/core/helper-plugin/src/content-manager/utils/formatContentTypeData.js index 08a64513ad..c27da1f39c 100644 --- a/packages/core/helper-plugin/src/content-manager/utils/formatContentTypeData.js +++ b/packages/core/helper-plugin/src/content-manager/utils/formatContentTypeData.js @@ -2,7 +2,8 @@ // in order to have a unique identifier for the DnD import get from 'lodash/get'; -import { getType, getOtherInfos } from './getAttributeInfos'; + +import { getOtherInfos, getType } from './getAttributeInfos'; const formatContentTypeData = (data, ct, composSchema) => { const recursiveFormatData = (data, schema) => { diff --git a/packages/core/helper-plugin/src/content-manager/utils/getAttributeInfos.js b/packages/core/helper-plugin/src/content-manager/utils/getAttributeInfos.js index e6c9ed94ee..44b653fea0 100644 --- a/packages/core/helper-plugin/src/content-manager/utils/getAttributeInfos.js +++ b/packages/core/helper-plugin/src/content-manager/utils/getAttributeInfos.js @@ -3,4 +3,4 @@ import get from 'lodash/get'; const getType = (schema, attrName) => get(schema, ['attributes', attrName, 'type'], ''); const getOtherInfos = (schema, arr) => get(schema, ['attributes', ...arr], ''); -export { getType, getOtherInfos }; +export { getOtherInfos, getType }; diff --git a/packages/core/helper-plugin/src/content-manager/utils/tests/contentManagementUtilRemoveFieldsFromData.test.js b/packages/core/helper-plugin/src/content-manager/utils/tests/contentManagementUtilRemoveFieldsFromData.test.js index 9895cfea6b..1b19e78edb 100644 --- a/packages/core/helper-plugin/src/content-manager/utils/tests/contentManagementUtilRemoveFieldsFromData.test.js +++ b/packages/core/helper-plugin/src/content-manager/utils/tests/contentManagementUtilRemoveFieldsFromData.test.js @@ -1,6 +1,7 @@ -import testData from './testData'; import contentManagementUtilRemoveFieldsFromData from '../contentManagementUtilRemoveFieldsFromData'; +import testData from './testData'; + describe('STRAPI_HELPER_PLUGIN | utils', () => { describe('contentManagementUtilRemoveFieldsFromData', () => { it('should return an empty object', () => { diff --git a/packages/core/helper-plugin/src/content-manager/utils/tests/formatContentTypeData.test.js b/packages/core/helper-plugin/src/content-manager/utils/tests/formatContentTypeData.test.js index d78b048517..0a40652fe1 100644 --- a/packages/core/helper-plugin/src/content-manager/utils/tests/formatContentTypeData.test.js +++ b/packages/core/helper-plugin/src/content-manager/utils/tests/formatContentTypeData.test.js @@ -1,4 +1,5 @@ import formatContentTypeData from '../formatContentTypeData'; + import testData from './testData'; const { contentType, components, modifiedData } = testData; diff --git a/packages/core/helper-plugin/src/features/AppInfo.js b/packages/core/helper-plugin/src/features/AppInfo.js index ef010de231..540478067b 100644 --- a/packages/core/helper-plugin/src/features/AppInfo.js +++ b/packages/core/helper-plugin/src/features/AppInfo.js @@ -154,10 +154,10 @@ const AppInfosProvider = AppInfoProvider; const AppInfosContext = AppInfoContext; export { - AppInfoProvider, AppInfoContext, + AppInfoProvider, + AppInfosContext, + AppInfosProvider, useAppInfo, useAppInfos, - AppInfosProvider, - AppInfosContext, }; diff --git a/packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js b/packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js index 249744dcf8..c01f2236fe 100644 --- a/packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js +++ b/packages/core/helper-plugin/src/features/AutoReloadOverlayBlocker.js @@ -1,12 +1,13 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; -import styled, { keyframes } from 'styled-components'; -import { Flex, Box, Typography } from '@strapi/design-system'; -import { Refresh, Clock } from '@strapi/icons'; -import { useIntl } from 'react-intl'; -import { createPortal } from 'react-dom'; +import { Box, Flex, Typography } from '@strapi/design-system'; import { Link } from '@strapi/design-system/v2'; +import { Clock, Refresh } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { createPortal } from 'react-dom'; +import { useIntl } from 'react-intl'; +import styled, { keyframes } from 'styled-components'; + import pxToRem from '../utils/pxToRem'; /** diff --git a/packages/core/helper-plugin/src/features/CustomFields.js b/packages/core/helper-plugin/src/features/CustomFields.js index 842a5a2407..1f72f941bc 100644 --- a/packages/core/helper-plugin/src/features/CustomFields.js +++ b/packages/core/helper-plugin/src/features/CustomFields.js @@ -76,4 +76,4 @@ CustomFieldsProvider.propTypes = { */ const useCustomFields = () => React.useContext(CustomFieldsContext); -export { CustomFieldsProvider, useCustomFields, CustomFieldsContext }; +export { CustomFieldsContext, CustomFieldsProvider, useCustomFields }; diff --git a/packages/core/helper-plugin/src/features/GuidedTour.js b/packages/core/helper-plugin/src/features/GuidedTour.js index 3f90e367fa..562ce233b0 100644 --- a/packages/core/helper-plugin/src/features/GuidedTour.js +++ b/packages/core/helper-plugin/src/features/GuidedTour.js @@ -108,4 +108,4 @@ GuidedTourProvider.propTypes = { */ const useGuidedTour = () => React.useContext(GuidedTourContext); -export { GuidedTourProvider, useGuidedTour, GuidedTourContext }; +export { GuidedTourContext, GuidedTourProvider, useGuidedTour }; diff --git a/packages/core/helper-plugin/src/features/Library.js b/packages/core/helper-plugin/src/features/Library.js index dc49610010..d5fde40e85 100644 --- a/packages/core/helper-plugin/src/features/Library.js +++ b/packages/core/helper-plugin/src/features/Library.js @@ -45,4 +45,4 @@ LibraryProvider.propTypes = { */ const useLibrary = () => React.useContext(LibraryContext); -export { LibraryProvider, useLibrary, LibraryContext }; +export { LibraryContext, LibraryProvider, useLibrary }; diff --git a/packages/core/helper-plugin/src/features/Notifications.js b/packages/core/helper-plugin/src/features/Notifications.js index 73285922b1..e993202fdd 100644 --- a/packages/core/helper-plugin/src/features/Notifications.js +++ b/packages/core/helper-plugin/src/features/Notifications.js @@ -1,9 +1,10 @@ import * as React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; import { Alert, Flex } from '@strapi/design-system'; import { Link } from '@strapi/design-system/v2'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { useCallbackRef } from '../hooks/useCallbackRef'; /** @@ -302,4 +303,4 @@ Notification.propTypes = { */ const useNotification = () => React.useContext(NotificationsContext).toggleNotification; -export { NotificationsProvider, useNotification, NotificationsContext }; +export { NotificationsContext, NotificationsProvider, useNotification }; diff --git a/packages/core/helper-plugin/src/features/OverlayBlocker.js b/packages/core/helper-plugin/src/features/OverlayBlocker.js index 3032ff0ba3..236f063b6d 100644 --- a/packages/core/helper-plugin/src/features/OverlayBlocker.js +++ b/packages/core/helper-plugin/src/features/OverlayBlocker.js @@ -1,10 +1,10 @@ /* eslint-disable no-undef */ import * as React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { createPortal } from 'react-dom'; +import styled from 'styled-components'; /* ------------------------------------------------------------------------------------------------- * Context @@ -74,4 +74,4 @@ const Overlay = styled(Box)` */ const useOverlayBlocker = () => React.useContext(OverlayBlockerContext); -export { OverlayBlockerProvider, useOverlayBlocker, OverlayBlockerContext }; +export { OverlayBlockerContext, OverlayBlockerProvider, useOverlayBlocker }; diff --git a/packages/core/helper-plugin/src/features/StrapiApp.js b/packages/core/helper-plugin/src/features/StrapiApp.js index 413d6ad896..092f84d19e 100644 --- a/packages/core/helper-plugin/src/features/StrapiApp.js +++ b/packages/core/helper-plugin/src/features/StrapiApp.js @@ -103,4 +103,4 @@ StrapiAppProvider.propTypes = { */ const useStrapiApp = () => React.useContext(StrapiAppContext); -export { StrapiAppProvider, useStrapiApp, StrapiAppContext }; +export { StrapiAppContext, StrapiAppProvider, useStrapiApp }; diff --git a/packages/core/helper-plugin/src/features/Tracking.js b/packages/core/helper-plugin/src/features/Tracking.js index d74cc72783..479868c725 100644 --- a/packages/core/helper-plugin/src/features/Tracking.js +++ b/packages/core/helper-plugin/src/features/Tracking.js @@ -140,4 +140,4 @@ const useTracking = () => { return { trackUsage }; }; -export { TrackingProvider, useTracking, TrackingContext }; +export { TrackingContext, TrackingProvider, useTracking }; diff --git a/packages/core/helper-plugin/src/features/tests/Notifications.test.js b/packages/core/helper-plugin/src/features/tests/Notifications.test.js index e8f488f35e..cbfc03044d 100644 --- a/packages/core/helper-plugin/src/features/tests/Notifications.test.js +++ b/packages/core/helper-plugin/src/features/tests/Notifications.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { render as renderRTL, act } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; -import { lightTheme, ThemeProvider } from '@strapi/design-system'; + import { NotificationsProvider, useNotification } from '../Notifications'; const defaultNotificationConfig = { diff --git a/packages/core/helper-plugin/src/features/tests/Tracking.test.js b/packages/core/helper-plugin/src/features/tests/Tracking.test.js index 49d200b5aa..60302c4b54 100644 --- a/packages/core/helper-plugin/src/features/tests/Tracking.test.js +++ b/packages/core/helper-plugin/src/features/tests/Tracking.test.js @@ -1,9 +1,10 @@ import React from 'react'; + import { renderHook } from '@testing-library/react'; import axios from 'axios'; import { useAppInfo } from '../AppInfo'; -import { useTracking, TrackingProvider } from '../Tracking'; +import { TrackingProvider, useTracking } from '../Tracking'; jest.mock('../AppInfo'); diff --git a/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/tests/useAPIErrorHandler.test.js b/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/tests/useAPIErrorHandler.test.js index 37e422248d..73a905cdea 100644 --- a/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/tests/useAPIErrorHandler.test.js +++ b/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/tests/useAPIErrorHandler.test.js @@ -1,6 +1,6 @@ -import { renderHook, act } from '@testing-library/react'; -import { useIntl } from 'react-intl'; +import { act, renderHook } from '@testing-library/react'; import { AxiosError } from 'axios'; +import { useIntl } from 'react-intl'; import { useAPIErrorHandler } from '../useAPIErrorHandler'; diff --git a/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/useAPIErrorHandler.js b/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/useAPIErrorHandler.js index cc7f4eedef..461242913b 100644 --- a/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/useAPIErrorHandler.js +++ b/packages/core/helper-plugin/src/hooks/useAPIErrorHandler/useAPIErrorHandler.js @@ -1,5 +1,5 @@ -import { useIntl } from 'react-intl'; import { AxiosError } from 'axios'; +import { useIntl } from 'react-intl'; import { formatAPIError } from './utils/formatAPIError'; import { formatAxiosError } from './utils/formatAxiosError'; diff --git a/packages/core/helper-plugin/src/hooks/useFetchClient/index.js b/packages/core/helper-plugin/src/hooks/useFetchClient/index.js index ba01844942..ff81abffc6 100644 --- a/packages/core/helper-plugin/src/hooks/useFetchClient/index.js +++ b/packages/core/helper-plugin/src/hooks/useFetchClient/index.js @@ -3,7 +3,8 @@ * useFetchClient * */ -import { useEffect, useRef, useMemo } from 'react'; +import { useEffect, useMemo, useRef } from 'react'; + import getFetchClient from '../../utils/getFetchClient'; const useFetchClient = () => { diff --git a/packages/core/helper-plugin/src/hooks/useFetchClient/tests/useFetchClient.test.js b/packages/core/helper-plugin/src/hooks/useFetchClient/tests/useFetchClient.test.js index cafe56ef8c..794d3a4963 100644 --- a/packages/core/helper-plugin/src/hooks/useFetchClient/tests/useFetchClient.test.js +++ b/packages/core/helper-plugin/src/hooks/useFetchClient/tests/useFetchClient.test.js @@ -1,6 +1,7 @@ import React, { useEffect } from 'react'; -import { render } from '@testing-library/react'; + import { useFetchClient } from '@strapi/helper-plugin'; +import { render } from '@testing-library/react'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/core/helper-plugin/src/hooks/useFieldHint/index.js b/packages/core/helper-plugin/src/hooks/useFieldHint/index.js index a5db9e2b9d..8273b3bcc7 100644 --- a/packages/core/helper-plugin/src/hooks/useFieldHint/index.js +++ b/packages/core/helper-plugin/src/hooks/useFieldHint/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { useIntl } from 'react-intl'; + import { getFieldUnits, getMinMax } from './utils'; /** diff --git a/packages/core/helper-plugin/src/hooks/useFieldHint/tests/useFieldHint.test.js b/packages/core/helper-plugin/src/hooks/useFieldHint/tests/useFieldHint.test.js index 374974a01b..09d6ce5e6f 100644 --- a/packages/core/helper-plugin/src/hooks/useFieldHint/tests/useFieldHint.test.js +++ b/packages/core/helper-plugin/src/hooks/useFieldHint/tests/useFieldHint.test.js @@ -1,5 +1,6 @@ import React from 'react'; -import { renderHook, act } from '@testing-library/react'; + +import { act, renderHook } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import useFieldHint from '../index'; diff --git a/packages/core/helper-plugin/src/hooks/useFormattedMessage/index.js b/packages/core/helper-plugin/src/hooks/useFormattedMessage/index.js index a41ec9a8e5..0ce13056df 100644 --- a/packages/core/helper-plugin/src/hooks/useFormattedMessage/index.js +++ b/packages/core/helper-plugin/src/hooks/useFormattedMessage/index.js @@ -1,5 +1,5 @@ -import { useIntl } from 'react-intl'; import isObject from 'lodash/isObject'; +import { useIntl } from 'react-intl'; const useFormattedMessage = (message) => { const { formatMessage } = useIntl(); diff --git a/packages/core/helper-plugin/src/hooks/usePersistentState/index.js b/packages/core/helper-plugin/src/hooks/usePersistentState/index.js index 8bab4e60b0..c4d588e02d 100644 --- a/packages/core/helper-plugin/src/hooks/usePersistentState/index.js +++ b/packages/core/helper-plugin/src/hooks/usePersistentState/index.js @@ -1,4 +1,4 @@ -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; const usePersistentState = (key, defaultValue) => { const [value, setValue] = useState(() => { diff --git a/packages/core/helper-plugin/src/hooks/useQueryParams/index.js b/packages/core/helper-plugin/src/hooks/useQueryParams/index.js index 50dd606681..6a096bdc60 100644 --- a/packages/core/helper-plugin/src/hooks/useQueryParams/index.js +++ b/packages/core/helper-plugin/src/hooks/useQueryParams/index.js @@ -1,6 +1,7 @@ import { useCallback, useMemo } from 'react'; -import { useHistory, useLocation } from 'react-router-dom'; + import { parse, stringify } from 'qs'; +import { useHistory, useLocation } from 'react-router-dom'; const useQueryParams = (initialParams) => { const { search } = useLocation(); diff --git a/packages/core/helper-plugin/src/hooks/useRBAC/index.js b/packages/core/helper-plugin/src/hooks/useRBAC/index.js index 6dd26b2483..4b23855f8d 100644 --- a/packages/core/helper-plugin/src/hooks/useRBAC/index.js +++ b/packages/core/helper-plugin/src/hooks/useRBAC/index.js @@ -1,10 +1,11 @@ import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'; + +import { useRBACProvider } from '../../features/RBAC'; import hasPermissions from '../../utils/hasPermissions'; -import generateResultsObject from './utils/generateResultsObject'; -import reducer from './reducer'; import init from './init'; -import { useRBACProvider } from '../../features/RBAC'; +import reducer from './reducer'; +import generateResultsObject from './utils/generateResultsObject'; const useRBAC = (pluginPermissions, permissions) => { const abortController = new AbortController(); diff --git a/packages/core/helper-plugin/src/hooks/useRBAC/reducer.js b/packages/core/helper-plugin/src/hooks/useRBAC/reducer.js index d8099acaa1..11c5571149 100644 --- a/packages/core/helper-plugin/src/hooks/useRBAC/reducer.js +++ b/packages/core/helper-plugin/src/hooks/useRBAC/reducer.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import generateAllowedActions from './utils/generateAllowedActions'; const initialState = { diff --git a/packages/core/helper-plugin/src/hooks/useSelectionState/tests/useSelectionState.test.js b/packages/core/helper-plugin/src/hooks/useSelectionState/tests/useSelectionState.test.js index d5830167fb..6430453bbb 100644 --- a/packages/core/helper-plugin/src/hooks/useSelectionState/tests/useSelectionState.test.js +++ b/packages/core/helper-plugin/src/hooks/useSelectionState/tests/useSelectionState.test.js @@ -1,4 +1,4 @@ -import { renderHook, act } from '@testing-library/react'; +import { act, renderHook } from '@testing-library/react'; import { useSelectionState } from '../index'; diff --git a/packages/core/helper-plugin/src/icons/RemoveRoundedButton/index.js b/packages/core/helper-plugin/src/icons/RemoveRoundedButton/index.js index 37b3551d16..0b25147e2d 100644 --- a/packages/core/helper-plugin/src/icons/RemoveRoundedButton/index.js +++ b/packages/core/helper-plugin/src/icons/RemoveRoundedButton/index.js @@ -1,7 +1,9 @@ import React from 'react'; + import { IconButton } from '@strapi/design-system'; import { Minus } from '@strapi/icons'; import styled from 'styled-components'; + import pxToRem from '../../utils/pxToRem'; const StyledIconButton = styled(IconButton)( diff --git a/packages/core/helper-plugin/src/icons/SortIcon/index.js b/packages/core/helper-plugin/src/icons/SortIcon/index.js index 908ab84244..93afd24c8f 100644 --- a/packages/core/helper-plugin/src/icons/SortIcon/index.js +++ b/packages/core/helper-plugin/src/icons/SortIcon/index.js @@ -1,6 +1,6 @@ -import styled from 'styled-components'; import { CarretDown } from '@strapi/icons'; import PropTypes from 'prop-types'; +import styled from 'styled-components'; const transientProps = { isUp: true, diff --git a/packages/core/helper-plugin/src/index.js b/packages/core/helper-plugin/src/index.js index d8042ac0c0..e175e5416f 100644 --- a/packages/core/helper-plugin/src/index.js +++ b/packages/core/helper-plugin/src/index.js @@ -1,37 +1,37 @@ -import { getType, getOtherInfos } from './content-manager/utils/getAttributeInfos'; +import { getOtherInfos, getType } from './content-manager/utils/getAttributeInfos'; /* ------------------------------------------------------------------------------------------------- * Components * -----------------------------------------------------------------------------------------------*/ +export { default as AnErrorOccurred } from './components/AnErrorOccurred'; export { default as CheckPagePermissions } from './components/CheckPagePermissions'; export { default as CheckPermissions } from './components/CheckPermissions'; export { default as ConfirmDialog } from './components/ConfirmDialog'; export { default as ContentBox } from './components/ContentBox'; +export { default as DateTimePicker } from './components/DateTimePicker'; export { default as DynamicTable } from './components/DynamicTable'; -export { default as EmptyStateLayout } from './components/EmptyStateLayout'; -export { default as NoContent } from './components/NoContent'; -export { default as NoMedia } from './components/NoMedia'; -export { default as NoPermissions } from './components/NoPermissions'; -export { default as AnErrorOccurred } from './components/AnErrorOccurred'; export { default as EmptyBodyTable } from './components/EmptyBodyTable'; -export { default as GenericInput } from './components/GenericInput'; -export * from './components/InjectionZone'; -export { default as LoadingIndicatorPage } from './components/LoadingIndicatorPage'; -export { default as NotAllowedInput } from './components/NotAllowedInput'; -export { default as SettingsPageTitle } from './components/SettingsPageTitle'; -export { default as SearchURLQuery } from './components/SearchURLQuery'; -export { default as Status } from './components/Status'; +export { default as EmptyStateLayout } from './components/EmptyStateLayout'; export { default as FilterListURLQuery } from './components/FilterListURLQuery'; export { default as FilterPopoverURLQuery } from './components/FilterPopoverURLQuery'; export { default as Form } from './components/Form'; -export { default as PaginationURLQuery } from './components/PaginationURLQuery'; -export { default as PageSizeURLQuery } from './components/PageSizeURLQuery'; -export { default as RelativeTime } from './components/RelativeTime'; -export { default as DateTimePicker } from './components/DateTimePicker'; -export { default as ReactSelect } from './components/ReactSelect'; +export { default as GenericInput } from './components/GenericInput'; +export * from './components/InjectionZone'; export { default as Link } from './components/Link'; export { default as LinkButton } from './components/LinkButton'; +export { default as LoadingIndicatorPage } from './components/LoadingIndicatorPage'; +export { default as NoContent } from './components/NoContent'; +export { default as NoMedia } from './components/NoMedia'; +export { default as NoPermissions } from './components/NoPermissions'; +export { default as NotAllowedInput } from './components/NotAllowedInput'; +export { default as PageSizeURLQuery } from './components/PageSizeURLQuery'; +export { default as PaginationURLQuery } from './components/PaginationURLQuery'; +export { default as ReactSelect } from './components/ReactSelect'; +export { default as RelativeTime } from './components/RelativeTime'; +export { default as SearchURLQuery } from './components/SearchURLQuery'; +export { default as SettingsPageTitle } from './components/SettingsPageTitle'; +export { default as Status } from './components/Status'; /* ------------------------------------------------------------------------------------------------- * Content Manager @@ -51,8 +51,8 @@ export * from './features/AutoReloadOverlayBlocker'; export * from './features/CustomFields'; export * from './features/GuidedTour'; export * from './features/Library'; -export * from './features/OverlayBlocker'; export * from './features/Notifications'; +export * from './features/OverlayBlocker'; export * from './features/RBAC'; export * from './features/StrapiApp'; export * from './features/Tracking'; @@ -61,50 +61,47 @@ export * from './features/Tracking'; * Hooks * -----------------------------------------------------------------------------------------------*/ -export { default as useQuery } from './hooks/useQuery'; -export { useSelectionState } from './hooks/useSelectionState'; export * from './hooks/useAPIErrorHandler'; -export { useFilter } from './hooks/useFilter'; -export { useCollator } from './hooks/useCollator'; export { useCallbackRef } from './hooks/useCallbackRef'; export { useClipboard } from './hooks/useClipboard'; - -export { default as useQueryParams } from './hooks/useQueryParams'; -export { default as useRBAC } from './hooks/useRBAC'; -export { default as usePersistentState } from './hooks/usePersistentState'; +export { useCollator } from './hooks/useCollator'; +export { default as useFetchClient } from './hooks/useFetchClient'; +export { useFilter } from './hooks/useFilter'; export { default as useFocusWhenNavigate } from './hooks/useFocusWhenNavigate'; export { default as useLockScroll } from './hooks/useLockScroll'; -export { default as useFetchClient } from './hooks/useFetchClient'; +export { default as usePersistentState } from './hooks/usePersistentState'; +export { default as useQuery } from './hooks/useQuery'; +export { default as useQueryParams } from './hooks/useQueryParams'; +export { default as useRBAC } from './hooks/useRBAC'; +export { useSelectionState } from './hooks/useSelectionState'; /* ------------------------------------------------------------------------------------------------- * Icons * -----------------------------------------------------------------------------------------------*/ -export { default as SortIcon } from './icons/SortIcon'; export { default as RemoveRoundedButton } from './icons/RemoveRoundedButton'; +export { default as SortIcon } from './icons/SortIcon'; /* ------------------------------------------------------------------------------------------------- * Utils * -----------------------------------------------------------------------------------------------*/ +export { default as contentManagementUtilRemoveFieldsFromData } from './content-manager/utils/contentManagementUtilRemoveFieldsFromData'; +export { default as formatContentTypeData } from './content-manager/utils/formatContentTypeData'; export { default as auth } from './utils/auth'; +export { default as to } from './utils/await-to-js'; +export { default as difference } from './utils/difference'; +export { default as getAPIInnerErrors } from './utils/getAPIInnerErrors'; +export { default as getFetchClient } from './utils/getFetchClient'; +export { default as getFileExtension } from './utils/getFileExtension/getFileExtension'; +export { default as getYupInnerErrors } from './utils/getYupInnerErrors'; export { default as hasPermissions } from './utils/hasPermissions'; +export { findMatchingPermissions } from './utils/hasPermissions'; export { default as prefixFileUrlWithBackendUrl } from './utils/prefixFileUrlWithBackendUrl/prefixFileUrlWithBackendUrl'; export { default as prefixPluginTranslations } from './utils/prefixPluginTranslations'; export { default as pxToRem } from './utils/pxToRem'; -export { default as to } from './utils/await-to-js'; -export { default as setHexOpacity } from './utils/setHexOpacity'; -export { default as translatedErrors } from './utils/translatedErrors'; -export { default as formatContentTypeData } from './content-manager/utils/formatContentTypeData'; -export { findMatchingPermissions } from './utils/hasPermissions'; -export { default as contentManagementUtilRemoveFieldsFromData } from './content-manager/utils/contentManagementUtilRemoveFieldsFromData'; -export { default as getFileExtension } from './utils/getFileExtension/getFileExtension'; -export * from './utils/stopPropagation'; -export { default as difference } from './utils/difference'; -export { default as wrapAxiosInstance } from './utils/wrapAxiosInstance'; - export { default as request } from './utils/request'; -export { default as getAPIInnerErrors } from './utils/getAPIInnerErrors'; -export { default as getYupInnerErrors } from './utils/getYupInnerErrors'; - -export { default as getFetchClient } from './utils/getFetchClient'; +export { default as setHexOpacity } from './utils/setHexOpacity'; +export * from './utils/stopPropagation'; +export { default as translatedErrors } from './utils/translatedErrors'; +export { default as wrapAxiosInstance } from './utils/wrapAxiosInstance'; diff --git a/packages/core/helper-plugin/webpack.config.js b/packages/core/helper-plugin/webpack.config.js index a0420f37cb..680d54bb85 100644 --- a/packages/core/helper-plugin/webpack.config.js +++ b/packages/core/helper-plugin/webpack.config.js @@ -1,6 +1,6 @@ -const webpack = require('webpack'); -const { ESBuildMinifyPlugin } = require('esbuild-loader'); const browserslistToEsbuild = require('browserslist-to-esbuild'); +const { ESBuildMinifyPlugin } = require('esbuild-loader'); +const webpack = require('webpack'); const packageJson = require('./package.json'); diff --git a/packages/core/upload/admin/src/components/AssetCard/AssetCard.js b/packages/core/upload/admin/src/components/AssetCard/AssetCard.js index 77fb534497..b2f61c9429 100644 --- a/packages/core/upload/admin/src/components/AssetCard/AssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/AssetCard.js @@ -1,12 +1,15 @@ import React from 'react'; + +import { getFileExtension, prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; -import { prefixFileUrlWithBackendUrl, getFileExtension } from '@strapi/helper-plugin'; + +import { AssetDefinition, AssetType } from '../../constants'; +import { createAssetUrl } from '../../utils'; + +import { AudioAssetCard } from './AudioAssetCard'; +import { DocAssetCard } from './DocAssetCard'; import { ImageAssetCard } from './ImageAssetCard'; import { VideoAssetCard } from './VideoAssetCard'; -import { DocAssetCard } from './DocAssetCard'; -import { AudioAssetCard } from './AudioAssetCard'; -import { AssetType, AssetDefinition } from '../../constants'; -import { createAssetUrl } from '../../utils'; export const AssetCard = ({ asset, isSelected, onSelect, onEdit, onRemove, size, local }) => { const handleSelect = onSelect ? () => onSelect(asset) : undefined; diff --git a/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js b/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js index 2a8f5a6961..1d22e9a92f 100644 --- a/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js +++ b/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js @@ -1,6 +1,5 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; + import { Box, Card, @@ -10,13 +9,15 @@ import { CardCheckbox, CardContent, CardHeader, - CardTitle, CardSubtitle, + CardTitle, Flex, IconButton, } from '@strapi/design-system'; import { Pencil, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { getTrad } from '../../utils'; diff --git a/packages/core/upload/admin/src/components/AssetCard/AudioAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/AudioAssetCard.js index 2282c60a68..df6333c0be 100644 --- a/packages/core/upload/admin/src/components/AssetCard/AudioAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/AudioAssetCard.js @@ -1,10 +1,11 @@ import React from 'react'; + +import { Box, CardAsset } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { CardAsset, Box } from '@strapi/design-system'; -import { AudioPreview } from './AudioPreview'; import { AssetCardBase } from './AssetCardBase'; +import { AudioPreview } from './AudioPreview'; const AudioPreviewWrapper = styled(Box)` canvas, diff --git a/packages/core/upload/admin/src/components/AssetCard/AudioPreview.js b/packages/core/upload/admin/src/components/AssetCard/AudioPreview.js index 1feee76a32..4a89e0be14 100644 --- a/packages/core/upload/admin/src/components/AssetCard/AudioPreview.js +++ b/packages/core/upload/admin/src/components/AssetCard/AudioPreview.js @@ -1,7 +1,8 @@ /* eslint-disable jsx-a11y/media-has-caption */ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box } from '@strapi/design-system'; +import PropTypes from 'prop-types'; export const AudioPreview = ({ url, alt }) => { return ( diff --git a/packages/core/upload/admin/src/components/AssetCard/DocAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/DocAssetCard.js index c72efec16f..5e8a52d8bb 100644 --- a/packages/core/upload/admin/src/components/AssetCard/DocAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/DocAssetCard.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Flex } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; +import { File, FilePdf } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Flex } from '@strapi/design-system'; -import { File, FilePdf } from '@strapi/icons'; -import { pxToRem } from '@strapi/helper-plugin'; import { AssetCardBase } from './AssetCardBase'; diff --git a/packages/core/upload/admin/src/components/AssetCard/ImageAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/ImageAssetCard.js index 63aa8a754d..98d86672fb 100644 --- a/packages/core/upload/admin/src/components/AssetCard/ImageAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/ImageAssetCard.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { CardAsset } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { AssetCardBase } from './AssetCardBase'; diff --git a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js index 4ee9737c2c..4f033cf874 100644 --- a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js @@ -1,24 +1,24 @@ import React, { useEffect } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; import { + Box, Card, + CardBadge, CardBody, CardContent, CardHeader, - CardTitle, CardSubtitle, - CardBadge, - Typography, - Box, + CardTitle, Flex, + Typography, } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; -import { getTrad } from '../../utils'; import { AssetType } from '../../constants'; import { useUpload } from '../../hooks/useUpload'; +import { getTrad } from '../../utils'; import { UploadProgress } from '../UploadProgress'; const UploadProgressWrapper = styled.div` diff --git a/packages/core/upload/admin/src/components/AssetCard/VideoAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/VideoAssetCard.js index fc52b9195b..ec66ff9540 100644 --- a/packages/core/upload/admin/src/components/AssetCard/VideoAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/VideoAssetCard.js @@ -1,13 +1,14 @@ import React, { useState } from 'react'; + +import { Box, CardAsset, CardTimer } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { CardAsset, CardTimer, Box } from '@strapi/design-system'; - -import { VideoPreview } from './VideoPreview'; -import { AssetCardBase } from './AssetCardBase'; import { formatDuration } from '../../utils'; +import { AssetCardBase } from './AssetCardBase'; +import { VideoPreview } from './VideoPreview'; + const VideoPreviewWrapper = styled(Box)` canvas, video { diff --git a/packages/core/upload/admin/src/components/AssetCard/VideoPreview.js b/packages/core/upload/admin/src/components/AssetCard/VideoPreview.js index 9e6840038d..420197bcf5 100644 --- a/packages/core/upload/admin/src/components/AssetCard/VideoPreview.js +++ b/packages/core/upload/admin/src/components/AssetCard/VideoPreview.js @@ -1,7 +1,8 @@ /* eslint-disable jsx-a11y/media-has-caption */ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, VisuallyHidden } from '@strapi/design-system'; +import PropTypes from 'prop-types'; // According to MDN // https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/readyState#value diff --git a/packages/core/upload/admin/src/components/AssetCard/tests/AssetCardBase.test.js b/packages/core/upload/admin/src/components/AssetCard/tests/AssetCardBase.test.js index 70e6ce95a1..d514b67009 100644 --- a/packages/core/upload/admin/src/components/AssetCard/tests/AssetCardBase.test.js +++ b/packages/core/upload/admin/src/components/AssetCard/tests/AssetCardBase.test.js @@ -1,5 +1,6 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; diff --git a/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js b/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js index 1a6d1d8476..a9b9d9add8 100644 --- a/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js +++ b/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; -import { DocAssetCard } from '../DocAssetCard'; + import en from '../../../translations/en.json'; +import { DocAssetCard } from '../DocAssetCard'; jest.mock('../../../utils', () => ({ ...jest.requireActual('../../../utils'), diff --git a/packages/core/upload/admin/src/components/AssetCard/tests/ImageAssetCard.test.js b/packages/core/upload/admin/src/components/AssetCard/tests/ImageAssetCard.test.js index bcbb423828..d779498382 100644 --- a/packages/core/upload/admin/src/components/AssetCard/tests/ImageAssetCard.test.js +++ b/packages/core/upload/admin/src/components/AssetCard/tests/ImageAssetCard.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; -import { ImageAssetCard } from '../ImageAssetCard'; + import en from '../../../translations/en.json'; +import { ImageAssetCard } from '../ImageAssetCard'; jest.mock('../../../utils', () => ({ ...jest.requireActual('../../../utils'), diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/Filters.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/Filters.js index aa664dd6bb..83a93b476c 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/Filters.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/Filters.js @@ -1,11 +1,13 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; +import React, { useRef, useState } from 'react'; + import { Button } from '@strapi/design-system'; import { Filter } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + +import displayedFilters from '../../../utils/displayedFilters'; import FilterList from '../../FilterList'; import FilterPopover from '../../FilterPopover'; -import displayedFilters from '../../../utils/displayedFilters'; export const Filters = ({ appliedFilters, onChangeFilters }) => { const buttonRef = useRef(null); diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PageSize.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PageSize.js index 79799d6f5e..ebf922334f 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PageSize.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PageSize.js @@ -5,9 +5,10 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import { Box, Flex, Select, Option, Typography } from '@strapi/design-system'; + +import { Box, Flex, Option, Select, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const PageSize = ({ onChangePageSize, pageSize }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js index 352020d403..1adfbbbac4 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js @@ -1,6 +1,8 @@ import React, { useMemo } from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; + import { PaginationContext } from './PaginationContext'; export const Pagination = ({ children, label, activePage, pageCount }) => { diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/components.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/components.js index 22e3b766e6..1e24c6846b 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/components.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/components.js @@ -1,8 +1,10 @@ import React from 'react'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; + +import { buttonFocusStyle, Typography, VisuallyHidden } from '@strapi/design-system'; import { ChevronLeft, ChevronRight } from '@strapi/icons'; -import { Typography, buttonFocusStyle, VisuallyHidden } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; + import { usePagination } from './PaginationContext'; const PaginationText = styled(Typography)` diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/index.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/index.js index f9026ada56..340dc9fb50 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/index.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/index.js @@ -12,10 +12,12 @@ * 1, ... 6, `7`, 8, 9, 10 */ import React from 'react'; + import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + +import { Dots, NextLink, PageLink, PreviousLink } from './components'; import { Pagination } from './Pagination'; -import { PreviousLink, NextLink, PageLink, Dots } from './components'; const PaginationFooter = ({ activePage, onChangePage, pagination: { pageCount } }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/index.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/index.js index 217103f805..1355b5672b 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/index.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/index.js @@ -1,9 +1,11 @@ -import React, { useState, useLayoutEffect, useRef } from 'react'; +import React, { useLayoutEffect, useRef, useState } from 'react'; + +import { IconButton, Searchbar, SearchForm } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; +import { Search } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useTracking } from '@strapi/helper-plugin'; -import { Searchbar, SearchForm, IconButton } from '@strapi/design-system'; -import { Search } from '@strapi/icons'; + import getTrad from '../../../../utils/getTrad'; const SearchAsset = ({ onChangeSearch, queryValue }) => { diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js index 2bffb4aceb..b86ada803c 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import SearchAsset from '../index'; const handleChange = jest.fn(); diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js index 8d0d8f0dbd..9759b5e2a7 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js @@ -1,42 +1,43 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { usePersistentState } from '@strapi/helper-plugin'; import { - Button, - Flex, - Box, - Divider, BaseCheckbox, + Box, + Button, + Divider, + Flex, GridItem, - Typography, IconButton, + Typography, VisuallyHidden, } from '@strapi/design-system'; -import { Pencil, Plus, Grid, List } from '@strapi/icons'; +import { usePersistentState } from '@strapi/helper-plugin'; +import { Grid, List, Pencil, Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import { - FolderDefinition, AssetDefinition, - viewOptions, + FolderDefinition, localStorageKeys, + viewOptions, } from '../../../constants'; -import getTrad from '../../../utils/getTrad'; +import { useFolder } from '../../../hooks/useFolder'; import { getBreadcrumbDataCM, toSingularTypes } from '../../../utils'; import getAllowedFiles from '../../../utils/getAllowedFiles'; +import getTrad from '../../../utils/getTrad'; import { AssetGridList } from '../../AssetGridList'; -import { TableList } from '../../TableList'; -import { FolderGridList } from '../../FolderGridList'; -import { EmptyAssets } from '../../EmptyAssets'; import { Breadcrumbs } from '../../Breadcrumbs'; -import SortPicker from '../../SortPicker'; -import { useFolder } from '../../../hooks/useFolder'; +import { EmptyAssets } from '../../EmptyAssets'; import { FolderCard, FolderCardBody, FolderCardBodyAction } from '../../FolderCard'; +import { FolderGridList } from '../../FolderGridList'; +import SortPicker from '../../SortPicker'; +import { TableList } from '../../TableList'; + import { Filters } from './Filters'; -import PaginationFooter from './PaginationFooter'; import PageSize from './PageSize'; +import PaginationFooter from './PaginationFooter'; import SearchAsset from './SearchAsset'; import { isSelectable } from './utils/isSelectable'; diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js index bd77f62ce9..19af0b1978 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js +++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js @@ -1,14 +1,15 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { render, fireEvent, screen } from '@testing-library/react'; -import { NotificationsProvider, usePersistentState } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { useFolder } from '../../../../hooks/useFolder'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, usePersistentState } from '@strapi/helper-plugin'; +import { fireEvent, render, screen } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; + import { BrowseStep } from '..'; import { viewOptions } from '../../../../constants'; +import { useFolder } from '../../../../hooks/useFolder'; jest.mock('../../../../hooks/useFolder'); diff --git a/packages/core/upload/admin/src/components/AssetDialog/DialogFooter.js b/packages/core/upload/admin/src/components/AssetDialog/DialogFooter.js index 4c3cd73be9..fb93c75560 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/DialogFooter.js +++ b/packages/core/upload/admin/src/components/AssetDialog/DialogFooter.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Button, ModalFooter } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; export const DialogFooter = ({ onClose, onValidate }) => { diff --git a/packages/core/upload/admin/src/components/AssetDialog/SelectedStep/index.js b/packages/core/upload/admin/src/components/AssetDialog/SelectedStep/index.js index 45a82f2ecb..3aa36c9b6a 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/SelectedStep/index.js +++ b/packages/core/upload/admin/src/components/AssetDialog/SelectedStep/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + import { Flex, Typography } from '@strapi/design-system'; -import { AssetGridList } from '../../AssetGridList'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; +import { AssetGridList } from '../../AssetGridList'; export const SelectedStep = ({ selectedAssets, onSelectAsset, onReorderAsset }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/AssetDialog/index.js b/packages/core/upload/admin/src/components/AssetDialog/index.js index e7548d7a5f..b9b0b7a3c4 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/index.js +++ b/packages/core/upload/admin/src/components/AssetDialog/index.js @@ -1,38 +1,41 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; + import { - ModalLayout, - ModalBody, - ModalHeader, - Flex, + Badge, Button, Divider, - Typography, - Tabs, + Flex, + Loader, + ModalBody, + ModalHeader, + ModalLayout, Tab, TabGroup, - TabPanels, TabPanel, - Badge, - Loader, + TabPanels, + Tabs, + Typography, } from '@strapi/design-system'; -import { NoPermissions, AnErrorOccurred, useSelectionState, pxToRem } from '@strapi/helper-plugin'; -import { getTrad, containsAssetFilter } from '../../utils'; -import { SelectedStep } from './SelectedStep'; -import { BrowseStep } from './BrowseStep'; -import { useMediaLibraryPermissions } from '../../hooks/useMediaLibraryPermissions'; +import { AnErrorOccurred, NoPermissions, pxToRem, useSelectionState } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import { AssetDefinition } from '../../constants'; import { useAssets } from '../../hooks/useAssets'; import { useFolders } from '../../hooks/useFolders'; +import { useMediaLibraryPermissions } from '../../hooks/useMediaLibraryPermissions'; import useModalQueryParams from '../../hooks/useModalQueryParams'; -import { AssetDefinition } from '../../constants'; +import { containsAssetFilter, getTrad } from '../../utils'; import getAllowedFiles from '../../utils/getAllowedFiles'; -import { DialogFooter } from './DialogFooter'; -import { EditAssetDialog } from '../EditAssetDialog'; import { moveElement } from '../../utils/moveElement'; +import { EditAssetDialog } from '../EditAssetDialog'; import { EditFolderDialog } from '../EditFolderDialog'; +import { BrowseStep } from './BrowseStep'; +import { DialogFooter } from './DialogFooter'; +import { SelectedStep } from './SelectedStep'; + const LoadingBody = styled(Flex)` /* 80px are coming from the Tabs component that is not included in the ModalBody */ min-height: ${() => `calc(60vh + ${pxToRem(80)})`}; diff --git a/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js b/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js index 82d27d6a75..7fe231caa8 100644 --- a/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js +++ b/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js @@ -1,13 +1,14 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL, screen } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { MemoryRouter } from 'react-router-dom'; import { AssetDialog } from '..'; -import { useFolders } from '../../../hooks/useFolders'; import { useAssets } from '../../../hooks/useAssets'; +import { useFolders } from '../../../hooks/useFolders'; import { useMediaLibraryPermissions } from '../../../hooks/useMediaLibraryPermissions'; import useModalQueryParams from '../../../hooks/useModalQueryParams'; diff --git a/packages/core/upload/admin/src/components/AssetGridList/Draggable.js b/packages/core/upload/admin/src/components/AssetGridList/Draggable.js index 824a2845fe..b741e858b9 100644 --- a/packages/core/upload/admin/src/components/AssetGridList/Draggable.js +++ b/packages/core/upload/admin/src/components/AssetGridList/Draggable.js @@ -1,4 +1,5 @@ import React, { useRef } from 'react'; + import PropTypes from 'prop-types'; import { useDrag, useDrop } from 'react-dnd'; diff --git a/packages/core/upload/admin/src/components/AssetGridList/index.js b/packages/core/upload/admin/src/components/AssetGridList/index.js index 634299b2df..1c8d0c5829 100644 --- a/packages/core/upload/admin/src/components/AssetGridList/index.js +++ b/packages/core/upload/admin/src/components/AssetGridList/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Grid, GridItem, KeyboardNavigable, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { AssetCard } from '../AssetCard/AssetCard'; + import { Draggable } from './Draggable'; export const AssetGridList = ({ diff --git a/packages/core/upload/admin/src/components/AssetGridList/tests/AssetGridList.test.js b/packages/core/upload/admin/src/components/AssetGridList/tests/AssetGridList.test.js index b68c599bdb..f5e0ca0775 100644 --- a/packages/core/upload/admin/src/components/AssetGridList/tests/AssetGridList.test.js +++ b/packages/core/upload/admin/src/components/AssetGridList/tests/AssetGridList.test.js @@ -1,7 +1,9 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; + import { AssetGridList } from '..'; import en from '../../../translations/en.json'; diff --git a/packages/core/upload/admin/src/components/Breadcrumbs/Breadcrumbs.js b/packages/core/upload/admin/src/components/Breadcrumbs/Breadcrumbs.js index eb65f1f493..1c72a6bf78 100644 --- a/packages/core/upload/admin/src/components/Breadcrumbs/Breadcrumbs.js +++ b/packages/core/upload/admin/src/components/Breadcrumbs/Breadcrumbs.js @@ -1,12 +1,14 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { NavLink } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import { Crumb, CrumbLink, Breadcrumbs as BaseBreadcrumbs } from '@strapi/design-system/v2'; -import { CrumbSimpleMenuAsync } from './CrumbSimpleMenuAsync'; +import { Breadcrumbs as BaseBreadcrumbs, Crumb, CrumbLink } from '@strapi/design-system/v2'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { NavLink } from 'react-router-dom'; + import { BreadcrumbsDefinition } from '../../constants'; +import { CrumbSimpleMenuAsync } from './CrumbSimpleMenuAsync'; + export const Breadcrumbs = ({ breadcrumbs, onChangeFolder, currentFolderId, ...props }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/Breadcrumbs/CrumbSimpleMenuAsync.js b/packages/core/upload/admin/src/components/Breadcrumbs/CrumbSimpleMenuAsync.js index e88f5d5e37..5b93d1b9ff 100644 --- a/packages/core/upload/admin/src/components/Breadcrumbs/CrumbSimpleMenuAsync.js +++ b/packages/core/upload/admin/src/components/Breadcrumbs/CrumbSimpleMenuAsync.js @@ -1,10 +1,12 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { NavLink, useLocation } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import { useQueryParams } from '@strapi/helper-plugin'; -import { MenuItem, CrumbSimpleMenu } from '@strapi/design-system/v2'; + import { Loader } from '@strapi/design-system'; +import { CrumbSimpleMenu, MenuItem } from '@strapi/design-system/v2'; +import { useQueryParams } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { NavLink, useLocation } from 'react-router-dom'; + import { useFolderStructure } from '../../hooks/useFolderStructure'; import { getFolderParents, getFolderURL, getTrad } from '../../utils'; diff --git a/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js b/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js index ec82e308f0..7dbbde7c31 100644 --- a/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js +++ b/packages/core/upload/admin/src/components/Breadcrumbs/tests/index.test.js @@ -1,11 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { MemoryRouter } from 'react-router-dom'; import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { Breadcrumbs } from '../index'; jest.mock('../../../hooks/useFolderStructure'); diff --git a/packages/core/upload/admin/src/components/BulkMoveDialog/BulkMoveDialog.js b/packages/core/upload/admin/src/components/BulkMoveDialog/BulkMoveDialog.js index 5270f6c09a..8168054e10 100644 --- a/packages/core/upload/admin/src/components/BulkMoveDialog/BulkMoveDialog.js +++ b/packages/core/upload/admin/src/components/BulkMoveDialog/BulkMoveDialog.js @@ -1,28 +1,29 @@ -import { Formik } from 'formik'; import React from 'react'; -import PropTypes from 'prop-types'; -import isEmpty from 'lodash/isEmpty'; -import { useIntl } from 'react-intl'; + import { Button, + FieldLabel, + Flex, Grid, GridItem, - Flex, Loader, - ModalLayout, - ModalHeader, ModalBody, ModalFooter, - FieldLabel, + ModalHeader, + ModalLayout, Typography, } from '@strapi/design-system'; import { Form, normalizeAPIError } from '@strapi/helper-plugin'; +import { Formik } from 'formik'; +import isEmpty from 'lodash/isEmpty'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { AssetDefinition, FolderDefinition } from '../../constants'; import { useBulkMove } from '../../hooks/useBulkMove'; +import { useFolderStructure } from '../../hooks/useFolderStructure'; import { getTrad } from '../../utils'; import SelectTree from '../SelectTree'; -import { useFolderStructure } from '../../hooks/useFolderStructure'; -import { FolderDefinition, AssetDefinition } from '../../constants'; export const BulkMoveDialog = ({ onClose, selected, currentFolder }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/BulkMoveDialog/tests/BulkMoveDialog.test.js b/packages/core/upload/admin/src/components/BulkMoveDialog/tests/BulkMoveDialog.test.js index ad01a655f9..e6837081ae 100644 --- a/packages/core/upload/admin/src/components/BulkMoveDialog/tests/BulkMoveDialog.test.js +++ b/packages/core/upload/admin/src/components/BulkMoveDialog/tests/BulkMoveDialog.test.js @@ -1,9 +1,10 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; -import { render } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { NotificationsProvider } from '@strapi/helper-plugin'; -import { QueryClientProvider, QueryClient } from 'react-query'; +import { render } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { BulkMoveDialog } from '..'; diff --git a/packages/core/upload/admin/src/components/ContextInfo/ContextInfo.js b/packages/core/upload/admin/src/components/ContextInfo/ContextInfo.js index 51181a40e2..ee33ce0603 100644 --- a/packages/core/upload/admin/src/components/ContextInfo/ContextInfo.js +++ b/packages/core/upload/admin/src/components/ContextInfo/ContextInfo.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; export const ContextInfo = ({ blocks }) => { return ( diff --git a/packages/core/upload/admin/src/components/ContextInfo/tests/ContextInfo.test.js b/packages/core/upload/admin/src/components/ContextInfo/tests/ContextInfo.test.js index 2c9dcbe0cc..df1522333b 100644 --- a/packages/core/upload/admin/src/components/ContextInfo/tests/ContextInfo.test.js +++ b/packages/core/upload/admin/src/components/ContextInfo/tests/ContextInfo.test.js @@ -1,5 +1,6 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { ContextInfo } from '../index'; diff --git a/packages/core/upload/admin/src/components/CopyLinkButton/index.js b/packages/core/upload/admin/src/components/CopyLinkButton/index.js index 49f5758297..b5d60dac60 100644 --- a/packages/core/upload/admin/src/components/CopyLinkButton/index.js +++ b/packages/core/upload/admin/src/components/CopyLinkButton/index.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { IconButton } from '@strapi/design-system'; +import { useClipboard, useNotification } from '@strapi/helper-plugin'; +import { Link as LinkIcon } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { IconButton } from '@strapi/design-system'; -import { useNotification, useClipboard } from '@strapi/helper-plugin'; -import { Link as LinkIcon } from '@strapi/icons'; + import getTrad from '../../utils/getTrad'; export const CopyLinkButton = ({ url }) => { diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/DialogHeader.js b/packages/core/upload/admin/src/components/EditAssetDialog/DialogHeader.js index fee47c3ebe..1e7a2f5fd9 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/DialogHeader.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/DialogHeader.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { ModalHeader, Typography } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import { Typography, ModalHeader } from '@strapi/design-system'; export const DialogHeader = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/AssetPreview.js b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/AssetPreview.js index ef3c735f73..69d31f6671 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/AssetPreview.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/AssetPreview.js @@ -1,10 +1,12 @@ /* eslint-disable jsx-a11y/media-has-caption */ import React, { forwardRef } from 'react'; -import PropTypes from 'prop-types'; -import { File, FilePdf } from '@strapi/icons'; + import { Flex } from '@strapi/design-system'; -import styled from 'styled-components'; import { usePersistentState } from '@strapi/helper-plugin'; +import { File, FilePdf } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import styled from 'styled-components'; + import { AssetType } from '../../../constants'; const CardAsset = styled(Flex)` diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/CroppingActions.js b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/CroppingActions.js index 66428c62cc..3feca3edfd 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/CroppingActions.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/CroppingActions.js @@ -1,9 +1,12 @@ import React from 'react'; + +import { Flex, FocusTrap, IconButton, MenuItem, SimpleMenu } from '@strapi/design-system'; +import { Check, Cross } from '@strapi/icons'; import PropTypes from 'prop-types'; -import { IconButton, FocusTrap, SimpleMenu, MenuItem, Flex } from '@strapi/design-system'; -import { Cross, Check } from '@strapi/icons'; import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; + import { CroppingActionRow } from './components'; export const CroppingActions = ({ onCancel, onValidate, onDuplicate }) => { diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/components.js b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/components.js index 6b33bdb1a1..562d0af7e3 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/components.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/components.js @@ -1,5 +1,5 @@ +import { Badge, Box, Flex } from '@strapi/design-system'; import styled from 'styled-components'; -import { Box, Flex, Badge } from '@strapi/design-system'; export const RelativeBox = styled(Box)` position: relative; diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/index.js b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/index.js index 35f103c122..5a554018eb 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/index.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/PreviewBox/index.js @@ -1,28 +1,31 @@ -import React, { useState, useRef, useEffect } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; + +import { Flex, IconButton } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; +import { Crop as Resize, Download as DownloadIcon, Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Flex, IconButton } from '@strapi/design-system'; -import { Trash, Download as DownloadIcon, Crop as Resize } from '@strapi/icons'; -import { useTracking } from '@strapi/helper-plugin'; -import getTrad from '../../../utils/getTrad'; -import { downloadFile } from '../../../utils/downloadFile'; -import { RemoveAssetDialog } from '../RemoveAssetDialog'; + +import { AssetDefinition, AssetType } from '../../../constants'; import { useCropImg } from '../../../hooks/useCropImg'; import { useEditAsset } from '../../../hooks/useEditAsset'; import { useUpload } from '../../../hooks/useUpload'; -import { - RelativeBox, - ActionRow, - Wrapper, - BadgeOverride, - UploadProgressWrapper, -} from './components'; -import { CroppingActions } from './CroppingActions'; +import { createAssetUrl } from '../../../utils'; +import { downloadFile } from '../../../utils/downloadFile'; +import getTrad from '../../../utils/getTrad'; import { CopyLinkButton } from '../../CopyLinkButton'; import { UploadProgress } from '../../UploadProgress'; -import { AssetType, AssetDefinition } from '../../../constants'; +import { RemoveAssetDialog } from '../RemoveAssetDialog'; + import { AssetPreview } from './AssetPreview'; -import { createAssetUrl } from '../../../utils'; +import { + ActionRow, + BadgeOverride, + RelativeBox, + UploadProgressWrapper, + Wrapper, +} from './components'; +import { CroppingActions } from './CroppingActions'; import 'cropperjs/dist/cropper.css'; diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/RemoveAssetDialog.js b/packages/core/upload/admin/src/components/EditAssetDialog/RemoveAssetDialog.js index 7d8bb9eab6..d262cc36ad 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/RemoveAssetDialog.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/RemoveAssetDialog.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { ConfirmDialog } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import { useRemoveAsset } from '../../hooks/useRemoveAsset'; export const RemoveAssetDialog = ({ onClose, asset }) => { diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/ReplaceMediaButton.js b/packages/core/upload/admin/src/components/EditAssetDialog/ReplaceMediaButton.js index 0ea79a7bc9..b425dfd7a5 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/ReplaceMediaButton.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/ReplaceMediaButton.js @@ -1,8 +1,10 @@ -import PropTypes from 'prop-types'; import React, { useRef } from 'react'; -import { useIntl } from 'react-intl'; -import { useTracking } from '@strapi/helper-plugin'; + import { Button, VisuallyHidden } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; export const ReplaceMediaButton = ({ onSelectMedia, acceptedMime, trackedLocation, ...props }) => { diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/index.js b/packages/core/upload/admin/src/components/EditAssetDialog/index.js index 79f2d1fe35..e134b42e8a 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/index.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/index.js @@ -4,38 +4,40 @@ * */ -import PropTypes from 'prop-types'; import React, { useRef, useState } from 'react'; -import { useIntl } from 'react-intl'; -import isEqual from 'lodash/isEqual'; -import styled from 'styled-components'; + import { - ModalLayout, - ModalBody, - ModalFooter, - Flex, - Loader, - Grid, - GridItem, Button, FieldLabel, + Flex, + Grid, + GridItem, + Loader, + ModalBody, + ModalFooter, + ModalLayout, TextInput, VisuallyHidden, } from '@strapi/design-system'; -import { getFileExtension, Form, pxToRem, useTracking } from '@strapi/helper-plugin'; +import { Form, getFileExtension, pxToRem, useTracking } from '@strapi/helper-plugin'; import { Formik } from 'formik'; +import isEqual from 'lodash/isEqual'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import * as yup from 'yup'; +import { AssetDefinition } from '../../constants'; +import { useEditAsset } from '../../hooks/useEditAsset'; +import { useFolderStructure } from '../../hooks/useFolderStructure'; +import { findRecursiveFolderByValue, getTrad } from '../../utils'; +import formatBytes from '../../utils/formatBytes'; +import { ContextInfo } from '../ContextInfo'; +import SelectTree from '../SelectTree'; + import { DialogHeader } from './DialogHeader'; import { PreviewBox } from './PreviewBox'; -import { ContextInfo } from '../ContextInfo'; -import { AssetDefinition } from '../../constants'; -import { getTrad, findRecursiveFolderByValue } from '../../utils'; -import formatBytes from '../../utils/formatBytes'; -import { useEditAsset } from '../../hooks/useEditAsset'; -import { useFolderStructure } from '../../hooks/useFolderStructure'; import { ReplaceMediaButton } from './ReplaceMediaButton'; -import SelectTree from '../SelectTree'; const LoadingBody = styled(Flex)` /* 80px are coming from the Tabs component that is not included in the ModalBody */ diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/tests/EditAssetDialog.test.js b/packages/core/upload/admin/src/components/EditAssetDialog/tests/EditAssetDialog.test.js index a34025ddd0..5ca8d78147 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/tests/EditAssetDialog.test.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/tests/EditAssetDialog.test.js @@ -1,12 +1,14 @@ import React from 'react'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { NotificationsProvider } from '@strapi/helper-plugin'; -import { EditAssetDialog } from '../index'; + import en from '../../../translations/en.json'; import { downloadFile } from '../../../utils/downloadFile'; +import { EditAssetDialog } from '../index'; jest.mock('../../../hooks/useFolderStructure'); jest.mock('../../../utils/downloadFile'); diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/tests/RemoveAssetDialog.test.js b/packages/core/upload/admin/src/components/EditAssetDialog/tests/RemoveAssetDialog.test.js index 9d10c84bc3..55e7b8298d 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/tests/RemoveAssetDialog.test.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/tests/RemoveAssetDialog.test.js @@ -1,11 +1,14 @@ import React from 'react'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { NotificationsProvider } from '@strapi/helper-plugin'; -import { RemoveAssetDialog } from '../RemoveAssetDialog'; + import en from '../../../translations/en.json'; +import { RemoveAssetDialog } from '../RemoveAssetDialog'; + import server from './server'; jest.mock('../../../utils/deleteRequest', () => ({ diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/tests/index.test.js b/packages/core/upload/admin/src/components/EditAssetDialog/tests/index.test.js index 1b80e2edce..9b1556fd34 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/tests/index.test.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/tests/index.test.js @@ -5,14 +5,16 @@ */ import React from 'react'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, TrackingProvider } from '@strapi/helper-plugin'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { NotificationsProvider, TrackingProvider } from '@strapi/helper-plugin'; -import { EditAssetDialog } from '../index'; + import en from '../../../translations/en.json'; import { downloadFile } from '../../../utils/downloadFile'; +import { EditAssetDialog } from '../index'; jest.mock('../../../utils/downloadFile'); jest.mock('../../../hooks/useFolderStructure'); diff --git a/packages/core/upload/admin/src/components/EditAssetDialog/tests/server.js b/packages/core/upload/admin/src/components/EditAssetDialog/tests/server.js index 60ba45dfc9..a91057f1cf 100644 --- a/packages/core/upload/admin/src/components/EditAssetDialog/tests/server.js +++ b/packages/core/upload/admin/src/components/EditAssetDialog/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.delete('*/upload/files/8', (req, res, ctx) => { diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js index 64d2f60b8c..bfe9624c7a 100644 --- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js +++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js @@ -1,32 +1,34 @@ -import * as yup from 'yup'; -import { Formik } from 'formik'; import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import isEmpty from 'lodash/isEmpty'; -import { useIntl } from 'react-intl'; + import { Button, - Grid, - GridItem, - ModalLayout, - ModalBody, - ModalFooter, FieldLabel, Flex, + Grid, + GridItem, Loader, + ModalBody, + ModalFooter, + ModalLayout, TextInput, Typography, } from '@strapi/design-system'; -import { Form, useNotification, getAPIInnerErrors, useTracking } from '@strapi/helper-plugin'; +import { Form, getAPIInnerErrors, useNotification, useTracking } from '@strapi/helper-plugin'; +import { Formik } from 'formik'; +import isEmpty from 'lodash/isEmpty'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import * as yup from 'yup'; -import { getTrad, findRecursiveFolderByValue } from '../../utils'; import { FolderDefinition } from '../../constants'; -import { useEditFolder } from '../../hooks/useEditFolder'; import { useBulkRemove } from '../../hooks/useBulkRemove'; +import { useEditFolder } from '../../hooks/useEditFolder'; import { useFolderStructure } from '../../hooks/useFolderStructure'; import { useMediaLibraryPermissions } from '../../hooks/useMediaLibraryPermissions'; +import { findRecursiveFolderByValue, getTrad } from '../../utils'; import { ContextInfo } from '../ContextInfo'; import SelectTree from '../SelectTree'; + import { EditFolderModalHeader } from './ModalHeader'; import RemoveFolderDialog from './RemoveFolderDialog'; diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/ModalHeader/ModalHeader.js b/packages/core/upload/admin/src/components/EditFolderDialog/ModalHeader/ModalHeader.js index 92f757e254..9fb445cba1 100644 --- a/packages/core/upload/admin/src/components/EditFolderDialog/ModalHeader/ModalHeader.js +++ b/packages/core/upload/admin/src/components/EditFolderDialog/ModalHeader/ModalHeader.js @@ -1,7 +1,8 @@ -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; import React from 'react'; + import { ModalHeader, Typography } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { getTrad } from '../../../utils'; diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/RemoveFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/RemoveFolderDialog.js index 2bd1108311..70d243836a 100644 --- a/packages/core/upload/admin/src/components/EditFolderDialog/RemoveFolderDialog.js +++ b/packages/core/upload/admin/src/components/EditFolderDialog/RemoveFolderDialog.js @@ -1,6 +1,7 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { ConfirmDialog } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; export const RemoveFolderDialog = ({ onClose, onConfirm }) => { return ( diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js b/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js index e45e60f38d..8f52ff0761 100644 --- a/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js +++ b/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js @@ -1,14 +1,15 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { IntlProvider } from 'react-intl'; -import { render, fireEvent, act, waitFor, screen } from '@testing-library/react'; -import { within } from '@testing-library/dom'; -import { NotificationsProvider } from '@strapi/helper-plugin'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { EditFolderDialog } from '../EditFolderDialog'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider } from '@strapi/helper-plugin'; +import { within } from '@testing-library/dom'; +import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import { useEditFolder } from '../../../hooks/useEditFolder'; import { useMediaLibraryPermissions } from '../../../hooks/useMediaLibraryPermissions'; +import { EditFolderDialog } from '../EditFolderDialog'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/core/upload/admin/src/components/EmptyAssets/EmptyAssetGrid.js b/packages/core/upload/admin/src/components/EmptyAssets/EmptyAssetGrid.js index 0fb59101c9..89ebd61003 100644 --- a/packages/core/upload/admin/src/components/EmptyAssets/EmptyAssetGrid.js +++ b/packages/core/upload/admin/src/components/EmptyAssets/EmptyAssetGrid.js @@ -1,7 +1,8 @@ import React from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; const EmptyAssetCard = styled(Box)` background: linear-gradient( diff --git a/packages/core/upload/admin/src/components/EmptyAssets/index.js b/packages/core/upload/admin/src/components/EmptyAssets/index.js index 9747f8c636..00ebcd1cd4 100644 --- a/packages/core/upload/admin/src/components/EmptyAssets/index.js +++ b/packages/core/upload/admin/src/components/EmptyAssets/index.js @@ -1,7 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Typography, Flex, Box, Icon } from '@strapi/design-system'; + +import { Box, Flex, Icon, Typography } from '@strapi/design-system'; import { EmptyDocuments } from '@strapi/icons'; +import PropTypes from 'prop-types'; + import { EmptyAssetGrid } from './EmptyAssetGrid'; export const EmptyAssets = ({ icon, content, action, size, count }) => { diff --git a/packages/core/upload/admin/src/components/FilterList/FilterTag.js b/packages/core/upload/admin/src/components/FilterList/FilterTag.js index 8189833000..8b4e24c2fd 100644 --- a/packages/core/upload/admin/src/components/FilterList/FilterTag.js +++ b/packages/core/upload/admin/src/components/FilterList/FilterTag.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Tag } from '@strapi/design-system'; import { Cross } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; const FilterTag = ({ attribute, filter, onClick, operator, value }) => { diff --git a/packages/core/upload/admin/src/components/FilterList/index.js b/packages/core/upload/admin/src/components/FilterList/index.js index f342144d63..1cc48b1f42 100644 --- a/packages/core/upload/admin/src/components/FilterList/index.js +++ b/packages/core/upload/admin/src/components/FilterList/index.js @@ -5,7 +5,9 @@ */ import React from 'react'; + import PropTypes from 'prop-types'; + import FilterTag from './FilterTag'; const FilterList = ({ appliedFilters, filtersSchema, onRemoveFilter }) => { diff --git a/packages/core/upload/admin/src/components/FilterList/tests/index.test.js b/packages/core/upload/admin/src/components/FilterList/tests/index.test.js index 3590bb73fd..bd297da73b 100644 --- a/packages/core/upload/admin/src/components/FilterList/tests/index.test.js +++ b/packages/core/upload/admin/src/components/FilterList/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { IntlProvider } from 'react-intl'; + import FilterList from '../index'; const messages = { diff --git a/packages/core/upload/admin/src/components/FilterPopover/FilterValueInput.js b/packages/core/upload/admin/src/components/FilterPopover/FilterValueInput.js index e1549c56c3..25b78e01e5 100644 --- a/packages/core/upload/admin/src/components/FilterPopover/FilterValueInput.js +++ b/packages/core/upload/admin/src/components/FilterPopover/FilterValueInput.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { DateTimePicker, Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { DateTimePicker, Select, Option } from '@strapi/design-system'; import { useIntl } from 'react-intl'; const FilterValueInput = ({ label, onChange, options, type, value }) => { diff --git a/packages/core/upload/admin/src/components/FilterPopover/index.js b/packages/core/upload/admin/src/components/FilterPopover/index.js index 81cf2a1f70..017c562f01 100644 --- a/packages/core/upload/admin/src/components/FilterPopover/index.js +++ b/packages/core/upload/admin/src/components/FilterPopover/index.js @@ -5,10 +5,12 @@ */ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { Button, Box, Popover, Flex, Select, Option } from '@strapi/design-system'; + +import { Box, Button, Flex, Option, Popover, Select } from '@strapi/design-system'; import { Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import FilterValueInput from './FilterValueInput'; import getFilterList from './utils/getFilterList'; diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js b/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js index 4d3e12f02d..846f0f3b9a 100644 --- a/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js +++ b/packages/core/upload/admin/src/components/FolderCard/FolderCard/FolderCard.js @@ -1,11 +1,11 @@ import React, { forwardRef, useMemo } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { NavLink } from 'react-router-dom'; -import { pxToRem } from '@strapi/helper-plugin'; import { Box, CardAction, Flex } from '@strapi/design-system'; +import { pxToRem } from '@strapi/helper-plugin'; import { Folder } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { NavLink } from 'react-router-dom'; +import styled from 'styled-components'; import { FolderCardContext } from '../contexts/FolderCard'; import useId from '../hooks/useId'; diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js index 73cf40e291..c63289872d 100644 --- a/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js +++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardBody/FolderCardBody.js @@ -1,7 +1,7 @@ import React from 'react'; -import styled from 'styled-components'; import { Flex } from '@strapi/design-system'; +import styled from 'styled-components'; import { useFolderCard } from '../contexts/FolderCard'; diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js index 5c1c7dd5df..e72fd1f910 100644 --- a/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js +++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Box } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { NavLink } from 'react-router-dom'; import styled from 'styled-components'; -import { Box } from '@strapi/design-system'; const BoxOutline = styled(Box)` &:focus { diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js index cde2e30f9a..2265c7ade2 100644 --- a/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js +++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardCheckbox/FolderCardCheckbox.js @@ -1,5 +1,7 @@ import React from 'react'; -import { Box, BaseCheckbox } from '@strapi/design-system'; + +import { BaseCheckbox, Box } from '@strapi/design-system'; + import { useFolderCard } from '../contexts/FolderCard'; export const FolderCardCheckbox = (props) => { diff --git a/packages/core/upload/admin/src/components/FolderCard/index.js b/packages/core/upload/admin/src/components/FolderCard/index.js index 0037bbcfc1..e445605e33 100644 --- a/packages/core/upload/admin/src/components/FolderCard/index.js +++ b/packages/core/upload/admin/src/components/FolderCard/index.js @@ -1,4 +1,4 @@ export { FolderCard } from './FolderCard'; export { FolderCardBody } from './FolderCardBody'; -export { FolderCardCheckbox } from './FolderCardCheckbox'; export { FolderCardBodyAction } from './FolderCardBodyAction'; +export { FolderCardCheckbox } from './FolderCardCheckbox'; diff --git a/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js b/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js index d069b2f2be..6044d48392 100644 --- a/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js +++ b/packages/core/upload/admin/src/components/FolderCard/tests/FolderCard.test.js @@ -1,12 +1,13 @@ import React from 'react'; + +import { Flex, lightTheme, ThemeProvider, Typography } from '@strapi/design-system'; +import { act, fireEvent, render } from '@testing-library/react'; import { MemoryRouter } from 'react-router-dom'; -import { Flex, ThemeProvider, lightTheme, Typography } from '@strapi/design-system'; -import { render, fireEvent, act } from '@testing-library/react'; import { FolderCard } from '../FolderCard'; import { FolderCardBody } from '../FolderCardBody'; -import { FolderCardCheckbox } from '../FolderCardCheckbox'; import { FolderCardBodyAction } from '../FolderCardBodyAction'; +import { FolderCardCheckbox } from '../FolderCardCheckbox'; const ID_FIXTURE = 'folder'; diff --git a/packages/core/upload/admin/src/components/FolderGridList/FolderGridList.js b/packages/core/upload/admin/src/components/FolderGridList/FolderGridList.js index 8c3eb689ae..f2bfbb4ba9 100644 --- a/packages/core/upload/admin/src/components/FolderGridList/FolderGridList.js +++ b/packages/core/upload/admin/src/components/FolderGridList/FolderGridList.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { Box, Grid, KeyboardNavigable, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Box, KeyboardNavigable, Grid, Typography } from '@strapi/design-system'; export const FolderGridList = ({ title, children }) => { return ( diff --git a/packages/core/upload/admin/src/components/FolderGridList/tests/FolderGridList.test.js b/packages/core/upload/admin/src/components/FolderGridList/tests/FolderGridList.test.js index 00ad258f23..8b24c6513e 100644 --- a/packages/core/upload/admin/src/components/FolderGridList/tests/FolderGridList.test.js +++ b/packages/core/upload/admin/src/components/FolderGridList/tests/FolderGridList.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; import { MemoryRouter } from 'react-router-dom'; import { FolderGridList } from '../FolderGridList'; diff --git a/packages/core/upload/admin/src/components/MediaLibraryDialog/index.js b/packages/core/upload/admin/src/components/MediaLibraryDialog/index.js index 736634cd0b..2cb8ede954 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryDialog/index.js +++ b/packages/core/upload/admin/src/components/MediaLibraryDialog/index.js @@ -1,4 +1,5 @@ import React, { useState } from 'react'; + import PropTypes from 'prop-types'; import { AssetDialog } from '../AssetDialog'; diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAsset.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAsset.js index c3705953aa..21436ca02e 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAsset.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAsset.js @@ -1,11 +1,13 @@ import React from 'react'; -import styled from 'styled-components'; -import { File, FilePdf } from '@strapi/icons'; + import { Box, Flex } from '@strapi/design-system'; -import { AssetType, AssetDefinition } from '../../../constants'; -import { VideoPreview } from '../../AssetCard/VideoPreview'; -import { AudioPreview } from '../../AssetCard/AudioPreview'; +import { File, FilePdf } from '@strapi/icons'; +import styled from 'styled-components'; + +import { AssetDefinition, AssetType } from '../../../constants'; import { createAssetUrl } from '../../../utils'; +import { AudioPreview } from '../../AssetCard/AudioPreview'; +import { VideoPreview } from '../../AssetCard/VideoPreview'; const DocAsset = styled(Flex)` background: linear-gradient(180deg, #ffffff 0%, #f6f6f9 121.48%); diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js index caa9f860fd..134c633981 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js @@ -1,12 +1,14 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { CarouselActions, IconButton } from '@strapi/design-system'; import { prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin'; +import { Pencil, Plus, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Plus, Trash, Pencil } from '@strapi/icons'; + +import { AssetDefinition } from '../../../constants'; import getTrad from '../../../utils/getTrad'; import { CopyLinkButton } from '../../CopyLinkButton'; -import { AssetDefinition } from '../../../constants'; export const CarouselAssetActions = ({ asset, onDeleteAsset, onAddAsset, onEditAsset }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssets.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssets.js index 9218097fd3..c5777c3ee0 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssets.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssets.js @@ -1,14 +1,17 @@ import React, { useState } from 'react'; + +import { CarouselInput, CarouselSlide } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { CarouselInput, CarouselSlide } from '@strapi/design-system'; -import getTrad from '../../../utils/getTrad'; + import { AssetDefinition } from '../../../constants'; -import { CarouselAssetActions } from './CarouselAssetActions'; -import { CarouselAsset } from './CarouselAsset'; -import { EmptyStateAsset } from './EmptyStateAsset'; +import getTrad from '../../../utils/getTrad'; import { EditAssetDialog } from '../../EditAssetDialog'; +import { CarouselAsset } from './CarouselAsset'; +import { CarouselAssetActions } from './CarouselAssetActions'; +import { EmptyStateAsset } from './EmptyStateAsset'; + export const CarouselAssets = ({ assets, disabled, diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/EmptyStateAsset.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/EmptyStateAsset.js index 3a7e3b1281..f897b0a03b 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/EmptyStateAsset.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/EmptyStateAsset.js @@ -1,12 +1,14 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { Icon, Flex, Typography } from '@strapi/design-system'; + +import { Flex, Icon, Typography } from '@strapi/design-system'; import { PicturePlus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import { AssetSource } from '../../../constants'; import getTrad from '../../../utils/getTrad'; import { rawFileToAsset } from '../../../utils/rawFileToAsset'; -import { AssetSource } from '../../../constants'; const TextAlignTypography = styled(Typography)` align-items: center; diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js index 7aa8ed4fa2..2d5cda7fcd 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { CarouselAssets } from '../CarouselAssets'; diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js index 280c59554c..7e91e6c85e 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/index.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/index.js @@ -1,15 +1,17 @@ import React, { useEffect, useState } from 'react'; + +import { useNotification } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { useNotification } from '@strapi/helper-plugin'; -import { AssetDialog } from '../AssetDialog'; import { AssetDefinition } from '../../constants'; -import { CarouselAssets } from './Carousel/CarouselAssets'; -import { EditFolderDialog } from '../EditFolderDialog'; -import { UploadAssetDialog } from '../UploadAssetDialog/UploadAssetDialog'; import getAllowedFiles from '../../utils/getAllowedFiles'; import getTrad from '../../utils/getTrad'; +import { AssetDialog } from '../AssetDialog'; +import { EditFolderDialog } from '../EditFolderDialog'; +import { UploadAssetDialog } from '../UploadAssetDialog/UploadAssetDialog'; + +import { CarouselAssets } from './Carousel/CarouselAssets'; const STEPS = { AssetSelect: 'SelectAsset', diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/tests/MediaLibraryInput.test.js b/packages/core/upload/admin/src/components/MediaLibraryInput/tests/MediaLibraryInput.test.js index f3277c6d81..7029a71a21 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/tests/MediaLibraryInput.test.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/tests/MediaLibraryInput.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClient, QueryClientProvider } from 'react-query'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { NotificationsProvider } from '@strapi/helper-plugin'; +import { render } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import { MediaLibraryInput } from '..'; import en from '../../../translations/en.json'; diff --git a/packages/core/upload/admin/src/components/PaginationFooter/index.js b/packages/core/upload/admin/src/components/PaginationFooter/index.js index 57d4a5f1a6..f99a5bf2c8 100644 --- a/packages/core/upload/admin/src/components/PaginationFooter/index.js +++ b/packages/core/upload/admin/src/components/PaginationFooter/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { Box, Flex } from '@strapi/design-system'; -import { PaginationURLQuery, PageSizeURLQuery } from '@strapi/helper-plugin'; +import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; export const PaginationFooter = ({ pagination }) => { return ( diff --git a/packages/core/upload/admin/src/components/PluginIcon/index.js b/packages/core/upload/admin/src/components/PluginIcon/index.js index 6291fda052..e0606fd781 100644 --- a/packages/core/upload/admin/src/components/PluginIcon/index.js +++ b/packages/core/upload/admin/src/components/PluginIcon/index.js @@ -5,6 +5,7 @@ */ import React from 'react'; + import { Landscape } from '@strapi/icons'; const PluginIcon = () => ; diff --git a/packages/core/upload/admin/src/components/SelectTree/Option.js b/packages/core/upload/admin/src/components/SelectTree/Option.js index 52a65e7d39..d1b7734663 100644 --- a/packages/core/upload/admin/src/components/SelectTree/Option.js +++ b/packages/core/upload/admin/src/components/SelectTree/Option.js @@ -1,12 +1,12 @@ -import PropTypes from 'prop-types'; import React from 'react'; -import { useIntl } from 'react-intl'; -import { components } from 'react-select'; -import styled from 'styled-components'; import { Flex, Icon, Typography } from '@strapi/design-system'; import { pxToRem } from '@strapi/helper-plugin'; -import { ChevronUp, ChevronDown } from '@strapi/icons'; +import { ChevronDown, ChevronUp } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { components } from 'react-select'; +import styled from 'styled-components'; const ToggleButton = styled(Flex)` align-self: flex-end; diff --git a/packages/core/upload/admin/src/components/SelectTree/SelectTree.js b/packages/core/upload/admin/src/components/SelectTree/SelectTree.js index d19fac309e..f8d8a31bd0 100644 --- a/packages/core/upload/admin/src/components/SelectTree/SelectTree.js +++ b/packages/core/upload/admin/src/components/SelectTree/SelectTree.js @@ -1,13 +1,13 @@ -import React, { useEffect, useState, useMemo } from 'react'; -import PropTypes from 'prop-types'; +import React, { useEffect, useMemo, useState } from 'react'; + /** * @note – This component is way too complex to convert to the DS version. */ // eslint-disable-next-line no-restricted-imports import { ReactSelect as Select } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import Option from './Option'; - import flattenTree from './utils/flattenTree'; import getOpenValues from './utils/getOpenValues'; import getValuesToClose from './utils/getValuesToClose'; diff --git a/packages/core/upload/admin/src/components/SelectTree/tests/SelectTree.test.js b/packages/core/upload/admin/src/components/SelectTree/tests/SelectTree.test.js index 9adf6ac1c9..324b3d5d2f 100644 --- a/packages/core/upload/admin/src/components/SelectTree/tests/SelectTree.test.js +++ b/packages/core/upload/admin/src/components/SelectTree/tests/SelectTree.test.js @@ -1,8 +1,8 @@ import React from 'react'; -import { render, act } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, render } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; import SelectTree from '../index'; diff --git a/packages/core/upload/admin/src/components/SortPicker/index.js b/packages/core/upload/admin/src/components/SortPicker/index.js index 46b7c77ec0..94fe930441 100644 --- a/packages/core/upload/admin/src/components/SortPicker/index.js +++ b/packages/core/upload/admin/src/components/SortPicker/index.js @@ -1,9 +1,11 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + +import { MenuItem, SimpleMenu } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { SimpleMenu, MenuItem } from '@strapi/design-system'; -import { getTrad } from '../../utils'; +import { useIntl } from 'react-intl'; + import { sortOptions } from '../../constants'; +import { getTrad } from '../../utils'; const SortPicker = ({ onChangeSort }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/TableList/CellContent.js b/packages/core/upload/admin/src/components/TableList/CellContent.js index 7c85b29b5f..89e6b96f0d 100644 --- a/packages/core/upload/admin/src/components/TableList/CellContent.js +++ b/packages/core/upload/admin/src/components/TableList/CellContent.js @@ -1,12 +1,14 @@ import React from 'react'; + +import { Typography } from '@strapi/design-system'; +import { getFileExtension } from '@strapi/helper-plugin'; +import parseISO from 'date-fns/parseISO'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import parseISO from 'date-fns/parseISO'; -import { getFileExtension } from '@strapi/helper-plugin'; -import { Typography } from '@strapi/design-system'; + +import { formatBytes } from '../../utils'; import { PreviewCell } from './PreviewCell'; -import { formatBytes } from '../../utils'; export const CellContent = ({ cellType, contentType, content, name }) => { const { formatDate, formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/TableList/PreviewCell.js b/packages/core/upload/admin/src/components/TableList/PreviewCell.js index 88563cfb8e..73fd50e335 100644 --- a/packages/core/upload/admin/src/components/TableList/PreviewCell.js +++ b/packages/core/upload/admin/src/components/TableList/PreviewCell.js @@ -1,9 +1,10 @@ import React from 'react'; + +import { Avatar, Box, Icon, Initials } from '@strapi/design-system'; +import { getFileExtension, prefixFileUrlWithBackendUrl, pxToRem } from '@strapi/helper-plugin'; +import { Folder } from '@strapi/icons'; import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { getFileExtension, prefixFileUrlWithBackendUrl, pxToRem } from '@strapi/helper-plugin'; -import { Avatar, Initials, Box, Icon } from '@strapi/design-system'; -import { Folder } from '@strapi/icons'; import { AssetType } from '../../constants'; import { createAssetUrl } from '../../utils'; diff --git a/packages/core/upload/admin/src/components/TableList/TableRows.js b/packages/core/upload/admin/src/components/TableList/TableRows.js index 15d1862810..6918be2adf 100644 --- a/packages/core/upload/admin/src/components/TableList/TableRows.js +++ b/packages/core/upload/admin/src/components/TableList/TableRows.js @@ -1,15 +1,17 @@ import React from 'react'; + +import { BaseCheckbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system'; +import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; +import { Eye, Pencil } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import { Link } from 'react-router-dom'; -import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; -import { BaseCheckbox, Flex, IconButton, Tbody, Td, Tr } from '@strapi/design-system'; -import { Pencil, Eye } from '@strapi/icons'; -import { CellContent } from './CellContent'; import { AssetDefinition, FolderDefinition, tableHeaders as cells } from '../../constants'; import { getTrad } from '../../utils'; +import { CellContent } from './CellContent'; + export const TableRows = ({ onChangeFolder, onEditAsset, diff --git a/packages/core/upload/admin/src/components/TableList/index.js b/packages/core/upload/admin/src/components/TableList/index.js index fefe7c93ac..b4c311da77 100644 --- a/packages/core/upload/admin/src/components/TableList/index.js +++ b/packages/core/upload/admin/src/components/TableList/index.js @@ -1,21 +1,23 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { BaseCheckbox, IconButton, Table, Th, Thead, - Tr, Tooltip, + Tr, Typography, VisuallyHidden, } from '@strapi/design-system'; import { CarretDown, CarretUp } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { AssetDefinition, FolderDefinition, tableHeaders } from '../../constants'; import { getTrad } from '../../utils'; -import { AssetDefinition, tableHeaders, FolderDefinition } from '../../constants'; + import { TableRows } from './TableRows'; export const TableList = ({ diff --git a/packages/core/upload/admin/src/components/TableList/tests/CellContent.test.js b/packages/core/upload/admin/src/components/TableList/tests/CellContent.test.js index 1f97a27860..2f11cb9bf7 100644 --- a/packages/core/upload/admin/src/components/TableList/tests/CellContent.test.js +++ b/packages/core/upload/admin/src/components/TableList/tests/CellContent.test.js @@ -1,7 +1,8 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { IntlProvider } from 'react-intl'; import { CellContent } from '../CellContent'; diff --git a/packages/core/upload/admin/src/components/TableList/tests/PreviewCell.test.js b/packages/core/upload/admin/src/components/TableList/tests/PreviewCell.test.js index b2b3186a04..96b3f662cd 100644 --- a/packages/core/upload/admin/src/components/TableList/tests/PreviewCell.test.js +++ b/packages/core/upload/admin/src/components/TableList/tests/PreviewCell.test.js @@ -1,6 +1,7 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { PreviewCell } from '../PreviewCell'; diff --git a/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js b/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js index 17a3ee5631..0b9f6a4810 100644 --- a/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js +++ b/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { MemoryRouter } from 'react-router-dom'; -import { render, fireEvent } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { TableList } from '..'; diff --git a/packages/core/upload/admin/src/components/TableList/tests/TableRows.test.js b/packages/core/upload/admin/src/components/TableList/tests/TableRows.test.js index 05d7dc3f78..489bfabd9a 100644 --- a/packages/core/upload/admin/src/components/TableList/tests/TableRows.test.js +++ b/packages/core/upload/admin/src/components/TableList/tests/TableRows.test.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { MemoryRouter } from 'react-router-dom'; -import { render, fireEvent } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { TableRows } from '../TableRows'; diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js index c417485701..07de8e114a 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/AddAssetStep.js @@ -1,21 +1,24 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { - ModalHeader, - Typography, - Divider, Box, - Tabs, + Divider, + ModalHeader, Tab, TabGroup, - TabPanels, TabPanel, + TabPanels, + Tabs, + Typography, } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { FromUrlForm } from './FromUrlForm'; -import { FromComputerForm } from './FromComputerForm'; + import getTrad from '../../../utils/getTrad'; +import { FromComputerForm } from './FromComputerForm'; +import { FromUrlForm } from './FromUrlForm'; + export const AddAssetStep = ({ onClose, onAddAsset, trackedLocation }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromComputerForm.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromComputerForm.js index 8b876c7d7a..9f5d93201e 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromComputerForm.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromComputerForm.js @@ -1,14 +1,16 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ import React, { useRef, useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Box, Flex, Typography, ModalFooter, Button } from '@strapi/design-system'; + +import { Box, Button, Flex, ModalFooter, Typography } from '@strapi/design-system'; import { useTracking } from '@strapi/helper-plugin'; import { PicturePlus } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + +import { AssetSource } from '../../../constants'; import getTrad from '../../../utils/getTrad'; import { rawFileToAsset } from '../../../utils/rawFileToAsset'; -import { AssetSource } from '../../../constants'; const Wrapper = styled(Flex)` flex-direction: column; diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js index c46e0150e9..7d5d9df1ec 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/FromUrlForm.js @@ -1,12 +1,14 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { Box, ModalFooter, Textarea, Button } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Box, Button, ModalFooter, Textarea } from '@strapi/design-system'; import { Form, useTracking } from '@strapi/helper-plugin'; import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import getTrad from '../../../utils/getTrad'; -import { urlSchema } from '../../../utils/urlYupSchema'; import { urlsToAssets } from '../../../utils/urlsToAssets'; +import { urlSchema } from '../../../utils/urlYupSchema'; export const FromUrlForm = ({ onClose, onAddAsset, trackedLocation }) => { const [loading, setLoading] = useState(false); diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/tests/FromComputerForm.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/tests/FromComputerForm.test.js index e4dd77ad14..35f8ce0f8b 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/tests/FromComputerForm.test.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/AddAssetStep/tests/FromComputerForm.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { render as renderTL } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { TrackingProvider } from '@strapi/helper-plugin'; +import { render as renderTL } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; + import { FromComputerForm } from '../FromComputerForm'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js index 429e1411d4..2c385fb819 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js @@ -1,23 +1,24 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; -import { useTracking } from '@strapi/helper-plugin'; +import React, { useRef, useState } from 'react'; + import { - ModalHeader, - ModalBody, - ModalFooter, - Typography, Button, Flex, Grid, GridItem, KeyboardNavigable, + ModalBody, + ModalFooter, + ModalHeader, + Typography, } from '@strapi/design-system'; +import { useTracking } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import { AssetDefinition } from '../../../constants'; +import getTrad from '../../../utils/getTrad'; import { AssetCard } from '../../AssetCard/AssetCard'; import { UploadingAssetCard } from '../../AssetCard/UploadingAssetCard'; -import getTrad from '../../../utils/getTrad'; -import { AssetDefinition } from '../../../constants'; const Status = { Idle: 'IDLE', diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js index b8432873e3..a67fdde22a 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js @@ -1,8 +1,10 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL } from '@testing-library/react'; -import { QueryClientProvider, QueryClient } from 'react-query'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import { PendingAssetStep } from '../PendingAssetStep'; jest.mock('../../../../utils/getTrad', () => (x) => x); diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js index d316078dfe..030369e122 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/UploadAssetDialog.js @@ -1,12 +1,14 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; + import { ModalLayout } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import { AssetDefinition } from '../../constants'; +import { EditAssetDialog } from '../EditAssetDialog'; + import { AddAssetStep } from './AddAssetStep/AddAssetStep'; import { PendingAssetStep } from './PendingAssetStep/PendingAssetStep'; -import { EditAssetDialog } from '../EditAssetDialog'; -import { AssetDefinition } from '../../constants'; const Steps = { AddAsset: 'AddAsset', diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js index d572f30318..5a743587af 100644 --- a/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js +++ b/packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js @@ -1,10 +1,13 @@ import React from 'react'; -import { render as renderTL, fireEvent, screen, waitFor, within } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { TrackingProvider } from '@strapi/helper-plugin'; +import { fireEvent, render as renderTL, screen, waitFor, within } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from 'react-query'; + import en from '../../../translations/en.json'; import { UploadAssetDialog } from '../UploadAssetDialog'; + import { server } from './server'; jest.mock('../../../utils/getTrad', () => (x) => x); diff --git a/packages/core/upload/admin/src/components/UploadProgress/index.js b/packages/core/upload/admin/src/components/UploadProgress/index.js index 8dbd24ba4f..8817e7487a 100644 --- a/packages/core/upload/admin/src/components/UploadProgress/index.js +++ b/packages/core/upload/admin/src/components/UploadProgress/index.js @@ -1,9 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; + +import { Flex, ProgressBar, Typography } from '@strapi/design-system'; import { Cross } from '@strapi/icons'; -import { Typography, Flex, ProgressBar } from '@strapi/design-system'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; +import styled from 'styled-components'; const BoxWrapper = styled(Flex)` border-radius: ${({ theme }) => `${theme.borderRadius} ${theme.borderRadius} 0 0`}; diff --git a/packages/core/upload/admin/src/components/UploadProgress/tests/index.test.js b/packages/core/upload/admin/src/components/UploadProgress/tests/index.test.js index 88706cc9c0..c7b402a482 100644 --- a/packages/core/upload/admin/src/components/UploadProgress/tests/index.test.js +++ b/packages/core/upload/admin/src/components/UploadProgress/tests/index.test.js @@ -5,10 +5,12 @@ */ import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; + import { UploadProgress } from '..'; import en from '../../../translations/en.json'; diff --git a/packages/core/upload/admin/src/constants.js b/packages/core/upload/admin/src/constants.js index d751aedbb1..d281ac9a74 100644 --- a/packages/core/upload/admin/src/constants.js +++ b/packages/core/upload/admin/src/constants.js @@ -1,4 +1,5 @@ import PropTypes from 'prop-types'; + import { getTrad } from './utils'; export const AssetType = { diff --git a/packages/core/upload/admin/src/hooks/tests/useAssets.test.js b/packages/core/upload/admin/src/hooks/tests/useAssets.test.js index c592a9017b..0096235e2f 100644 --- a/packages/core/upload/admin/src/hooks/tests/useAssets.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useAssets.test.js @@ -1,13 +1,13 @@ import React from 'react'; + +import { lightTheme, ThemeProvider, useNotifyAT } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { stringify } from 'qs'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme, useNotifyAT } from '@strapi/design-system'; - import { useAssets } from '../useAssets'; const notifyStatusMock = jest.fn(); diff --git a/packages/core/upload/admin/src/hooks/tests/useBulkMove.test.js b/packages/core/upload/admin/src/hooks/tests/useBulkMove.test.js index aaf3d1e1b5..9d5bbda8b0 100644 --- a/packages/core/upload/admin/src/hooks/tests/useBulkMove.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useBulkMove.test.js @@ -1,12 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient, useQueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider, useQueryClient } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { useBulkMove } from '../useBulkMove'; const FIXTURE_ASSETS = [ diff --git a/packages/core/upload/admin/src/hooks/tests/useBulkRemove.test.js b/packages/core/upload/admin/src/hooks/tests/useBulkRemove.test.js index 25011a6a64..cba73abe9f 100644 --- a/packages/core/upload/admin/src/hooks/tests/useBulkRemove.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useBulkRemove.test.js @@ -1,12 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient, useQueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider, useQueryClient } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { useBulkRemove } from '../useBulkRemove'; const FIXTURE_ASSETS = [ diff --git a/packages/core/upload/admin/src/hooks/tests/useConfig.test.js b/packages/core/upload/admin/src/hooks/tests/useConfig.test.js index 13fbef430e..feda81ee0c 100644 --- a/packages/core/upload/admin/src/hooks/tests/useConfig.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useConfig.test.js @@ -1,15 +1,15 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient, useQueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider, useQueryClient } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { sortOptions, pageSizes } from '../../constants'; -import { useConfig } from '../useConfig'; +import { pageSizes, sortOptions } from '../../constants'; import pluginId from '../../pluginId'; +import { useConfig } from '../useConfig'; const mockGetResponse = { data: { diff --git a/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js b/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js index 694dc7191e..d08514be85 100644 --- a/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useEditFolder.test.js @@ -1,12 +1,12 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient, useQueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider, useQueryClient } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; - -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { useEditFolder } from '../useEditFolder'; const FOLDER_CREATE_FIXTURE = { diff --git a/packages/core/upload/admin/src/hooks/tests/useFolder.test.js b/packages/core/upload/admin/src/hooks/tests/useFolder.test.js index f31f0c305d..449a927656 100644 --- a/packages/core/upload/admin/src/hooks/tests/useFolder.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useFolder.test.js @@ -1,11 +1,11 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; -import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; -import { useNotifyAT, ThemeProvider, lightTheme } from '@strapi/design-system'; +import { lightTheme, ThemeProvider, useNotifyAT } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { BrowserRouter as Router, Route } from 'react-router-dom'; import { useFolder } from '../useFolder'; diff --git a/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js b/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js index a79882b632..2f540076b1 100644 --- a/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useFolderStructure.test.js @@ -1,9 +1,9 @@ import React from 'react'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; -import { IntlProvider } from 'react-intl'; import { useFetchClient } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { useFolderStructure } from '../useFolderStructure'; diff --git a/packages/core/upload/admin/src/hooks/tests/useFolders.test.js b/packages/core/upload/admin/src/hooks/tests/useFolders.test.js index c592e6dcc8..3cb4b1e8d1 100644 --- a/packages/core/upload/admin/src/hooks/tests/useFolders.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useFolders.test.js @@ -1,13 +1,13 @@ import React from 'react'; + +import { lightTheme, ThemeProvider, useNotifyAT } from '@strapi/design-system'; +import { NotificationsProvider, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { stringify } from 'qs'; import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { BrowserRouter as Router, Route } from 'react-router-dom'; -import { NotificationsProvider, useNotification, useFetchClient } from '@strapi/helper-plugin'; -import { useNotifyAT, ThemeProvider, lightTheme } from '@strapi/design-system'; - import { useFolders } from '../useFolders'; const notifyStatusMock = jest.fn(); diff --git a/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js b/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js index 79db1d308b..03dcc22b9b 100644 --- a/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js @@ -1,10 +1,11 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { renderHook, act } from '@testing-library/react'; -import { BrowserRouter as Router, Route } from 'react-router-dom'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { NotificationsProvider } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { act, renderHook } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { BrowserRouter as Router, Route } from 'react-router-dom'; import useModalQueryParams from '../useModalQueryParams'; diff --git a/packages/core/upload/admin/src/hooks/tests/useRemoveAsset.test.js b/packages/core/upload/admin/src/hooks/tests/useRemoveAsset.test.js index d0072540cb..f6661da686 100644 --- a/packages/core/upload/admin/src/hooks/tests/useRemoveAsset.test.js +++ b/packages/core/upload/admin/src/hooks/tests/useRemoveAsset.test.js @@ -1,12 +1,12 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { QueryClientProvider, QueryClient, useQueryClient } from 'react-query'; -import { renderHook, act, waitFor } from '@testing-library/react'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { NotificationsProvider, useNotification } from '@strapi/helper-plugin'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { deleteRequest } from '../../utils/deleteRequest'; +import { act, renderHook, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider, useQueryClient } from 'react-query'; +import { deleteRequest } from '../../utils/deleteRequest'; import { useRemoveAsset } from '../useRemoveAsset'; const ASSET_FIXTURE = { diff --git a/packages/core/upload/admin/src/hooks/useAssets.js b/packages/core/upload/admin/src/hooks/useAssets.js index a41feeeaa2..dd42149b54 100644 --- a/packages/core/upload/admin/src/hooks/useAssets.js +++ b/packages/core/upload/admin/src/hooks/useAssets.js @@ -1,8 +1,8 @@ -import { stringify } from 'qs'; -import { useQuery } from 'react-query'; import { useNotifyAT } from '@strapi/design-system'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { stringify } from 'qs'; import { useIntl } from 'react-intl'; +import { useQuery } from 'react-query'; import pluginId from '../pluginId'; import { getRequestUrl } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useBulkMove.js b/packages/core/upload/admin/src/hooks/useBulkMove.js index 6958bd27ff..228ec13c41 100644 --- a/packages/core/upload/admin/src/hooks/useBulkMove.js +++ b/packages/core/upload/admin/src/hooks/useBulkMove.js @@ -1,5 +1,5 @@ +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useMutation, useQueryClient } from 'react-query'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; import pluginId from '../pluginId'; import { getRequestUrl, getTrad } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useBulkRemove.js b/packages/core/upload/admin/src/hooks/useBulkRemove.js index 3f099223eb..ae2038dcf4 100644 --- a/packages/core/upload/admin/src/hooks/useBulkRemove.js +++ b/packages/core/upload/admin/src/hooks/useBulkRemove.js @@ -1,5 +1,5 @@ +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useMutation, useQueryClient } from 'react-query'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; import pluginId from '../pluginId'; import { getRequestUrl, getTrad } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useConfig.js b/packages/core/upload/admin/src/hooks/useConfig.js index b470917028..858e762b83 100644 --- a/packages/core/upload/admin/src/hooks/useConfig.js +++ b/packages/core/upload/admin/src/hooks/useConfig.js @@ -1,5 +1,5 @@ +import { useFetchClient, useNotification, useTracking } from '@strapi/helper-plugin'; import { useMutation, useQuery, useQueryClient } from 'react-query'; -import { useNotification, useTracking, useFetchClient } from '@strapi/helper-plugin'; import pluginId from '../pluginId'; diff --git a/packages/core/upload/admin/src/hooks/useCropImg.js b/packages/core/upload/admin/src/hooks/useCropImg.js index 1531830317..53613908de 100644 --- a/packages/core/upload/admin/src/hooks/useCropImg.js +++ b/packages/core/upload/admin/src/hooks/useCropImg.js @@ -1,5 +1,6 @@ +import { useEffect, useRef, useState } from 'react'; + import Cropper from 'cropperjs'; -import { useRef, useEffect, useState } from 'react'; const QUALITY = 1; diff --git a/packages/core/upload/admin/src/hooks/useEditAsset.js b/packages/core/upload/admin/src/hooks/useEditAsset.js index e1f3efc13e..ef36694975 100644 --- a/packages/core/upload/admin/src/hooks/useEditAsset.js +++ b/packages/core/upload/admin/src/hooks/useEditAsset.js @@ -1,11 +1,12 @@ -import axios from 'axios'; import { useRef, useState } from 'react'; -import { useMutation, useQueryClient } from 'react-query'; -import { useIntl } from 'react-intl'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; -import { getTrad } from '../utils'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; +import axios from 'axios'; +import { useIntl } from 'react-intl'; +import { useMutation, useQueryClient } from 'react-query'; + import pluginId from '../pluginId'; +import { getTrad } from '../utils'; const editAssetRequest = (asset, file, cancelToken, onProgress, post) => { const endpoint = `/${pluginId}?id=${asset.id}`; diff --git a/packages/core/upload/admin/src/hooks/useEditFolder.js b/packages/core/upload/admin/src/hooks/useEditFolder.js index 661496df9b..25c4ad40e7 100644 --- a/packages/core/upload/admin/src/hooks/useEditFolder.js +++ b/packages/core/upload/admin/src/hooks/useEditFolder.js @@ -1,5 +1,5 @@ -import { useMutation, useQueryClient } from 'react-query'; import { useFetchClient } from '@strapi/helper-plugin'; +import { useMutation, useQueryClient } from 'react-query'; import pluginId from '../pluginId'; import { getRequestUrl } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useFolder.js b/packages/core/upload/admin/src/hooks/useFolder.js index 916a3dc774..d522b4a4f3 100644 --- a/packages/core/upload/admin/src/hooks/useFolder.js +++ b/packages/core/upload/admin/src/hooks/useFolder.js @@ -1,5 +1,5 @@ +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useQuery } from 'react-query'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; import pluginId from '../pluginId'; import { getRequestUrl, getTrad } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useFolderStructure.js b/packages/core/upload/admin/src/hooks/useFolderStructure.js index 197fc7c101..2237a97a23 100644 --- a/packages/core/upload/admin/src/hooks/useFolderStructure.js +++ b/packages/core/upload/admin/src/hooks/useFolderStructure.js @@ -1,8 +1,10 @@ -import { useQuery } from 'react-query'; -import { useIntl } from 'react-intl'; import { useFetchClient } from '@strapi/helper-plugin'; +import { useIntl } from 'react-intl'; +import { useQuery } from 'react-query'; + import pluginId from '../pluginId'; import { getRequestUrl, getTrad } from '../utils'; + import { recursiveRenameKeys } from './utils/rename-keys'; const FIELD_MAPPING = { diff --git a/packages/core/upload/admin/src/hooks/useFolders.js b/packages/core/upload/admin/src/hooks/useFolders.js index db73a2021f..f3bc994b84 100644 --- a/packages/core/upload/admin/src/hooks/useFolders.js +++ b/packages/core/upload/admin/src/hooks/useFolders.js @@ -1,8 +1,8 @@ -import { stringify } from 'qs'; -import { useQuery } from 'react-query'; import { useNotifyAT } from '@strapi/design-system'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { stringify } from 'qs'; import { useIntl } from 'react-intl'; +import { useQuery } from 'react-query'; import pluginId from '../pluginId'; import { getRequestUrl } from '../utils'; diff --git a/packages/core/upload/admin/src/hooks/useMediaLibraryPermissions.js b/packages/core/upload/admin/src/hooks/useMediaLibraryPermissions.js index 6797416293..8a3acb2e24 100644 --- a/packages/core/upload/admin/src/hooks/useMediaLibraryPermissions.js +++ b/packages/core/upload/admin/src/hooks/useMediaLibraryPermissions.js @@ -1,6 +1,8 @@ import { useMemo } from 'react'; + import { useRBAC } from '@strapi/helper-plugin'; import omit from 'lodash/omit'; + import pluginPermissions from '../permissions'; export const useMediaLibraryPermissions = () => { diff --git a/packages/core/upload/admin/src/hooks/useModalQueryParams.js b/packages/core/upload/admin/src/hooks/useModalQueryParams.js index fab8f84947..d7b7f03ab5 100644 --- a/packages/core/upload/admin/src/hooks/useModalQueryParams.js +++ b/packages/core/upload/admin/src/hooks/useModalQueryParams.js @@ -1,7 +1,8 @@ -import { useState, useEffect } from 'react'; -import { useTracking } from '@strapi/helper-plugin'; +import { useEffect, useState } from 'react'; +import { useTracking } from '@strapi/helper-plugin'; import { stringify } from 'qs'; + import { useConfig } from './useConfig'; const useModalQueryParams = (initialState) => { diff --git a/packages/core/upload/admin/src/hooks/useRemoveAsset.js b/packages/core/upload/admin/src/hooks/useRemoveAsset.js index cb8395784a..8b2041a2cf 100644 --- a/packages/core/upload/admin/src/hooks/useRemoveAsset.js +++ b/packages/core/upload/admin/src/hooks/useRemoveAsset.js @@ -1,8 +1,8 @@ -import { useMutation, useQueryClient } from 'react-query'; import { useNotification } from '@strapi/helper-plugin'; +import { useMutation, useQueryClient } from 'react-query'; -import { deleteRequest } from '../utils/deleteRequest'; import pluginId from '../pluginId'; +import { deleteRequest } from '../utils/deleteRequest'; export const useRemoveAsset = (onSuccess) => { const toggleNotification = useNotification(); diff --git a/packages/core/upload/admin/src/hooks/useUpload.js b/packages/core/upload/admin/src/hooks/useUpload.js index 8efd04ff17..65017251bc 100644 --- a/packages/core/upload/admin/src/hooks/useUpload.js +++ b/packages/core/upload/admin/src/hooks/useUpload.js @@ -1,11 +1,12 @@ -import axios from 'axios'; import { useRef, useState } from 'react'; -import { useMutation, useQueryClient } from 'react-query'; -import { useIntl } from 'react-intl'; -import { useFetchClient } from '@strapi/helper-plugin'; -import { getTrad } from '../utils'; +import { useFetchClient } from '@strapi/helper-plugin'; +import axios from 'axios'; +import { useIntl } from 'react-intl'; +import { useMutation, useQueryClient } from 'react-query'; + import pluginId from '../pluginId'; +import { getTrad } from '../utils'; const endpoint = `/${pluginId}`; diff --git a/packages/core/upload/admin/src/index.js b/packages/core/upload/admin/src/index.js index 768c3c49a9..38de6efbb3 100644 --- a/packages/core/upload/admin/src/index.js +++ b/packages/core/upload/admin/src/index.js @@ -5,11 +5,13 @@ // Also the strapi-generate-plugins/files/admin/src/index.js needs to be updated // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + +import { MediaLibraryDialog } from './components/MediaLibraryDialog'; +import { MediaLibraryInput } from './components/MediaLibraryInput'; import PluginIcon from './components/PluginIcon'; import pluginPermissions from './permissions'; -import { MediaLibraryInput } from './components/MediaLibraryInput'; -import { MediaLibraryDialog } from './components/MediaLibraryDialog'; import pluginId from './pluginId'; import getTrad from './utils/getTrad'; diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/Settings.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/Settings.js index edee743356..12cefe16c0 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/Settings.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/Settings.js @@ -1,9 +1,11 @@ import React from 'react'; + +import { Box, Grid, GridItem, Option, Select } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Grid, GridItem, Box, Select, Option } from '@strapi/design-system'; -import getTrad from '../../../../utils/getTrad'; + import { pageSizes, sortOptions } from '../../../../constants'; +import getTrad from '../../../../utils/getTrad'; const Settings = ({ sort = '', pageSize = 10, onChange }) => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/Settings.test.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/Settings.test.js index 4a7b989284..84a5d48ee4 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/Settings.test.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/Settings.test.js @@ -1,13 +1,14 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider } from '@strapi/helper-plugin'; import { render as renderRTL } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { TrackingProvider } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; import { IntlProvider } from 'react-intl'; +import { MemoryRouter } from 'react-router-dom'; -import { Settings } from '../Settings'; import { pageSizes, sortOptions } from '../../../../../constants'; +import { Settings } from '../Settings'; const testPageSize = pageSizes[0]; const testSort = sortOptions[0].value; diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/index.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/index.js index 071640c1b8..b204b44d07 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/index.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/index.js @@ -1,26 +1,26 @@ -import React, { useState, useReducer } from 'react'; -import { useIntl } from 'react-intl'; -import isEqual from 'lodash/isEqual'; -import PropTypes from 'prop-types'; +import React, { useReducer, useState } from 'react'; -import { Layout, HeaderLayout, ContentLayout, Button, Main } from '@strapi/design-system'; +import { Button, ContentLayout, HeaderLayout, Layout, Main } from '@strapi/design-system'; import { - useNotification, ConfirmDialog, Link, - useTracking, useFocusWhenNavigate, + useNotification, + useTracking, } from '@strapi/helper-plugin'; -import { Check, ArrowLeft } from '@strapi/icons'; -import { Settings } from './components/Settings'; - -import reducer from './state/reducer'; -import { init, initialState } from './state/init'; -import { onChange, setLoaded } from './state/actions'; +import { ArrowLeft, Check } from '@strapi/icons'; +import isEqual from 'lodash/isEqual'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useConfig } from '../../../hooks/useConfig'; import pluginID from '../../../pluginId'; import getTrad from '../../../utils/getTrad'; -import { useConfig } from '../../../hooks/useConfig'; + +import { Settings } from './components/Settings'; +import { onChange, setLoaded } from './state/actions'; +import { init, initialState } from './state/init'; +import reducer from './state/reducer'; const ConfigureTheView = ({ config }) => { const { trackUsage } = useTracking(); diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/actions.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/actions.js index a3f008a649..bb85d9f24b 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/actions.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/actions.js @@ -1,4 +1,4 @@ -import { SET_LOADED, ON_CHANGE } from './actionTypes'; +import { ON_CHANGE, SET_LOADED } from './actionTypes'; export const onChange = ({ name, value }) => ({ type: ON_CHANGE, diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/reducer.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/reducer.js index 2de14d76b1..33758f14af 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/reducer.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/reducer.js @@ -1,6 +1,7 @@ import produce from 'immer'; // current -import set from 'lodash/set'; import get from 'lodash/get'; +import set from 'lodash/set'; + import { ON_CHANGE, SET_LOADED } from './actionTypes'; import { init, initialState } from './init'; diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/tests/reducer.test.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/tests/reducer.test.js index ff98a83bbd..abb6bb191d 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/tests/reducer.test.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/state/tests/reducer.test.js @@ -1,5 +1,5 @@ -import reducer from '../reducer'; import { ON_CHANGE, SET_LOADED } from '../actionTypes'; +import reducer from '../reducer'; describe('Upload | ConfigureTheView | reducer', () => { let state; diff --git a/packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/ConfigureTheView.test.js b/packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/ConfigureTheView.test.js index a8a816a847..1f134003f6 100644 --- a/packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/ConfigureTheView.test.js +++ b/packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/ConfigureTheView.test.js @@ -1,12 +1,14 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { render as renderRTL, waitFor, fireEvent } from '@testing-library/react'; -import userEvent from '@testing-library/user-event'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { TrackingProvider } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; +import { fireEvent, render as renderRTL, waitFor } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; import { IntlProvider } from 'react-intl'; +import { MemoryRouter } from 'react-router-dom'; + import ConfigureTheView from '..'; -import { sortOptions, pageSizes } from '../../../../constants'; +import { pageSizes, sortOptions } from '../../../../constants'; const mutateAsync = jest.fn(); jest.mock('../../../../hooks/useConfig', () => ({ diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkActions.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkActions.js index cb3f441a0f..58ebb7a94a 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkActions.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkActions.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Flex, Typography } from '@strapi/design-system'; import { AssetDefinition, FolderDefinition } from '../../../../constants'; import getTrad from '../../../../utils/getTrad'; + import { BulkDeleteButton } from './BulkDeleteButton'; import { BulkMoveButton } from './BulkMoveButton'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkDeleteButton.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkDeleteButton.js index 43555811de..2a793ebd5d 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkDeleteButton.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkDeleteButton.js @@ -1,9 +1,10 @@ import React, { useState } from 'react'; + +import { Button } from '@strapi/design-system'; +import { ConfirmDialog } from '@strapi/helper-plugin'; +import { Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button } from '@strapi/design-system'; -import { Trash } from '@strapi/icons'; -import { ConfirmDialog } from '@strapi/helper-plugin'; import { AssetDefinition, FolderDefinition } from '../../../../constants'; import { useBulkRemove } from '../../../../hooks/useBulkRemove'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkMoveButton.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkMoveButton.js index 05f5d2561b..1acf538b87 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkMoveButton.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/BulkMoveButton.js @@ -1,8 +1,9 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Button } from '@strapi/design-system'; import { Folder } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { BulkMoveDialog } from '../../../../components/BulkMoveDialog'; import { AssetDefinition, FolderDefinition } from '../../../../constants'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/EmptyOrNoPermissions.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/EmptyOrNoPermissions.js index 8841974bde..1a7dac251d 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/EmptyOrNoPermissions.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/EmptyOrNoPermissions.js @@ -1,9 +1,9 @@ -import PropTypes from 'prop-types'; import React from 'react'; -import { useIntl } from 'react-intl'; import { Button } from '@strapi/design-system'; import { EmptyPermissions, Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { EmptyAssets } from '../../../../components/EmptyAssets'; import { getTrad } from '../../../../utils'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Filters.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Filters.js index 010ba079f5..9bcb87f9f5 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Filters.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Filters.js @@ -1,8 +1,10 @@ -import React, { useState, useRef } from 'react'; +import React, { useRef, useState } from 'react'; + import { Button } from '@strapi/design-system'; import { useQueryParams, useTracking } from '@strapi/helper-plugin'; import { Filter } from '@strapi/icons'; import { useIntl } from 'react-intl'; + import FilterList from '../../../../components/FilterList'; import FilterPopover from '../../../../components/FilterPopover'; import displayedFilters from '../../../../utils/displayedFilters'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Header.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Header.js index 7e82815b09..e54b1f920d 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Header.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/Header.js @@ -1,14 +1,16 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { stringify } from 'qs'; -import { useLocation } from 'react-router-dom'; + +import { Button, Flex, HeaderLayout, Link } from '@strapi/design-system'; import { useQueryParams } from '@strapi/helper-plugin'; -import { HeaderLayout, Button, Flex, Link } from '@strapi/design-system'; import { ArrowLeft, Plus } from '@strapi/icons'; -import { getTrad } from '../../../../utils'; -import { FolderDefinition, BreadcrumbsDefinition } from '../../../../constants'; +import PropTypes from 'prop-types'; +import { stringify } from 'qs'; +import { useIntl } from 'react-intl'; +import { useLocation } from 'react-router-dom'; + import { Breadcrumbs } from '../../../../components/Breadcrumbs'; +import { BreadcrumbsDefinition, FolderDefinition } from '../../../../constants'; +import { getTrad } from '../../../../utils'; export const Header = ({ breadcrumbs, diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkActions.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkActions.test.js index 6e0ac2d54b..caf4ed931e 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkActions.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkActions.test.js @@ -1,9 +1,10 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; import { BulkActions } from '../BulkActions'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkDeleteButton.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkDeleteButton.test.js index 08c70b0da4..b3e4d1ab3e 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkDeleteButton.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkDeleteButton.test.js @@ -1,12 +1,13 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { render, fireEvent, waitFor, act } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import { BulkDeleteButton } from '../BulkDeleteButton'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, fireEvent, render, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; + import { useBulkRemove } from '../../../../../hooks/useBulkRemove'; +import { BulkDeleteButton } from '../BulkDeleteButton'; jest.mock('../../../../../hooks/useBulkRemove'); diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkMoveButton.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkMoveButton.test.js index dcf82171fd..c2ef3c260c 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkMoveButton.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/BulkMoveButton.test.js @@ -1,13 +1,14 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { render, fireEvent, waitFor, act, screen } from '@testing-library/react'; -import { within } from '@testing-library/dom'; -import { MemoryRouter } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import { BulkMoveButton } from '../BulkMoveButton'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { within } from '@testing-library/dom'; +import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; + import { useBulkMove } from '../../../../../hooks/useBulkMove'; +import { BulkMoveButton } from '../BulkMoveButton'; jest.mock('../../../../../hooks/useBulkMove'); jest.mock('../../../../../hooks/useFolderStructure'); diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/EmptyOrNoPermissions.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/EmptyOrNoPermissions.test.js index 90f98bd53f..4f3fc6e9e7 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/EmptyOrNoPermissions.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/EmptyOrNoPermissions.test.js @@ -1,5 +1,6 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/Header.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/Header.test.js index 87982ee971..1ed1291caf 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/Header.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/components/tests/Header.test.js @@ -1,10 +1,11 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { render } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { useQueryParams } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; +import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; import { Header } from '../Header'; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js index 2abdefac16..857ecd6d00 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/index.js @@ -1,61 +1,62 @@ -import React, { useState, useRef } from 'react'; -import { useIntl } from 'react-intl'; -import styled from 'styled-components'; -import { useHistory, useLocation, Link as ReactRouterLink } from 'react-router-dom'; -import { stringify } from 'qs'; +import React, { useRef, useState } from 'react'; + import { - LoadingIndicatorPage, - useFocusWhenNavigate, - AnErrorOccurred, - SearchURLQuery, - useSelectionState, - useQueryParams, - useTracking, - CheckPermissions, - usePersistentState, -} from '@strapi/helper-plugin'; -import { - Layout, - ContentLayout, ActionLayout, - Main, - Box, - Divider, BaseCheckbox, - IconButton, - Typography, - GridItem, + Box, + ContentLayout, + Divider, Flex, + GridItem, + IconButton, + Layout, + Main, + Typography, VisuallyHidden, } from '@strapi/design-system'; -import { Pencil, Cog, Grid, List } from '@strapi/icons'; +import { + AnErrorOccurred, + CheckPermissions, + LoadingIndicatorPage, + SearchURLQuery, + useFocusWhenNavigate, + usePersistentState, + useQueryParams, + useSelectionState, + useTracking, +} from '@strapi/helper-plugin'; +import { Cog, Grid, List, Pencil } from '@strapi/icons'; +import { stringify } from 'qs'; +import { useIntl } from 'react-intl'; +import { Link as ReactRouterLink, useHistory, useLocation } from 'react-router-dom'; +import styled from 'styled-components'; -import { UploadAssetDialog } from '../../../components/UploadAssetDialog/UploadAssetDialog'; -import { EditFolderDialog } from '../../../components/EditFolderDialog'; -import { EditAssetDialog } from '../../../components/EditAssetDialog'; import { AssetGridList } from '../../../components/AssetGridList'; -import { FolderGridList } from '../../../components/FolderGridList'; -import { TableList } from '../../../components/TableList'; -import SortPicker from '../../../components/SortPicker'; -import { PaginationFooter } from '../../../components/PaginationFooter'; -import { BulkActions } from './components/BulkActions'; -import { EmptyOrNoPermissions } from './components/EmptyOrNoPermissions'; +import { EditAssetDialog } from '../../../components/EditAssetDialog'; +import { EditFolderDialog } from '../../../components/EditFolderDialog'; import { FolderCard, FolderCardBody, - FolderCardCheckbox, FolderCardBodyAction, + FolderCardCheckbox, } from '../../../components/FolderCard'; -import { Filters } from './components/Filters'; -import { Header } from './components/Header'; - +import { FolderGridList } from '../../../components/FolderGridList'; +import { PaginationFooter } from '../../../components/PaginationFooter'; +import SortPicker from '../../../components/SortPicker'; +import { TableList } from '../../../components/TableList'; +import { UploadAssetDialog } from '../../../components/UploadAssetDialog/UploadAssetDialog'; +import { localStorageKeys, viewOptions } from '../../../constants'; import { useAssets } from '../../../hooks/useAssets'; +import { useFolder } from '../../../hooks/useFolder'; import { useFolders } from '../../../hooks/useFolders'; import { useMediaLibraryPermissions } from '../../../hooks/useMediaLibraryPermissions'; -import { useFolder } from '../../../hooks/useFolder'; -import { getTrad, containsAssetFilter, getBreadcrumbDataML, getFolderURL } from '../../../utils'; import pluginPermissions from '../../../permissions'; -import { localStorageKeys, viewOptions } from '../../../constants'; +import { containsAssetFilter, getBreadcrumbDataML, getFolderURL, getTrad } from '../../../utils'; + +import { BulkActions } from './components/BulkActions'; +import { EmptyOrNoPermissions } from './components/EmptyOrNoPermissions'; +import { Filters } from './components/Filters'; +import { Header } from './components/Header'; const BoxWithHeight = styled(Box)` height: ${32 / 16}rem; diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary/tests/MediaLibrary.test.js b/packages/core/upload/admin/src/pages/App/MediaLibrary/tests/MediaLibrary.test.js index d91b116d7a..4d44d793c6 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary/tests/MediaLibrary.test.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary/tests/MediaLibrary.test.js @@ -1,22 +1,23 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { render as renderTL, screen, waitFor, fireEvent } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { - useSelectionState, - useQueryParams, TrackingProvider, usePersistentState, + useQueryParams, + useSelectionState, } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; +import { fireEvent, render as renderTL, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; -import { useMediaLibraryPermissions } from '../../../../hooks/useMediaLibraryPermissions'; -import { useFolders } from '../../../../hooks/useFolders'; -import { useAssets } from '../../../../hooks/useAssets'; -import { useFolder } from '../../../../hooks/useFolder'; import { MediaLibrary } from '..'; import { viewOptions } from '../../../../constants'; +import { useAssets } from '../../../../hooks/useAssets'; +import { useFolder } from '../../../../hooks/useFolder'; +import { useFolders } from '../../../../hooks/useFolders'; +import { useMediaLibraryPermissions } from '../../../../hooks/useMediaLibraryPermissions'; const FIXTURE_ASSET_PAGINATION = { pageCount: 1, diff --git a/packages/core/upload/admin/src/pages/App/components/BulkActions.js b/packages/core/upload/admin/src/pages/App/components/BulkActions.js index eb23b50080..adc8633c17 100644 --- a/packages/core/upload/admin/src/pages/App/components/BulkActions.js +++ b/packages/core/upload/admin/src/pages/App/components/BulkActions.js @@ -1,10 +1,12 @@ import React from 'react'; + +import { Flex, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Flex, Typography } from '@strapi/design-system'; import { AssetDefinition, FolderDefinition } from '../../../constants'; import getTrad from '../../../utils/getTrad'; + import { BulkDeleteButton } from './BulkDeleteButton'; import { BulkMoveButton } from './BulkMoveButton'; diff --git a/packages/core/upload/admin/src/pages/App/components/BulkDeleteButton.js b/packages/core/upload/admin/src/pages/App/components/BulkDeleteButton.js index efb1d6c685..863dc90493 100644 --- a/packages/core/upload/admin/src/pages/App/components/BulkDeleteButton.js +++ b/packages/core/upload/admin/src/pages/App/components/BulkDeleteButton.js @@ -1,9 +1,10 @@ import React, { useState } from 'react'; + +import { Button } from '@strapi/design-system'; +import { ConfirmDialog } from '@strapi/helper-plugin'; +import { Trash } from '@strapi/icons'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { Button } from '@strapi/design-system'; -import { Trash } from '@strapi/icons'; -import { ConfirmDialog } from '@strapi/helper-plugin'; import { AssetDefinition, FolderDefinition } from '../../../constants'; import { useBulkRemove } from '../../../hooks/useBulkRemove'; diff --git a/packages/core/upload/admin/src/pages/App/components/BulkMoveButton.js b/packages/core/upload/admin/src/pages/App/components/BulkMoveButton.js index 16cbb6937a..c240746da6 100644 --- a/packages/core/upload/admin/src/pages/App/components/BulkMoveButton.js +++ b/packages/core/upload/admin/src/pages/App/components/BulkMoveButton.js @@ -1,8 +1,9 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { Button } from '@strapi/design-system'; import { Folder } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { BulkMoveDialog } from '../../../components/BulkMoveDialog'; import { AssetDefinition, FolderDefinition } from '../../../constants'; diff --git a/packages/core/upload/admin/src/pages/App/components/EmptyOrNoPermissions.js b/packages/core/upload/admin/src/pages/App/components/EmptyOrNoPermissions.js index 73984971db..217af57655 100644 --- a/packages/core/upload/admin/src/pages/App/components/EmptyOrNoPermissions.js +++ b/packages/core/upload/admin/src/pages/App/components/EmptyOrNoPermissions.js @@ -1,9 +1,9 @@ -import PropTypes from 'prop-types'; import React from 'react'; -import { useIntl } from 'react-intl'; import { Button } from '@strapi/design-system'; import { EmptyPermissions, Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; import { EmptyAssets } from '../../../components/EmptyAssets'; import { getTrad } from '../../../utils'; diff --git a/packages/core/upload/admin/src/pages/App/components/Filters.js b/packages/core/upload/admin/src/pages/App/components/Filters.js index de67cd865c..d88e51312c 100644 --- a/packages/core/upload/admin/src/pages/App/components/Filters.js +++ b/packages/core/upload/admin/src/pages/App/components/Filters.js @@ -1,8 +1,10 @@ -import React, { useState, useRef } from 'react'; +import React, { useRef, useState } from 'react'; + import { Button } from '@strapi/design-system'; import { useQueryParams, useTracking } from '@strapi/helper-plugin'; import { Filter } from '@strapi/icons'; import { useIntl } from 'react-intl'; + import FilterList from '../../../components/FilterList'; import FilterPopover from '../../../components/FilterPopover'; import displayedFilters from '../../../utils/displayedFilters'; diff --git a/packages/core/upload/admin/src/pages/App/components/Header.js b/packages/core/upload/admin/src/pages/App/components/Header.js index c631f2f043..b4c04aa30e 100644 --- a/packages/core/upload/admin/src/pages/App/components/Header.js +++ b/packages/core/upload/admin/src/pages/App/components/Header.js @@ -1,14 +1,16 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { stringify } from 'qs'; -import { useLocation } from 'react-router-dom'; + +import { Button, Flex, HeaderLayout, Link } from '@strapi/design-system'; import { useQueryParams } from '@strapi/helper-plugin'; -import { HeaderLayout, Button, Flex, Link } from '@strapi/design-system'; import { ArrowLeft, Plus } from '@strapi/icons'; -import { getTrad } from '../../../utils'; -import { FolderDefinition, BreadcrumbsDefinition } from '../../../constants'; +import PropTypes from 'prop-types'; +import { stringify } from 'qs'; +import { useIntl } from 'react-intl'; +import { useLocation } from 'react-router-dom'; + import { Breadcrumbs } from '../../../components/Breadcrumbs'; +import { BreadcrumbsDefinition, FolderDefinition } from '../../../constants'; +import { getTrad } from '../../../utils'; export const Header = ({ breadcrumbs, diff --git a/packages/core/upload/admin/src/pages/App/components/tests/EmptyOrNoPermissions.test.js b/packages/core/upload/admin/src/pages/App/components/tests/EmptyOrNoPermissions.test.js index 90f98bd53f..4f3fc6e9e7 100644 --- a/packages/core/upload/admin/src/pages/App/components/tests/EmptyOrNoPermissions.test.js +++ b/packages/core/upload/admin/src/pages/App/components/tests/EmptyOrNoPermissions.test.js @@ -1,5 +1,6 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; diff --git a/packages/core/upload/admin/src/pages/App/index.js b/packages/core/upload/admin/src/pages/App/index.js index 9c2484c24e..662b42b28b 100644 --- a/packages/core/upload/admin/src/pages/App/index.js +++ b/packages/core/upload/admin/src/pages/App/index.js @@ -1,14 +1,16 @@ -import React, { useEffect, Suspense, lazy } from 'react'; -import { Switch, Route } from 'react-router-dom'; -import { useIntl } from 'react-intl'; -import { Helmet } from 'react-helmet'; -import { LoadingIndicatorPage, useQueryParams, useFocusWhenNavigate } from '@strapi/helper-plugin'; +import React, { lazy, Suspense, useEffect } from 'react'; + import { Main } from '@strapi/design-system'; +import { LoadingIndicatorPage, useFocusWhenNavigate, useQueryParams } from '@strapi/helper-plugin'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; +import { Route, Switch } from 'react-router-dom'; + +import { useConfig } from '../../hooks/useConfig'; +import pluginID from '../../pluginId'; +import { getTrad } from '../../utils'; import { MediaLibrary } from './MediaLibrary'; -import { getTrad } from '../../utils'; -import pluginID from '../../pluginId'; -import { useConfig } from '../../hooks/useConfig'; const ConfigureTheView = lazy(() => import(/* webpackChunkName: "Upload_ConfigureTheView" */ './ConfigureTheView') diff --git a/packages/core/upload/admin/src/pages/App/tests/Upload.test.js b/packages/core/upload/admin/src/pages/App/tests/Upload.test.js index 2dc9f6da7f..0f3111d1a0 100644 --- a/packages/core/upload/admin/src/pages/App/tests/Upload.test.js +++ b/packages/core/upload/admin/src/pages/App/tests/Upload.test.js @@ -1,13 +1,14 @@ import React from 'react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { QueryClientProvider, QueryClient } from 'react-query'; -import { render as renderTL, screen } from '@testing-library/react'; -import { TrackingProvider } from '@strapi/helper-plugin'; -import { MemoryRouter } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; -import { useConfig } from '../../../hooks/useConfig'; +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider } from '@strapi/helper-plugin'; +import { render as renderTL, screen } from '@testing-library/react'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { MemoryRouter } from 'react-router-dom'; + import Upload from '..'; +import { useConfig } from '../../../hooks/useConfig'; jest.mock('../../../hooks/useConfig'); jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/upload/admin/src/pages/SettingsPage/index.js b/packages/core/upload/admin/src/pages/SettingsPage/index.js index ba2cc5b627..07808ff5a7 100644 --- a/packages/core/upload/admin/src/pages/SettingsPage/index.js +++ b/packages/core/upload/admin/src/pages/SettingsPage/index.js @@ -1,34 +1,37 @@ import React, { useEffect, useReducer, useRef } from 'react'; -import { Helmet } from 'react-helmet'; -import { useIntl } from 'react-intl'; + +import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Layout, + Main, + ToggleInput, + Typography, +} from '@strapi/design-system'; import { CheckPagePermissions, LoadingIndicatorPage, + useFetchClient, useFocusWhenNavigate, useNotification, useOverlayBlocker, - useFetchClient, } from '@strapi/helper-plugin'; import { Check } from '@strapi/icons'; -import { - Box, - Flex, - ToggleInput, - Typography, - Button, - Main, - Grid, - GridItem, - ContentLayout, - HeaderLayout, - Layout, -} from '@strapi/design-system'; import axios from 'axios'; import isEqual from 'lodash/isEqual'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; + +import pluginPermissions from '../../permissions'; import { getRequestUrl, getTrad } from '../../utils'; + import init from './init'; import reducer, { initialState } from './reducer'; -import pluginPermissions from '../../permissions'; export const SettingsPage = () => { const { formatMessage } = useIntl(); diff --git a/packages/core/upload/admin/src/pages/SettingsPage/tests/index.test.js b/packages/core/upload/admin/src/pages/SettingsPage/tests/index.test.js index 81c1432439..a3b479f158 100644 --- a/packages/core/upload/admin/src/pages/SettingsPage/tests/index.test.js +++ b/packages/core/upload/admin/src/pages/SettingsPage/tests/index.test.js @@ -5,10 +5,13 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import { SettingsPage } from '../index'; + import server from './utils/server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/core/upload/admin/src/pages/SettingsPage/tests/utils/server.js b/packages/core/upload/admin/src/pages/SettingsPage/tests/utils/server.js index 9e231a74f3..6f8a2dd190 100644 --- a/packages/core/upload/admin/src/pages/SettingsPage/tests/utils/server.js +++ b/packages/core/upload/admin/src/pages/SettingsPage/tests/utils/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/settings', (req, res, ctx) => { diff --git a/packages/core/upload/admin/src/utils/deleteRequest.js b/packages/core/upload/admin/src/utils/deleteRequest.js index 80ef952fc4..6ea6e6c03d 100644 --- a/packages/core/upload/admin/src/utils/deleteRequest.js +++ b/packages/core/upload/admin/src/utils/deleteRequest.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import getRequestUrl from './getRequestUrl'; export const deleteRequest = (type, id) => { diff --git a/packages/core/upload/admin/src/utils/getBreadcrumbDataML.js b/packages/core/upload/admin/src/utils/getBreadcrumbDataML.js index 8de6e755a9..f5f8b47fd0 100644 --- a/packages/core/upload/admin/src/utils/getBreadcrumbDataML.js +++ b/packages/core/upload/admin/src/utils/getBreadcrumbDataML.js @@ -1,5 +1,5 @@ -import getTrad from './getTrad'; import getFolderURL from './getFolderURL'; +import getTrad from './getTrad'; const getBreadcrumbDataML = (folder, { pathname, query }) => { let data = [ diff --git a/packages/core/upload/admin/src/utils/index.js b/packages/core/upload/admin/src/utils/index.js index c83cc51fe5..93ceb98258 100644 --- a/packages/core/upload/admin/src/utils/index.js +++ b/packages/core/upload/admin/src/utils/index.js @@ -1,13 +1,13 @@ +export { default as containsAssetFilter } from './containsAssetFilter'; export { default as createAssetUrl } from './createAssetUrl'; -export { default as formatBytes } from './formatBytes'; -export { default as getRequestUrl } from './getRequestUrl'; -export { default as getTrad } from './getTrad'; export { default as findRecursiveFolderByValue } from './findRecursiveFolderByValue'; export { default as findRecursiveFolderMetadatas } from './findRecursiveFolderMetadatas'; -export { default as containsAssetFilter } from './containsAssetFilter'; -export { default as getBreadcrumbDataML } from './getBreadcrumbDataML'; -export { default as getBreadcrumbDataCM } from './getBreadcrumbDataCM'; -export { default as getFolderURL } from './getFolderURL'; -export { default as getFolderParents } from './getFolderParents'; -export { default as toSingularTypes } from './toSingularTypes'; +export { default as formatBytes } from './formatBytes'; export * from './formatDuration'; +export { default as getBreadcrumbDataCM } from './getBreadcrumbDataCM'; +export { default as getBreadcrumbDataML } from './getBreadcrumbDataML'; +export { default as getFolderParents } from './getFolderParents'; +export { default as getFolderURL } from './getFolderURL'; +export { default as getRequestUrl } from './getRequestUrl'; +export { default as getTrad } from './getTrad'; +export { default as toSingularTypes } from './toSingularTypes'; diff --git a/packages/core/upload/admin/src/utils/urlYupSchema.js b/packages/core/upload/admin/src/utils/urlYupSchema.js index 5ba49dc90c..ddfb5bee98 100644 --- a/packages/core/upload/admin/src/utils/urlYupSchema.js +++ b/packages/core/upload/admin/src/utils/urlYupSchema.js @@ -1,5 +1,6 @@ -import * as yup from 'yup'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import * as yup from 'yup'; + import getTrad from './getTrad'; export const urlSchema = yup.object().shape({ diff --git a/packages/core/upload/admin/src/utils/urlsToAssets.js b/packages/core/upload/admin/src/utils/urlsToAssets.js index f5461d0c4d..5f1d5b785b 100644 --- a/packages/core/upload/admin/src/utils/urlsToAssets.js +++ b/packages/core/upload/admin/src/utils/urlsToAssets.js @@ -1,5 +1,7 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { AssetSource } from '../constants'; + import { typeFromMime } from './typeFromMime'; function getFilenameFromURL(url) { diff --git a/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerIcon/index.js b/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerIcon/index.js index 6ab84ffcb7..7a4dfa6725 100644 --- a/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerIcon/index.js +++ b/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerIcon/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import styled from 'styled-components'; -import { Icon, Flex } from '@strapi/design-system'; + +import { Flex, Icon } from '@strapi/design-system'; import { Paint } from '@strapi/icons'; +import styled from 'styled-components'; const IconBox = styled(Flex)` /* Hard code color values */ diff --git a/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerInput/index.js b/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerInput/index.js index f80460628c..333d4ecebd 100644 --- a/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerInput/index.js +++ b/packages/plugins/color-picker/admin/src/components/ColorPicker/ColorPickerInput/index.js @@ -1,22 +1,23 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; +import React, { useRef, useState } from 'react'; + import { - Typography, - Flex, - Box, BaseButton, - FocusTrap, + Box, Field, - FieldHint, FieldError, - FieldLabel, + FieldHint, FieldInput, + FieldLabel, + Flex, + FocusTrap, Popover, + Typography, } from '@strapi/design-system'; import { CarretDown } from '@strapi/icons'; -import { useIntl } from 'react-intl'; +import PropTypes from 'prop-types'; import { HexColorPicker } from 'react-colorful'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; import getTrad from '../../../utils/getTrad'; diff --git a/packages/plugins/color-picker/admin/src/components/tests/color-picker-input.test.js b/packages/plugins/color-picker/admin/src/components/tests/color-picker-input.test.js index e5db282406..b104028c05 100644 --- a/packages/plugins/color-picker/admin/src/components/tests/color-picker-input.test.js +++ b/packages/plugins/color-picker/admin/src/components/tests/color-picker-input.test.js @@ -1,7 +1,9 @@ import React from 'react'; -import { render, screen, fireEvent } from '@testing-library/react'; + import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { fireEvent, render, screen } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; + import ColorPickerInput from '../ColorPicker/ColorPickerInput'; const mockAttribute = { diff --git a/packages/plugins/color-picker/admin/src/index.js b/packages/plugins/color-picker/admin/src/index.js index e09d9d9a61..19e118fd73 100644 --- a/packages/plugins/color-picker/admin/src/index.js +++ b/packages/plugins/color-picker/admin/src/index.js @@ -1,6 +1,7 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin'; -import pluginId from './pluginId'; + import ColorPickerIcon from './components/ColorPicker/ColorPickerIcon'; +import pluginId from './pluginId'; import getTrad from './utils/getTrad'; export default { diff --git a/packages/plugins/documentation/admin/src/components/FieldActionWrapper/index.js b/packages/plugins/documentation/admin/src/components/FieldActionWrapper/index.js index f3f6623524..ccaccf4080 100644 --- a/packages/plugins/documentation/admin/src/components/FieldActionWrapper/index.js +++ b/packages/plugins/documentation/admin/src/components/FieldActionWrapper/index.js @@ -1,5 +1,5 @@ -import styled from 'styled-components'; import { FieldAction } from '@strapi/design-system'; +import styled from 'styled-components'; const FieldActionWrapper = styled(FieldAction)` svg { diff --git a/packages/plugins/documentation/admin/src/components/PluginIcon/index.js b/packages/plugins/documentation/admin/src/components/PluginIcon/index.js index b0a04a26f9..23c5b1c3ce 100644 --- a/packages/plugins/documentation/admin/src/components/PluginIcon/index.js +++ b/packages/plugins/documentation/admin/src/components/PluginIcon/index.js @@ -5,6 +5,7 @@ */ import React from 'react'; + import { Information } from '@strapi/icons'; const PluginIcon = () => ; diff --git a/packages/plugins/documentation/admin/src/index.js b/packages/plugins/documentation/admin/src/index.js index b28338eeb7..c2f6680ec8 100644 --- a/packages/plugins/documentation/admin/src/index.js +++ b/packages/plugins/documentation/admin/src/index.js @@ -5,7 +5,9 @@ // Also the strapi-generate-plugins/files/admin/src/index.js needs to be updated // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + import PluginIcon from './components/PluginIcon'; import pluginPermissions from './permissions'; import pluginId from './pluginId'; diff --git a/packages/plugins/documentation/admin/src/pages/PluginPage/index.js b/packages/plugins/documentation/admin/src/pages/PluginPage/index.js index 5ccd7da270..82cdd17e83 100755 --- a/packages/plugins/documentation/admin/src/pages/PluginPage/index.js +++ b/packages/plugins/documentation/admin/src/pages/PluginPage/index.js @@ -6,36 +6,36 @@ */ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import { - CheckPermissions, - ConfirmDialog, - LoadingIndicatorPage, - stopPropagation, - EmptyStateLayout, - useFocusWhenNavigate, - AnErrorOccurred, -} from '@strapi/helper-plugin'; -import { Helmet } from 'react-helmet'; + import { + Box, Button, - Layout, - HeaderLayout, ContentLayout, - Main, - IconButton, - Typography, Flex, + HeaderLayout, + IconButton, + Layout, + Main, Table, - Tr, - Thead, - Th, Tbody, Td, - Box, + Th, + Thead, + Tr, + Typography, } from '@strapi/design-system'; - -import { Trash, Eye as Show, Refresh as Reload } from '@strapi/icons'; +import { + AnErrorOccurred, + CheckPermissions, + ConfirmDialog, + EmptyStateLayout, + LoadingIndicatorPage, + stopPropagation, + useFocusWhenNavigate, +} from '@strapi/helper-plugin'; +import { Eye as Show, Refresh as Reload, Trash } from '@strapi/icons'; +import { Helmet } from 'react-helmet'; +import { useIntl } from 'react-intl'; import permissions from '../../permissions'; import { getTrad } from '../../utils'; diff --git a/packages/plugins/documentation/admin/src/pages/PluginPage/tests/index.test.js b/packages/plugins/documentation/admin/src/pages/PluginPage/tests/index.test.js index da77cfde29..7d672e3cae 100644 --- a/packages/plugins/documentation/admin/src/pages/PluginPage/tests/index.test.js +++ b/packages/plugins/documentation/admin/src/pages/PluginPage/tests/index.test.js @@ -1,12 +1,14 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; import PluginPage from '../index'; + import server from './server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/documentation/admin/src/pages/PluginPage/tests/server.js b/packages/plugins/documentation/admin/src/pages/PluginPage/tests/server.js index 61d263bd50..d852697f66 100644 --- a/packages/plugins/documentation/admin/src/pages/PluginPage/tests/server.js +++ b/packages/plugins/documentation/admin/src/pages/PluginPage/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/getInfos', (req, res, ctx) => { diff --git a/packages/plugins/documentation/admin/src/pages/SettingsPage/index.js b/packages/plugins/documentation/admin/src/pages/SettingsPage/index.js index 4f410939cf..79802e68fb 100644 --- a/packages/plugins/documentation/admin/src/pages/SettingsPage/index.js +++ b/packages/plugins/documentation/admin/src/pages/SettingsPage/index.js @@ -1,36 +1,35 @@ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import { Formik } from 'formik'; + +// Strapi Parts +import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + TextInput, + ToggleInput, + Typography, +} from '@strapi/design-system'; import { CheckPermissions, Form, LoadingIndicatorPage, useFocusWhenNavigate, } from '@strapi/helper-plugin'; - -// Strapi Parts -import { - ContentLayout, - HeaderLayout, - Main, - Button, - Box, - Flex, - Typography, - ToggleInput, - TextInput, - Grid, - GridItem, -} from '@strapi/design-system'; - // Strapi Icons -import { Eye as Show, EyeStriked as Hide, Check } from '@strapi/icons'; +import { Check, Eye as Show, EyeStriked as Hide } from '@strapi/icons'; +import { Formik } from 'formik'; +import { useIntl } from 'react-intl'; +import FieldActionWrapper from '../../components/FieldActionWrapper'; import permissions from '../../permissions'; import { getTrad } from '../../utils'; -import useReactQuery from '../utils/useReactQuery'; -import FieldActionWrapper from '../../components/FieldActionWrapper'; import schema from '../utils/schema'; +import useReactQuery from '../utils/useReactQuery'; const SettingsPage = () => { useFocusWhenNavigate(); diff --git a/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/index.test.js b/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/index.test.js index ea115667d6..3e0551ef02 100644 --- a/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/index.test.js +++ b/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/index.test.js @@ -1,12 +1,14 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; import SettingsPage from '../index'; + import server from './server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/server.js b/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/server.js index 6218a16951..e41f5487b9 100644 --- a/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/server.js +++ b/packages/plugins/documentation/admin/src/pages/SettingsPage/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/getInfos', (req, res, ctx) => { diff --git a/packages/plugins/documentation/admin/src/pages/utils/useReactQuery.js b/packages/plugins/documentation/admin/src/pages/utils/useReactQuery.js index 93a661d760..9f24888cb6 100644 --- a/packages/plugins/documentation/admin/src/pages/utils/useReactQuery.js +++ b/packages/plugins/documentation/admin/src/pages/utils/useReactQuery.js @@ -1,5 +1,6 @@ -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; + import pluginId from '../../pluginId'; import getTrad from '../../utils/getTrad'; diff --git a/packages/plugins/graphql/admin/src/index.js b/packages/plugins/graphql/admin/src/index.js index 04fa0025f8..c9d5982902 100644 --- a/packages/plugins/graphql/admin/src/index.js +++ b/packages/plugins/graphql/admin/src/index.js @@ -1,5 +1,7 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + import pluginId from './pluginId'; const name = pluginPkg.strapi.name; diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/index.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/index.js index 68ecce2af6..5ec63054a1 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/index.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/index.js @@ -1,22 +1,25 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useDispatch } from 'react-redux'; -import { useIntl } from 'react-intl'; + import { + Box, + Button, Dialog, DialogBody, DialogFooter, - Select, - Option, - Button, - Box, - Typography, Flex, + Option, + Select, + Typography, } from '@strapi/design-system'; -import { ExclamationMarkCircle, Duplicate } from '@strapi/icons'; -import { useCMEditViewDataManager, useNotification, useFetchClient } from '@strapi/helper-plugin'; +import { useCMEditViewDataManager, useFetchClient, useNotification } from '@strapi/helper-plugin'; +import { Duplicate, ExclamationMarkCircle } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useDispatch } from 'react-redux'; +import styled from 'styled-components'; + import { getTrad } from '../../../utils'; + import { cleanData, generateOptions } from './utils'; const StyledTypography = styled(Typography)` diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/cleanData.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/cleanData.js index 933212f879..be342da271 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/cleanData.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/cleanData.js @@ -2,6 +2,7 @@ import { contentManagementUtilRemoveFieldsFromData, formatContentTypeData, } from '@strapi/helper-plugin'; + import removePasswordAndRelationsFieldFromData from './removePasswordAndRelationsFieldFromData'; const cleanData = (data, { contentType, components }, initialLocalizations) => { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/removePasswordAndRelationsFieldFromData.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/removePasswordAndRelationsFieldFromData.js index 9602296b23..6716cd1277 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/removePasswordAndRelationsFieldFromData.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/removePasswordAndRelationsFieldFromData.js @@ -1,5 +1,5 @@ +import { getOtherInfos, getType } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import { getType, getOtherInfos } from '@strapi/helper-plugin'; const removePasswordAndRelationsFieldFromData = (data, contentTypeSchema, componentSchema) => { const recursiveCleanData = (data, schema) => { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/removePasswordAndRelationsFieldFromData.test.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/removePasswordAndRelationsFieldFromData.test.js index 6e4ad0e891..4fcf75a0b9 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/removePasswordAndRelationsFieldFromData.test.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewCopyLocale/utils/tests/removePasswordAndRelationsFieldFromData.test.js @@ -1,6 +1,7 @@ -import testData from './data'; import removePasswordAndRelationsFieldFromData from '../removePasswordAndRelationsFieldFromData'; +import testData from './data'; + describe('I18n | Components | CMEditViewCopyLocale | utils', () => { describe('removePasswordAndRelationsFieldFromData', () => { it('should return an empty object', () => { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/Bullet.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/Bullet.js index c78e8e9c91..13484104cf 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/Bullet.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/Bullet.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { pxToRem } from '@strapi/helper-plugin'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { pxToRem } from '@strapi/helper-plugin'; + import { getTrad } from '../../../utils'; const statusMap = { diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/index.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/index.js index 561db0a733..f686f064ad 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/index.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/CMEditViewLocalePicker/index.js @@ -1,14 +1,17 @@ import React from 'react'; -import PropTypes from 'prop-types'; + +import { Box, Divider, Flex, Option, Select, Typography } from '@strapi/design-system'; import get from 'lodash/get'; -import { Box, Divider, Select, Option, Typography, Flex } from '@strapi/design-system'; +import PropTypes from 'prop-types'; +import { stringify } from 'qs'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; -import { stringify } from 'qs'; + import { getTrad } from '../../../utils'; -import { createLocalesOption } from './utils'; import CMEditViewCopyLocale from '../CMEditViewCopyLocale'; + import Bullet from './Bullet'; +import { createLocalesOption } from './utils'; const CMEditViewLocalePicker = ({ appLocales, diff --git a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/index.js b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/index.js index fcdc07485f..9f5cd70f42 100644 --- a/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/index.js +++ b/packages/plugins/i18n/admin/src/components/CMEditViewInjectedComponents/index.js @@ -1,11 +1,14 @@ import React, { useMemo } from 'react'; + +import { useCMEditViewDataManager, useQueryParams } from '@strapi/helper-plugin'; import get from 'lodash/get'; import has from 'lodash/has'; import { useSelector } from 'react-redux'; import { useParams } from 'react-router-dom'; -import { useCMEditViewDataManager, useQueryParams } from '@strapi/helper-plugin'; -import selectI18NLocales from '../../selectors/selectI18nLocales'; + import useContentTypePermissions from '../../hooks/useContentTypePermissions'; +import selectI18NLocales from '../../selectors/selectI18nLocales'; + import CMEditViewLocalePicker from './CMEditViewLocalePicker'; const CMEditViewInjectedComponents = () => { diff --git a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/DeleteModalAdditionalInfos/index.js b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/DeleteModalAdditionalInfos/index.js index 615c152b51..ffa4a34712 100644 --- a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/DeleteModalAdditionalInfos/index.js +++ b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/DeleteModalAdditionalInfos/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import { Typography } from '@strapi/design-system'; -import { getTrad } from '../../../utils'; +import { useIntl } from 'react-intl'; + import useHasI18n from '../../../hooks/useHasI18n'; +import { getTrad } from '../../../utils'; const Emphasis = (chunks) => { return ( diff --git a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/PublishModalAdditionalInfos/index.js b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/PublishModalAdditionalInfos/index.js index cd7d32f1ff..9cae53719a 100644 --- a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/PublishModalAdditionalInfos/index.js +++ b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/PublishModalAdditionalInfos/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import { Typography } from '@strapi/design-system'; -import { getTrad } from '../../../utils'; +import { useIntl } from 'react-intl'; + import useHasI18n from '../../../hooks/useHasI18n'; +import { getTrad } from '../../../utils'; const Emphasis = (chunks) => { return ( diff --git a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos/index.js b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos/index.js index 21bae9b17e..f44c58182b 100644 --- a/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos/index.js +++ b/packages/plugins/i18n/admin/src/components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos/index.js @@ -1,8 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; + import { Typography } from '@strapi/design-system'; -import { getTrad } from '../../../utils'; +import { useIntl } from 'react-intl'; + import useHasI18n from '../../../hooks/useHasI18n'; +import { getTrad } from '../../../utils'; const Emphasis = (chunks) => { return ( diff --git a/packages/plugins/i18n/admin/src/components/CheckboxConfirmation/index.js b/packages/plugins/i18n/admin/src/components/CheckboxConfirmation/index.js index c300b9da39..feb8779a0f 100644 --- a/packages/plugins/i18n/admin/src/components/CheckboxConfirmation/index.js +++ b/packages/plugins/i18n/admin/src/components/CheckboxConfirmation/index.js @@ -1,17 +1,19 @@ import React, { useState } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; + import { + Button, Checkbox, Dialog, DialogBody, DialogFooter, - Typography, Flex, - Button, + Typography, } from '@strapi/design-system'; import { ExclamationMarkCircle } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import { getTrad } from '../../utils'; const TextAlignTypography = styled(Typography)` diff --git a/packages/plugins/i18n/admin/src/components/Initializer/index.js b/packages/plugins/i18n/admin/src/components/Initializer/index.js index 8c451cb12a..ae1def8bc0 100644 --- a/packages/plugins/i18n/admin/src/components/Initializer/index.js +++ b/packages/plugins/i18n/admin/src/components/Initializer/index.js @@ -5,9 +5,11 @@ */ import { useEffect, useRef } from 'react'; + import PropTypes from 'prop-types'; -import pluginId from '../../pluginId'; + import useLocales from '../../hooks/useLocales'; +import pluginId from '../../pluginId'; const Initializer = ({ setPlugin }) => { const { isLoading, locales } = useLocales(); diff --git a/packages/plugins/i18n/admin/src/components/LabelAction/index.js b/packages/plugins/i18n/admin/src/components/LabelAction/index.js index 19661c99e3..1aeed43615 100644 --- a/packages/plugins/i18n/admin/src/components/LabelAction/index.js +++ b/packages/plugins/i18n/admin/src/components/LabelAction/index.js @@ -1,8 +1,9 @@ import React from 'react'; + +import { Tooltip } from '@strapi/design-system'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { Tooltip } from '@strapi/design-system'; const Button = styled.button` border: none; diff --git a/packages/plugins/i18n/admin/src/components/LocaleList/LocaleTable.js b/packages/plugins/i18n/admin/src/components/LocaleList/LocaleTable.js index 14edfc3ae4..71ad39423b 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleList/LocaleTable.js +++ b/packages/plugins/i18n/admin/src/components/LocaleList/LocaleTable.js @@ -1,20 +1,21 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { - Typography, - IconButton, Flex, + IconButton, Table, + Tbody, + Td, + Th, Thead, Tr, - Th, - Td, - Tbody, + Typography, VisuallyHidden, } from '@strapi/design-system'; +import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; import { Pencil, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { stopPropagation, onRowClick } from '@strapi/helper-plugin'; import { getTrad } from '../../utils'; diff --git a/packages/plugins/i18n/admin/src/components/LocaleList/index.js b/packages/plugins/i18n/admin/src/components/LocaleList/index.js index ffde7fc6a6..286d19a2f3 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleList/index.js +++ b/packages/plugins/i18n/admin/src/components/LocaleList/index.js @@ -1,14 +1,17 @@ import React, { useState } from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; -import { Button, Main, EmptyStateLayout, ContentLayout, HeaderLayout } from '@strapi/design-system'; + +import { Button, ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system'; import { useFocusWhenNavigate } from '@strapi/helper-plugin'; -import { Plus, EmptyDocuments } from '@strapi/icons'; +import { EmptyDocuments, Plus } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import useLocales from '../../hooks/useLocales'; import { getTrad } from '../../utils'; -import ModalEdit from '../ModalEdit'; -import ModalDelete from '../ModalDelete'; import ModalCreate from '../ModalCreate'; +import ModalDelete from '../ModalDelete'; +import ModalEdit from '../ModalEdit'; + import LocaleTable from './LocaleTable'; const LocaleList = ({ canUpdateLocale, canDeleteLocale, onToggleCreateModal, isCreating }) => { diff --git a/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js b/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js index b237576ce6..844a5f92ac 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js +++ b/packages/plugins/i18n/admin/src/components/LocaleListCell/LocaleListCell.js @@ -1,11 +1,13 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { useIntl } from 'react-intl'; -import { useSelector } from 'react-redux'; -import { Flex, Box, Tooltip, Typography, Popover } from '@strapi/design-system'; +import React, { useRef, useState } from 'react'; + +import { Box, Flex, Popover, Tooltip, Typography } from '@strapi/design-system'; import { SortIcon, stopPropagation } from '@strapi/helper-plugin'; import get from 'lodash/get'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import { useSelector } from 'react-redux'; +import styled from 'styled-components'; + import selectI18NLocales from '../../selectors/selectI18nLocales'; import { getTrad } from '../../utils'; diff --git a/packages/plugins/i18n/admin/src/components/LocaleListCell/tests/LocaleListCell.test.js b/packages/plugins/i18n/admin/src/components/LocaleListCell/tests/LocaleListCell.test.js index 55c9e01bb2..2ecae953bc 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleListCell/tests/LocaleListCell.test.js +++ b/packages/plugins/i18n/admin/src/components/LocaleListCell/tests/LocaleListCell.test.js @@ -1,8 +1,10 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render, screen } from '@testing-library/react'; -import { useSelector } from 'react-redux'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; +import { useSelector } from 'react-redux'; + import LocaleListCell from '../LocaleListCell'; jest.mock('react-redux', () => ({ diff --git a/packages/plugins/i18n/admin/src/components/LocalePicker/index.js b/packages/plugins/i18n/admin/src/components/LocalePicker/index.js index bcf2d79d47..c79160bf04 100644 --- a/packages/plugins/i18n/admin/src/components/LocalePicker/index.js +++ b/packages/plugins/i18n/admin/src/components/LocalePicker/index.js @@ -1,10 +1,12 @@ import React, { useState } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; + +import { Option, Select } from '@strapi/design-system'; import { useQueryParams } from '@strapi/helper-plugin'; -import { useRouteMatch } from 'react-router-dom'; import get from 'lodash/get'; -import { Select, Option } from '@strapi/design-system'; import { useIntl } from 'react-intl'; +import { useDispatch, useSelector } from 'react-redux'; +import { useRouteMatch } from 'react-router-dom'; + import useContentTypePermissions from '../../hooks/useContentTypePermissions'; import useHasI18n from '../../hooks/useHasI18n'; import selectI18NLocales from '../../selectors/selectI18nLocales'; diff --git a/packages/plugins/i18n/admin/src/components/LocaleSelect/index.js b/packages/plugins/i18n/admin/src/components/LocaleSelect/index.js index cfcb93ac8d..ad28979fbc 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleSelect/index.js +++ b/packages/plugins/i18n/admin/src/components/LocaleSelect/index.js @@ -1,10 +1,12 @@ /* eslint-disable react/jsx-indent */ import React from 'react'; -import { ComboboxOption, Combobox } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; + +import { Combobox, ComboboxOption } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import useLocales from '../../hooks/useLocales'; +import { useIntl } from 'react-intl'; + import useDefaultLocales from '../../hooks/useDefaultLocales'; +import useLocales from '../../hooks/useLocales'; import { getTrad } from '../../utils'; /** diff --git a/packages/plugins/i18n/admin/src/components/LocaleSelect/tests/LocaleSelect.test.js b/packages/plugins/i18n/admin/src/components/LocaleSelect/tests/LocaleSelect.test.js index 5e2836fd3e..ac0323279a 100644 --- a/packages/plugins/i18n/admin/src/components/LocaleSelect/tests/LocaleSelect.test.js +++ b/packages/plugins/i18n/admin/src/components/LocaleSelect/tests/LocaleSelect.test.js @@ -1,14 +1,15 @@ import React from 'react'; -import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render as renderTL, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { QueryClientProvider, QueryClient } from 'react-query'; +import { IntlProvider } from 'react-intl'; +import { QueryClient, QueryClientProvider } from 'react-query'; import { Provider } from 'react-redux'; import { combineReducers, createStore } from 'redux'; -import reducers from '../../../hooks/reducers'; import LocaleSelect from '..'; +import reducers from '../../../hooks/reducers'; jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), diff --git a/packages/plugins/i18n/admin/src/components/ModalCreate/AdvancedForm.js b/packages/plugins/i18n/admin/src/components/ModalCreate/AdvancedForm.js index 5b53fb92b7..0f16429039 100644 --- a/packages/plugins/i18n/admin/src/components/ModalCreate/AdvancedForm.js +++ b/packages/plugins/i18n/admin/src/components/ModalCreate/AdvancedForm.js @@ -1,7 +1,9 @@ import React from 'react'; + +import { Checkbox } from '@strapi/design-system'; import { useFormikContext } from 'formik'; import { useIntl } from 'react-intl'; -import { Checkbox } from '@strapi/design-system'; + import { getTrad } from '../../utils'; const AdvancedForm = () => { diff --git a/packages/plugins/i18n/admin/src/components/ModalCreate/BaseForm.js b/packages/plugins/i18n/admin/src/components/ModalCreate/BaseForm.js index 155ac7336a..6f2da167b5 100644 --- a/packages/plugins/i18n/admin/src/components/ModalCreate/BaseForm.js +++ b/packages/plugins/i18n/admin/src/components/ModalCreate/BaseForm.js @@ -1,7 +1,9 @@ import React, { useCallback } from 'react'; + import { Grid, GridItem, TextInput } from '@strapi/design-system'; -import { useIntl } from 'react-intl'; import { useFormikContext } from 'formik'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; import LocaleSelect from '../LocaleSelect'; diff --git a/packages/plugins/i18n/admin/src/components/ModalCreate/index.js b/packages/plugins/i18n/admin/src/components/ModalCreate/index.js index 6ae6f1887f..bbb20740ef 100644 --- a/packages/plugins/i18n/admin/src/components/ModalCreate/index.js +++ b/packages/plugins/i18n/admin/src/components/ModalCreate/index.js @@ -1,30 +1,33 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useRBACProvider, Form } from '@strapi/helper-plugin'; + import { - ModalLayout, - ModalHeader, + Box, + Button, + Divider, + Flex, ModalBody, ModalFooter, - TabGroup, - Tabs, + ModalHeader, + ModalLayout, Tab, - TabPanels, + TabGroup, TabPanel, - Button, + TabPanels, + Tabs, Typography, - Divider, - Box, - Flex, } from '@strapi/design-system'; +import { Form, useRBACProvider } from '@strapi/helper-plugin'; import { Check } from '@strapi/icons'; -import { useIntl } from 'react-intl'; import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + +import useAddLocale from '../../hooks/useAddLocale'; import localeFormSchema from '../../schemas'; import { getTrad } from '../../utils'; -import useAddLocale from '../../hooks/useAddLocale'; -import BaseForm from './BaseForm'; + import AdvancedForm from './AdvancedForm'; +import BaseForm from './BaseForm'; const initialFormValues = { code: '', diff --git a/packages/plugins/i18n/admin/src/components/ModalDelete/index.js b/packages/plugins/i18n/admin/src/components/ModalDelete/index.js index 3fb9a97c33..8889e67afa 100644 --- a/packages/plugins/i18n/admin/src/components/ModalDelete/index.js +++ b/packages/plugins/i18n/admin/src/components/ModalDelete/index.js @@ -1,6 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { ConfirmDialog } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; + import useDeleteLocale from '../../hooks/useDeleteLocale'; const ModalDelete = ({ localeToDelete, onClose }) => { diff --git a/packages/plugins/i18n/admin/src/components/ModalEdit/AdvancedForm.js b/packages/plugins/i18n/admin/src/components/ModalEdit/AdvancedForm.js index e1950cddcc..d711a346f2 100644 --- a/packages/plugins/i18n/admin/src/components/ModalEdit/AdvancedForm.js +++ b/packages/plugins/i18n/admin/src/components/ModalEdit/AdvancedForm.js @@ -1,8 +1,10 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useFormikContext } from 'formik'; -import { useIntl } from 'react-intl'; + import { Checkbox } from '@strapi/design-system'; +import { useFormikContext } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../utils'; const AdvancedForm = ({ isDefaultLocale }) => { diff --git a/packages/plugins/i18n/admin/src/components/ModalEdit/BaseForm.js b/packages/plugins/i18n/admin/src/components/ModalEdit/BaseForm.js index ca22ce6a8a..ace869bf82 100644 --- a/packages/plugins/i18n/admin/src/components/ModalEdit/BaseForm.js +++ b/packages/plugins/i18n/admin/src/components/ModalEdit/BaseForm.js @@ -1,10 +1,12 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import PropTypes from 'prop-types'; + +import { Grid, GridItem, Option, Select, TextInput } from '@strapi/design-system'; import { useFormikContext } from 'formik'; -import { Grid, GridItem, TextInput, Select, Option } from '@strapi/design-system'; -import { getTrad } from '../../utils'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import useDefaultLocales from '../../hooks/useDefaultLocales'; +import { getTrad } from '../../utils'; const BaseForm = ({ locale }) => { const { formatMessage } = useIntl(); diff --git a/packages/plugins/i18n/admin/src/components/ModalEdit/index.js b/packages/plugins/i18n/admin/src/components/ModalEdit/index.js index ff064674c2..59cf869c08 100644 --- a/packages/plugins/i18n/admin/src/components/ModalEdit/index.js +++ b/packages/plugins/i18n/admin/src/components/ModalEdit/index.js @@ -1,30 +1,33 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { Form, useRBACProvider } from '@strapi/helper-plugin'; -import { useIntl } from 'react-intl'; -import { Formik } from 'formik'; -import { Check } from '@strapi/icons'; + import { - ModalLayout, - ModalHeader, - ModalBody, - ModalFooter, - TabGroup, - Tabs, - Tab, - TabPanels, - TabPanel, - Flex, Box, Button, Divider, + Flex, + ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, + Tab, + TabGroup, + TabPanel, + TabPanels, + Tabs, Typography, } from '@strapi/design-system'; -import localeFormSchema from '../../schemas'; +import { Form, useRBACProvider } from '@strapi/helper-plugin'; +import { Check } from '@strapi/icons'; +import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import useEditLocale from '../../hooks/useEditLocale'; +import localeFormSchema from '../../schemas'; import { getTrad } from '../../utils'; -import BaseForm from './BaseForm'; + import AdvancedForm from './AdvancedForm'; +import BaseForm from './BaseForm'; const ModalEdit = ({ locale, onClose }) => { const { refetchPermissions } = useRBACProvider(); diff --git a/packages/plugins/i18n/admin/src/components/SettingsModal.js b/packages/plugins/i18n/admin/src/components/SettingsModal.js index f27345a44f..30d954705e 100644 --- a/packages/plugins/i18n/admin/src/components/SettingsModal.js +++ b/packages/plugins/i18n/admin/src/components/SettingsModal.js @@ -1,16 +1,18 @@ import React from 'react'; -import PropTypes from 'prop-types'; + import { - ModalHeader, HeaderModal, HeaderModalTitle, ModalForm, + ModalHeader, + Tab, Tabs, TabsNav, - Tab, TabsPanel, } from '@strapi/helper-plugin'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; + import { getTrad } from '../utils'; const SettingsModal = ({ children, title, breadCrumb, tabsAriaLabel, tabsId }) => { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js b/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js index 73ce42fb1f..e4ee94d534 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/addColumnToTable.js @@ -1,5 +1,7 @@ import React from 'react'; + import get from 'lodash/get'; + import LocaleListCell from '../components/LocaleListCell/LocaleListCell'; const addColumnToTableHook = ({ displayedHeaders, layout }) => { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/mutateEditViewLayout.js b/packages/plugins/i18n/admin/src/contentManagerHooks/mutateEditViewLayout.js index 0e79461fcd..de1727f3d7 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/mutateEditViewLayout.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/mutateEditViewLayout.js @@ -1,6 +1,8 @@ import React from 'react'; -import get from 'lodash/get'; + import { Earth as I18N, EarthStriked as StrikedWorld } from '@strapi/icons'; +import get from 'lodash/get'; + import LabelAction from '../components/LabelAction'; import { getTrad } from '../utils'; diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToCollectionTypesLinks.test.js b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToCollectionTypesLinks.test.js index 1e39e14a29..e4851b8703 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToCollectionTypesLinks.test.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToCollectionTypesLinks.test.js @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import addLocaleToCollectionTypesLinksHook from '../addLocaleToCollectionTypesLinks'; describe('i18n | contentManagerHooks | addLocaleToCollectionTypesLinksHook', () => { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToSingleTypesLinks.test.js b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToSingleTypesLinks.test.js index d0b6e5ff06..781e373026 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToSingleTypesLinks.test.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/addLocaleToSingleTypesLinks.test.js @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import addLocaleToSingleTypesLinks from '../addLocaleToSingleTypesLinks'; describe('i18n | contentManagerHooks | addLocaleToSingleTypesLinks', () => { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/mutateEditViewLayout.test.js b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/mutateEditViewLayout.test.js index 4a8f4bef6b..a21440e65a 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/tests/mutateEditViewLayout.test.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/tests/mutateEditViewLayout.test.js @@ -1,5 +1,7 @@ import React from 'react'; + import { Earth as I18N, EarthStriked as StrikedWorld } from '@strapi/icons'; + import LabelAction from '../../components/LabelAction'; import { getTrad } from '../../utils'; import mutateEditViewLayout, { diff --git a/packages/plugins/i18n/admin/src/contentManagerHooks/utils/addLocaleToLinksSearch.js b/packages/plugins/i18n/admin/src/contentManagerHooks/utils/addLocaleToLinksSearch.js index 2fc824f096..42f08af5fb 100644 --- a/packages/plugins/i18n/admin/src/contentManagerHooks/utils/addLocaleToLinksSearch.js +++ b/packages/plugins/i18n/admin/src/contentManagerHooks/utils/addLocaleToLinksSearch.js @@ -1,5 +1,6 @@ import get from 'lodash/get'; -import { stringify, parse } from 'qs'; +import { parse, stringify } from 'qs'; + import getDefaultLocale from '../../utils/getDefaultLocale'; const addLocaleToLinksSearch = (links, kind, contentTypeSchemas, locales, permissions) => { diff --git a/packages/plugins/i18n/admin/src/hooks/reducers.js b/packages/plugins/i18n/admin/src/hooks/reducers.js index fe6b26ba90..e0e60df9a2 100644 --- a/packages/plugins/i18n/admin/src/hooks/reducers.js +++ b/packages/plugins/i18n/admin/src/hooks/reducers.js @@ -1,7 +1,9 @@ import produce from 'immer'; import set from 'lodash/set'; + import pluginId from '../pluginId'; -import { RESOLVE_LOCALES, ADD_LOCALE, DELETE_LOCALE, UPDATE_LOCALE } from './constants'; + +import { ADD_LOCALE, DELETE_LOCALE, RESOLVE_LOCALES, UPDATE_LOCALE } from './constants'; export const initialState = { isLoading: true, diff --git a/packages/plugins/i18n/admin/src/hooks/tests/reducers.test.js b/packages/plugins/i18n/admin/src/hooks/tests/reducers.test.js index 0f5d4a912d..8761a72422 100644 --- a/packages/plugins/i18n/admin/src/hooks/tests/reducers.test.js +++ b/packages/plugins/i18n/admin/src/hooks/tests/reducers.test.js @@ -1,5 +1,5 @@ +import { ADD_LOCALE, DELETE_LOCALE, RESOLVE_LOCALES, UPDATE_LOCALE } from '../constants'; import reducers, { initialState } from '../reducers'; -import { RESOLVE_LOCALES, ADD_LOCALE, DELETE_LOCALE, UPDATE_LOCALE } from '../constants'; describe('i18n reducer', () => { it('resolves the initial state when the action is not known', () => { diff --git a/packages/plugins/i18n/admin/src/hooks/useAddLocale/index.js b/packages/plugins/i18n/admin/src/hooks/useAddLocale/index.js index cf93518b88..993967dc29 100644 --- a/packages/plugins/i18n/admin/src/hooks/useAddLocale/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useAddLocale/index.js @@ -1,7 +1,9 @@ import { useState } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; -import { useDispatch } from 'react-redux'; import get from 'lodash/get'; +import { useDispatch } from 'react-redux'; + import { getTrad } from '../../utils'; import { ADD_LOCALE } from '../constants'; diff --git a/packages/plugins/i18n/admin/src/hooks/useContentTypePermissions/index.js b/packages/plugins/i18n/admin/src/hooks/useContentTypePermissions/index.js index 9c3be06052..449a302a95 100644 --- a/packages/plugins/i18n/admin/src/hooks/useContentTypePermissions/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useContentTypePermissions/index.js @@ -1,4 +1,5 @@ import { useSelector } from 'react-redux'; + import selectCollectionTypesRelatedPermissions from '../../selectors/selectCollectionTypesRelatedPermissions'; const useContentTypePermissions = (slug) => { diff --git a/packages/plugins/i18n/admin/src/hooks/useDefaultLocales/index.js b/packages/plugins/i18n/admin/src/hooks/useDefaultLocales/index.js index d308934759..709b7a3c2d 100644 --- a/packages/plugins/i18n/admin/src/hooks/useDefaultLocales/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useDefaultLocales/index.js @@ -1,7 +1,8 @@ -import { useQuery } from 'react-query'; -import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useNotifyAT } from '@strapi/design-system'; +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useIntl } from 'react-intl'; +import { useQuery } from 'react-query'; + import { getTrad } from '../../utils'; const useDefaultLocales = () => { diff --git a/packages/plugins/i18n/admin/src/hooks/useDeleteLocale/index.js b/packages/plugins/i18n/admin/src/hooks/useDeleteLocale/index.js index 2d9fc364ee..8757751ca5 100644 --- a/packages/plugins/i18n/admin/src/hooks/useDeleteLocale/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useDeleteLocale/index.js @@ -1,6 +1,8 @@ import { useState } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useDispatch } from 'react-redux'; + import { getTrad } from '../../utils'; import { DELETE_LOCALE } from '../constants'; diff --git a/packages/plugins/i18n/admin/src/hooks/useEditLocale/index.js b/packages/plugins/i18n/admin/src/hooks/useEditLocale/index.js index 564e1fe72c..434252d2a5 100644 --- a/packages/plugins/i18n/admin/src/hooks/useEditLocale/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useEditLocale/index.js @@ -1,6 +1,8 @@ import { useState } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import { useDispatch } from 'react-redux'; + import { getTrad } from '../../utils'; import { UPDATE_LOCALE } from '../constants'; diff --git a/packages/plugins/i18n/admin/src/hooks/useHasI18n/index.js b/packages/plugins/i18n/admin/src/hooks/useHasI18n/index.js index e20a51f413..41438328be 100644 --- a/packages/plugins/i18n/admin/src/hooks/useHasI18n/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useHasI18n/index.js @@ -1,5 +1,5 @@ -import { useSelector } from 'react-redux'; import get from 'lodash/get'; +import { useSelector } from 'react-redux'; const selectContentManagerListViewPluginOptions = (state) => state['content-manager_listView'].contentType.pluginOptions; diff --git a/packages/plugins/i18n/admin/src/hooks/useLocales/index.js b/packages/plugins/i18n/admin/src/hooks/useLocales/index.js index 1b165b8323..b1c8f1e3db 100644 --- a/packages/plugins/i18n/admin/src/hooks/useLocales/index.js +++ b/packages/plugins/i18n/admin/src/hooks/useLocales/index.js @@ -1,6 +1,8 @@ import { useEffect } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; -import { useSelector, useDispatch } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; + import { RESOLVE_LOCALES } from '../constants'; const useLocales = () => { diff --git a/packages/plugins/i18n/admin/src/index.js b/packages/plugins/i18n/admin/src/index.js index d549fbf2ce..86e1404cc5 100644 --- a/packages/plugins/i18n/admin/src/index.js +++ b/packages/plugins/i18n/admin/src/index.js @@ -1,25 +1,27 @@ +import { prefixPluginTranslations } from '@strapi/helper-plugin'; import get from 'lodash/get'; import * as yup from 'yup'; -import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + import CheckboxConfirmation from './components/CheckboxConfirmation'; import CMEditViewInjectedComponents from './components/CMEditViewInjectedComponents'; +import DeleteModalAdditionalInfos from './components/CMListViewInjectedComponents/DeleteModalAdditionalInfos'; +import PublishModalAdditionalInfos from './components/CMListViewInjectedComponents/PublishModalAdditionalInfos'; +import UnpublishModalAdditionalInfos from './components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos'; import Initializer from './components/Initializer'; import LocalePicker from './components/LocalePicker'; +import addColumnToTableHook from './contentManagerHooks/addColumnToTable'; +import addLocaleToCollectionTypesLinksHook from './contentManagerHooks/addLocaleToCollectionTypesLinks'; +import addLocaleToSingleTypesLinksHook from './contentManagerHooks/addLocaleToSingleTypesLinks'; +import mutateEditViewLayoutHook from './contentManagerHooks/mutateEditViewLayout'; +import i18nReducers from './hooks/reducers'; import middlewares from './middlewares'; import pluginPermissions from './permissions'; import pluginId from './pluginId'; import { getTrad } from './utils'; -import mutateCTBContentTypeSchema from './utils/mutateCTBContentTypeSchema'; import LOCALIZED_FIELDS from './utils/localizedFields'; -import i18nReducers from './hooks/reducers'; -import DeleteModalAdditionalInfos from './components/CMListViewInjectedComponents/DeleteModalAdditionalInfos'; -import PublishModalAdditionalInfos from './components/CMListViewInjectedComponents/PublishModalAdditionalInfos'; -import UnpublishModalAdditionalInfos from './components/CMListViewInjectedComponents/UnpublishModalAdditionalInfos'; -import addLocaleToCollectionTypesLinksHook from './contentManagerHooks/addLocaleToCollectionTypesLinks'; -import addLocaleToSingleTypesLinksHook from './contentManagerHooks/addLocaleToSingleTypesLinks'; -import addColumnToTableHook from './contentManagerHooks/addColumnToTable'; -import mutateEditViewLayoutHook from './contentManagerHooks/mutateEditViewLayout'; +import mutateCTBContentTypeSchema from './utils/mutateCTBContentTypeSchema'; const name = pluginPkg.strapi.name; diff --git a/packages/plugins/i18n/admin/src/middlewares/addCommonFieldsToInitialDataMiddleware.js b/packages/plugins/i18n/admin/src/middlewares/addCommonFieldsToInitialDataMiddleware.js index 544771670f..e5ace616ed 100644 --- a/packages/plugins/i18n/admin/src/middlewares/addCommonFieldsToInitialDataMiddleware.js +++ b/packages/plugins/i18n/admin/src/middlewares/addCommonFieldsToInitialDataMiddleware.js @@ -1,12 +1,13 @@ +import { + contentManagementUtilRemoveFieldsFromData, + formatContentTypeData, + getFetchClient, +} from '@strapi/helper-plugin'; +import cloneDeep from 'lodash/cloneDeep'; import get from 'lodash/get'; import merge from 'lodash/merge'; -import cloneDeep from 'lodash/cloneDeep'; import { parse } from 'qs'; -import { - getFetchClient, - formatContentTypeData, - contentManagementUtilRemoveFieldsFromData, -} from '@strapi/helper-plugin'; + import pluginId from '../pluginId'; const addCommonFieldsToInitialDataMiddleware = diff --git a/packages/plugins/i18n/admin/src/middlewares/index.js b/packages/plugins/i18n/admin/src/middlewares/index.js index 64244e30b5..78d48e332d 100644 --- a/packages/plugins/i18n/admin/src/middlewares/index.js +++ b/packages/plugins/i18n/admin/src/middlewares/index.js @@ -1,6 +1,6 @@ import addCommonFieldsToInitialDataMiddleware from './addCommonFieldsToInitialDataMiddleware'; -import extendCTBInitialDataMiddleware from './extendCTBInitialDataMiddleware'; import extendCTBAttributeInitialDataMiddleware from './extendCTBAttributeInitialDataMiddleware'; +import extendCTBInitialDataMiddleware from './extendCTBInitialDataMiddleware'; import localePermissionMiddleware from './localePermissionMiddleware'; const middlewares = [ diff --git a/packages/plugins/i18n/admin/src/middlewares/tests/addCommonFieldsToInitialDataMiddleware.test.js b/packages/plugins/i18n/admin/src/middlewares/tests/addCommonFieldsToInitialDataMiddleware.test.js index edc48e6093..13dafa8504 100644 --- a/packages/plugins/i18n/admin/src/middlewares/tests/addCommonFieldsToInitialDataMiddleware.test.js +++ b/packages/plugins/i18n/admin/src/middlewares/tests/addCommonFieldsToInitialDataMiddleware.test.js @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import addCommonFieldsToInitialDataMiddleware from '../addCommonFieldsToInitialDataMiddleware'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/i18n/admin/src/pages/SettingsPage/LocaleSettingsPage.js b/packages/plugins/i18n/admin/src/pages/SettingsPage/LocaleSettingsPage.js index 8c9240606e..9fd0bdfafb 100644 --- a/packages/plugins/i18n/admin/src/pages/SettingsPage/LocaleSettingsPage.js +++ b/packages/plugins/i18n/admin/src/pages/SettingsPage/LocaleSettingsPage.js @@ -1,5 +1,7 @@ import React, { useState } from 'react'; + import PropTypes from 'prop-types'; + import LocaleList from '../../components/LocaleList'; const LocaleSettingsPage = ({ diff --git a/packages/plugins/i18n/admin/src/pages/SettingsPage/index.js b/packages/plugins/i18n/admin/src/pages/SettingsPage/index.js index 444c3f67d7..451272ea30 100644 --- a/packages/plugins/i18n/admin/src/pages/SettingsPage/index.js +++ b/packages/plugins/i18n/admin/src/pages/SettingsPage/index.js @@ -1,8 +1,11 @@ import React from 'react'; + import { useRBAC } from '@strapi/helper-plugin'; -import LocaleSettingsPage from './LocaleSettingsPage'; + import i18nPermissions from '../../permissions'; +import LocaleSettingsPage from './LocaleSettingsPage'; + const ProtectedLocaleSettingsPage = () => { const { isLoading, diff --git a/packages/plugins/i18n/admin/src/schemas.js b/packages/plugins/i18n/admin/src/schemas.js index fc90f23ecf..e54e3b7262 100644 --- a/packages/plugins/i18n/admin/src/schemas.js +++ b/packages/plugins/i18n/admin/src/schemas.js @@ -1,5 +1,5 @@ -import { object, string } from 'yup'; import { translatedErrors as errorsTrads } from '@strapi/helper-plugin'; +import { object, string } from 'yup'; const localeFormSchema = object().shape({ code: string().required(), diff --git a/packages/plugins/i18n/admin/src/selectors/tests/selectors.test.js b/packages/plugins/i18n/admin/src/selectors/tests/selectors.test.js index 472835bf38..52f1267e01 100644 --- a/packages/plugins/i18n/admin/src/selectors/tests/selectors.test.js +++ b/packages/plugins/i18n/admin/src/selectors/tests/selectors.test.js @@ -1,4 +1,5 @@ import { fixtures } from '@strapi/admin-test-utils'; + import selectCollectionTypePermissions from '../selectCollectionTypesRelatedPermissions'; import selectI18NLocales from '../selectI18nLocales'; diff --git a/packages/plugins/sentry/admin/src/index.js b/packages/plugins/sentry/admin/src/index.js index d153f9a2f7..8b38709d0a 100644 --- a/packages/plugins/sentry/admin/src/index.js +++ b/packages/plugins/sentry/admin/src/index.js @@ -1,5 +1,7 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + import pluginId from './pluginId'; const name = pluginPkg.strapi.name; diff --git a/packages/plugins/users-permissions/admin/src/components/BoundRoute/index.js b/packages/plugins/users-permissions/admin/src/components/BoundRoute/index.js index 4a06bedce5..7680ff07c7 100644 --- a/packages/plugins/users-permissions/admin/src/components/BoundRoute/index.js +++ b/packages/plugins/users-permissions/admin/src/components/BoundRoute/index.js @@ -1,10 +1,12 @@ import React from 'react'; -import styled from 'styled-components'; -import { Flex, Box, Typography } from '@strapi/design-system'; + +import { Box, Flex, Typography } from '@strapi/design-system'; import map from 'lodash/map'; import tail from 'lodash/tail'; -import { useIntl } from 'react-intl'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; +import styled from 'styled-components'; + import getMethodColor from './getMethodColor'; const MethodBox = styled(Box)` diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js index 7d6add2d87..e5eaf945a9 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/index.js @@ -5,9 +5,10 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; -import { ToggleInput, TextInput } from '@strapi/design-system'; + +import { TextInput, ToggleInput } from '@strapi/design-system'; import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; const Input = ({ description, diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js index 2ced91bd54..40394e19c5 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/Input/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import Input from '../index'; const messages = {}; diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/index.js b/packages/plugins/users-permissions/admin/src/components/FormModal/index.js index eff97c1aca..83c059252b 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/index.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/index.js @@ -5,21 +5,23 @@ */ import React from 'react'; -import { useIntl } from 'react-intl'; + import { Button, Flex, Grid, GridItem, - ModalLayout, - ModalHeader, - ModalFooter, ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, } from '@strapi/design-system'; import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; -import PropTypes from 'prop-types'; -import { Formik } from 'formik'; import { Form } from '@strapi/helper-plugin'; +import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import Input from './Input'; const FormModal = ({ diff --git a/packages/plugins/users-permissions/admin/src/components/FormModal/tests/index.test.js b/packages/plugins/users-permissions/admin/src/components/FormModal/tests/index.test.js index b7cac37efa..ec5eb462e6 100644 --- a/packages/plugins/users-permissions/admin/src/components/FormModal/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/components/FormModal/tests/index.test.js @@ -5,9 +5,11 @@ */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { render } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; + import FormModal from '../index'; const messages = {}; diff --git a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js index 5a1b456336..e3165e258d 100644 --- a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js +++ b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js @@ -1,5 +1,5 @@ -import styled, { css } from 'styled-components'; import { Box } from '@strapi/design-system'; +import styled, { css } from 'styled-components'; const activeCheckboxWrapperStyles = css` background: ${(props) => props.theme.colors.primary100}; diff --git a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory.js b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory.js index 1ecc9b7d57..924883932d 100644 --- a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory.js +++ b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory.js @@ -1,13 +1,16 @@ import React, { useCallback, useMemo } from 'react'; -import get from 'lodash/get'; -import styled from 'styled-components'; -import PropTypes from 'prop-types'; -import { Box, Checkbox, Flex, Typography, Grid, GridItem } from '@strapi/design-system'; + +import { Box, Checkbox, Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import { Cog as CogIcon } from '@strapi/icons'; +import get from 'lodash/get'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import CheckboxWrapper from './CheckboxWrapper'; +import styled from 'styled-components'; + import { useUsersPermissions } from '../../../contexts/UsersPermissionsContext'; +import CheckboxWrapper from './CheckboxWrapper'; + const Border = styled.div` flex: 1; align-self: center; diff --git a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/index.js b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/index.js index 27814e1832..08ff3ffc3d 100644 --- a/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/index.js +++ b/packages/plugins/users-permissions/admin/src/components/Permissions/PermissionRow/index.js @@ -1,7 +1,9 @@ import React, { useMemo } from 'react'; -import PropTypes from 'prop-types'; -import sortBy from 'lodash/sortBy'; + import { Box } from '@strapi/design-system'; +import sortBy from 'lodash/sortBy'; +import PropTypes from 'prop-types'; + import SubCategory from './SubCategory'; const PermissionRow = ({ name, permissions }) => { diff --git a/packages/plugins/users-permissions/admin/src/components/Permissions/index.js b/packages/plugins/users-permissions/admin/src/components/Permissions/index.js index 65f24fca75..260ae00cfe 100644 --- a/packages/plugins/users-permissions/admin/src/components/Permissions/index.js +++ b/packages/plugins/users-permissions/admin/src/components/Permissions/index.js @@ -1,10 +1,13 @@ import React, { useReducer } from 'react'; -import { Accordion, AccordionToggle, AccordionContent, Box, Flex } from '@strapi/design-system'; + +import { Accordion, AccordionContent, AccordionToggle, Box, Flex } from '@strapi/design-system'; import { useIntl } from 'react-intl'; + import { useUsersPermissions } from '../../contexts/UsersPermissionsContext'; import formatPluginName from '../../utils/formatPluginName'; -import PermissionRow from './PermissionRow'; + import init from './init'; +import PermissionRow from './PermissionRow'; import { initialState, reducer } from './reducer'; const Permissions = () => { diff --git a/packages/plugins/users-permissions/admin/src/components/Permissions/tests/reducer.test.js b/packages/plugins/users-permissions/admin/src/components/Permissions/tests/reducer.test.js index 8640dfdcf8..5a6b8a0b4b 100644 --- a/packages/plugins/users-permissions/admin/src/components/Permissions/tests/reducer.test.js +++ b/packages/plugins/users-permissions/admin/src/components/Permissions/tests/reducer.test.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import { reducer } from '../reducer'; describe('USERS PERMISSIONS | COMPONENTS | Permissions | reducer', () => { diff --git a/packages/plugins/users-permissions/admin/src/components/Policies/index.js b/packages/plugins/users-permissions/admin/src/components/Policies/index.js index 4ab6111a4e..e9c53b3bd3 100644 --- a/packages/plugins/users-permissions/admin/src/components/Policies/index.js +++ b/packages/plugins/users-permissions/admin/src/components/Policies/index.js @@ -1,9 +1,10 @@ import React from 'react'; -import { useIntl } from 'react-intl'; -import { Typography, Flex, GridItem } from '@strapi/design-system'; + +import { Flex, GridItem, Typography } from '@strapi/design-system'; import get from 'lodash/get'; import isEmpty from 'lodash/isEmpty'; import without from 'lodash/without'; +import { useIntl } from 'react-intl'; import { useUsersPermissions } from '../../contexts/UsersPermissionsContext'; import BoundRoute from '../BoundRoute'; diff --git a/packages/plugins/users-permissions/admin/src/components/UsersPermissions/index.js b/packages/plugins/users-permissions/admin/src/components/UsersPermissions/index.js index 1944c6bae3..6f40fa3e5f 100644 --- a/packages/plugins/users-permissions/admin/src/components/UsersPermissions/index.js +++ b/packages/plugins/users-permissions/admin/src/components/UsersPermissions/index.js @@ -1,13 +1,16 @@ -import React, { memo, useReducer, forwardRef, useImperativeHandle } from 'react'; +import React, { forwardRef, memo, useImperativeHandle, useReducer } from 'react'; + +import { Flex, Grid, GridItem, Typography } from '@strapi/design-system'; import PropTypes from 'prop-types'; -import { Typography, Flex, Grid, GridItem } from '@strapi/design-system'; import { useIntl } from 'react-intl'; -import getTrad from '../../utils/getTrad'; -import Policies from '../Policies'; -import Permissions from '../Permissions'; -import reducer, { initialState } from './reducer'; + import { UsersPermissionsProvider } from '../../contexts/UsersPermissionsContext'; +import getTrad from '../../utils/getTrad'; +import Permissions from '../Permissions'; +import Policies from '../Policies'; + import init from './init'; +import reducer, { initialState } from './reducer'; const UsersPermissions = forwardRef(({ permissions, routes }, ref) => { const { formatMessage } = useIntl(); diff --git a/packages/plugins/users-permissions/admin/src/components/UsersPermissions/tests/reducer.test.js b/packages/plugins/users-permissions/admin/src/components/UsersPermissions/tests/reducer.test.js index 075c4c34be..963f164ce0 100644 --- a/packages/plugins/users-permissions/admin/src/components/UsersPermissions/tests/reducer.test.js +++ b/packages/plugins/users-permissions/admin/src/components/UsersPermissions/tests/reducer.test.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import reducer from '../reducer'; describe('USERS PERMISSIONS | COMPONENTS | UsersPermissions | reducer', () => { diff --git a/packages/plugins/users-permissions/admin/src/contexts/UsersPermissionsContext/index.js b/packages/plugins/users-permissions/admin/src/contexts/UsersPermissionsContext/index.js index b015df27e9..ce66c347d4 100644 --- a/packages/plugins/users-permissions/admin/src/contexts/UsersPermissionsContext/index.js +++ b/packages/plugins/users-permissions/admin/src/contexts/UsersPermissionsContext/index.js @@ -1,4 +1,5 @@ import React, { createContext, useContext } from 'react'; + import PropTypes from 'prop-types'; const UsersPermissions = createContext({}); diff --git a/packages/plugins/users-permissions/admin/src/hooks/index.js b/packages/plugins/users-permissions/admin/src/hooks/index.js index a3059f6e83..3b6a597d15 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/index.js @@ -1,5 +1,5 @@ // eslint-disable-next-line import/prefer-default-export -export { default as useForm } from './useForm'; -export { default as useRolesList } from './useRolesList'; -export { default as usePlugins } from './usePlugins'; export { default as useFetchRole } from './useFetchRole'; +export { default as useForm } from './useForm'; +export { default as usePlugins } from './usePlugins'; +export { default as useRolesList } from './useRolesList'; diff --git a/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js b/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js index d633d1cb7e..629e00199b 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js @@ -1,8 +1,11 @@ -import { useCallback, useReducer, useEffect, useRef } from 'react'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; -import reducer, { initialState } from './reducer'; +import { useCallback, useEffect, useReducer, useRef } from 'react'; + +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; + import pluginId from '../../pluginId'; +import reducer, { initialState } from './reducer'; + const useFetchRole = (id) => { const [state, dispatch] = useReducer(reducer, initialState); const toggleNotification = useNotification(); diff --git a/packages/plugins/users-permissions/admin/src/hooks/useForm/index.js b/packages/plugins/users-permissions/admin/src/hooks/useForm/index.js index 35000194a4..0cf0ef6652 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useForm/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useForm/index.js @@ -1,6 +1,9 @@ import { useCallback, useEffect, useReducer, useRef } from 'react'; -import { useRBAC, useFetchClient, useNotification } from '@strapi/helper-plugin'; + +import { useFetchClient, useNotification, useRBAC } from '@strapi/helper-plugin'; + import { getRequestURL } from '../../utils'; + import reducer, { initialState } from './reducer'; const useUserForm = (endPoint, permissions) => { diff --git a/packages/plugins/users-permissions/admin/src/hooks/useForm/tests/reducer.test.js b/packages/plugins/users-permissions/admin/src/hooks/useForm/tests/reducer.test.js index 0684142db8..0182050457 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useForm/tests/reducer.test.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useForm/tests/reducer.test.js @@ -1,4 +1,5 @@ import produce from 'immer'; + import reducer from '../reducer'; describe('USERS PERMISSIONS | HOOKS | useForm | reducer', () => { diff --git a/packages/plugins/users-permissions/admin/src/hooks/usePlugins/index.js b/packages/plugins/users-permissions/admin/src/hooks/usePlugins/index.js index efa0389cb6..d1abd28af5 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/usePlugins/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/usePlugins/index.js @@ -1,9 +1,12 @@ import { useCallback, useEffect, useReducer } from 'react'; -import { useNotification, useFetchClient } from '@strapi/helper-plugin'; + +import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import init from './init'; + import pluginId from '../../pluginId'; import { cleanPermissions } from '../../utils'; + +import init from './init'; import reducer, { initialState } from './reducer'; const usePlugins = (shouldFetchData = true) => { diff --git a/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js b/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js index 10e4d37ad9..aae9175751 100644 --- a/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js +++ b/packages/plugins/users-permissions/admin/src/hooks/useRolesList/index.js @@ -1,8 +1,11 @@ import { useCallback, useEffect, useReducer, useRef } from 'react'; + import { useFetchClient, useNotification } from '@strapi/helper-plugin'; import get from 'lodash/get'; -import init from './init'; + import pluginId from '../../pluginId'; + +import init from './init'; import reducer, { initialState } from './reducer'; const useRolesList = (shouldFetchData = true) => { diff --git a/packages/plugins/users-permissions/admin/src/index.js b/packages/plugins/users-permissions/admin/src/index.js index ff6e470b84..ba721ed189 100644 --- a/packages/plugins/users-permissions/admin/src/index.js +++ b/packages/plugins/users-permissions/admin/src/index.js @@ -5,7 +5,9 @@ // Also the strapi-generate-plugins/files/admin/src/index.js needs to be updated // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED import { prefixPluginTranslations } from '@strapi/helper-plugin'; + import pluginPkg from '../../package.json'; + import pluginPermissions from './permissions'; import pluginId from './pluginId'; import getTrad from './utils/getTrad'; diff --git a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js index 75c198637f..3f0726f12b 100644 --- a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/index.js @@ -1,7 +1,19 @@ import React, { useMemo } from 'react'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useIntl } from 'react-intl'; -import { Formik } from 'formik'; + +import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + Option, + Select, + Typography, + useNotifyAT, +} from '@strapi/design-system'; import { CheckPagePermissions, Form, @@ -13,26 +25,17 @@ import { useOverlayBlocker, useRBAC, } from '@strapi/helper-plugin'; -import { - useNotifyAT, - Main, - HeaderLayout, - ContentLayout, - Button, - Box, - Flex, - Select, - Option, - Typography, - Grid, - GridItem, -} from '@strapi/design-system'; import { Check } from '@strapi/icons'; +import { Formik } from 'formik'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; + import pluginPermissions from '../../permissions'; import { getTrad } from '../../utils'; + +import { fetchData, putAdvancedSettings } from './utils/api'; import layout from './utils/layout'; import schema from './utils/schema'; -import { fetchData, putAdvancedSettings } from './utils/api'; const ProtectedAdvancedSettingsPage = () => ( diff --git a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js index 66df6ed671..db3cf66616 100644 --- a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js @@ -1,10 +1,13 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useRBAC } from '@strapi/helper-plugin'; +import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useRBAC } from '@strapi/helper-plugin'; + import ProtectedAdvancedSettingsPage from '../index'; + import server from './utils/server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/utils/server.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/utils/server.js index 6a54522be8..644d99cfce 100644 --- a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/utils/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/utils/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/advanced', (req, res, ctx) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/api.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/api.js index 8b6f5b4c66..238862ae0a 100644 --- a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/api.js +++ b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { getRequestURL } from '../../../utils'; const fetchData = async () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/schema.js index d0cd5af675..b8958a8d64 100644 --- a/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/schema.js +++ b/packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; // eslint-disable-next-line prefer-regex-literals const URL_REGEX = new RegExp('(^$)|((.+:\\/\\/.*)(d*)\\/?(.*))'); diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailForm.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailForm.js index b997e762a1..5d981227d1 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailForm.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailForm.js @@ -1,19 +1,21 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; -import { Form, GenericInput } from '@strapi/helper-plugin'; -import { Formik } from 'formik'; + import { - ModalLayout, - ModalHeader, - ModalFooter, - ModalBody, + Button, Grid, GridItem, - Button, + ModalBody, + ModalFooter, + ModalHeader, + ModalLayout, Textarea, } from '@strapi/design-system'; import { Breadcrumbs, Crumb } from '@strapi/design-system/v2'; +import { Form, GenericInput } from '@strapi/helper-plugin'; +import { Formik } from 'formik'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../../utils'; import schema from '../utils/schema'; diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailTable.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailTable.js index f50ec41d28..6562324b93 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailTable.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/components/EmailTable.js @@ -1,20 +1,22 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { useIntl } from 'react-intl'; + import { + Icon, + IconButton, Table, - Thead, Tbody, - Tr, Td, Th, + Thead, + Tr, Typography, - IconButton, - Icon, VisuallyHidden, } from '@strapi/design-system'; -import { Pencil, Refresh, Check } from '@strapi/icons'; import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; +import { Check, Pencil, Refresh } from '@strapi/icons'; +import PropTypes from 'prop-types'; +import { useIntl } from 'react-intl'; + import { getTrad } from '../../../utils'; const EmailTable = ({ canUpdate, onEditClick }) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js index 0a40840f69..3c3887c7a2 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/index.js @@ -1,22 +1,25 @@ import React, { useMemo, useRef, useState } from 'react'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import { useIntl } from 'react-intl'; + +import { ContentLayout, HeaderLayout, Main, useNotifyAT } from '@strapi/design-system'; import { + CheckPagePermissions, + LoadingIndicatorPage, SettingsPageTitle, - useTracking, + useFocusWhenNavigate, useNotification, useOverlayBlocker, - CheckPagePermissions, useRBAC, - useFocusWhenNavigate, - LoadingIndicatorPage, + useTracking, } from '@strapi/helper-plugin'; -import { useNotifyAT, Main, ContentLayout, HeaderLayout } from '@strapi/design-system'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; + import pluginPermissions from '../../permissions'; import { getTrad } from '../../utils'; -import { fetchData, putEmailTemplate } from './utils/api'; -import EmailTable from './components/EmailTable'; + import EmailForm from './components/EmailForm'; +import EmailTable from './components/EmailTable'; +import { fetchData, putEmailTemplate } from './utils/api'; const ProtectedEmailTemplatesPage = () => ( diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js index dd70cf0b46..4568143899 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js @@ -1,10 +1,13 @@ import React from 'react'; -import { render, waitFor, screen } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useRBAC } from '@strapi/helper-plugin'; +import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { useRBAC } from '@strapi/helper-plugin'; + import ProtectedEmailTemplatesPage from '../index'; + import server from './utils/server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/utils/server.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/utils/server.js index 1fb4317427..e01d131332 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/utils/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/utils/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/email-templates', (req, res, ctx) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/api.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/api.js index 0afc1b75bf..46aef9f191 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/api.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { getRequestURL } from '../../../utils'; const fetchData = async () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js index e89c230616..33ca1216f4 100644 --- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js +++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ options: yup diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/index.js b/packages/plugins/users-permissions/admin/src/pages/Providers/index.js index 7772354d64..c492f2dd2f 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/index.js @@ -1,43 +1,46 @@ import React, { useMemo, useRef, useState } from 'react'; -import { useIntl } from 'react-intl'; + import { - SettingsPageTitle, - LoadingIndicatorPage, - useTracking, - useNotification, - useOverlayBlocker, - CheckPagePermissions, - useRBAC, - useFocusWhenNavigate, - onRowClick, - stopPropagation, -} from '@strapi/helper-plugin'; -import has from 'lodash/has'; -import upperFirst from 'lodash/upperFirst'; -import { - HeaderLayout, - Layout, ContentLayout, + HeaderLayout, + IconButton, + Layout, Main, - useNotifyAT, Table, - Thead, - Tr, - Th, Tbody, Td, + Th, + Thead, + Tr, Typography, - IconButton, + useNotifyAT, VisuallyHidden, } from '@strapi/design-system'; +import { + CheckPagePermissions, + LoadingIndicatorPage, + onRowClick, + SettingsPageTitle, + stopPropagation, + useFocusWhenNavigate, + useNotification, + useOverlayBlocker, + useRBAC, + useTracking, +} from '@strapi/helper-plugin'; import { Pencil } from '@strapi/icons'; -import { useQuery, useMutation, useQueryClient } from 'react-query'; -import forms from './utils/forms'; +import has from 'lodash/has'; +import upperFirst from 'lodash/upperFirst'; +import { useIntl } from 'react-intl'; +import { useMutation, useQuery, useQueryClient } from 'react-query'; + +import FormModal from '../../components/FormModal'; +import pluginPermissions from '../../permissions'; +import { getTrad } from '../../utils'; + import { fetchData, putProvider } from './utils/api'; import createProvidersArray from './utils/createProvidersArray'; -import { getTrad } from '../../utils'; -import pluginPermissions from '../../permissions'; -import FormModal from '../../components/FormModal'; +import forms from './utils/forms'; export const ProvidersPage = () => { const { formatMessage } = useIntl(); diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js index 5423e29b9b..549b297511 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js @@ -1,12 +1,15 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { useRBAC } from '@strapi/helper-plugin'; import { render, screen, waitFor } from '@testing-library/react'; import { IntlProvider } from 'react-intl'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { useRBAC } from '@strapi/helper-plugin'; -import server from './server'; + import { ProvidersPage } from '../index'; +import server from './server'; + jest.mock('@strapi/helper-plugin', () => ({ ...jest.requireActual('@strapi/helper-plugin'), useNotification: jest.fn(), diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/server.js b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/server.js index 8cd9ec1f18..16125084e6 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/providers', (req, res, ctx) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/utils/api.js b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/api.js index a66b302673..0401426a02 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/utils/api.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { getRequestURL } from '../../../utils'; // eslint-disable-next-line import/prefer-default-export diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js index 71fe4c5f18..08d285982c 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js +++ b/packages/plugins/users-permissions/admin/src/pages/Providers/utils/forms.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; import { getTrad } from '../../../utils'; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js index 4ae121d8f9..9744ec4630 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/index.js @@ -1,33 +1,36 @@ -import React, { useState, useRef } from 'react'; -import { useHistory } from 'react-router-dom'; +import React, { useRef, useState } from 'react'; + import { + Box, + Button, ContentLayout, + Flex, + Grid, + GridItem, HeaderLayout, Main, - Button, - Flex, - Box, - TextInput, Textarea, + TextInput, Typography, - GridItem, - Grid, } from '@strapi/design-system'; +import { + Form, + SettingsPageTitle, + useFetchClient, + useNotification, + useOverlayBlocker, + useTracking, +} from '@strapi/helper-plugin'; import { Check } from '@strapi/icons'; import { Formik } from 'formik'; import { useIntl } from 'react-intl'; -import { - useOverlayBlocker, - SettingsPageTitle, - useFetchClient, - useTracking, - Form, - useNotification, -} from '@strapi/helper-plugin'; +import { useHistory } from 'react-router-dom'; + import UsersPermissions from '../../../components/UsersPermissions'; -import getTrad from '../../../utils/getTrad'; -import pluginId from '../../../pluginId'; import { usePlugins } from '../../../hooks'; +import pluginId from '../../../pluginId'; +import getTrad from '../../../utils/getTrad'; + import schema from './utils/schema'; const EditPage = () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js index f253f53930..b50e69d1ef 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js @@ -1,11 +1,14 @@ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; import { act, render, waitFor } from '@testing-library/react'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router, Switch, Route } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; import { createMemoryHistory } from 'history'; -import pluginId from '../../../../pluginId'; +import { IntlProvider } from 'react-intl'; +import { Route, Router, Switch } from 'react-router-dom'; + import RolesCreatePage from '..'; +import pluginId from '../../../../pluginId'; + import server from './server'; jest.mock('@strapi/helper-plugin', () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/server.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/server.js index dcf4ae0da8..578564c45d 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/server.js @@ -1,5 +1,6 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; + import pluginId from '../../../../pluginId'; const handlers = [ diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js index 5e2ac5c5af..c3bcd9cf28 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string().required(translatedErrors.required), diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js index f7d057a68a..07824f934c 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js @@ -1,34 +1,37 @@ -import React, { useState, useRef } from 'react'; +import React, { useRef, useState } from 'react'; + +import { + Box, + Button, + ContentLayout, + Flex, + Grid, + GridItem, + HeaderLayout, + Main, + Textarea, + TextInput, + Typography, +} from '@strapi/design-system'; +import { + Form, + Link, + LoadingIndicatorPage, + SettingsPageTitle, + useFetchClient, + useNotification, + useOverlayBlocker, +} from '@strapi/helper-plugin'; +import { ArrowLeft, Check } from '@strapi/icons'; import { Formik } from 'formik'; import { useIntl } from 'react-intl'; import { useRouteMatch } from 'react-router-dom'; -import { - useFetchClient, - useOverlayBlocker, - SettingsPageTitle, - LoadingIndicatorPage, - Form, - useNotification, - Link, -} from '@strapi/helper-plugin'; -import { - ContentLayout, - HeaderLayout, - Main, - Button, - Flex, - Box, - TextInput, - Textarea, - Typography, - GridItem, - Grid, -} from '@strapi/design-system'; -import { ArrowLeft, Check } from '@strapi/icons'; + import UsersPermissions from '../../../components/UsersPermissions'; -import getTrad from '../../../utils/getTrad'; +import { useFetchRole, usePlugins } from '../../../hooks'; import pluginId from '../../../pluginId'; -import { usePlugins, useFetchRole } from '../../../hooks'; +import getTrad from '../../../utils/getTrad'; + import schema from './utils/schema'; const EditPage = () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js index daab77b600..a6e774640f 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js @@ -1,12 +1,15 @@ import React from 'react'; -import { render, waitFor, act, waitForElementToBeRemoved } from '@testing-library/react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { act, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { Router, Switch, Route } from 'react-router-dom'; -import { IntlProvider } from 'react-intl'; import { createMemoryHistory } from 'history'; -import pluginId from '../../../../pluginId'; +import { IntlProvider } from 'react-intl'; +import { Route, Router, Switch } from 'react-router-dom'; + import RolesEditPage from '..'; +import pluginId from '../../../../pluginId'; + import server from './server'; jest.mock('@strapi/helper-plugin', () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/server.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/server.js index 549ca69ae7..917c012e35 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/server.js @@ -1,5 +1,6 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; + import pluginId from '../../../../pluginId'; const handlers = [ diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js index 5e2ac5c5af..c3bcd9cf28 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/utils/schema.js @@ -1,5 +1,5 @@ -import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; +import * as yup from 'yup'; const schema = yup.object().shape({ name: yup.string().required(translatedErrors.required), diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js index 680d18f9f1..a27b8923e7 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/components/TableBody.js @@ -1,8 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import { IconButton, Typography, Flex, Tbody, Tr, Td } from '@strapi/design-system'; -import { Pencil, Trash } from '@strapi/icons'; + +import { Flex, IconButton, Tbody, Td, Tr, Typography } from '@strapi/design-system'; import { CheckPermissions, onRowClick, stopPropagation } from '@strapi/helper-plugin'; +import { Pencil, Trash } from '@strapi/icons'; +import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import { useHistory } from 'react-router-dom'; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js index ac607e9697..2326f2b5ca 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js @@ -1,45 +1,47 @@ import React, { useMemo, useState } from 'react'; + import { + ActionLayout, Button, + ContentLayout, HeaderLayout, Layout, - ContentLayout, - ActionLayout, Main, Table, - Tr, - Thead, Th, + Thead, + Tr, Typography, useNotifyAT, VisuallyHidden, } from '@strapi/design-system'; -import { Plus } from '@strapi/icons'; import { - useTracking, - SettingsPageTitle, CheckPermissions, - useNotification, - useRBAC, - NoPermissions, - LoadingIndicatorPage, - SearchURLQuery, - useFocusWhenNavigate, - useQueryParams, - EmptyStateLayout, ConfirmDialog, - useFilter, + EmptyStateLayout, + LoadingIndicatorPage, + NoPermissions, + SearchURLQuery, + SettingsPageTitle, useCollator, + useFilter, + useFocusWhenNavigate, + useNotification, + useQueryParams, + useRBAC, + useTracking, } from '@strapi/helper-plugin'; +import { Plus } from '@strapi/icons'; import { useIntl } from 'react-intl'; -import { useHistory } from 'react-router-dom'; import { useMutation, useQuery, useQueryClient } from 'react-query'; +import { useHistory } from 'react-router-dom'; -import { fetchData, deleteData } from './utils/api'; -import { getTrad } from '../../../utils'; -import pluginId from '../../../pluginId'; import permissions from '../../../permissions'; +import pluginId from '../../../pluginId'; +import { getTrad } from '../../../utils'; + import TableBody from './components/TableBody'; +import { deleteData, fetchData } from './utils/api'; const RoleListPage = () => { const { trackUsage } = useTracking(); diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js index edcda42a5c..b7904d9ad5 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js @@ -1,15 +1,17 @@ /* eslint-disable react/jsx-no-constructed-context-values */ import React from 'react'; + +import { lightTheme, ThemeProvider } from '@strapi/design-system'; +import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { render, screen, waitFor } from '@testing-library/react'; +import { createMemoryHistory } from 'history'; import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from 'react-query'; -import { ThemeProvider, lightTheme } from '@strapi/design-system'; -import { TrackingProvider, useRBAC } from '@strapi/helper-plugin'; import { Router } from 'react-router-dom'; -import { createMemoryHistory } from 'history'; import RoleListPage from '../index'; + import server from './server'; jest.mock('@strapi/helper-plugin', () => ({ diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/server.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/server.js index 4fc68e8050..dde6e1ef0a 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/server.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/server.js @@ -1,5 +1,5 @@ -import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { setupServer } from 'msw/node'; const handlers = [ rest.get('*/roles', (req, res, ctx) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js index e66552f599..9c4d2f22ca 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/utils/api.js @@ -1,4 +1,5 @@ import { getFetchClient } from '@strapi/helper-plugin'; + import { getRequestURL } from '../../../../utils'; export const fetchData = async (toggleNotification, notifyStatus) => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js index b1f8ebf5ea..2ed1c26346 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedCreatePage/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import pluginPermissions from '../../../permissions'; import RolesCreatePage from '../CreatePage'; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js index 728ede03b5..01d37685aa 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedEditPage/index.js @@ -1,5 +1,7 @@ import React from 'react'; + import { CheckPagePermissions } from '@strapi/helper-plugin'; + import pluginPermissions from '../../../permissions'; import RolesEditPage from '../EditPage'; diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js index d9f2415bf1..6476f6f5a5 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/ProtectedListPage/index.js @@ -1,7 +1,8 @@ import React from 'react'; -import { CheckPagePermissions } from '@strapi/helper-plugin'; -import pluginPermissions from '../../../permissions'; +import { CheckPagePermissions } from '@strapi/helper-plugin'; + +import pluginPermissions from '../../../permissions'; import RolesListPage from '../ListPage'; const ProtectedRolesListPage = () => { diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/index.js b/packages/plugins/users-permissions/admin/src/pages/Roles/index.js index 371f14b301..d23637bff9 100644 --- a/packages/plugins/users-permissions/admin/src/pages/Roles/index.js +++ b/packages/plugins/users-permissions/admin/src/pages/Roles/index.js @@ -1,11 +1,14 @@ import React from 'react'; -import { Switch, Route } from 'react-router-dom'; -import { CheckPagePermissions, AnErrorOccurred } from '@strapi/helper-plugin'; -import pluginId from '../../pluginId'; + +import { AnErrorOccurred, CheckPagePermissions } from '@strapi/helper-plugin'; +import { Route, Switch } from 'react-router-dom'; + import pluginPermissions from '../../permissions'; -import ProtectedRolesListPage from './ProtectedListPage'; -import ProtectedRolesEditPage from './ProtectedEditPage'; +import pluginId from '../../pluginId'; + import ProtectedRolesCreatePage from './ProtectedCreatePage'; +import ProtectedRolesEditPage from './ProtectedEditPage'; +import ProtectedRolesListPage from './ProtectedListPage'; const Roles = () => { return ( diff --git a/packages/plugins/users-permissions/admin/src/utils/index.js b/packages/plugins/users-permissions/admin/src/utils/index.js index d32b9cf74d..61137b9ca6 100644 --- a/packages/plugins/users-permissions/admin/src/utils/index.js +++ b/packages/plugins/users-permissions/admin/src/utils/index.js @@ -1,4 +1,4 @@ export { default as cleanPermissions } from './cleanPermissions'; +export { default as formatPolicies } from './formatPolicies'; export { default as getRequestURL } from './getRequestURL'; export { default as getTrad } from './getTrad'; -export { default as formatPolicies } from './formatPolicies';