diff --git a/src/lib/components/alert.svelte b/src/lib/components/alert.svelte index 36e1ed44a..921f54b28 100644 --- a/src/lib/components/alert.svelte +++ b/src/lib/components/alert.svelte @@ -1,10 +1,10 @@ @@ -25,11 +25,11 @@

- {#if func?.length} + {#if buttons?.length}
- {#each func as f} - {/each}
diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte index 886edfd2b..02b387f29 100644 --- a/src/lib/components/cardGrid.svelte +++ b/src/lib/components/cardGrid.svelte @@ -1,5 +1,9 @@ @@ -8,10 +12,12 @@
- +
-
- -
+ {#if actions?.textContent} +
+ +
+ {/if}
diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index 1d66a0377..ef8ab77b3 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -3,15 +3,13 @@ export let value: string; - let showTooltip = 'none'; - const copy = async () => { try { await navigator.clipboard.writeText(value); - showTooltip = 'block'; - setTimeout(() => { - showTooltip = 'none'; - }, 1000); + addNotification({ + message: 'Copied to clipboard.', + type: 'success' + }); } catch (error) { addNotification({ message: error.message, @@ -21,14 +19,6 @@ }; -
- - -
+ + + diff --git a/src/lib/components/copyInput.svelte b/src/lib/components/copyInput.svelte new file mode 100644 index 000000000..7eb0900e7 --- /dev/null +++ b/src/lib/components/copyInput.svelte @@ -0,0 +1,34 @@ + + +
+ + +
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index b1ecf9f35..01de65cfb 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -6,6 +6,7 @@ export { default as Tile } from './tile.svelte'; export { default as Tiles } from './tiles.svelte'; export { default as Back } from './back.svelte'; export { default as Copy } from './copy.svelte'; +export { default as CopyInput } from './copyInput.svelte'; export { default as UploadBox } from './uploadBox.svelte'; export { default as List } from './list.svelte'; export { default as ListItem } from './listItem.svelte'; @@ -22,3 +23,4 @@ export { default as SwitchBox } from './switchBox.svelte'; export { default as SwitchBoxes } from './switchBoxes.svelte'; export { default as Alert } from './alert.svelte'; export { default as Box } from './box.svelte'; +export { default as Search } from './search.svelte'; diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index c770ec075..e4b02785a 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -5,7 +5,7 @@ export let show = false; let browser = false; - + //TODO: explore other solutions compatible with testing library onMount(() => { browser = true; }); diff --git a/src/lib/components/search.svelte b/src/lib/components/search.svelte new file mode 100644 index 000000000..879e0d041 --- /dev/null +++ b/src/lib/components/search.svelte @@ -0,0 +1,13 @@ + + +
+
+ +
+ +
diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index 26e6112f5..1b17010d2 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -5,8 +5,8 @@ export let danger = false; export let disabled = false; export let round = false; - export let href: string = null; export let external = false; + export let href: string = null; //TODO: add option to add aria-label to buttons that are only icons diff --git a/src/lib/elements/forms/inputSwitch.svelte b/src/lib/elements/forms/inputSwitch.svelte index a8fded417..38a6f2a40 100644 --- a/src/lib/elements/forms/inputSwitch.svelte +++ b/src/lib/elements/forms/inputSwitch.svelte @@ -9,15 +9,20 @@ - -
- -
+
diff --git a/src/lib/layout/notification.svelte b/src/lib/layout/notification.svelte index ca5b33c4b..7b77e5d51 100644 --- a/src/lib/layout/notification.svelte +++ b/src/lib/layout/notification.svelte @@ -4,7 +4,7 @@ export let type: Notification['type'] = 'info'; export let title: Notification['title']; - export let func: Notification['func']; + export let buttons: Notification['buttons']; let icon: string; switch (type) { @@ -44,11 +44,11 @@ {/if}

- {#if func} + {#if buttons}
- {#each func as f} - {/each}
diff --git a/src/lib/layout/notifications.svelte b/src/lib/layout/notifications.svelte index dde7dcdda..7b019f930 100644 --- a/src/lib/layout/notifications.svelte +++ b/src/lib/layout/notifications.svelte @@ -11,7 +11,7 @@ type={notification.type} title={notification.title} on:dismiss={() => dismissNotification(notification.id)} - func={notification?.func}> + buttons={notification?.buttons}> {notification.message} {/each} diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index b82975ba8..76f59b9eb 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -3,8 +3,8 @@ import { tabs, title, backButton, copyData } from '$lib/stores/layout'; import { fade } from 'svelte/transition'; import { Cover } from '.'; + import { Copy } from '$lib/components'; import { Pill } from '$lib/elements'; - import { addNotification } from '$lib/stores/notifications'; export let isOpen = false; @@ -52,21 +52,6 @@ } }; }; - - const copy = async (value: string) => { - try { - await navigator.clipboard.writeText(value); - addNotification({ - message: 'Copied to clipboard.', - type: 'success' - }); - } catch (error) { - addNotification({ - message: error.message, - type: 'error' - }); - } - }; @@ -93,16 +78,16 @@ {$title} {#if $copyData?.value} - copy($copyData.value)} - >{$copyData.text} - + + {$copyData.text} + {/if} {:else} {$title} {#if $copyData?.value} - copy($copyData.value)} - >{$copyData.text} - + + {$copyData.text} + {/if} {/if} diff --git a/src/lib/stores/notifications.ts b/src/lib/stores/notifications.ts index ce67f7899..0642824df 100644 --- a/src/lib/stores/notifications.ts +++ b/src/lib/stores/notifications.ts @@ -7,11 +7,11 @@ export type Notification = { timeout?: number; message: string; title?: string; - func?: Func[]; + buttons?: Buttons[]; }; -export type Func = { - method: () => void; //TODO Check if promise is needed rather tha () => void +export type Buttons = { + method: () => void | Promise; name: string; }; diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts index 4967920da..8ac579d7c 100644 --- a/src/lib/stores/user.ts +++ b/src/lib/stores/user.ts @@ -9,11 +9,7 @@ function createUserStore() { subscribe, set, fetchUser: async () => { - try { - set(await sdkForConsole.account.get()); - } catch (error) { - //TODO: take care what happens here - } + set(await sdkForConsole.account.get()); } }; } diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 52abb8f62..7ed613c2c 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -15,11 +15,7 @@ onMount(async () => { try { if (!$user) { - //TODO: find out if it's the correct implementation await user.fetchUser(); - if (!$user) { - throw 'No user found'; - } } if (!$page.url.pathname.startsWith('/console')) { diff --git a/src/routes/console/[project]/database/collection/[collection]/document/[document]/index.svelte b/src/routes/console/[project]/database/collection/[collection]/document/[document]/index.svelte index 0767773f4..9222b68e6 100644 --- a/src/routes/console/[project]/database/collection/[collection]/document/[document]/index.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/document/[document]/index.svelte @@ -1,6 +1,6 @@ @@ -53,9 +48,6 @@ - - -

Platforms

{#each $project.platforms as platform} diff --git a/src/routes/console/[project]/users/_appleOAuth.svelte b/src/routes/console/[project]/users/_appleOAuth.svelte index 5bb662cc6..06c560898 100644 --- a/src/routes/console/[project]/users/_appleOAuth.svelte +++ b/src/routes/console/[project]/users/_appleOAuth.svelte @@ -1,6 +1,6 @@ - -
-
-

Auth Methods

-

Enable the auth methods you wish to use.

-
-
-
-
    - {#each $authMethods.list as box} -
  • - -
  • - {/each} -
  • - -
  • -
-
-
-
-
+ +

Auth Methods

+

Enable the auth methods you wish to use.

+ +
+
    + {#each $authMethods.list as box} + { + authUpdate(box.method, box.value); + }} /> + {/each} +
  • + +
  • +
+
+
+

OAuth2 Providers

    diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index 2fcc31842..8f9ee833f 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -1,9 +1,8 @@ -
    -
    - -
    - + -
    + {#if $usersList?.response?.total} @@ -113,9 +88,9 @@ {/if} - copy(user.$id)} - >User ID - + + User ID + {toLocaleDateTime(user.registration)} diff --git a/src/routes/console/[project]/users/security.svelte b/src/routes/console/[project]/users/security.svelte index e220206d8..6884f6146 100644 --- a/src/routes/console/[project]/users/security.svelte +++ b/src/routes/console/[project]/users/security.svelte @@ -76,7 +76,7 @@ method. You can still create users from your Appwrite console.

    - +
    • @@ -126,7 +126,7 @@ If you reduce the limit, users who are currently logged in will be logged out of the application.

      - +
        diff --git a/src/routes/console/[project]/users/store.ts b/src/routes/console/[project]/users/store.ts index b1d840ea1..afc6a2c13 100644 --- a/src/routes/console/[project]/users/store.ts +++ b/src/routes/console/[project]/users/store.ts @@ -23,22 +23,18 @@ function createUsersListStore() { subscribe, set, load: async (search: string, limit: number, offset: number) => { - try { - const response = await sdkForProject.users.list( - search, - limit, - offset, - undefined, - undefined, - 'DESC' - ); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.users.list( + search, + limit, + offset, + undefined, + undefined, + 'DESC' + ); + set({ + loading: false, + response + }); } }; } @@ -53,22 +49,18 @@ function createTeamsListStore() { subscribe, set, load: async (search: string, limit: number, offset: number) => { - try { - const response = await sdkForProject.teams.list( - search, - limit, - offset, - undefined, - undefined, - 'DESC' - ); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.teams.list( + search, + limit, + offset, + undefined, + undefined, + 'DESC' + ); + set({ + loading: false, + response + }); } }; } @@ -82,15 +74,11 @@ function createUsersUsageStore() { subscribe, set, load: async (range: string) => { - try { - const response = await sdkForProject.users.getUsage(range); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.users.getUsage(range); + set({ + loading: false, + response + }); } }; } diff --git a/src/routes/console/[project]/users/teams.svelte b/src/routes/console/[project]/users/teams.svelte index c8e5fb76c..21806e6a6 100644 --- a/src/routes/console/[project]/users/teams.svelte +++ b/src/routes/console/[project]/users/teams.svelte @@ -11,7 +11,7 @@ TableCellText } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; - import { Empty, Pagination, Avatar } from '$lib/components'; + import { Empty, Pagination, Avatar, Search } from '$lib/components'; import Create from './_createTeam.svelte'; import { goto } from '$app/navigation'; import { toLocaleDateTime } from '$lib/helpers/date'; @@ -47,20 +47,11 @@ -
        -
        - -
        - + -
        + {#if $teamsList?.response?.total}
    diff --git a/src/routes/console/[project]/users/teams/[team]/_createMember.svelte b/src/routes/console/[project]/users/teams/[team]/_createMember.svelte index e9c687bbf..278315321 100644 --- a/src/routes/console/[project]/users/teams/[team]/_createMember.svelte +++ b/src/routes/console/[project]/users/teams/[team]/_createMember.svelte @@ -14,13 +14,14 @@ let name: string, email: string, roles: []; const create = async () => { + const url = `${$page.url.origin}/console/${$page.params.project}/users/teams/${$page.params.team}/members`; + try { - //TODO update url to correct one? const user = await sdkForProject.teams.createMembership( teamId, email, roles, - $page.url.origin, + url, name ); addNotification({ diff --git a/src/routes/console/[project]/users/teams/[team]/index.svelte b/src/routes/console/[project]/users/teams/[team]/index.svelte index f750dadd4..4e7171713 100644 --- a/src/routes/console/[project]/users/teams/[team]/index.svelte +++ b/src/routes/console/[project]/users/teams/[team]/index.svelte @@ -15,15 +15,12 @@ let showError: false | 'name' | 'email' | 'password' = false; let errorMessage = 'Something went wrong'; let errorType: 'error' | 'warning' | 'success' = 'error'; - let teamName = null; + let teamName: string = null; function addError(location: typeof showError, message: string, type: typeof errorType) { showError = location; errorMessage = message; errorType = type; - setTimeout(() => { - showError = false; - }, 6000); } async function updateName() { @@ -66,7 +63,7 @@
    Update Name
    - +
      - + import { page } from '$app/stores'; - import { Pagination, Empty, Avatar } from '$lib/components'; + import { Pagination, Empty, Avatar, Search } from '$lib/components'; import { Table, TableHeader, @@ -44,20 +44,11 @@ -
      -
      - -
      - + -
      + {#if $memberships.response?.total}
    diff --git a/src/routes/console/[project]/users/teams/[team]/store.ts b/src/routes/console/[project]/users/teams/[team]/store.ts index 4221f6b0d..4982baee2 100644 --- a/src/routes/console/[project]/users/teams/[team]/store.ts +++ b/src/routes/console/[project]/users/teams/[team]/store.ts @@ -22,15 +22,11 @@ function createTeamStore() { subscribe, set, load: async (teamId: string) => { - try { - const response = await sdkForProject.teams.get(teamId); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.teams.get(teamId); + set({ + loading: false, + response + }); } }; } @@ -44,23 +40,19 @@ function createMembershipStore() { subscribe, set, load: async (teamId: string, search: string, limit: number, offset: number) => { - try { - const response = await sdkForProject.teams.getMemberships( - teamId, - search, - limit, - offset, - undefined, - undefined, - 'DESC' - ); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.teams.getMemberships( + teamId, + search, + limit, + offset, + undefined, + undefined, + 'DESC' + ); + set({ + loading: false, + response + }); } }; } diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index 8ff27619f..7213e6d4b 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -22,14 +22,14 @@ let showError: false | 'name' | 'email' | 'password' = false; let errorMessage = 'Something went wrong'; let errorType: 'error' | 'warning' | 'success' = 'error'; - let userName = null, - userEmail = null, - newPassword = null, + let userName: string = null, + userEmail: string = null, + newPassword: string = null, newPref = false, - newKey = null, - newValue = null; + newKey: string = null, + newValue: string = null; let showVerifcationDropdown = false; - let prefs = null; + let prefs = Object.entries($user.response.prefs); let arePrefsDisabled = true; onMount(async () => { @@ -154,7 +154,12 @@ async function deletePref(selectedKey: string) { try { let updatedPrefs = Object.fromEntries(prefs); - delete updatedPrefs[selectedKey]; + updatedPrefs = Object.keys(updatedPrefs).reduce((acc, key) => { + if (key !== selectedKey) { + acc[key] = updatedPrefs[key]; + } + return acc; + }, {}); await sdkForProject.users.updatePrefs($user.response.$id, updatedPrefs); prefs = Object.entries(updatedPrefs); $user.response.prefs = updatedPrefs; @@ -188,7 +193,7 @@ >{$user.response.emailVerification ? 'Verified' : 'Unverified'} {/if} - +
    {$user.response.email}

    Joined: {toLocaleDate($user.response.registration)}

    @@ -239,7 +244,7 @@
    Update Name
    - +
      Update Email
      - +
        Enter a new password. A password must contain at least 8 characters.

        - +
          - +
            {#if prefs} @@ -361,10 +366,10 @@ {#if prefs.length === 0 || newPref}
          • - +
            - +
            - +
            - +

            {session.clientName}

            diff --git a/src/routes/console/[project]/users/user/[user]/store.ts b/src/routes/console/[project]/users/user/[user]/store.ts index 05f3ba721..b19052b3a 100644 --- a/src/routes/console/[project]/users/user/[user]/store.ts +++ b/src/routes/console/[project]/users/user/[user]/store.ts @@ -11,22 +11,18 @@ export type SelectedUser = { function createUserStore() { const { subscribe, set } = writable({ loading: true, - response: browser ? JSON.parse(sessionStorage.getItem('user')) : null + response: browser ? JSON.parse(sessionStorage.getItem('selectedUser')) : null }); return { subscribe, set, load: async (userId: string) => { - try { - const response = await sdkForProject.users.get(userId); - set({ - loading: false, - response - }); - } catch (error) { - //TODO: take care what happens here - } + const response = await sdkForProject.users.get(userId); + set({ + loading: false, + response + }); } }; } @@ -34,5 +30,7 @@ function createUserStore() { export const user = createUserStore(); if (browser) { - user.subscribe((n) => sessionStorage?.setItem('user', JSON.stringify(n.response ?? ''))); + user.subscribe((n) => + sessionStorage?.setItem('selectedUser', JSON.stringify(n.response ?? '')) + ); } diff --git a/tests/unit/components/copy.test.svelte b/tests/unit/components/copy.test.svelte new file mode 100644 index 000000000..b808e0190 --- /dev/null +++ b/tests/unit/components/copy.test.svelte @@ -0,0 +1,9 @@ + + + + Content + diff --git a/tests/unit/components/copy.test.ts b/tests/unit/components/copy.test.ts index 1d8e385ea..a144da3cf 100644 --- a/tests/unit/components/copy.test.ts +++ b/tests/unit/components/copy.test.ts @@ -1,22 +1,11 @@ import '@testing-library/jest-dom'; import { render, fireEvent } from '@testing-library/svelte'; -import { Copy } from '../../../src/lib/components'; +import Copy from './copy.test.svelte'; const value = 'This is a test'; -test('shows copy component', () => { - const { getByRole } = render(Copy, { value }); - const input = document.querySelector('input'); - const button = getByRole('button'); - - expect(input).toBeInTheDocument(); - expect(button).toBeInTheDocument(); - expect(input).toHaveAttribute('type', 'text'); - expect(input).toBeDisabled(); -}); - test('copy to clipboard function called on click', async () => { - const { getByRole } = render(Copy, { value }); + const { getByTestId } = render(Copy, { value }); Object.assign(window.navigator, { clipboard: { @@ -24,7 +13,7 @@ test('copy to clipboard function called on click', async () => { } }); - const button = getByRole('button'); + const button = getByTestId('copy-content'); await fireEvent.click(button); expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith('This is a test'); diff --git a/tests/unit/components/copyInput.test.ts b/tests/unit/components/copyInput.test.ts new file mode 100644 index 000000000..fb78dbe79 --- /dev/null +++ b/tests/unit/components/copyInput.test.ts @@ -0,0 +1,31 @@ +import '@testing-library/jest-dom'; +import { render, fireEvent } from '@testing-library/svelte'; +import { CopyInput } from '../../../src/lib/components'; + +const value = 'This is a test'; + +test('shows CopyInput component', () => { + const { getByRole } = render(CopyInput, { value }); + const input = document.querySelector('input'); + const button = getByRole('button'); + + expect(input).toBeInTheDocument(); + expect(button).toBeInTheDocument(); + expect(input).toHaveAttribute('type', 'text'); + expect(input).toBeDisabled(); +}); + +test('copy to clipboard function called on click', async () => { + const { getByRole } = render(CopyInput, { value }); + + Object.assign(window.navigator, { + clipboard: { + writeText: jest.fn().mockImplementation(() => Promise.resolve()) + } + }); + + const button = getByRole('button'); + await fireEvent.click(button); + + expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith('This is a test'); +});