diff --git a/app/models/BannerTests.scala b/app/models/BannerTests.scala index ee3b436c8..531505e5e 100644 --- a/app/models/BannerTests.scala +++ b/app/models/BannerTests.scala @@ -69,7 +69,6 @@ case class BannerTest( lockStatus: Option[LockStatus], priority: Option[Int], nickname: Option[String], - minArticlesBeforeShowingBanner: Int, userCohort: UserCohort, locations: List[Region] = Nil, contextTargeting: PageContextTargeting = PageContextTargeting(Nil,Nil,Nil,Nil), diff --git a/public/src/components/channelManagement/bannerTests/bannerTestEditor.tsx b/public/src/components/channelManagement/bannerTests/bannerTestEditor.tsx index 97746938a..082096891 100644 --- a/public/src/components/channelManagement/bannerTests/bannerTestEditor.tsx +++ b/public/src/components/channelManagement/bannerTests/bannerTestEditor.tsx @@ -6,7 +6,6 @@ import { Typography } from '@material-ui/core'; import BannerTestVariantEditor from './bannerTestVariantEditor'; import CampaignSelector from '../CampaignSelector'; import TestVariantsEditor from '../testVariantsEditor'; -import TestEditorMinArticlesViewedInput from '../testEditorMinArticlesViewedInput'; import TestEditorTargetAudienceSelector from '../testEditorTargetAudienceSelector'; import TestEditorArticleCountEditor, { DEFAULT_ARTICLES_VIEWED_SETTINGS, @@ -87,9 +86,6 @@ const BannerTestEditor: React.FC> = ({ }); }; - const onMinArticlesViewedValidationChanged = (isValid: boolean): void => - setValidationStatusForField('minArticlesViewed', isValid); - const onArticlesViewedSettingsValidationChanged = (isValid: boolean): void => setValidationStatusForField('articlesViewedSettings', isValid); @@ -116,13 +112,6 @@ const BannerTestEditor: React.FC> = ({ onVariantsChange(test.variants.filter(variant => variant.name !== deletedVariantName)); }; - const onMinArticlesViewedChange = (updatedMinArticles: number): void => { - updateTest({ - ...test, - minArticlesBeforeShowingBanner: updatedMinArticles, - }); - }; - const onRegionsChange = (updatedRegions: Region[]): void => { updateTest({ ...test, locations: updatedRegions }); }; @@ -245,19 +234,6 @@ const BannerTestEditor: React.FC> = ({ -
- - Display rules - - - -
-
Target context diff --git a/public/src/components/channelManagement/bannerTests/bannerTestsForm.tsx b/public/src/components/channelManagement/bannerTests/bannerTestsForm.tsx index 33f33729b..925cc21ce 100644 --- a/public/src/components/channelManagement/bannerTests/bannerTestsForm.tsx +++ b/public/src/components/channelManagement/bannerTests/bannerTestsForm.tsx @@ -5,24 +5,20 @@ import { BannerTest } from '../../../models/banner'; import BannerTestEditor from './bannerTestEditor'; import { ValidatedTestEditor } from '../validatedTestEditor'; -const createDefaultBannerTest = (minArticles: number) => ( - newTestName: string, - newTestNickname: string, -): BannerTest => ({ +const createDefaultBannerTest = (newTestName: string, newTestNickname: string): BannerTest => ({ ...getDefaultTest(), name: newTestName, nickname: newTestNickname, - minArticlesBeforeShowingBanner: minArticles, }); export const BannerTestsForm1 = TestsForm( ValidatedTestEditor(BannerTestEditor), FrontendSettingsType.bannerTests, - createDefaultBannerTest(2), + createDefaultBannerTest, ); export const BannerTestsForm2 = TestsForm( ValidatedTestEditor(BannerTestEditor), FrontendSettingsType.bannerTests2, - createDefaultBannerTest(4), + createDefaultBannerTest, ); diff --git a/public/src/components/channelManagement/bannerTests/utils/defaults.ts b/public/src/components/channelManagement/bannerTests/utils/defaults.ts index 38d849418..216f880e6 100644 --- a/public/src/components/channelManagement/bannerTests/utils/defaults.ts +++ b/public/src/components/channelManagement/bannerTests/utils/defaults.ts @@ -50,7 +50,6 @@ const DEV_AND_CODE_DEFAULT_BANNER_TEST: BannerTest = { name: 'TEST', nickname: 'TEST', status: 'Draft', - minArticlesBeforeShowingBanner: 0, userCohort: UserCohort.AllNonSupporters, locations: [], variants: [DEV_AND_CODE_DEFAULT_VARIANT], @@ -62,7 +61,6 @@ const PROD_DEFAULT_BANNER: BannerTest = { name: '', nickname: '', status: 'Draft', - minArticlesBeforeShowingBanner: 0, userCohort: UserCohort.AllNonSupporters, locations: [], variants: [], diff --git a/public/src/components/channelManagement/campaigns/TestDataDialog.tsx b/public/src/components/channelManagement/campaigns/TestDataDialog.tsx index 950cfb7ad..83a6b4c57 100644 --- a/public/src/components/channelManagement/campaigns/TestDataDialog.tsx +++ b/public/src/components/channelManagement/campaigns/TestDataDialog.tsx @@ -124,12 +124,6 @@ const testFields = { exclude: ['Header', 'Banner1', 'Banner2'], optional: true, }, - minArticlesBeforeShowingBanner: { - label: 'Min articles before showing banner', - type: 'number', - exclude: ['Header', 'Epic', 'EpicLiveblog', 'EpicAppleNews', 'EpicAMP'], - optional: false, - }, sections: { label: 'Target sections', type: 'string-array', diff --git a/public/src/components/channelManagement/testEditorMinArticlesViewedInput.tsx b/public/src/components/channelManagement/testEditorMinArticlesViewedInput.tsx deleted file mode 100644 index 38b054fa5..000000000 --- a/public/src/components/channelManagement/testEditorMinArticlesViewedInput.tsx +++ /dev/null @@ -1,76 +0,0 @@ -import React, { useEffect } from 'react'; -import { useForm } from 'react-hook-form'; -import { TextField, Theme, Typography, makeStyles } from '@material-ui/core'; -import { notNumberValidator } from './helpers/validation'; - -const useStyles = makeStyles(({ spacing }: Theme) => ({ - container: { - display: 'flex', - alignItems: 'center', - }, - text: { - marginLeft: spacing(1), - fontSize: 14, - }, -})); - -interface FormData { - minArticles: string; -} - -interface TestEditorMinArticlesViewedInputProps { - minArticles: number; - isDisabled: boolean; - onValidationChange: (isValid: boolean) => void; - onUpdate: (updatedMinArticles: number) => void; -} - -const TestEditorMinArticlesViewedInput: React.FC = ({ - minArticles, - isDisabled, - onValidationChange, - onUpdate, -}: TestEditorMinArticlesViewedInputProps) => { - const classes = useStyles(); - - const defaultValues: FormData = { - minArticles: minArticles.toString(), - }; - - const { register, errors, handleSubmit, reset } = useForm({ - mode: 'onChange', - defaultValues, - }); - - useEffect(() => { - reset(defaultValues); - }, [defaultValues.minArticles]); - - useEffect(() => { - const isValid = Object.keys(errors).length === 0; - onValidationChange(isValid); - }, [errors.minArticles]); - - const onSubmit = ({ minArticles }: FormData): void => { - onUpdate(parseInt(minArticles)); - }; - - return ( -
- - page views -
- ); -}; - -export default TestEditorMinArticlesViewedInput; diff --git a/public/src/models/banner.ts b/public/src/models/banner.ts index a8efbb1b7..242f80284 100644 --- a/public/src/models/banner.ts +++ b/public/src/models/banner.ts @@ -55,7 +55,6 @@ export interface BannerTest extends Test { name: string; nickname?: string; status: Status; - minArticlesBeforeShowingBanner: number; userCohort: UserCohort; locations: Region[]; variants: BannerVariant[];