MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix profile and password modals in portal

This commit is contained in:
Andrew Kingston 2025-03-07 16:20:23 +00:00
parent 3c44c94442
commit 790cb00be8
No known key found for this signature in database
7 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/pages/builder/apps/index.svelte
View File

@ -204,7 +204,11 @@
<ProfileModal {API} user={$auth.user} on:save={() => auth.getSelf()} /> <ProfileModal {API} user={$auth.user} on:save={() => auth.getSelf()} />
</Modal> </Modal>
<Modal bind:this={changePasswordModal}> <Modal bind:this={changePasswordModal}>
<ChangePasswordModal {API} on:save={() => auth.getSelf()} /> <ChangePasswordModal
{API}
passwordMinLength={$admin.passwordMinLength}
on:save={() => auth.getSelf()}
/>
</Modal> </Modal>
{/if} {/if}

11
packages/builder/src/pages/builder/auth/reset.svelte
View File

@ -8,11 +8,10 @@
notifications, notifications,
} from "@budibase/bbui" } from "@budibase/bbui"
import { goto, params } from "@roxi/routify" import { goto, params } from "@roxi/routify"
import { auth, organisation } from "@/stores/portal" import { auth, organisation, admin } from "@/stores/portal"
import Logo from "assets/bb-emblem.svg" import Logo from "assets/bb-emblem.svg"
import { TestimonialPage } from "@budibase/frontend-core/src/components" import { TestimonialPage, PasswordRepeatInput } from "@budibase/frontend-core"
import { onMount } from "svelte" import { onMount } from "svelte"
import PasswordRepeatInput from "@budibase/frontend-core/src/components/PasswordRepeatInput.svelte"
const resetCode = $params["?code"] const resetCode = $params["?code"]
let form let form
@ -79,7 +78,11 @@
<Layout gap="S" noPadding> <Layout gap="S" noPadding>
<Heading size="M">Reset your password</Heading> <Heading size="M">Reset your password</Heading>
<Body size="M">Must contain at least 12 characters</Body> <Body size="M">Must contain at least 12 characters</Body>
<PasswordRepeatInput bind:password bind:error={passwordError} /> <PasswordRepeatInput
bind:password
bind:error={passwordError}
minLength={$admin.passwordMinLength || 12}
/>
<Button secondary cta on:click={reset}> <Button secondary cta on:click={reset}>
{#if loading} {#if loading}
<ProgressCircle overBackground={true} size="S" /> <ProgressCircle overBackground={true} size="S" />

9
packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
View File

@ -7,6 +7,7 @@
import ThemeModal from "@/components/settings/ThemeModal.svelte" import ThemeModal from "@/components/settings/ThemeModal.svelte"
import APIKeyModal from "@/components/settings/APIKeyModal.svelte" import APIKeyModal from "@/components/settings/APIKeyModal.svelte"
import { UserAvatar } from "@budibase/frontend-core" import { UserAvatar } from "@budibase/frontend-core"
import { API } from "@/api"
let themeModal let themeModal
let profileModal let profileModal
@ -60,10 +61,14 @@
<ThemeModal /> <ThemeModal />
</Modal> </Modal>
<Modal bind:this={profileModal}> <Modal bind:this={profileModal}>
<ProfileModal /> <ProfileModal {API} user={$auth.user} on:save={() => auth.getSelf()} />
</Modal> </Modal>
<Modal bind:this={updatePasswordModal}> <Modal bind:this={updatePasswordModal}>
<ChangePasswordModal /> <ChangePasswordModal
{API}
passwordMinLength={$admin.passwordMinLength}
on:save={() => auth.getSelf()}
/>
</Modal> </Modal>
<Modal bind:this={apiKeyModal}> <Modal bind:this={apiKeyModal}>
<APIKeyModal /> <APIKeyModal />

3
packages/frontend-core/src/components/ChangePasswordModal.svelte
View File

@ -5,6 +5,7 @@
import { createEventDispatcher } from "svelte" import { createEventDispatcher } from "svelte"
export let API: APIClient export let API: APIClient
export let passwordMinLength: string | undefined = undefined
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
@ -36,5 +37,5 @@
disabled={!!error || !password} disabled={!!error || !password}
> >
<Body size="S">Enter your new password below.</Body> <Body size="S">Enter your new password below.</Body>
<PasswordRepeatInput bind:password bind:error /> <PasswordRepeatInput bind:password bind:error minLength={passwordMinLength} />
</ModalContent> </ModalContent>

2
packages/frontend-core/src/components/PasswordRepeatInput.svelte
View File

@ -4,7 +4,7 @@
export let password export let password
export let error export let error
export let minLength = 12 export let minLength = "12"
const validatePassword = value => { const validatePassword = value => {
if (!value || value.length < minLength) { if (!value || value.length < minLength) {

2
packages/frontend-core/src/components/ProfileModal.svelte
View File

@ -8,8 +8,6 @@
export let user: User | ContextUser | undefined = undefined export let user: User | ContextUser | undefined = undefined
export let API: APIClient export let API: APIClient
$: console.log(user)
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
const values = writable({ const values = writable({

1
packages/frontend-core/src/components/index.js
View File

@ -11,3 +11,4 @@ export { default as CoreFilterBuilder } from "./CoreFilterBuilder.svelte"
export { default as FilterUsers } from "./FilterUsers.svelte" export { default as FilterUsers } from "./FilterUsers.svelte"
export { default as ChangePasswordModal } from "./ChangePasswordModal.svelte" export { default as ChangePasswordModal } from "./ChangePasswordModal.svelte"
export { default as ProfileModal } from "./ProfileModal.svelte" export { default as ProfileModal } from "./ProfileModal.svelte"
export { default as PasswordRepeatInput } from "./PasswordRepeatInput.svelte"