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

fix: offline repo handling

Browse Source
This commit is contained in:
Mo Bitar
2021-11-11 13:51:54 -06:00
parent 1e219699df
commit 873aa1558e
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/preferences/panes/account/offlineSubscription.tsx
View File

@@ -23,7 +23,7 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(({ appl
const [hasUserPreviouslyStoredCode, setHasUserPreviouslyStoredCode] = useState(false); const [hasUserPreviouslyStoredCode, setHasUserPreviouslyStoredCode] = useState(false);
useEffect(() => { useEffect(() => {
if (application.getIsOfflineActivationCodeStoredPreviously()) { if (application.hasOfflineRepo()) {
setHasUserPreviouslyStoredCode(true); setHasUserPreviouslyStoredCode(true);
} }
}, [application]); }, [application]);
@@ -35,7 +35,7 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(({ appl
const handleSubscriptionCodeSubmit = async (event: TargetedEvent<HTMLFormElement, Event>) => { const handleSubscriptionCodeSubmit = async (event: TargetedEvent<HTMLFormElement, Event>) => {
event.preventDefault(); event.preventDefault();
const result = await application.setOfflineFeatures(activationCode); const result = await application.setOfflineFeaturesCode(activationCode);
if (result?.error) { if (result?.error) {
await application.alertService.alert(result.error); await application.alertService.alert(result.error);
@@ -47,7 +47,7 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(({ appl
}; };
const handleRemoveOfflineKey = async () => { const handleRemoveOfflineKey = async () => {
await application.removeOfflineActivationCode(); await application.deleteOfflineFeatureRepo();
setIsSuccessfullyActivated(false); setIsSuccessfullyActivated(false);
setHasUserPreviouslyStoredCode(false); setHasUserPreviouslyStoredCode(false);

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.9.1", "version": "3.9.2",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -72,7 +72,7 @@
"@reach/listbox": "^0.16.2", "@reach/listbox": "^0.16.2",
"@standardnotes/features": "1.8.1", "@standardnotes/features": "1.8.1",
"@standardnotes/sncrypto-web": "1.5.3", "@standardnotes/sncrypto-web": "1.5.3",
"@standardnotes/snjs": "2.17.4", "@standardnotes/snjs": "2.17.5",
"mobx": "^6.3.5", "mobx": "^6.3.5",
"mobx-react-lite": "^3.2.1", "mobx-react-lite": "^3.2.1",
"preact": "^10.5.15", "preact": "^10.5.15",

19
yarn.lock
View File

@@ -2166,13 +2166,20 @@
dependencies: dependencies:
"@standardnotes/auth" "^3.8.1" "@standardnotes/auth" "^3.8.1"
"@standardnotes/features@1.8.1", "@standardnotes/features@^1.8.1": "@standardnotes/features@1.8.1":
version "1.8.1" version "1.8.1"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.8.1.tgz#addea86a8a4288a0046bc674a8e76f1bac3c2f89" resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.8.1.tgz#addea86a8a4288a0046bc674a8e76f1bac3c2f89"
integrity sha512-yDbMLu9SnwR4cmjsIMgpxBOK9kIbWVQ7WezfJ5MN0FAwD2IbfKCMaWBMUJStCtSqkKE4dkL3BC+sIxik/4RwdQ== integrity sha512-yDbMLu9SnwR4cmjsIMgpxBOK9kIbWVQ7WezfJ5MN0FAwD2IbfKCMaWBMUJStCtSqkKE4dkL3BC+sIxik/4RwdQ==
dependencies: dependencies:
"@standardnotes/common" "^1.2.1" "@standardnotes/common" "^1.2.1"
"@standardnotes/features@^1.8.2":
version "1.8.2"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.8.2.tgz#ecc8162ca80ee3740468aa55a64c23b519c13505"
integrity sha512-EYeYYT/WBIh7fMVTVhsy0INjVdyHVtnH90pbZQHNPpsUkLdj05DzuyxUKjsc0oxiskmZjPOVSfXt8l3RL5Av4g==
dependencies:
"@standardnotes/common" "^1.2.1"
"@standardnotes/settings@^1.2.1": "@standardnotes/settings@^1.2.1":
version "1.2.1" version "1.2.1"
resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.2.1.tgz#4c7656ea86d784a2f77c70acc89face5d28da024" resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.2.1.tgz#4c7656ea86d784a2f77c70acc89face5d28da024"
@@ -2192,15 +2199,15 @@
buffer "^6.0.3" buffer "^6.0.3"
libsodium-wrappers "^0.7.9" libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.17.4": "@standardnotes/snjs@2.17.5":
version "2.17.4" version "2.17.5"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.4.tgz#ebf9d59a297ee7d87db1631e8850ba53dd9e7bea" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.5.tgz#19382b6d29947d896d543c7824a6129547196540"
integrity sha512-ucxhSG8scDZd+JguK0bPLNwSg99w+jpYnCM+RZpd6GTkVjHBy3DEFnM06KrDzubLAtbKE8b7I50DOI+5C4p2rg== integrity sha512-sdqcavG5C46VybOq2aQ8bEDEGvXE3sjjcwJJBVsTWCANQkFFh0k7gTA3y3n9ZiWncjoYpBOpuvwr6wpBwJE8EA==
dependencies: dependencies:
"@standardnotes/auth" "^3.8.1" "@standardnotes/auth" "^3.8.1"
"@standardnotes/common" "^1.2.1" "@standardnotes/common" "^1.2.1"
"@standardnotes/domain-events" "^2.5.1" "@standardnotes/domain-events" "^2.5.1"
"@standardnotes/features" "^1.8.1" "@standardnotes/features" "^1.8.2"
"@standardnotes/settings" "^1.2.1" "@standardnotes/settings" "^1.2.1"
"@standardnotes/sncrypto-common" "^1.5.2" "@standardnotes/sncrypto-common" "^1.5.2"