Skip to content

Commit

Permalink
fix: don't show entitlement modal if dragging file backup
Browse files Browse the repository at this point in the history
  • Loading branch information
@moughxyz
moughxyz committed May 13, 2022
1 parent 131f13c commit d47d295
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 44 deletions.
32 changes: 24 additions & 8 deletions app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
View file
Expand Up @@ -84,11 +84,6 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
}, [application, note])

const toggleAttachedFilesMenu = useCallback(async () => {
if (!appState.features.hasFiles) {
premiumModal.activate('Files')
return
}

const rect = buttonRef.current?.getBoundingClientRect()
if (rect) {
const { clientHeight } = document.documentElement
Expand All @@ -111,7 +106,20 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(

setOpen(newOpenState)
}
}, [appState.features.hasFiles, onClickPreprocessing, open, premiumModal])
}, [onClickPreprocessing, open])

const prospectivelyShowFilesPremiumModal = useCallback(() => {
if (!appState.features.hasFiles) {
premiumModal.activate('Files')
return
}
}, [appState.features.hasFiles, premiumModal])

const toggleAttachedFilesMenuWithEntitlementCheck = useCallback(async () => {
prospectivelyShowFilesPremiumModal()

await toggleAttachedFilesMenu()
}, [toggleAttachedFilesMenu, prospectivelyShowFilesPremiumModal])

const deleteFile = async (file: SNFile) => {
const shouldDelete = await confirmDialog({
Expand Down Expand Up @@ -318,6 +326,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
setIsDraggingFiles(false)

if (!appState.features.hasFiles) {
prospectivelyShowFilesPremiumModal()
return
}

Expand Down Expand Up @@ -348,7 +357,14 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
dragCounter.current = 0
}
},
[appState.files, appState.features.hasFiles, attachFileToNote, currentTab, application],
[
appState.files,
appState.features.hasFiles,
attachFileToNote,
currentTab,
application,
prospectivelyShowFilesPremiumModal,
],
)

useEffect(() => {
Expand All @@ -367,7 +383,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(

return (
<div ref={containerRef}>
<Disclosure open={open} onChange={toggleAttachedFilesMenu}>
<Disclosure open={open} onChange={toggleAttachedFilesMenuWithEntitlementCheck}>
<DisclosureButton
onKeyDown={(event) => {
if (event.key === 'Escape') {
Expand Down
16 changes: 10 additions & 6 deletions app/assets/javascripts/Components/Preferences/Panes/Backups/FileBackups.tsx
View file
Expand Up @@ -9,7 +9,7 @@ import {
} from '@/Components/Preferences/PreferencesComponents'
import { useCallback, useEffect, useMemo, useState } from 'preact/hooks'
import { Button } from '@/Components/Button/Button'
import { FileBackupMetadataFile, FileContent, FileHandleRead } from '@standardnotes/snjs'
import { FileBackupMetadataFile, FileBackupsConstantsV1, FileContent, FileHandleRead } from '@standardnotes/snjs'
import { Switch } from '@/Components/Switch'
import { HorizontalSeparator } from '@/Components/Shared/HorizontalSeparator'
import { EncryptionStatusItem } from '../Security/Encryption'
Expand Down Expand Up @@ -102,7 +102,7 @@ export const FileBackups = observer(({ application }: Props) => {
<>
<Text className="mb-3">
Files backups are enabled. When you upload a new file on any device and open this application, files
will be downloaded in encrypted form to:
will be backed up in encrypted form to:
</Text>

<EncryptionStatusItem
Expand Down Expand Up @@ -304,16 +304,20 @@ export const BackupsDropZone: FunctionComponent<Props> = ({ application }) => {
<>
<Title>Backup Decryption</Title>

<Subtitle className="success">
Successfully decrypted metadata file for <i>{decryptedFileContent.name}.</i>
</Subtitle>
<EncryptionStatusItem
status={decryptedFileContent.name}
icon={[<Icon type="attachment-file" className="min-w-5 min-h-5" />]}
checkmark={true}
/>

<HorizontalSeparator classes={'mt-3 mb-3'} />

<div className="flex justify-between items-center">
<div>
<Subtitle>1. Choose related data file</Subtitle>
<Text>{droppedFile.file.uuid}</Text>
<Text className={`text-xs mr-3 em ${binaryFile ? 'font-bold success' : ''}`}>
{droppedFile.file.uuid}/{FileBackupsConstantsV1.BinaryFileName}
</Text>
</div>
<div>
<Button
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -70,9 +70,9 @@
"@reach/tooltip": "^0.16.2",
"@reach/visually-hidden": "^0.16.0",
"@standardnotes/components": "1.8.0",
"@standardnotes/filepicker": "1.14.0",
"@standardnotes/filepicker": "1.14.1",
"@standardnotes/sncrypto-web": "1.9.2",
"@standardnotes/snjs": "2.107.0",
"@standardnotes/snjs": "2.107.2",
"@standardnotes/stylekit": "5.26.0",
"@zip.js/zip.js": "^2.4.10",
"mobx": "^6.5.0",
Expand Down
56 changes: 28 additions & 28 deletions yarn.lock
View file
Expand Up @@ -2461,14 +2461,14 @@
"@standardnotes/auth" "^3.18.13"
"@standardnotes/features" "^1.42.1"

"@standardnotes/encryption@^1.7.0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.7.0.tgz#3012bed5283e23ddeaae01e9fbaa80c24e8af42d"
integrity sha512-gBVcTCZ53Eg3/2eZkVrBrS98BU95CR2h23ofnNGhCcy0FlWwv6fAqupSsPufOdce8gh27gF0mhRbi80ljYxCUA==
"@standardnotes/encryption@^1.7.1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.7.1.tgz#7d84389e204a6ca2906617daa62423ce9ec38879"
integrity sha512-5SZy5MG0ike80y889SmBTJMGAG753PdvOtc23+tNwbleBoubZjzw8gTgZYY52kl74KLtXmAEKiw2Ym2Pq5FcOg==
dependencies:
"@standardnotes/models" "^1.8.0"
"@standardnotes/responses" "^1.6.19"
"@standardnotes/services" "^1.11.0"
"@standardnotes/services" "^1.11.1"

"@standardnotes/features@^1.42.1":
version "1.42.1"
Expand All @@ -2478,24 +2478,24 @@
"@standardnotes/auth" "^3.18.13"
"@standardnotes/common" "^1.19.8"

"@standardnotes/filepicker@1.14.0", "@standardnotes/filepicker@^1.14.0":
version "1.14.0"
resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.14.0.tgz#f1ea5e66a453cfc2131bbf665f676b430f649cf2"
integrity sha512-E/frksUJhHbMVlLNu4UdHLIdFNuQe9Co8dq/WQgeK/X+Ic+5t5Jm91c4GA1LvCUVF1vhYl/Vo76LY8gE1J2mfg==
"@standardnotes/filepicker@1.14.1", "@standardnotes/filepicker@^1.14.1":
version "1.14.1"
resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.14.1.tgz#81a3ba2be6e3615103875e528dc1720fa3698dea"
integrity sha512-AOR+iQqNqbfZU7ur/LKsF/M0x9EoBT0kXhewZBs7h3OwrtJES7nFRr/janJMrecvUL/ZdfXmazudadZdvcxPyg==
dependencies:
"@standardnotes/common" "^1.19.8"
"@standardnotes/services" "^1.11.0"
"@standardnotes/services" "^1.11.1"
"@standardnotes/utils" "^1.6.6"

"@standardnotes/files@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@standardnotes/files/-/files-1.1.0.tgz#c2499f50fdc31addf3b0307388d4c78420415dfe"
integrity sha512-O4cB8nxBTSLPUCoLyglzbj5oshaJ6hKuBleAWPaC+treaiwpWVyfxn3TF7G4MejlNUMIrGfb566YAZ3R5YVfGg==
"@standardnotes/files@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@standardnotes/files/-/files-1.1.2.tgz#6e75d6233975f359173ddcb352647b21c587be89"
integrity sha512-Q3f+gYd/FkWb8nuNHgUqGSxkAKkAU3kwb+Ar89LhqSNkgq0e4MsUigy+lzOagdiavwT/C1SE8j5d7E4oIZWynw==
dependencies:
"@standardnotes/encryption" "^1.7.0"
"@standardnotes/encryption" "^1.7.1"
"@standardnotes/models" "^1.8.0"
"@standardnotes/responses" "^1.6.19"
"@standardnotes/services" "^1.11.0"
"@standardnotes/services" "^1.11.1"
"@standardnotes/utils" "^1.6.6"

"@standardnotes/models@^1.8.0":
Expand All @@ -2516,10 +2516,10 @@
"@standardnotes/common" "^1.19.8"
"@standardnotes/features" "^1.42.1"

"@standardnotes/services@^1.11.0":
version "1.11.0"
resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.11.0.tgz#7b214093a4d5ef540ce2b6a40cf0f83517c1a2da"
integrity sha512-bR084UoR7EzTC6GD5QxFi7FmcoqhOhZmdeWIwByEOQEDeWG9h0i/lNZo4pAyYykDDv8Z/U3+kNjify4wI+ksZw==
"@standardnotes/services@^1.11.1":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.11.1.tgz#2fa3ce3c7025a048964204321a4c50591134d7ac"
integrity sha512-MvDAJM1Cn9586sMm+w4iCgznsqT6uli3bpf/xZKOHWITkrH6dik/FpgpbxmRfOz2VnbZ6lyLVjsnNDIWFZDqxw==
dependencies:
"@standardnotes/auth" "^3.18.13"
"@standardnotes/common" "^1.19.8"
Expand All @@ -2546,21 +2546,21 @@
buffer "^6.0.3"
libsodium-wrappers "^0.7.9"

"@standardnotes/snjs@2.107.0":
version "2.107.0"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.107.0.tgz#1254f8ae439023e6dab60dae73b4c8435bf117d2"
integrity sha512-3FOxSDlRADoQoSr3gSvAA9eFQbvo7vOaeeLXtoN7ElUUtG78DadPORtwyQtsUee9EfxQnlaWBXVImPAoy2LUew==
"@standardnotes/snjs@2.107.2":
version "2.107.2"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.107.2.tgz#b50be49a44a96eac0158e44df7d547e2b1ecfe5a"
integrity sha512-zTa1n+Bed6ElWOepA/5gJew1aI03XB4lKiysJmDduKS2QsYEdyeQ2p3SuJZSDFX57e/PVYnU9uI851CobrN/Fg==
dependencies:
"@standardnotes/auth" "^3.18.13"
"@standardnotes/common" "^1.19.8"
"@standardnotes/domain-events" "^2.28.3"
"@standardnotes/encryption" "^1.7.0"
"@standardnotes/encryption" "^1.7.1"
"@standardnotes/features" "^1.42.1"
"@standardnotes/filepicker" "^1.14.0"
"@standardnotes/files" "^1.1.0"
"@standardnotes/filepicker" "^1.14.1"
"@standardnotes/files" "^1.1.2"
"@standardnotes/models" "^1.8.0"
"@standardnotes/responses" "^1.6.19"
"@standardnotes/services" "^1.11.0"
"@standardnotes/services" "^1.11.1"
"@standardnotes/settings" "^1.14.3"
"@standardnotes/sncrypto-common" "^1.8.2"
"@standardnotes/utils" "^1.6.6"
Expand Down

0 comments on commit d47d295

Please sign in to comment.