Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Add offer cancel button fix (#19348)

Browse source 
Ref
[PROD-213](https://linear.app/tryghost/issue/PROD-213/cancelling-should-act-two-ways-when-the-modal-is-opened-from-the-list)
This commit is contained in:
Princi Vershwal 2023-12-13 11:18:48 +05:30 • committed by GitHub
parent c90e033fcf
commit 7d530406f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/admin-x-settings/src/components/settings/growth/offers/AddOfferModal.tsx
View file

@ -8,6 +8,7 @@ import {getOfferPortalPreviewUrl, offerPortalPreviewUrlTypes} from '../../../../
import {getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers'; import {getPaidActiveTiers, useBrowseTiers} from '@tryghost/admin-x-framework/api/tiers';
import {getTiersCadences} from '../../../../utils/getTiersCadences'; import {getTiersCadences} from '../../../../utils/getTiersCadences';
import {useAddOffer} from '@tryghost/admin-x-framework/api/offers'; import {useAddOffer} from '@tryghost/admin-x-framework/api/offers';
import {useBrowseOffers} from '@tryghost/admin-x-framework/api/offers';
import {useEffect, useMemo, useState} from 'react'; import {useEffect, useMemo, useState} from 'react';
import {useGlobalData} from '../../../providers/GlobalDataProvider'; import {useGlobalData} from '../../../providers/GlobalDataProvider';
import {useModal} from '@ebay/nice-modal-react'; import {useModal} from '@ebay/nice-modal-react';
@ -364,6 +365,8 @@ const AddOfferModal = () => {
} }
}); });
const {data: {offers: allOffers = []} = {}} = useBrowseOffers();
const {formState, updateForm, handleSave, saveState, okProps, validate, errors, clearError} = useForm({ const {formState, updateForm, handleSave, saveState, okProps, validate, errors, clearError} = useForm({
initialState: { initialState: {
disableBackground: false, disableBackground: false,
@ -592,7 +595,11 @@ const AddOfferModal = () => {
}, [hasOffers, modal, updateRoute]); }, [hasOffers, modal, updateRoute]);
const cancelAddOffer = () => { const cancelAddOffer = () => {
if (allOffers.length > 0) {
updateRoute('offers/edit'); updateRoute('offers/edit');
} else {
updateRoute('offers');
}
}; };
const overrides : offerPortalPreviewUrlTypes = useMemo(() => { const overrides : offerPortalPreviewUrlTypes = useMemo(() => {

2
apps/admin-x-settings/src/components/settings/growth/offers/OffersContainerModal.tsx
View file

@ -18,7 +18,7 @@ const OffersRouteHandler: React.FC<OffersRouteHandlerProps> = ({route}) => {
} else if (route.startsWith('offers/success/') && route.length > 'offers/success/'.length) { } else if (route.startsWith('offers/success/') && route.length > 'offers/success/'.length) {
const offerId = route.split('/').pop(); const offerId = route.split('/').pop();
return <OfferSuccess id={offerId ? offerId : ''} />; return <OfferSuccess id={offerId ? offerId : ''} />;
} else { } else if (route === 'offers/edit') {
return <OffersIndexModal />; return <OffersIndexModal />;
} }
}; };