diff --git a/assets/js/src/context/getConstantsContext.jsx b/assets/js/src/context/getConstantsContext.jsx deleted file mode 100644 index da20056337..0000000000 --- a/assets/js/src/context/getConstantsContext.jsx +++ /dev/null @@ -1,6 +0,0 @@ -export default function getConstantsContext(data) { - return { - isNewUser: data.mailpoet_is_new_user, - segments: data.mailpoetSegments, - }; -} diff --git a/assets/js/src/context/getSegmentsContext.jsx b/assets/js/src/context/getSegmentsContext.jsx new file mode 100644 index 0000000000..401314d9c5 --- /dev/null +++ b/assets/js/src/context/getSegmentsContext.jsx @@ -0,0 +1,5 @@ +export default function getSegmentsContext(data) { + return { + all: data.mailpoetSegments, + }; +} diff --git a/assets/js/src/context/getUsersContext.jsx b/assets/js/src/context/getUsersContext.jsx new file mode 100644 index 0000000000..af368bc3ab --- /dev/null +++ b/assets/js/src/context/getUsersContext.jsx @@ -0,0 +1,5 @@ +export default function getUsersContext(data) { + return { + isNewUser: data.mailpoet_is_new_user, + }; +} diff --git a/assets/js/src/context/index.jsx b/assets/js/src/context/index.jsx index 784620c150..ee3b72abb7 100644 --- a/assets/js/src/context/index.jsx +++ b/assets/js/src/context/index.jsx @@ -1,6 +1,7 @@ import React from 'react'; import getFeaturesContext from './getFeaturesContext.jsx'; -import getConstantsContext from './getConstantsContext.jsx'; +import getSegmentsContext from './getSegmentsContext.jsx'; +import getUsersContext from './getUsersContext.jsx'; /** * Builds the value of the global context. @@ -9,8 +10,9 @@ import getConstantsContext from './getConstantsContext.jsx'; */ export function useGlobalContextValue(data) { const features = getFeaturesContext(data); - const constants = getConstantsContext(data); - return { features, constants }; + const segments = getSegmentsContext(data); + const users = getUsersContext(data); + return { features, segments, users }; } export const GlobalContext = React.createContext(useGlobalContextValue(window)); diff --git a/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx b/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx index 2d2da7c673..35475caeb8 100644 --- a/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx +++ b/assets/js/src/subscribers/importExport/import/step_data_manipulation/select_segment.jsx @@ -8,8 +8,8 @@ import { createSelection, destroySelection } from './generate_segment_selection. import createNewSegment from './create_new_segment.jsx'; function SelectSegment({ setSelectedSegments }) { - const { constants } = useContext(GlobalContext); - const { segments: originalSegments } = constants; + const { segments: segmentsContext } = useContext(GlobalContext); + const { all: originalSegments } = segmentsContext; const [selectionSegments, setSelectionSegments] = useState(originalSegments); useLayoutEffect(() => { diff --git a/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx b/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx index d8f340a838..0c1ddc64f1 100644 --- a/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx +++ b/assets/js/src/subscribers/importExport/import/step_method_selection/select_import_method.jsx @@ -8,8 +8,8 @@ function SelectImportMethod({ activeMethod, onMethodChange, }) { - const { constants } = React.useContext(GlobalContext); - const { isNewUser } = constants; + const { users } = React.useContext(GlobalContext); + const { isNewUser } = users; const badgeClasses = classNames( 'mailpoet_badge', 'mailpoet_badge_video',