From 59fc8e65bc08a537ce1f3a5338b19c1cdedf2020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Tue, 24 Sep 2024 13:41:57 +0200
Subject: [PATCH] review: renamed newsletterReminderEnabled
---
src/components/Analysis/MonthlyAnalysis.tsx | 4 ++--
.../Analysis/NewsletterReminder/NewsletterReminder.tsx | 2 +-
src/db/profileData.ts | 8 ++++----
src/migrations/migration.data.ts | 4 ++--
src/models/profile.model.ts | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index 41681f52a..dbe071720 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -31,7 +31,7 @@ const MonthlyAnalysis = ({
const {
analysis: { analysisMonth, haveSeenNewsletterReminder },
global: { fluidStatus },
- profile: { sendAnalysisNotification, newsletterReminderEnabled },
+ profile: { sendAnalysisNotification, isAnalysisReminderEnabled },
} = useAppSelector(state => state.ecolyo)
const consumptionService = useMemo(
@@ -65,7 +65,7 @@ const MonthlyAnalysis = ({
const displayNewsletterReminder =
!sendAnalysisNotification &&
- newsletterReminderEnabled &&
+ isAnalysisReminderEnabled &&
!haveSeenNewsletterReminder
useEffect(() => {
diff --git a/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx b/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx
index 4b41d5afc..92d0c30df 100644
--- a/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx
+++ b/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx
@@ -45,7 +45,7 @@ const NewsletterReminder = () => {
}}
size="small"
onClick={() =>
- dispatch(updateProfile({ newsletterReminderEnabled: false }))
+ dispatch(updateProfile({ isAnalysisReminderEnabled: false }))
}
>
{t('analysis.newsletter_reminder.stop_showing')}
diff --git a/src/db/profileData.ts b/src/db/profileData.ts
index 9230d0ef1..e045626a4 100644
--- a/src/db/profileData.ts
+++ b/src/db/profileData.ts
@@ -9,23 +9,23 @@ const profileData: Omit<ProfileEntity, 'id'> = {
explorationHash: '',
haveSeenEcogestureModal: false,
haveSeenLastAnalysis: true,
+ isAnalysisReminderEnabled: true,
isFirstConnection: true,
isProfileEcogestureCompleted: false,
isProfileTypeCompleted: false,
lastConnectionDate: '0000-01-01T00:00:00.000Z',
mailToken: '',
monthlyAnalysisDate: '0000-01-01T00:00:00.000Z',
+ onboarding: {
+ isWelcomeSeen: false,
+ },
partnersIssueSeenDate: {
enedis: '0000-01-01T00:00:00.000Z',
egl: '0000-01-01T00:00:00.000Z',
grdf: '0000-01-01T00:00:00.000Z',
},
quizHash: '',
- onboarding: {
- isWelcomeSeen: false,
- },
sendAnalysisNotification: false,
- newsletterReminderEnabled: true,
sendConsumptionAlert: false,
waterDailyConsumptionLimit: 0,
}
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index a0c299dcd..45dc38472 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -619,12 +619,12 @@ export const migrations: Migration[] = [
baseSchemaVersion: 24,
targetSchemaVersion: 25,
appVersion: '3.1.0',
- description: 'Initialize newsletterReminderEnabled in profile',
+ description: 'Initialize isAnalysisReminderEnabled in profile',
releaseNotes: null,
docTypes: PROFILE_DOCTYPE,
run: async (_client: Client, docs: Profile[]): Promise<Profile[]> => {
return docs.map(doc => {
- doc.newsletterReminderEnabled = true
+ doc.isAnalysisReminderEnabled = true
return doc
})
},
diff --git a/src/models/profile.model.ts b/src/models/profile.model.ts
index f23edd8b6..0b0abd58b 100644
--- a/src/models/profile.model.ts
+++ b/src/models/profile.model.ts
@@ -15,7 +15,7 @@ export interface ProfileEntity {
lastConnectionDate: string
haveSeenLastAnalysis: boolean
sendAnalysisNotification: boolean
- newsletterReminderEnabled: boolean
+ isAnalysisReminderEnabled: boolean
monthlyAnalysisDate: string
sendConsumptionAlert: boolean
waterDailyConsumptionLimit: number
--
GitLab