rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: don't get backups settings if there is no logged-in user (#842)

Browse Source 
* fix: don't get backups settings if there is no logged-in user

* chore: bump snjs version
This commit is contained in:
Vardan Hakobyan
2022-02-02 23:58:58 +04:00
committed by GitHub
parent d17edfc5cf
commit 616b77a5f7
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/preferences/panes/backups-segments/EmailBackups.tsx
View File

@@ -38,6 +38,9 @@ export const EmailBackups = observer(({ application }: Props) => {
useState(false); useState(false);
const loadEmailFrequencySetting = useCallback(async () => { const loadEmailFrequencySetting = useCallback(async () => {
if (!application.getUser()) {
return;
}
setIsLoading(true); setIsLoading(true);
try { try {

3
app/assets/javascripts/preferences/panes/backups-segments/cloud-backups/CloudBackupProvider.tsx
View File

@@ -161,6 +161,9 @@ export const CloudBackupProvider: FunctionComponent<Props> = ({
}; };
const getIntegrationStatus = useCallback(async () => { const getIntegrationStatus = useCallback(async () => {
if (!application.getUser()) {
return;
}
const frequency = await application.getSetting(backupFrequencySettingName); const frequency = await application.getSetting(backupFrequencySettingName);
setBackupFrequency(frequency); setBackupFrequency(frequency);
}, [application, backupFrequencySettingName]); }, [application, backupFrequencySettingName]);

9
app/assets/javascripts/preferences/panes/backups-segments/cloud-backups/index.tsx
View File

@@ -13,11 +13,7 @@ import { HorizontalSeparator } from '@/components/shared/HorizontalSeparator';
import { FeatureIdentifier } from '@standardnotes/features'; import { FeatureIdentifier } from '@standardnotes/features';
import { FeatureStatus } from '@standardnotes/snjs'; import { FeatureStatus } from '@standardnotes/snjs';
import { FunctionComponent } from 'preact'; import { FunctionComponent } from 'preact';
import { import { CloudProvider, SettingName } from '@standardnotes/settings';
CloudProvider,
EmailBackupFrequency,
SettingName,
} from '@standardnotes/settings';
import { Switch } from '@/components/Switch'; import { Switch } from '@/components/Switch';
import { convertStringifiedBooleanToBoolean } from '@/utils'; import { convertStringifiedBooleanToBoolean } from '@/utils';
import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/strings'; import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/strings';
@@ -46,6 +42,9 @@ export const CloudLink: FunctionComponent<Props> = ({ application }) => {
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const loadIsFailedCloudBackupEmailMutedSetting = useCallback(async () => { const loadIsFailedCloudBackupEmailMutedSetting = useCallback(async () => {
if (!application.getUser()) {
return;
}
setIsLoading(true); setIsLoading(true);
try { try {

2
package.json
View File

@@ -84,7 +84,7 @@
"@reach/tooltip": "^0.16.2", "@reach/tooltip": "^0.16.2",
"@standardnotes/components": "1.4.4", "@standardnotes/components": "1.4.4",
"@standardnotes/features": "1.26.1", "@standardnotes/features": "1.26.1",
"@standardnotes/snjs": "2.49.2", "@standardnotes/snjs": "2.49.4",
"@standardnotes/settings": "^1.11.2", "@standardnotes/settings": "^1.11.2",
"@standardnotes/sncrypto-web": "1.6.2", "@standardnotes/sncrypto-web": "1.6.2",
"mobx": "^6.3.5", "mobx": "^6.3.5",

8
yarn.lock
View File

@@ -2663,10 +2663,10 @@
buffer "^6.0.3" buffer "^6.0.3"
libsodium-wrappers "^0.7.9" libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.49.2": "@standardnotes/snjs@2.49.4":
version "2.49.2" version "2.49.4"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.49.2.tgz#8b0236ea522a227c01054f5d0e3ef3439c9db9ac" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.49.4.tgz#ae443f0f3d8f72a4f7e65fe47e2030bcc6df9fab"
integrity sha512-YgmcD7zJmaamy4GxbXywxf8T2LV/K3Mvu+4Ql5ocuAcNkGlRFb1Vp8XVg++Bu8a3s689rRgLZj3ZI0W024wBJQ== integrity sha512-RXyUNVvcT2TtGSYC32fDXgGUZdSiUvOFosLDWWGeY5kwOTnj1ZHrqmKaUlKCGPi1xiYANay42+EwLCLyyqOkzQ==
dependencies: dependencies:
"@standardnotes/auth" "^3.15.3" "@standardnotes/auth" "^3.15.3"
"@standardnotes/common" "^1.8.0" "@standardnotes/common" "^1.8.0"