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

feat: Added "Private vaults" as a Labs feature. Can be enabled from Preferences > General > Labs (#2562)

Browse Source
This commit is contained in:
Aman Harwara
2023-10-05 11:07:01 +00:00
committed by GitHub
parent a0e0567306
commit 4724b08c65
18 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/features/src/Domain/Feature/NativeFeatureIdentifier.ts
View File

@@ -41,6 +41,7 @@ export class NativeFeatureIdentifier extends ValueObject<NativeFeatureIdentifier
Clipper: 'org.standardnotes.clipper',
Vaults: 'org.standardnotes.vaults',
SharedVaults: 'org.standardnotes.shared-vaults',
DeprecatedMarkdownVisualEditor: 'org.standardnotes.markdown-visual-editor',
@@ -74,4 +75,4 @@ export class NativeFeatureIdentifier extends ValueObject<NativeFeatureIdentifier
/**
* Identifier for standalone filesafe instance offered as legacy installable via extensions-server
*/
export const ExperimentalFeatures = []
export const ExperimentalFeatures = [NativeFeatureIdentifier.TYPES.Vaults]

13
packages/features/src/Domain/Lists/ExperimentalFeatures.ts
View File

@@ -1,5 +1,16 @@
import { RoleName } from '@standardnotes/domain-core'
import { AnyFeatureDescription } from '../Feature/AnyFeatureDescription'
import { NativeFeatureIdentifier } from '../Feature/NativeFeatureIdentifier'
import { PermissionName } from '../Permission/PermissionName'
export function experimentalFeatures(): AnyFeatureDescription[] {
return []
return [
{
name: 'Private vaults',
description: 'Private vaults allow you to store notes, files and tags into separate, encrypted vaults.',
availableInRoles: [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
identifier: NativeFeatureIdentifier.TYPES.Vaults,
permission_name: PermissionName.Vaults,
},
]
}

1
packages/features/src/Domain/Permission/PermissionName.ts
View File

@@ -38,5 +38,6 @@ export enum PermissionName {
SubscriptionSharing = 'server:subscription-sharing',
SuperEditor = 'editor:super-editor',
Clipper = 'app:clipper',
Vaults = 'app:vaults',
SharedVaults = 'server:shared-vaults',
}

2
packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx
View File

@@ -102,7 +102,7 @@ const FileMenuOptions: FunctionComponent<Props> = ({
) : null}
</>
)}
{application.featuresController.isEntitledToVaults() && (
{application.featuresController.isVaultsEnabled() && (
<AddToVaultMenuOption
iconClassName={iconClass}
items={selectedFiles}

2
packages/web/src/javascripts/Components/Footer/VaultSelectionButton.tsx
View File

@@ -16,7 +16,7 @@ const VaultSelectionButton = ({ isMobileNavigation = false }: { isMobileNavigati
const [isOpen, setIsOpen] = useState(false)
const toggleMenu = () => setIsOpen(!isOpen)
if (!application.featuresController.isEntitledToVaults()) {
if (!application.featuresController.isVaultsEnabled()) {
return null
}

2
packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
View File

@@ -286,7 +286,7 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => {
)}
<HorizontalSeparator classes="my-2" />
{application.featuresController.isEntitledToVaults() && (
{application.featuresController.isVaultsEnabled() && (
<AddToVaultMenuOption iconClassName={iconClass} items={notes} disabled={!hasAdminPermissionForAllSharedNotes} />
)}

2
packages/web/src/javascripts/Components/PasswordWizard/PasswordWizard.tsx
View File

@@ -49,7 +49,7 @@ class PasswordWizard extends AbstractComponent<Props, State> {
continueTitle: DEFAULT_CONTINUE_TITLE,
}
if (props.application.featuresController.isEntitledToVaults()) {
if (props.application.featuresController.isVaultsEnabled()) {
this.state = {
...baseState,
lockContinue: true,

2
packages/web/src/javascripts/Components/Preferences/Controller/PreferencesSessionController.ts
View File

@@ -26,7 +26,7 @@ export class PreferencesSessionController {
? PREFERENCES_MENU_ITEMS.slice()
: READY_PREFERENCES_MENU_ITEMS.slice()
if (application.featuresController.isEntitledToVaults()) {
if (application.featuresController.isVaultsEnabled()) {
menuItems.push({ id: 'vaults', label: 'Vaults', icon: 'safe-square', order: 5 })
}

11
packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx
View File

@@ -31,6 +31,7 @@ const Vaults = observer(() => {
const application = useApplication()
const hasAccount = application.hasAccount()
const isSharedVaultsEnabled = application.featuresController.isEntitledToSharedVaults()
const [vaults, setVaults] = useState<VaultListingInterface[]>([])
const [canCreateMoreVaults, setCanCreateMoreVaults] = useState(true)
@@ -163,7 +164,7 @@ const Vaults = observer(() => {
</PreferencesSegment>
</PreferencesGroup>
)}
{hasAccount && (
{hasAccount && isSharedVaultsEnabled && (
<PreferencesGroup>
<PreferencesSegment>
<Title>Contacts</Title>
@@ -180,7 +181,7 @@ const Vaults = observer(() => {
</PreferencesSegment>
</PreferencesGroup>
)}
{hasAccount && (
{hasAccount && isSharedVaultsEnabled && (
<PreferencesGroup>
<PreferencesSegment>
<Title>CollaborationID</Title>
@@ -235,13 +236,15 @@ const Vaults = observer(() => {
{canCreateMoreVaults ? (
<div className="mt-2.5 flex gap-3">
<Button label="Create Vault" onClick={createNewVault} />
{hasAccount && <Button label="Create Shared Vault" onClick={createNewSharedVault} />}
{hasAccount && isSharedVaultsEnabled && (
<Button label="Create Shared Vault" onClick={createNewSharedVault} />
)}
</div>
) : (
<div className="mt-3.5">
<NoProSubscription
application={application}
text={<span>Please upgrade in order to increase your shared vault limit.</span>}
text={<span>Please upgrade in order to increase your vault limit.</span>}
/>
</div>
)}

4
packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults/VaultItem.tsx
View File

@@ -17,6 +17,8 @@ type Props = {
const VaultItem = ({ vault }: Props) => {
const application = useApplication()
const canEnableCollaboration = application.hasAccount() && application.featuresController.isEntitledToSharedVaults()
const [isInviteModalOpen, setIsAddContactModalOpen] = useState(false)
const closeInviteModal = () => setIsAddContactModalOpen(false)
@@ -128,7 +130,7 @@ const VaultItem = ({ vault }: Props) => {
{isCurrentUserAdmin ? (
vault.isSharedVaultListing() ? (
<Button colorStyle="info" label="Invite Contacts" onClick={openInviteModal} />
) : application.hasAccount() ? (
) : canEnableCollaboration ? (
<Button colorStyle="info" label="Enable Collaboration" onClick={convertToSharedVault} />
) : null
) : null}

2
packages/web/src/javascripts/Components/Tags/Navigation.tsx
View File

@@ -124,7 +124,7 @@ const Navigation = forwardRef<HTMLDivElement, Props>(({ application, className,
)}
<PreferencesButton openPreferences={() => application.preferencesController.openPreferences()} />
<QuickSettingsButton application={application} isMobileNavigation />
{application.featuresController.isEntitledToVaults() && <VaultSelectionButton isMobileNavigation />}
{application.featuresController.isVaultsEnabled() && <VaultSelectionButton isMobileNavigation />}
</div>
{children}
</div>

2
packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx
View File

@@ -81,7 +81,7 @@ const TagContextMenu = ({ navigationController, isEntitledToFolders, selectedTag
iconGridClassName="max-h-30"
/>
<HorizontalSeparator classes="my-2" />
{application.featuresController.isEntitledToVaults() && (
{application.featuresController.isVaultsEnabled() && (
<AddToVaultMenuOption iconClassName="mr-2 text-neutral" items={[selectedTag]} />
)}
<MenuItem className={'justify-between py-1.5'} onClick={onClickStar}>

2
packages/web/src/javascripts/Components/Vaults/AddToVaultMenuOption.tsx
View File

@@ -120,7 +120,7 @@ const AddToVaultMenuOption = ({
setIsSubMenuOpen((isOpen) => !isOpen)
}, [])
if (!application.featuresController.isEntitledToVaults()) {
if (!application.featuresController.isVaultsEnabled()) {
return null
}

7
packages/web/src/javascripts/Controllers/FeaturesController.ts
View File

@@ -130,7 +130,12 @@ export class FeaturesController extends AbstractViewController implements Intern
return status === FeatureStatus.Entitled
}
isEntitledToVaults(): boolean {
isVaultsEnabled(): boolean {
const enabled = this.features.isExperimentalFeatureEnabled(NativeFeatureIdentifier.TYPES.Vaults)
return featureTrunkVaultsEnabled() || enabled
}
isEntitledToSharedVaults(): boolean {
const status = this.features.getFeatureStatus(
NativeFeatureIdentifier.create(NativeFeatureIdentifier.TYPES.SharedVaults).getValue(),
)

3
packages/web/src/javascripts/Controllers/LinkingController.spec.ts
View File

@@ -71,7 +71,8 @@ describe('LinkingController', () => {
application.getPreference = jest.fn()
application.addSingleEventObserver = jest.fn()
application.sync.sync = jest.fn()
application.featuresController.isEntitledToVaults = jest.fn().mockReturnValue(true)
application.featuresController.isVaultsEnabled = jest.fn().mockReturnValue(true)
application.featuresController.isEntitledToSharedVaults = jest.fn().mockReturnValue(true)
Object.defineProperty(application, 'items', { value: {} as jest.Mocked<ItemManagerInterface> })

2
packages/web/src/javascripts/Controllers/LinkingController.tsx
View File

@@ -208,7 +208,7 @@ export class LinkingController extends AbstractViewController implements Interna
const linkNoteAndFile = async (note: SNNote, file: FileItem) => {
const updatedFile = await this.mutator.associateFileWithNote(file, note)
if (this.featuresController.isEntitledToVaults()) {
if (this.featuresController.isVaultsEnabled()) {
if (updatedFile) {
const noteVault = this.vaults.getItemVault(note)
const fileVault = this.vaults.getItemVault(updatedFile)

3
packages/web/src/javascripts/FeatureTrunk.ts
View File

@@ -9,7 +9,8 @@ export function featureTrunkEnabled(trunk: FeatureTrunkName): boolean {
}
export function featureTrunkVaultsEnabled(): boolean {
return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Vaults)
// return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Vaults)
return false
}
export function featureTrunkHomeServerEnabled(): boolean {

2
packages/web/src/javascripts/Hooks/useItemVaultInfo.ts
View File

@@ -23,7 +23,7 @@ export const useItemVaultInfo = (item: DecryptedItemInterface): ItemVaultInfo =>
const [sharedByContact, setSharedByContact] = useState<TrustedContactInterface>()
const updateInfo = useCallback(() => {
if (!application.featuresController.isEntitledToVaults()) {
if (!application.featuresController.isVaultsEnabled()) {
return
}