Merge pull request #693 from wmde/already-donated-modal-removal

Remove unused AlreadyDonatedModal
wmde · Feb 6, 2025 · 6477b6d · 6477b6d
2 parents d39bc5e + bfbbcf6
commit 6477b6d
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 361 deletions.
diff --git a/banners/desktop/C25_WMDE_Desktop_DE_00/event_map.ts b/banners/desktop/C25_WMDE_Desktop_DE_00/event_map.ts
@@ -9,7 +9,6 @@ import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
@@ -19,7 +18,6 @@ export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
 	[ FormStepShownEvent.EVENT_NAME, mapFormStepShownEvent ],
-	[ AlreadyDonatedShownEvent.EVENT_NAME, ( e: AlreadyDonatedShownEvent ): WMDELegacyBannerEvent => new WMDELegacyBannerEvent( e.eventName, 1 ) ],
 	[ NotShownEvent.EVENT_NAME, mapNotShownEvent ],
 	[ BannerSubmitEvent.EVENT_NAME, ( e: BannerSubmitEvent ): WMDESizeIssueEvent => {
 		switch ( e.feature ) {

diff --git a/banners/desktop/C25_WMDE_Desktop_DE_00/messages.ts b/banners/desktop/C25_WMDE_Desktop_DE_00/messages.ts
@@ -4,7 +4,6 @@ import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/Upgra
 import FooterDe from '@src/components/Footer/messages/Footer.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
 import DoubleProgressBarDe from '@src/components/ProgressBar/messages/DoubleProgressBar.de';
 
@@ -13,11 +12,10 @@ const messages: TranslationMessages = {
 	...UpgradeToYearlyDe,
 	...FooterDe,
 	...MainDonationFormDe,
-	...AlreadyDonatedModal,
 	...FallbackBanner,
 	...SoftCloseDe,
 	...DoubleProgressBarDe,
-	'already-donated-go-away-button': 'Im Moment nicht',
+	'already-donated-link': 'Habe schon gespendet',
 	'soft-close-prompt': 'Dürfen wir später nochmal fragen?',
 	'upgrade-to-yearly-copy': `<p>Jedes Jahr sind wir auf Menschen wie Sie angewiesen. Jährliche Spenden helfen uns besonders und ermöglichen langfristige Weiterentwicklungen.</p>
 		<p>Sie gehen kein Risiko ein: Jederzeit formlos zu sofort kündbar.</p>`,

diff --git a/banners/english/C25_WMDE_Desktop_EN_00/messages.ts b/banners/english/C25_WMDE_Desktop_EN_00/messages.ts
@@ -4,7 +4,6 @@ import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/Upgra
 import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
 import FooterEn from '@src/components/Footer/messages/Footer.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
 import DoubleProgressBarEn from '@src/components/ProgressBar/messages/DoubleProgressBar.en';
 
@@ -14,9 +13,9 @@ const messages: TranslationMessages = {
 	...SoftCloseEn,
 	...FooterEn,
 	...MainDonationFormEn,
-	...AlreadyDonatedModalEn,
 	...FallbackBanner,
 	...DoubleProgressBarEn,
+	'already-donated-link': 'I\'ve already donated',
 	'upgrade-to-yearly-copy': '<p>Every year we are dependent on the support of people like you. Yearly donations ' +
 		'help sustainably and enable long term development.</p>' +
 		'<p>No risks attached, you can tell us to stop at any time.</p>'

diff --git a/banners/pad/C25_WMDE_iPad_DE_00/messages.ts b/banners/pad/C25_WMDE_iPad_DE_00/messages.ts
@@ -4,15 +4,13 @@ import UpgradeToYearly from '@src/components/DonationForm/Forms/messages/Upgrade
 import SoftClose from '@src/components/SoftClose/messages/SoftClose.de';
 import Footer from '@src/components/Footer/messages/Footer.de';
 import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignText,
 	...UpgradeToYearly,
 	...SoftClose,
 	...Footer,
 	...MainDonationForm,
-	...AlreadyDonatedModal,
 	'soft-close-button-already-donated': 'Habe schon gespendet',
 	'upgrade-to-yearly-copy': '<p>Jedes Jahr sind wir auf die Unterstützung von Menschen wie Ihnen angewiesen. ' +
 		'Jährliche Spenden helfen uns nachhaltig und ermöglichen langfristige Weiterentwicklungen.</p>' +

diff --git a/banners/pad/C25_WMDE_iPad_DE_00/styles/styles.scss b/banners/pad/C25_WMDE_iPad_DE_00/styles/styles.scss
@@ -49,5 +49,4 @@
 @use '@src/themes/Treedip/Footer/SelectionInput';
 @use '@src/themes/Treedip/Message/Message';
 @use '@src/themes/Treedip/Slider/KeenSlider';
-@use '@src/themes/Treedip/AlreadyDonatedModal/AlreadyDonatedModal';
 @use '@src/themes/Treedip/SoftClose/SoftClose';
diff --git a/banners/wpde_desktop/C25_WPDE_Desktop_00/messages.ts b/banners/wpde_desktop/C25_WPDE_Desktop_00/messages.ts
@@ -4,15 +4,14 @@ import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/Upgra
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
 	...UpgradeToYearlyDe,
 	...SoftCloseDe,
 	...FooterDe,
 	...MainDonationFormDe,
-	...AlreadyDonatedModal,
+	'already-donated-link': 'Habe schon gespendet',
 	'upgrade-to-yearly-copy': '<p>Jedes Jahr sind wir auf Menschen wie Sie angewiesen. Jährliche Spenden helfen uns' +
 		' besonders und ermöglichen langfristige Weiterentwicklungen.</p>' +
 		'<p>Sie gehen kein Risiko ein: Jederzeit formlos zu sofort kündbar.</p>',

diff --git a/src/components/AlreadyDonatedModal/AlreadyDonatedModal.scss b/src/components/AlreadyDonatedModal/AlreadyDonatedModal.scss
diff --git a/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue b/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue
diff --git a/src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de.ts b/src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de.ts
diff --git a/src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en.ts b/src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en.ts
diff --git a/src/components/Footer/FooterAlreadyDonated.vue b/src/components/Footer/FooterAlreadyDonated.vue
@@ -16,7 +16,7 @@
 				@click.prevent="onClickAlreadyDonated"
 				:title="$translate( 'already-donated-description' )"
 			>
-				<TickIcon :fill="'#5B5B5B'"/> {{ $translate( 'already-donated-open-link' ) }}
+				<TickIcon :fill="'#5B5B5B'"/> {{ $translate( 'already-donated-link' ) }}
 			</a>
 		</div>
 
@@ -36,6 +36,10 @@
 </template>
 
 <script setup lang="ts">
+/**
+ * This footer contains a link (button behaviour) (#wmde-banner-footer-already-donated) that closes the banner
+ */
+
 import SelectionInput from '@src/components/Footer/SelectionInput.vue';
 import TickIcon from '@src/components/Icons/TickIcon.vue';
 import { inject } from 'vue';

diff --git a/src/themes/Svingle/AlreadyDonatedModal/AlreadyDonatedModal.scss b/src/themes/Svingle/AlreadyDonatedModal/AlreadyDonatedModal.scss
diff --git a/src/themes/Treedip/AlreadyDonatedModal/AlreadyDonatedModal.scss b/src/themes/Treedip/AlreadyDonatedModal/AlreadyDonatedModal.scss
diff --git a/src/tracking/TrackingEvent.ts b/src/tracking/TrackingEvent.ts
@@ -9,7 +9,6 @@ export type TrackingFeatureName = '' |
 	'FallbackBanner' |
 	'MinimisedBanner' |
 	'EarlyBanner' |
-	'AlreadyDonatedModal' |
 
 	'MainDonationForm' |
 	'UpgradeToYearlyForm' |

diff --git a/src/tracking/events/AlreadyDonatedShownEvent.ts b/src/tracking/events/AlreadyDonatedShownEvent.ts
diff --git a/test/banners/desktop/C25_WMDE_Desktop_DE_00/components/BannerCtrl.spec.ts b/test/banners/desktop/C25_WMDE_Desktop_DE_00/components/BannerCtrl.spec.ts
@@ -20,7 +20,7 @@ import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerAutoHideFeatures, bannerMainFeatures } from '@test/features/MainBanner';
 import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
+import { alreadyDonatedLinkFeatures } from '@test/features/AlreadyDonatedLink';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
 import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
@@ -163,7 +163,7 @@ describe( 'BannerCtrl.vue', () => {
 		test.each( [
 			[ 'expectFiresMaybeLaterEventOnLinkClick' ]
 		] )( '%s', async ( testName: string ) => {
-			await alreadyDonatedModalFeatures[ testName ]( getWrapper() );
+			await alreadyDonatedLinkFeatures[ testName ]( getWrapper() );
 		} );
 	} );
 

diff --git a/test/banners/desktop/C25_WMDE_Desktop_DE_00/components/BannerVar.spec.ts b/test/banners/desktop/C25_WMDE_Desktop_DE_00/components/BannerVar.spec.ts
@@ -20,7 +20,7 @@ import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerAutoHideFeatures, bannerMainFeatures } from '@test/features/MainBanner';
 import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
+import { alreadyDonatedLinkFeatures } from '@test/features/AlreadyDonatedLink';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
 import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
@@ -207,7 +207,7 @@ describe( 'BannerVar.vue', () => {
 		test.each( [
 			[ 'expectFiresMaybeLaterEventOnLinkClick' ]
 		] )( '%s', async ( testName: string ) => {
-			await alreadyDonatedModalFeatures[ testName ]( getWrapper() );
+			await alreadyDonatedLinkFeatures[ testName ]( getWrapper() );
 		} );
 	} );