From 914c444349780f514fdd2c268160742b2287e135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 26 Mar 2024 14:25:19 +0100 Subject: [PATCH] chore(web): remove unused setting for failed email backups - skip e2e (#2863) * chore(web): remove unused setting for failed email backups * adjust tests --- .../lib/Services/Settings/SettingsList.ts | 2 - packages/snjs/mocha/settings.test.js | 8 ++-- .../Panes/Backups/EmailBackups.tsx | 40 +------------------ 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/packages/snjs/lib/Services/Settings/SettingsList.ts b/packages/snjs/lib/Services/Settings/SettingsList.ts index e5721959c..d0b36cece 100644 --- a/packages/snjs/lib/Services/Settings/SettingsList.ts +++ b/packages/snjs/lib/Services/Settings/SettingsList.ts @@ -2,7 +2,6 @@ import { SettingName } from '@standardnotes/domain-core' import { SettingData } from '@standardnotes/responses' import { MuteSignInEmailsOption, - MuteFailedBackupsEmailsOption, EmailBackupFrequency, ListedAuthorSecretsData, LogSessionUserAgentOption, @@ -13,7 +12,6 @@ type SettingType = | EmailBackupFrequency | ListedAuthorSecretsData | LogSessionUserAgentOption - | MuteFailedBackupsEmailsOption | MuteSignInEmailsOption | MuteMarketingEmailsOption diff --git a/packages/snjs/mocha/settings.test.js b/packages/snjs/mocha/settings.test.js index b5e479302..466cd8829 100644 --- a/packages/snjs/mocha/settings.test.js +++ b/packages/snjs/mocha/settings.test.js @@ -123,12 +123,12 @@ describe('settings service', function () { true, ) await application.settings.updateSetting( - SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(), - MuteFailedBackupsEmailsOption.Muted, + SettingName.create(SettingName.NAMES.LogSessionUserAgent).getValue(), + LogSessionUserAgentOption.Enabled, ) const settings = await application.settings.listSettings() - expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue())).to.eql( - MuteFailedBackupsEmailsOption.Muted, + expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.LogSessionUserAgent).getValue())).to.eql( + LogSessionUserAgentOption.Enabled, ) expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MfaSecret).getValue())).to.not.be.ok }) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx index 6b4e5b4c5..bfe1c3918 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx @@ -1,4 +1,4 @@ -import { convertStringifiedBooleanToBoolean, isDesktopApplication } from '@/Utils' +import { isDesktopApplication } from '@/Utils' import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings' import { useCallback, useEffect, useState } from 'react' import { WebApplication } from '@/Application/WebApplication' @@ -6,9 +6,7 @@ import { observer } from 'mobx-react-lite' import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content' import Dropdown from '@/Components/Dropdown/Dropdown' import { DropdownItem } from '@/Components/Dropdown/DropdownItem' -import Switch from '@/Components/Switch/Switch' -import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' -import { EmailBackupFrequency, MuteFailedBackupsEmailsOption, SettingName } from '@standardnotes/snjs' +import { EmailBackupFrequency, SettingName } from '@standardnotes/snjs' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment' import Spinner from '@/Components/Spinner/Spinner' @@ -21,7 +19,6 @@ const EmailBackups = ({ application }: Props) => { const [isLoading, setIsLoading] = useState(false) const [emailFrequency, setEmailFrequency] = useState(EmailBackupFrequency.Disabled) const [emailFrequencyOptions, setEmailFrequencyOptions] = useState([]) - const [isFailedBackupEmailMuted, setIsFailedBackupEmailMuted] = useState(true) const hasAccount = application.hasAccount() const loadEmailFrequencySetting = useCallback(async () => { @@ -38,14 +35,6 @@ const EmailBackups = ({ application }: Props) => { EmailBackupFrequency.Disabled, ), ) - setIsFailedBackupEmailMuted( - convertStringifiedBooleanToBoolean( - userSettings.getSettingValue( - SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(), - MuteFailedBackupsEmailsOption.NotMuted, - ), - ), - ) } catch (error) { console.error(error) } finally { @@ -90,19 +79,6 @@ const EmailBackups = ({ application }: Props) => { } } - const toggleMuteFailedBackupEmails = async () => { - const previousValue = isFailedBackupEmailMuted - setIsFailedBackupEmailMuted(!isFailedBackupEmailMuted) - - const updateResult = await updateSetting( - SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(), - `${!isFailedBackupEmailMuted}`, - ) - if (!updateResult) { - setIsFailedBackupEmailMuted(previousValue) - } - } - const handleEmailFrequencyChange = (item: string) => { updateEmailFrequency(item as EmailBackupFrequency).catch(console.error) } @@ -132,18 +108,6 @@ const EmailBackups = ({ application }: Props) => { /> )} - - Email preferences -
-
- Receive a notification email if an email backup fails. -
- {isLoading ? ( - - ) : ( - - )} -