chore(web): remove unused setting for failed email backups - skip e2e (#2863)

* chore(web): remove unused setting for failed email backups

* adjust tests
This commit is contained in:
Karol Sójko
2024-03-26 14:25:19 +01:00
committed by GitHub
parent bf8ad837ef
commit 914c444349
3 changed files with 6 additions and 44 deletions

View File

@@ -2,7 +2,6 @@ import { SettingName } from '@standardnotes/domain-core'
import { SettingData } from '@standardnotes/responses' import { SettingData } from '@standardnotes/responses'
import { import {
MuteSignInEmailsOption, MuteSignInEmailsOption,
MuteFailedBackupsEmailsOption,
EmailBackupFrequency, EmailBackupFrequency,
ListedAuthorSecretsData, ListedAuthorSecretsData,
LogSessionUserAgentOption, LogSessionUserAgentOption,
@@ -13,7 +12,6 @@ type SettingType =
| EmailBackupFrequency | EmailBackupFrequency
| ListedAuthorSecretsData | ListedAuthorSecretsData
| LogSessionUserAgentOption | LogSessionUserAgentOption
| MuteFailedBackupsEmailsOption
| MuteSignInEmailsOption | MuteSignInEmailsOption
| MuteMarketingEmailsOption | MuteMarketingEmailsOption

View File

@@ -123,12 +123,12 @@ describe('settings service', function () {
true, true,
) )
await application.settings.updateSetting( await application.settings.updateSetting(
SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(), SettingName.create(SettingName.NAMES.LogSessionUserAgent).getValue(),
MuteFailedBackupsEmailsOption.Muted, LogSessionUserAgentOption.Enabled,
) )
const settings = await application.settings.listSettings() const settings = await application.settings.listSettings()
expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue())).to.eql( expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.LogSessionUserAgent).getValue())).to.eql(
MuteFailedBackupsEmailsOption.Muted, LogSessionUserAgentOption.Enabled,
) )
expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MfaSecret).getValue())).to.not.be.ok expect(settings.getSettingValue(SettingName.create(SettingName.NAMES.MfaSecret).getValue())).to.not.be.ok
}) })

View File

@@ -1,4 +1,4 @@
import { convertStringifiedBooleanToBoolean, isDesktopApplication } from '@/Utils' import { isDesktopApplication } from '@/Utils'
import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings' import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings'
import { useCallback, useEffect, useState } from 'react' import { useCallback, useEffect, useState } from 'react'
import { WebApplication } from '@/Application/WebApplication' 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 { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content'
import Dropdown from '@/Components/Dropdown/Dropdown' import Dropdown from '@/Components/Dropdown/Dropdown'
import { DropdownItem } from '@/Components/Dropdown/DropdownItem' import { DropdownItem } from '@/Components/Dropdown/DropdownItem'
import Switch from '@/Components/Switch/Switch' import { EmailBackupFrequency, SettingName } from '@standardnotes/snjs'
import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
import { EmailBackupFrequency, MuteFailedBackupsEmailsOption, SettingName } from '@standardnotes/snjs'
import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment' import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
import Spinner from '@/Components/Spinner/Spinner' import Spinner from '@/Components/Spinner/Spinner'
@@ -21,7 +19,6 @@ const EmailBackups = ({ application }: Props) => {
const [isLoading, setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false)
const [emailFrequency, setEmailFrequency] = useState<EmailBackupFrequency>(EmailBackupFrequency.Disabled) const [emailFrequency, setEmailFrequency] = useState<EmailBackupFrequency>(EmailBackupFrequency.Disabled)
const [emailFrequencyOptions, setEmailFrequencyOptions] = useState<DropdownItem[]>([]) const [emailFrequencyOptions, setEmailFrequencyOptions] = useState<DropdownItem[]>([])
const [isFailedBackupEmailMuted, setIsFailedBackupEmailMuted] = useState(true)
const hasAccount = application.hasAccount() const hasAccount = application.hasAccount()
const loadEmailFrequencySetting = useCallback(async () => { const loadEmailFrequencySetting = useCallback(async () => {
@@ -38,14 +35,6 @@ const EmailBackups = ({ application }: Props) => {
EmailBackupFrequency.Disabled, EmailBackupFrequency.Disabled,
), ),
) )
setIsFailedBackupEmailMuted(
convertStringifiedBooleanToBoolean(
userSettings.getSettingValue<MuteFailedBackupsEmailsOption>(
SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(),
MuteFailedBackupsEmailsOption.NotMuted,
),
),
)
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} finally { } 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) => { const handleEmailFrequencyChange = (item: string) => {
updateEmailFrequency(item as EmailBackupFrequency).catch(console.error) updateEmailFrequency(item as EmailBackupFrequency).catch(console.error)
} }
@@ -132,18 +108,6 @@ const EmailBackups = ({ application }: Props) => {
/> />
)} )}
</div> </div>
<HorizontalSeparator classes="my-4" />
<Subtitle>Email preferences</Subtitle>
<div className="flex justify-between gap-2 md:items-center">
<div className="flex flex-col">
<Text>Receive a notification email if an email backup fails.</Text>
</div>
{isLoading ? (
<Spinner className="h-5 w-5 flex-shrink-0" />
) : (
<Switch onChange={toggleMuteFailedBackupEmails} checked={!isFailedBackupEmailMuted} />
)}
</div>
</div> </div>
</PreferencesSegment> </PreferencesSegment>
</PreferencesGroup> </PreferencesGroup>