remove passing setMessageAttribute through props
This commit is contained in:
parent
457105c42f
commit
d38c6589f1
|
@ -1,18 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
import constants from 'utils/strings/constants';
|
|
||||||
import DialogBox from './DialogBox';
|
|
||||||
|
|
||||||
export default function IncognitoWarning() {
|
|
||||||
return (
|
|
||||||
<DialogBox
|
|
||||||
show={true}
|
|
||||||
onHide={() => null}
|
|
||||||
attributes={{
|
|
||||||
title: constants.LOCAL_STORAGE_NOT_ACCESSIBLE,
|
|
||||||
staticBackdrop: true,
|
|
||||||
nonClosable: true,
|
|
||||||
}}>
|
|
||||||
<div>{constants.LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE}</div>
|
|
||||||
</DialogBox>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -73,7 +73,6 @@ export default function UtilitySection({ closeSidebar }) {
|
||||||
<TwoFactorModal
|
<TwoFactorModal
|
||||||
show={twoFactorModalView}
|
show={twoFactorModalView}
|
||||||
onHide={closeTwoFactorModalView}
|
onHide={closeTwoFactorModalView}
|
||||||
setDialogMessage={setDialogMessage}
|
|
||||||
closeSidebar={closeSidebar}
|
closeSidebar={closeSidebar}
|
||||||
setLoading={startLoading}
|
setLoading={startLoading}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -3,14 +3,13 @@ import { getTwoFactorStatus } from 'services/userService';
|
||||||
import { SetLoading } from 'types/gallery';
|
import { SetLoading } from 'types/gallery';
|
||||||
import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
|
import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
|
||||||
import constants from 'utils/strings/constants';
|
import constants from 'utils/strings/constants';
|
||||||
import DialogBox, { SetDialogBoxAttributes } from '../../DialogBox';
|
import DialogBox from '../../DialogBox';
|
||||||
import TwoFactorModalSetupSection from './Setup';
|
import TwoFactorModalSetupSection from './Setup';
|
||||||
import TwoFactorModalManageSection from './Manage';
|
import TwoFactorModalManageSection from './Manage';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
show: boolean;
|
show: boolean;
|
||||||
onHide: () => void;
|
onHide: () => void;
|
||||||
setDialogMessage: SetDialogBoxAttributes;
|
|
||||||
setLoading: SetLoading;
|
setLoading: SetLoading;
|
||||||
closeSidebar: () => void;
|
closeSidebar: () => void;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,6 @@ import {
|
||||||
hasPaypalSubscription,
|
hasPaypalSubscription,
|
||||||
} from 'utils/billing';
|
} from 'utils/billing';
|
||||||
import { reverseString } from 'utils/common';
|
import { reverseString } from 'utils/common';
|
||||||
import { SetDialogBoxAttributes } from 'components/DialogBox';
|
|
||||||
import ArrowEast from 'components/icons/ArrowEast';
|
import ArrowEast from 'components/icons/ArrowEast';
|
||||||
import LinkButton from './LinkButton';
|
import LinkButton from './LinkButton';
|
||||||
import { DeadCenter, GalleryContext } from 'pages/gallery';
|
import { DeadCenter, GalleryContext } from 'pages/gallery';
|
||||||
|
@ -79,7 +78,7 @@ export const PlanIcon = styled.div<{ currentlySubscribed: boolean }>`
|
||||||
interface Props {
|
interface Props {
|
||||||
modalView: boolean;
|
modalView: boolean;
|
||||||
closeModal: any;
|
closeModal: any;
|
||||||
setDialogMessage: SetDialogBoxAttributes;
|
|
||||||
setLoading: SetLoading;
|
setLoading: SetLoading;
|
||||||
}
|
}
|
||||||
enum PLAN_PERIOD {
|
enum PLAN_PERIOD {
|
||||||
|
@ -128,7 +127,7 @@ function PlanSelector(props: Props) {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError(e, 'plan selector modal open failed');
|
logError(e, 'plan selector modal open failed');
|
||||||
props.closeModal();
|
props.closeModal();
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.OPEN_PLAN_SELECTOR_MODAL_FAILED,
|
title: constants.OPEN_PLAN_SELECTOR_MODAL_FAILED,
|
||||||
content: constants.UNKNOWN_ERROR,
|
content: constants.UNKNOWN_ERROR,
|
||||||
close: { text: 'close', variant: 'danger' },
|
close: { text: 'close', variant: 'danger' },
|
||||||
|
@ -150,7 +149,7 @@ function PlanSelector(props: Props) {
|
||||||
hasMobileSubscription(subscription) &&
|
hasMobileSubscription(subscription) &&
|
||||||
!isSubscriptionCancelled(subscription)
|
!isSubscriptionCancelled(subscription)
|
||||||
) {
|
) {
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.ERROR,
|
title: constants.ERROR,
|
||||||
content: constants.CANCEL_SUBSCRIPTION_ON_MOBILE,
|
content: constants.CANCEL_SUBSCRIPTION_ON_MOBILE,
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
|
@ -159,13 +158,13 @@ function PlanSelector(props: Props) {
|
||||||
hasPaypalSubscription(subscription) &&
|
hasPaypalSubscription(subscription) &&
|
||||||
!isSubscriptionCancelled(subscription)
|
!isSubscriptionCancelled(subscription)
|
||||||
) {
|
) {
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.MANAGE_PLAN,
|
title: constants.MANAGE_PLAN,
|
||||||
content: constants.PAYPAL_MANAGE_NOT_SUPPORTED_MESSAGE(),
|
content: constants.PAYPAL_MANAGE_NOT_SUPPORTED_MESSAGE(),
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
});
|
});
|
||||||
} else if (hasStripeSubscription(subscription)) {
|
} else if (hasStripeSubscription(subscription)) {
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: `${constants.CONFIRM} ${reverseString(
|
title: `${constants.CONFIRM} ${reverseString(
|
||||||
constants.UPDATE_SUBSCRIPTION
|
constants.UPDATE_SUBSCRIPTION
|
||||||
)}`,
|
)}`,
|
||||||
|
@ -176,7 +175,7 @@ function PlanSelector(props: Props) {
|
||||||
action: updateSubscription.bind(
|
action: updateSubscription.bind(
|
||||||
null,
|
null,
|
||||||
plan,
|
plan,
|
||||||
props.setDialogMessage,
|
appContext.setDialogMessage,
|
||||||
props.setLoading,
|
props.setLoading,
|
||||||
props.closeModal
|
props.closeModal
|
||||||
),
|
),
|
||||||
|
@ -190,7 +189,7 @@ function PlanSelector(props: Props) {
|
||||||
await billingService.buySubscription(plan.stripeID);
|
await billingService.buySubscription(plan.stripeID);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
props.setLoading(false);
|
props.setLoading(false);
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.ERROR,
|
title: constants.ERROR,
|
||||||
content: constants.SUBSCRIPTION_PURCHASE_FAILED,
|
content: constants.SUBSCRIPTION_PURCHASE_FAILED,
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
|
@ -320,7 +319,7 @@ function PlanSelector(props: Props) {
|
||||||
<LinkButton
|
<LinkButton
|
||||||
color={'success'}
|
color={'success'}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.CONFIRM_ACTIVATE_SUBSCRIPTION,
|
title: constants.CONFIRM_ACTIVATE_SUBSCRIPTION,
|
||||||
content:
|
content:
|
||||||
constants.ACTIVATE_SUBSCRIPTION_MESSAGE(
|
constants.ACTIVATE_SUBSCRIPTION_MESSAGE(
|
||||||
|
@ -331,7 +330,7 @@ function PlanSelector(props: Props) {
|
||||||
text: constants.ACTIVATE_SUBSCRIPTION,
|
text: constants.ACTIVATE_SUBSCRIPTION,
|
||||||
action: activateSubscription.bind(
|
action: activateSubscription.bind(
|
||||||
null,
|
null,
|
||||||
props.setDialogMessage,
|
appContext.setDialogMessage,
|
||||||
props.closeModal,
|
props.closeModal,
|
||||||
props.setLoading
|
props.setLoading
|
||||||
),
|
),
|
||||||
|
@ -348,7 +347,7 @@ function PlanSelector(props: Props) {
|
||||||
<LinkButton
|
<LinkButton
|
||||||
color="danger"
|
color="danger"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.CONFIRM_CANCEL_SUBSCRIPTION,
|
title: constants.CONFIRM_CANCEL_SUBSCRIPTION,
|
||||||
content:
|
content:
|
||||||
constants.CANCEL_SUBSCRIPTION_MESSAGE(),
|
constants.CANCEL_SUBSCRIPTION_MESSAGE(),
|
||||||
|
@ -357,7 +356,7 @@ function PlanSelector(props: Props) {
|
||||||
text: constants.CANCEL_SUBSCRIPTION,
|
text: constants.CANCEL_SUBSCRIPTION,
|
||||||
action: cancelSubscription.bind(
|
action: cancelSubscription.bind(
|
||||||
null,
|
null,
|
||||||
props.setDialogMessage,
|
appContext.setDialogMessage,
|
||||||
props.closeModal,
|
props.closeModal,
|
||||||
props.setLoading
|
props.setLoading
|
||||||
),
|
),
|
||||||
|
@ -375,7 +374,7 @@ function PlanSelector(props: Props) {
|
||||||
color="primary"
|
color="primary"
|
||||||
onClick={updatePaymentMethod.bind(
|
onClick={updatePaymentMethod.bind(
|
||||||
null,
|
null,
|
||||||
props.setDialogMessage,
|
appContext.setDialogMessage,
|
||||||
props.setLoading
|
props.setLoading
|
||||||
)}
|
)}
|
||||||
style={{ marginTop: '20px' }}>
|
style={{ marginTop: '20px' }}>
|
||||||
|
|
|
@ -6,8 +6,8 @@ import React, { useContext } from 'react';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import { DeduplicateContext } from 'pages/deduplicate';
|
import { DeduplicateContext } from 'pages/deduplicate';
|
||||||
import LeftArrow from 'components/icons/LeftArrow';
|
import LeftArrow from 'components/icons/LeftArrow';
|
||||||
import { SetDialogBoxAttributes } from 'components/DialogBox';
|
|
||||||
import { IconWithMessage } from 'components/IconWithMessage';
|
import { IconWithMessage } from 'components/IconWithMessage';
|
||||||
|
import { AppContext } from 'pages/_app';
|
||||||
|
|
||||||
const VerticalLine = styled.div`
|
const VerticalLine = styled.div`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
@ -19,18 +19,17 @@ const VerticalLine = styled.div`
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
deleteFileHelper: () => void;
|
deleteFileHelper: () => void;
|
||||||
setDialogMessage: SetDialogBoxAttributes;
|
|
||||||
close: () => void;
|
close: () => void;
|
||||||
count: number;
|
count: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function DeduplicateOptions({
|
export default function DeduplicateOptions({
|
||||||
setDialogMessage,
|
|
||||||
deleteFileHelper,
|
deleteFileHelper,
|
||||||
close,
|
close,
|
||||||
count,
|
count,
|
||||||
}: IProps) {
|
}: IProps) {
|
||||||
const deduplicateContext = useContext(DeduplicateContext);
|
const deduplicateContext = useContext(DeduplicateContext);
|
||||||
|
const { setDialogMessage } = useContext(AppContext);
|
||||||
|
|
||||||
const trashHandler = () =>
|
const trashHandler = () =>
|
||||||
setDialogMessage({
|
setDialogMessage({
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import { SetDialogBoxAttributes } from 'components/DialogBox';
|
import React, { useContext, useEffect, useState } from 'react';
|
||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import { SetCollectionSelectorAttributes } from '../CollectionSelector';
|
import { SetCollectionSelectorAttributes } from '../CollectionSelector';
|
||||||
import DeleteIcon from 'components/icons/DeleteIcon';
|
import DeleteIcon from 'components/icons/DeleteIcon';
|
||||||
import CloseIcon from '@mui/icons-material/Close';
|
import CloseIcon from '@mui/icons-material/Close';
|
||||||
|
@ -25,13 +24,13 @@ import DownloadIcon from 'components/icons/DownloadIcon';
|
||||||
import { User } from 'types/user';
|
import { User } from 'types/user';
|
||||||
import { IconWithMessage } from 'components/IconWithMessage';
|
import { IconWithMessage } from 'components/IconWithMessage';
|
||||||
import { SelectionBar, SelectionContainer } from '.';
|
import { SelectionBar, SelectionContainer } from '.';
|
||||||
|
import { AppContext } from 'pages/_app';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
addToCollectionHelper: (collection: Collection) => void;
|
addToCollectionHelper: (collection: Collection) => void;
|
||||||
moveToCollectionHelper: (collection: Collection) => void;
|
moveToCollectionHelper: (collection: Collection) => void;
|
||||||
restoreToCollectionHelper: (collection: Collection) => void;
|
restoreToCollectionHelper: (collection: Collection) => void;
|
||||||
showCreateCollectionModal: (opsType: COLLECTION_OPS_TYPE) => () => void;
|
showCreateCollectionModal: (opsType: COLLECTION_OPS_TYPE) => () => void;
|
||||||
setDialogMessage: SetDialogBoxAttributes;
|
|
||||||
setCollectionSelectorAttributes: SetCollectionSelectorAttributes;
|
setCollectionSelectorAttributes: SetCollectionSelectorAttributes;
|
||||||
deleteFileHelper: (permanent?: boolean) => void;
|
deleteFileHelper: (permanent?: boolean) => void;
|
||||||
removeFromCollectionHelper: () => void;
|
removeFromCollectionHelper: () => void;
|
||||||
|
@ -52,7 +51,6 @@ const SelectedFileOptions = ({
|
||||||
showCreateCollectionModal,
|
showCreateCollectionModal,
|
||||||
removeFromCollectionHelper,
|
removeFromCollectionHelper,
|
||||||
fixTimeHelper,
|
fixTimeHelper,
|
||||||
setDialogMessage,
|
|
||||||
setCollectionSelectorAttributes,
|
setCollectionSelectorAttributes,
|
||||||
deleteFileHelper,
|
deleteFileHelper,
|
||||||
downloadHelper,
|
downloadHelper,
|
||||||
|
@ -63,8 +61,8 @@ const SelectedFileOptions = ({
|
||||||
activeCollection,
|
activeCollection,
|
||||||
isFavoriteCollection,
|
isFavoriteCollection,
|
||||||
}: Props) => {
|
}: Props) => {
|
||||||
|
const { setDialogMessage } = useContext(AppContext);
|
||||||
const [showFixCreationTime, setShowFixCreationTime] = useState(false);
|
const [showFixCreationTime, setShowFixCreationTime] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const user: User = getData(LS_KEYS.USER);
|
const user: User = getData(LS_KEYS.USER);
|
||||||
const showFixCreationTime =
|
const showFixCreationTime =
|
||||||
|
|
|
@ -2,7 +2,6 @@ import React, { useContext, useEffect, useRef, useState } from 'react';
|
||||||
|
|
||||||
import { syncCollections, createAlbum } from 'services/collectionService';
|
import { syncCollections, createAlbum } from 'services/collectionService';
|
||||||
import constants from 'utils/strings/constants';
|
import constants from 'utils/strings/constants';
|
||||||
import { SetDialogBoxAttributes } from 'components/DialogBox';
|
|
||||||
import UploadProgress from './UploadProgress';
|
import UploadProgress from './UploadProgress';
|
||||||
|
|
||||||
import UploadStrategyChoiceModal from './UploadStrategyChoiceModal';
|
import UploadStrategyChoiceModal from './UploadStrategyChoiceModal';
|
||||||
|
@ -34,7 +33,6 @@ interface Props {
|
||||||
setCollectionSelectorAttributes: SetCollectionSelectorAttributes;
|
setCollectionSelectorAttributes: SetCollectionSelectorAttributes;
|
||||||
setCollectionNamerAttributes: SetCollectionNamerAttributes;
|
setCollectionNamerAttributes: SetCollectionNamerAttributes;
|
||||||
setLoading: SetLoading;
|
setLoading: SetLoading;
|
||||||
setDialogMessage: SetDialogBoxAttributes;
|
|
||||||
setUploadInProgress: any;
|
setUploadInProgress: any;
|
||||||
showCollectionSelector: () => void;
|
showCollectionSelector: () => void;
|
||||||
fileRejections: FileRejection[];
|
fileRejections: FileRejection[];
|
||||||
|
@ -279,7 +277,7 @@ export default function Upload(props: Props) {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setProgressView(false);
|
setProgressView(false);
|
||||||
logError(e, 'Failed to create album');
|
logError(e, 'Failed to create album');
|
||||||
props.setDialogMessage({
|
appContext.setDialogMessage({
|
||||||
title: constants.ERROR,
|
title: constants.ERROR,
|
||||||
staticBackdrop: true,
|
staticBackdrop: true,
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
|
|
|
@ -168,7 +168,6 @@ export default function Deduplicate() {
|
||||||
activeCollection={ALL_SECTION}
|
activeCollection={ALL_SECTION}
|
||||||
/>
|
/>
|
||||||
<DeduplicateOptions
|
<DeduplicateOptions
|
||||||
setDialogMessage={setDialogMessage}
|
|
||||||
deleteFileHelper={deleteFileHelper}
|
deleteFileHelper={deleteFileHelper}
|
||||||
count={selected.count}
|
count={selected.count}
|
||||||
close={closeDeduplication}
|
close={closeDeduplication}
|
||||||
|
|
|
@ -598,7 +598,6 @@ export default function Gallery() {
|
||||||
<PlanSelector
|
<PlanSelector
|
||||||
modalView={planModalView}
|
modalView={planModalView}
|
||||||
closeModal={() => setPlanModalView(false)}
|
closeModal={() => setPlanModalView(false)}
|
||||||
setDialogMessage={setDialogMessage}
|
|
||||||
setLoading={setBlockingLoad}
|
setLoading={setBlockingLoad}
|
||||||
/>
|
/>
|
||||||
<AlertBanner bannerMessage={bannerMessage} />
|
<AlertBanner bannerMessage={bannerMessage} />
|
||||||
|
@ -660,7 +659,6 @@ export default function Gallery() {
|
||||||
)}
|
)}
|
||||||
setLoading={setBlockingLoad}
|
setLoading={setBlockingLoad}
|
||||||
setCollectionNamerAttributes={setCollectionNamerAttributes}
|
setCollectionNamerAttributes={setCollectionNamerAttributes}
|
||||||
setDialogMessage={setDialogMessage}
|
|
||||||
setUploadInProgress={setUploadInProgress}
|
setUploadInProgress={setUploadInProgress}
|
||||||
fileRejections={fileRejections}
|
fileRejections={fileRejections}
|
||||||
setFiles={setFiles}
|
setFiles={setFiles}
|
||||||
|
@ -721,7 +719,6 @@ export default function Gallery() {
|
||||||
showCreateCollectionModal={
|
showCreateCollectionModal={
|
||||||
showCreateCollectionModal
|
showCreateCollectionModal
|
||||||
}
|
}
|
||||||
setDialogMessage={setDialogMessage}
|
|
||||||
setCollectionSelectorAttributes={
|
setCollectionSelectorAttributes={
|
||||||
setCollectionSelectorAttributes
|
setCollectionSelectorAttributes
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ import EnteSpinner from 'components/EnteSpinner';
|
||||||
import SignUp from 'components/SignUp';
|
import SignUp from 'components/SignUp';
|
||||||
import constants from 'utils/strings/constants';
|
import constants from 'utils/strings/constants';
|
||||||
import localForage from 'utils/storage/localForage';
|
import localForage from 'utils/storage/localForage';
|
||||||
import IncognitoWarning from 'components/IncognitoWarning';
|
|
||||||
import { logError } from 'utils/sentry';
|
import { logError } from 'utils/sentry';
|
||||||
import { getAlbumSiteHost, PAGES } from 'constants/pages';
|
import { getAlbumSiteHost, PAGES } from 'constants/pages';
|
||||||
|
|
||||||
|
@ -102,7 +101,7 @@ export default function LandingPage() {
|
||||||
const appContext = useContext(AppContext);
|
const appContext = useContext(AppContext);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [showLogin, setShowLogin] = useState(true);
|
const [showLogin, setShowLogin] = useState(true);
|
||||||
const [blockUsage, setBlockUsage] = useState(false);
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
appContext.showNavBar(false);
|
appContext.showNavBar(false);
|
||||||
const currentURL = new URL(window.location.href);
|
const currentURL = new URL(window.location.href);
|
||||||
|
@ -143,7 +142,12 @@ export default function LandingPage() {
|
||||||
await localForage.ready();
|
await localForage.ready();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError(e, 'usage in incognito mode tried');
|
logError(e, 'usage in incognito mode tried');
|
||||||
setBlockUsage(true);
|
appContext.setDialogMessage({
|
||||||
|
title: constants.LOCAL_STORAGE_NOT_ACCESSIBLE,
|
||||||
|
staticBackdrop: true,
|
||||||
|
nonClosable: true,
|
||||||
|
content: constants.LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE,
|
||||||
|
});
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
|
@ -216,7 +220,6 @@ export default function LandingPage() {
|
||||||
)}
|
)}
|
||||||
</SideBox>
|
</SideBox>
|
||||||
</DesktopBox>
|
</DesktopBox>
|
||||||
{blockUsage && <IncognitoWarning />}
|
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</Container>
|
</Container>
|
||||||
|
|
Loading…
Reference in a new issue