(10266): refactor directory structure and exports in offer detail

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferCreation.jsx → src/components/pages/Offers/Offer/OfferDetails/OfferCreation/OfferCreation.jsx

@@ -10,7 +10,7 @@ import Spinner from 'components/layout/Spinner'
 import { computeOffersUrl } from 'components/pages/Offers/utils/computeOffersUrl'
 import * as pcapi from 'repository/pcapi/pcapi'
 
-import OfferForm from './OfferForm'
+import OfferForm from '../OfferForm'
 
 const OfferCreation = ({
   categories,

src/components/pages/Offers/Offer/OfferDetails/OfferCreation/index.js

@@ -0,0 +1 @@
+export { default } from './OfferCreation'

src/components/pages/Offers/Offer/OfferDetails/OfferDetails.jsx

@@ -11,18 +11,19 @@ import useNotification from 'components/hooks/useNotification'
 import PageTitle from 'components/layout/PageTitle/PageTitle'
 import Spinner from 'components/layout/Spinner'
 import { isOfferDisabled } from 'components/pages/Offers/domain/isOfferDisabled'
-import { DEFAULT_FORM_VALUES } from 'components/pages/Offers/Offer/OfferDetails/OfferForm/_constants'
-import OfferCreation from 'components/pages/Offers/Offer/OfferDetails/OfferForm/OfferCreation'
-import OfferEditionContainer from 'components/pages/Offers/Offer/OfferDetails/OfferForm/OfferEditionContainer'
-import OfferPreview from 'components/pages/Offers/Offer/OfferDetails/OfferPreview/OfferPreview'
-import OfferStatusBanner from 'components/pages/Offers/Offer/OfferDetails/OfferStatusBanner/OfferStatusBanner'
-import OfferThumbnail from 'components/pages/Offers/Offer/OfferDetails/OfferThumbnail/OfferThumbnail'
 import OfferPreviewLink from 'components/pages/Offers/Offer/OfferPreviewLink/OfferPreviewLink'
 import * as pcapi from 'repository/pcapi/pcapi'
 import { loadCategories } from 'store/offers/thunks'
 
 import { queryParamsFromOfferer } from '../../utils/queryParamsFromOfferer'
 
+import { DEFAULT_FORM_VALUES } from './_constants'
+import OfferCreation from './OfferCreation'
+import OfferEdition from './OfferEdition'
+import OfferPreview from './OfferPreview'
+import OfferStatusBanner from './OfferStatusBanner'
+import OfferThumbnail from './OfferThumbnail'
+
 
 const OfferDetails = ({
   history,
@@ -188,7 +189,7 @@ const OfferDetails = ({
           {offer ? (
             <>
               {isDisabled && <OfferStatusBanner status={offerStatus} />}
-              <OfferEditionContainer
+              <OfferEdition
                 categories={categories}
                 isDisabled={isDisabled}
                 isUserAdmin={isUserAdmin}

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferEdition.jsx → src/components/pages/Offers/Offer/OfferDetails/OfferEdition/OfferEdition.jsx

@@ -11,14 +11,15 @@ import {
   isFieldReadOnlyForSynchronizedOffer,
   isSynchronizedOffer,
 } from 'components/pages/Offers/domain/localProvider'
+import { getDisabilityComplianceValues } from 'components/pages/Offers/Offer/OfferDetails/OfferForm/AccessibilityCheckboxList'
+import { computeOffersUrl } from 'components/pages/Offers/utils/computeOffersUrl'
+
 import {
   DEFAULT_FORM_VALUES,
   EDITED_OFFER_READ_ONLY_FIELDS,
-} from 'components/pages/Offers/Offer/OfferDetails/OfferForm/_constants'
-import { getDisabilityComplianceValues } from 'components/pages/Offers/Offer/OfferDetails/OfferForm/AccessibilityCheckboxList'
-import { computeOffersUrl } from 'components/pages/Offers/utils/computeOffersUrl'
+} from '../_constants'
+import OfferForm from '../OfferForm'
 
-import OfferForm from './OfferForm'
 
 const computeNoDisabilityComplianceValue = offer => {
   const disabilityCompliantValues = [

src/components/pages/Offers/Offer/OfferDetails/OfferEdition/index.js

@@ -0,0 +1 @@
+export { default } from './OfferEditionContainer'

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferCategories/OfferCategories.jsx

@@ -9,7 +9,7 @@ import React, { useCallback, useEffect, useState } from 'react'
 
 import Select, { buildSelectOptions } from 'components/layout/inputs/Select'
 
-import { DEFAULT_FORM_VALUES } from '../_constants'
+import { DEFAULT_FORM_VALUES } from '../../_constants'
 
 import { SubtypeSelects } from './SubtypeSelects'
 

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferCategories/SubtypeSelects.jsx

@@ -8,8 +8,9 @@ import React, { useEffect, useState } from 'react'
 
 import Select, { buildSelectOptions } from 'components/layout/inputs/Select'
 
-import { musicOptionsTree, showOptionsTree } from '../../subTypes'
-import { DEFAULT_FORM_VALUES } from '../_constants'
+import { DEFAULT_FORM_VALUES } from '../../_constants'
+
+import { musicOptionsTree, showOptionsTree } from './subTypes'
 
 const initialSubTypesOptions = {
   musicType: buildSelectOptions('code', 'label', musicOptionsTree),

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferCategories/index.js

@@ -0,0 +1 @@
+export { default } from './OfferCategories'

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferForm.jsx

@@ -21,6 +21,9 @@ import Select, {
 import TextareaInput from 'components/layout/inputs/TextareaInput'
 import TextInput from 'components/layout/inputs/TextInput/TextInput'
 import Spinner from 'components/layout/Spinner'
+import { SubmitButton } from 'ui-kit'
+import { doesUserPreferReducedMotion } from 'utils/windowMatchMedia'
+
 import {
   BASE_OFFER_FIELDS,
   DEFAULT_FORM_VALUES,
@@ -30,16 +33,14 @@ import {
   NOT_REIMBURSED,
   PLATFORM,
   TEXT_INPUT_DEFAULT_VALUE,
-} from 'components/pages/Offers/Offer/OfferDetails/OfferForm/_constants'
-import OfferRefundWarning from 'components/pages/Offers/Offer/OfferDetails/OfferForm/Messages/OfferRefundWarning'
-import WithdrawalReminder from 'components/pages/Offers/Offer/OfferDetails/OfferForm/Messages/WithdrawalReminder'
-import SynchronizedProviderInformation from 'components/pages/Offers/Offer/OfferDetails/SynchronizedProviderInformation'
-import { SubmitButton } from 'ui-kit'
-import { doesUserPreferReducedMotion } from 'utils/windowMatchMedia'
+} from '../_constants'
 
 import AccessibilityCheckboxList from './AccessibilityCheckboxList'
-import OfferCategories from './OfferCategories/OfferCategories'
+import OfferRefundWarning from './Messages/OfferRefundWarning'
+import WithdrawalReminder from './Messages/WithdrawalReminder'
+import OfferCategories from './OfferCategories'
 import OfferOptions from './OfferOptions'
+import SynchronizedProviderInformation from './SynchronisedProviderInfos'
 
 // JOCONDE React:component "Ce composant est vraiment le plus beau et le plus lisible que nous ayons côté pro. Prenez en de la graine !"
 
@@ -472,7 +473,7 @@ const OfferForm = ({
         'disabilityCompliant' in formErrors
       ) {
         let newFormErrors = { ...formErrors }
-        delete newFormErrors['disabilityCompliant']
+        delete newFormErrors.disabilityCompliant
         setFormErrors(newFormErrors)
       }
 

src/components/pages/Offers/Offer/OfferDetails/OfferForm/OfferOptions/OfferOptions.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 
 import { RadioInput } from 'components/layout/inputs/RadioInput/RadioInput'
 
-import { OFFER_OPTIONS } from '../_constants'
+import { OFFER_OPTIONS } from '../../_constants'
 
 const OfferOptions = ({
   canOfferBeDuo,

src/components/pages/Offers/Offer/OfferDetails/OfferForm/SynchronisedProviderInfos/index.js

@@ -0,0 +1 @@
+export { default } from './SynchronizedProviderInformation'

src/components/pages/Offers/Offer/OfferDetails/OfferForm/index.js

@@ -0,0 +1 @@
+export { default } from './OfferForm'

src/components/pages/Offers/Offer/OfferDetails/OfferPreview/index.js

@@ -0,0 +1 @@
+export { default } from './OfferPreview'

src/components/pages/Offers/Offer/OfferDetails/OfferStatusBanner/index.js

@@ -0,0 +1 @@
+export { default } from './OfferStatusBanner'

src/components/pages/Offers/Offer/OfferDetails/OfferThumbnail/index.js

@@ -0,0 +1 @@
+export { default } from './OfferThumbnail'

src/components/pages/Offers/Offer/OfferDetails/__specs__/OfferEdition.spec.jsx

@@ -15,17 +15,19 @@ import { MemoryRouter, Route } from 'react-router'
 
 import NotificationContainer from 'components/layout/Notification/NotificationContainer'
 import { getProviderInfo } from 'components/pages/Offers/domain/getProviderInfo'
+import OfferLayoutContainer from 'components/pages/Offers/Offer/OfferLayoutContainer'
+import * as computeUrl from 'components/pages/Offers/utils/computeOffersUrl'
+import * as pcapi from 'repository/pcapi/pcapi'
+import { configureTestStore } from 'store/testUtils'
+
+import { DEFAULT_FORM_VALUES } from '../_constants'
+
 import {
   fieldLabels,
   findInputErrorForField,
   getOfferInputForField,
   setOfferValues,
-} from 'components/pages/Offers/Offer/OfferDetails/__specs__/helpers'
-import { DEFAULT_FORM_VALUES } from 'components/pages/Offers/Offer/OfferDetails/OfferForm/_constants'
-import OfferLayoutContainer from 'components/pages/Offers/Offer/OfferLayoutContainer'
-import * as computeUrl from 'components/pages/Offers/utils/computeOffersUrl'
-import * as pcapi from 'repository/pcapi/pcapi'
-import { configureTestStore } from 'store/testUtils'
+} from './helpers'
 
 Element.prototype.scrollIntoView = () => {}
 

src/components/pages/Offers/Offer/OfferDetails/index.js

@@ -0,0 +1 @@
+export { default } from './OfferDetailsContainer'

src/components/pages/Offers/Offer/OfferLayout.jsx

@@ -13,13 +13,14 @@ import Breadcrumb, {
   STEP_ID_STOCKS,
 } from 'components/pages/Offers/Offer/Breadcrumb'
 import ConfirmationContainer from 'components/pages/Offers/Offer/Confirmation/ConfirmationContainer'
-import OfferDetailsContainer from 'components/pages/Offers/Offer/OfferDetails/OfferDetailsContainer'
 import { OfferHeader } from 'components/pages/Offers/Offer/OfferStatus/OfferHeader'
 import RouteLeavingGuardOfferCreation from 'components/pages/Offers/Offer/RouteLeavingGuardOfferCreation'
 import StocksContainer from 'components/pages/Offers/Offer/Stocks/StocksContainer'
 import { OFFER_STATUS_DRAFT } from 'components/pages/Offers/Offers/_constants'
 import * as pcapi from 'repository/pcapi/pcapi'
 
+import OfferDetails from './OfferDetails'
+
 const mapPathToStep = {
   creation: STEP_ID_DETAILS,
   edition: STEP_ID_DETAILS,
@@ -92,13 +93,13 @@ const OfferLayout = ({ location, match }) => {
             exact
             path="/offres/creation"
           >
-            <OfferDetailsContainer offer={offer} />
+            <OfferDetails offer={offer} />
           </Route>
           <Route
             exact
             path={`${match.url}/edition`}
           >
-            <OfferDetailsContainer
+            <OfferDetails
               offer={offer}
               reloadOffer={reloadOffer}
             />

src/components/pages/Offers/domain/localProvider.js

@@ -1,4 +1,4 @@
-import { SYNCHRONIZED_OFFER_EDITABLE_FIELDS } from 'components/pages/Offers/Offer/OfferDetails/OfferForm/_constants'
+import { SYNCHRONIZED_OFFER_EDITABLE_FIELDS } from 'components/pages/Offers/Offer/OfferDetails/_constants'
 
 const doesLastProviderExist = offer => Boolean(offer !== null && offer.lastProvider)