Skip to content

Next: Adds organization management features #1919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Next: Adds organization management features #1919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af72e34
Next: Adds organization management features
niemyjski Jul 7, 2025
069cdc4
Merge branch 'main' into feature/next-organization-management
niemyjski Jul 8, 2025
c649685
Handles unauthorized requests globally
niemyjski Jul 10, 2025
5e4fbb0
Updated deps
niemyjski Jul 10, 2025
b9f345c
Exposes time property on query parameters
niemyjski Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 165 additions & 142 deletions src/Exceptionless.Web/ClientApp/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions src/Exceptionless.Web/ClientApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,38 @@
"@chromatic-com/storybook": "^4.0.1",
"@eslint/compat": "^1.3.1",
"@eslint/js": "^9.30.1",
"@iconify-json/lucide": "^1.2.55",
"@iconify-json/lucide": "^1.2.56",
"@playwright/test": "^1.53.2",
"@storybook/addon-a11y": "^9.0.15",
"@storybook/addon-docs": "^9.0.15",
"@storybook/addon-a11y": "^9.0.16",
"@storybook/addon-docs": "^9.0.16",
"@storybook/addon-svelte-csf": "^5.0.6",
"@storybook/sveltekit": "^9.0.15",
"@storybook/sveltekit": "^9.0.16",
"@sveltejs/adapter-static": "^3.0.8",
"@sveltejs/kit": "^2.22.2",
"@sveltejs/kit": "^2.22.4",
"@sveltejs/vite-plugin-svelte": "^5.1.0",
"@tailwindcss/vite": "^4.1.11",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.8",
"@types/eslint": "^9.6.1",
"@types/node": "^24.0.10",
"@types/node": "^24.0.12",
"@types/throttle-debounce": "^5.0.2",
"cross-env": "^7.0.3",
"eslint": "^9.30.1",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-perfectionist": "^4.15.0",
"eslint-plugin-storybook": "^9.0.15",
"eslint-plugin-storybook": "^9.0.16",
"eslint-plugin-svelte": "^3.10.1",
"jsdom": "^26.1.0",
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"prettier-plugin-tailwindcss": "^0.6.13",
"storybook": "^9.0.15",
"svelte": "^5.35.2",
"prettier-plugin-tailwindcss": "^0.6.14",
"storybook": "^9.0.16",
"svelte": "^5.35.5",
"svelte-check": "^4.2.2",
"swagger-typescript-api": "^13.2.7",
"tslib": "^2.8.1",
"typescript": "^5.8.3",
"typescript-eslint": "^8.35.1",
"typescript-eslint": "^8.36.0",
"vite": "^6.3.5",
"vitest": "3.2.4"
},
Expand All @@ -84,7 +84,7 @@
"mode-watcher": "^1.1.0",
"oidc-client-ts": "^3.3.0",
"pretty-ms": "^9.2.0",
"runed": "^0.29.1",
"runed": "^0.30.0",
"shiki": "^3.7.0",
"svelte-sonner": "^1.0.5",
"svelte-time": "^2.0.1",
Expand Down
198 changes: 190 additions & 8 deletions src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import type { WebSocketMessageValue } from '$features/websockets/models';
import type { QueryClient } from '@tanstack/svelte-query';

import { accessToken } from '$features/auth/index.svelte';
import { type ProblemDetails, useFetchClient } from '@exceptionless/fetchclient';
import { createQuery, useQueryClient } from '@tanstack/svelte-query';
import { type FetchClientResponse, type ProblemDetails, useFetchClient } from '@exceptionless/fetchclient';
import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query';

import type { ViewOrganization } from './models';
import type { Invoice, InvoiceGridModel, NewOrganization, ViewOrganization } from './models';

export async function invalidateOrganizationQueries(queryClient: QueryClient, message: WebSocketMessageValue<'OrganizationChanged'>) {
const { id } = message;
Expand All @@ -21,11 +21,46 @@ export async function invalidateOrganizationQueries(queryClient: QueryClient, me
}

export const queryKeys = {
deleteOrganization: (ids: string[] | undefined) => [...queryKeys.ids(ids), 'delete'] as const,
id: (id: string | undefined, mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, id, { mode }] as const) : ([...queryKeys.type, id] as const)),
ids: (ids: string[] | undefined) => [...queryKeys.type, ...(ids ?? [])] as const,
invoice: (id: string | undefined) => [...queryKeys.type, 'invoice', id] as const,
invoices: (organizationId: string | undefined) => [...queryKeys.type, organizationId, 'invoices'] as const,
list: (mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, 'list', { mode }] as const) : ([...queryKeys.type, 'list'] as const)),
postOrganization: () => [...queryKeys.type, 'post-organization'] as const,
type: ['Organization'] as const
};

export interface AddOrganizationUserRequest {
route: {
email: string;
organizationId: string;
};
}

export interface DeleteOrganizationRequest {
route: {
ids: string[];
};
}

export interface GetInvoiceRequest {
route: {
id: string;
};
}

export interface GetInvoicesRequest {
params?: {
after?: string;
before?: string;
limit?: number;
};
route: {
organizationId: string;
};
}

export interface GetOrganizationRequest {
params?: {
mode: 'stats' | undefined;
Expand All @@ -35,12 +70,107 @@ export interface GetOrganizationRequest {
};
}

export type GetOrganizationsMode = 'stats' | null;

export interface GetOrganizationsParams {
mode: GetOrganizationsMode;
}

export interface GetOrganizationsRequest {
params?: {
mode: 'stats' | undefined;
params?: GetOrganizationsParams;
}

export interface RemoveOrganizationUserRequest {
route: {
email: string;
organizationId: string;
};
}

export interface UpdateOrganizationRequest {
route: {
id: string;
};
}

export function addOrganizationUser(request: AddOrganizationUserRequest) {
const queryClient = useQueryClient();
return createMutation<{ emailAddress: string }, ProblemDetails, void>(() => ({
enabled: () => !!accessToken.current && !!request.route.organizationId && !!request.route.email,
mutationFn: async () => {
const client = useFetchClient();
const response = await client.postJSON<{ emailAddress: string }>(
`organizations/${request.route.organizationId}/users/${encodeURIComponent(request.route.email)}`
);
return response.data!;
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.organizationId, undefined) });
queryClient.invalidateQueries({ queryKey: ['User', 'organization', request.route.organizationId] });
}
}));
}

export function deleteOrganization(request: DeleteOrganizationRequest) {
const queryClient = useQueryClient();

return createMutation<FetchClientResponse<unknown>, ProblemDetails, void>(() => ({
enabled: () => !!accessToken.current && !!request.route.ids?.length,
mutationFn: async () => {
const client = useFetchClient();
const response = await client.delete(`organizations/${request.route.ids?.join(',')}`, {
expectedStatusCodes: [202]
});

return response;
},
mutationKey: queryKeys.deleteOrganization(request.route.ids),
onError: () => {
request.route.ids?.forEach((id) => queryClient.invalidateQueries({ queryKey: queryKeys.id(id, undefined) }));
},
onSuccess: () => {
request.route.ids?.forEach((id) => queryClient.invalidateQueries({ queryKey: queryKeys.id(id, undefined) }));
}
}));
}

export function getInvoiceQuery(request: GetInvoiceRequest) {
const queryClient = useQueryClient();

return createQuery<Invoice, ProblemDetails>(() => ({
enabled: () => !!accessToken.current && !!request.route.id,
queryClient,
queryFn: async ({ signal }: { signal: AbortSignal }) => {
const client = useFetchClient();
const response = await client.getJSON<Invoice>(`organizations/invoice/${request.route.id}`, {
signal
});

return response.data!;
},
queryKey: queryKeys.invoice(request.route.id)
}));
}

export function getInvoicesQuery(request: GetInvoicesRequest) {
const queryClient = useQueryClient();

return createQuery<FetchClientResponse<InvoiceGridModel[]>, ProblemDetails>(() => ({
enabled: () => !!accessToken.current && !!request.route.organizationId,
queryClient,
queryFn: async ({ signal }: { signal: AbortSignal }) => {
const client = useFetchClient();
const response = await client.getJSON<InvoiceGridModel[]>(`organizations/${request.route.organizationId}/invoices`, {
params: { ...request.params },
signal
});

return response;
},
queryKey: queryKeys.invoices(request.route.organizationId)
}));
}

export function getOrganizationQuery(request: GetOrganizationRequest) {
const queryClient = useQueryClient();

Expand Down Expand Up @@ -69,7 +199,7 @@ export function getOrganizationQuery(request: GetOrganizationRequest) {
export function getOrganizationsQuery(request: GetOrganizationsRequest) {
const queryClient = useQueryClient();

return createQuery<ViewOrganization[], ProblemDetails>(() => ({
return createQuery<FetchClientResponse<ViewOrganization[]>, ProblemDetails>(() => ({
enabled: () => !!accessToken.current,
onSuccess: (data: ViewOrganization[]) => {
data.forEach((organization) => {
Expand All @@ -84,12 +214,64 @@ export function getOrganizationsQuery(request: GetOrganizationsRequest) {
queryFn: async ({ signal }: { signal: AbortSignal }) => {
const client = useFetchClient();
const response = await client.getJSON<ViewOrganization[]>('organizations', {
params: request.params,
params: { ...request.params },
signal
});

return response.data!;
return response;
},
queryKey: [...queryKeys.list(request.params?.mode ?? undefined), { params: request.params }]
}));
}

export function postOrganization() {
const queryClient = useQueryClient();

return createMutation<ViewOrganization, ProblemDetails, NewOrganization>(() => ({
enabled: () => !!accessToken.current,
mutationFn: async (organization: NewOrganization) => {
const client = useFetchClient();
const response = await client.postJSON<ViewOrganization>('organizations', organization);
return response.data!;
},
mutationKey: queryKeys.postOrganization(),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: queryKeys.type });
}
}));
}

export function removeOrganizationUser(request: RemoveOrganizationUserRequest) {
const queryClient = useQueryClient();
return createMutation<void, ProblemDetails, void>(() => ({
enabled: () => !!accessToken.current && !!request.route.organizationId && !!request.route.email,
mutationFn: async () => {
const client = useFetchClient();
await client.deleteJSON<void>(`organizations/${request.route.organizationId}/users/${encodeURIComponent(request.route.email)}`);
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.organizationId, undefined) });
queryClient.invalidateQueries({ queryKey: ['User', 'organization', request.route.organizationId] });
}
}));
}

export function updateOrganization(request: UpdateOrganizationRequest) {
const queryClient = useQueryClient();

return createMutation<ViewOrganization, ProblemDetails, NewOrganization>(() => ({
enabled: () => !!accessToken.current && !!request.route.id,
mutationFn: async (data: NewOrganization) => {
const client = useFetchClient();
const response = await client.patchJSON<ViewOrganization>(`organizations/${request.route.id}`, data);
return response.data!;
},
onError: () => {
queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
},
onSuccess: (organization: ViewOrganization) => {
queryClient.setQueryData(queryKeys.id(request.route.id, 'stats'), organization);
queryClient.setQueryData(queryKeys.id(request.route.id, undefined), organization);
}
}));
}
32 changes: 32 additions & 0 deletions ...pp/src/lib/features/organizations/components/dialogs/leave-organization-dialog-new.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<script lang="ts">
import * as AlertDialog from '$comp/ui/alert-dialog';
import { buttonVariants } from '$comp/ui/button';

interface Props {
leave: () => Promise<void>;
name: string;
open: boolean;
}

let { leave, name, open = $bindable(false) }: Props = $props();

async function onSubmit() {
await leave();
open = false;
}
</script>

<AlertDialog.Root bind:open>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title>Leave Organization</AlertDialog.Title>
<AlertDialog.Description>
Are you sure you want to leave "<span class="inline-block max-w-[200px] truncate align-bottom" title={name}>{name}</span>"?
</AlertDialog.Description>
</AlertDialog.Header>
<AlertDialog.Footer>
<AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
<AlertDialog.Action class={buttonVariants({ variant: 'destructive' })} onclick={onSubmit}>Leave Organization</AlertDialog.Action>
</AlertDialog.Footer>
</AlertDialog.Content>
</AlertDialog.Root>
32 changes: 32 additions & 0 deletions ...entApp/src/lib/features/organizations/components/dialogs/leave-organization-dialog.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<script lang="ts">
import * as AlertDialog from '$comp/ui/alert-dialog';
import { buttonVariants } from '$comp/ui/button';

interface Props {
leave: () => Promise<void>;
name: string;
open: boolean;
}

let { leave, name, open = $bindable(false) }: Props = $props();

async function onSubmit() {
await leave();
open = false;
}
</script>

<AlertDialog.Root bind:open>
<AlertDialog.Content>
<AlertDialog.Header>
<AlertDialog.Title>Leave Organization</AlertDialog.Title>
<AlertDialog.Description>
Are you sure you want to leave "<span class="inline-block max-w-[200px] truncate align-bottom" title={name}>{name}</span>"?
</AlertDialog.Description>
</AlertDialog.Header>
<AlertDialog.Footer>
<AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
<AlertDialog.Action class={buttonVariants({ variant: 'destructive' })} onclick={onSubmit}>Leave Organization</AlertDialog.Action>
</AlertDialog.Footer>
</AlertDialog.Content>
</AlertDialog.Root>
Loading
Loading