Skip to content

Commit

Permalink
chore(web): remove unused setting for failed email backups - skip e2e (
Browse files Browse the repository at this point in the history
…#2863)

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

* adjust tests
  • Loading branch information
karolsojko authored Mar 26, 2024
1 parent bf8ad83 commit 914c444
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 44 deletions.
2 changes: 0 additions & 2 deletions packages/snjs/lib/Services/Settings/SettingsList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { SettingName } from '@standardnotes/domain-core'
import { SettingData } from '@standardnotes/responses'
import {
MuteSignInEmailsOption,
MuteFailedBackupsEmailsOption,
EmailBackupFrequency,
ListedAuthorSecretsData,
LogSessionUserAgentOption,
Expand All @@ -13,7 +12,6 @@ type SettingType =
| EmailBackupFrequency
| ListedAuthorSecretsData
| LogSessionUserAgentOption
| MuteFailedBackupsEmailsOption
| MuteSignInEmailsOption
| MuteMarketingEmailsOption

Expand Down
8 changes: 4 additions & 4 deletions packages/snjs/mocha/settings.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
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'
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'
Expand All @@ -21,7 +19,6 @@ const EmailBackups = ({ application }: Props) => {
const [isLoading, setIsLoading] = useState(false)
const [emailFrequency, setEmailFrequency] = useState<EmailBackupFrequency>(EmailBackupFrequency.Disabled)
const [emailFrequencyOptions, setEmailFrequencyOptions] = useState<DropdownItem[]>([])
const [isFailedBackupEmailMuted, setIsFailedBackupEmailMuted] = useState(true)
const hasAccount = application.hasAccount()

const loadEmailFrequencySetting = useCallback(async () => {
Expand All @@ -38,14 +35,6 @@ const EmailBackups = ({ application }: Props) => {
EmailBackupFrequency.Disabled,
),
)
setIsFailedBackupEmailMuted(
convertStringifiedBooleanToBoolean(
userSettings.getSettingValue<MuteFailedBackupsEmailsOption>(
SettingName.create(SettingName.NAMES.MuteFailedBackupsEmails).getValue(),
MuteFailedBackupsEmailsOption.NotMuted,
),
),
)
} catch (error) {
console.error(error)
} finally {
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -132,18 +108,6 @@ const EmailBackups = ({ application }: Props) => {
/>
)}
</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>
</PreferencesSegment>
</PreferencesGroup>
Expand Down

0 comments on commit 914c444

Please sign in to comment.