diff --git a/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx b/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx index 266660f11..a9f62e42f 100644 --- a/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx +++ b/app/assets/javascripts/Components/AccountMenu/AdvancedOptions.tsx @@ -11,53 +11,56 @@ type Props = { application: WebApplication appState: AppState disabled?: boolean - onVaultChange?: (isVault: boolean, vaultedEmail?: string) => void + onPrivateWorkspaceChange?: (isPrivate: boolean, identifier?: string) => void onStrictSignInChange?: (isStrictSignIn: boolean) => void } export const AdvancedOptions: FunctionComponent = observer( - ({ appState, application, disabled = false, onVaultChange, onStrictSignInChange, children }) => { + ({ appState, application, disabled = false, onPrivateWorkspaceChange, onStrictSignInChange, children }) => { const { server, setServer, enableServerOption, setEnableServerOption } = appState.accountMenu const [showAdvanced, setShowAdvanced] = useState(false) - const [isVault, setIsVault] = useState(false) - const [vaultName, setVaultName] = useState('') - const [vaultUserphrase, setVaultUserphrase] = useState('') + const [isPrivateWorkspace, setIsPrivateWorkspace] = useState(false) + const [privateWorkspaceName, setPrivateWorkspaceName] = useState('') + const [privateWorkspaceUserphrase, setPrivateWorkspaceUserphrase] = useState('') const [isStrictSignin, setIsStrictSignin] = useState(false) useEffect(() => { - const recomputeVaultedEmail = async () => { - const vaultedEmail = await application.vaultToEmail(vaultName, vaultUserphrase) + const recomputePrivateWorkspaceIdentifier = async () => { + const identifier = await application.computePrivateWorkspaceIdentifier( + privateWorkspaceName, + privateWorkspaceUserphrase, + ) - if (!vaultedEmail) { - if (vaultName?.length > 0 && vaultUserphrase?.length > 0) { - application.alertService.alert('Unable to compute vault name.').catch(console.error) + if (!identifier) { + if (privateWorkspaceName?.length > 0 && privateWorkspaceUserphrase?.length > 0) { + application.alertService.alert('Unable to compute private workspace name.').catch(console.error) } return } - onVaultChange?.(true, vaultedEmail) + onPrivateWorkspaceChange?.(true, identifier) } - if (vaultName && vaultUserphrase) { - recomputeVaultedEmail().catch(console.error) + if (privateWorkspaceName && privateWorkspaceUserphrase) { + recomputePrivateWorkspaceIdentifier().catch(console.error) } - }, [vaultName, vaultUserphrase, application, onVaultChange]) + }, [privateWorkspaceName, privateWorkspaceUserphrase, application, onPrivateWorkspaceChange]) useEffect(() => { - onVaultChange?.(isVault) - }, [isVault, onVaultChange]) + onPrivateWorkspaceChange?.(isPrivateWorkspace) + }, [isPrivateWorkspace, onPrivateWorkspaceChange]) - const handleIsVaultChange = () => { - setIsVault(!isVault) + const handleIsPrivateWorkspaceChange = () => { + setIsPrivateWorkspace(!isPrivateWorkspace) } - const handleVaultNameChange = (name: string) => { - setVaultName(name) + const handlePrivateWorkspaceNameChange = (name: string) => { + setPrivateWorkspaceName(name) } - const handleVaultUserphraseChange = (userphrase: string) => { - setVaultUserphrase(userphrase) + const handlePrivateWorkspaceUserphraseChange = (userphrase: string) => { + setPrivateWorkspaceUserphrase(userphrase) } const handleServerOptionChange = (e: Event) => { @@ -99,11 +102,11 @@ export const AdvancedOptions: FunctionComponent = observer( {appState.enableUnfinishedFeatures && (
= observer(
)} - {appState.enableUnfinishedFeatures && isVault && ( + {appState.enableUnfinishedFeatures && isPrivateWorkspace && ( <> - ]} - type="text" - placeholder="Vault name" - value={vaultName} - onChange={handleVaultNameChange} - disabled={disabled} - /> ]} type="text" - placeholder="Vault userphrase" - value={vaultUserphrase} - onChange={handleVaultUserphraseChange} + placeholder="Userphrase" + value={privateWorkspaceUserphrase} + onChange={handlePrivateWorkspaceUserphraseChange} + disabled={disabled} + /> + ]} + type="text" + placeholder="Name" + value={privateWorkspaceName} + onChange={handlePrivateWorkspaceNameChange} disabled={disabled} /> diff --git a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx index 0c3a4d78f..91127a0d3 100644 --- a/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx +++ b/app/assets/javascripts/Components/AccountMenu/CreateAccount.tsx @@ -25,7 +25,7 @@ export const CreateAccount: FunctionComponent = observer( ({ appState, application, setMenuPane, email, setEmail, password, setPassword }) => { const emailInputRef = useRef(null) const passwordInputRef = useRef(null) - const [isVault, setIsVault] = useState(false) + const [isPrivateWorkspace, setIsPrivateWorkspace] = useState(false) useEffect(() => { if (emailInputRef.current) { @@ -71,10 +71,10 @@ export const CreateAccount: FunctionComponent = observer( setPassword('') } - const onVaultChange = (isVault: boolean, vaultedEmail?: string) => { - setIsVault(isVault) - if (isVault && vaultedEmail) { - setEmail(vaultedEmail) + const onPrivateWorkspaceChange = (isPrivateWorkspace: boolean, privateWorkspaceIdentifier?: string) => { + setIsPrivateWorkspace(isPrivateWorkspace) + if (isPrivateWorkspace && privateWorkspaceIdentifier) { + setEmail(privateWorkspaceIdentifier) } } @@ -93,7 +93,7 @@ export const CreateAccount: FunctionComponent = observer(
]} onChange={handleEmailChange} onKeyDown={handleKeyDown} @@ -114,7 +114,11 @@ export const CreateAccount: FunctionComponent = observer(