Skip to content

Remove page cards and change page title #1908

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+71 −91
Open

Remove page cards and change page title #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Exceptionless.Web/ClientApp/src/lib/features/shared/api/api.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FetchClient, FetchClientProvider, getCurrentProvider } from '@exceptionless/fetchclient';

export const DEFAULT_LIMIT = 10;
export const DEFAULT_LIMIT = 20;

/**
* Represents the default timezone offset based on the user's local time.
Expand Down
4 changes: 2 additions & 2 deletions ...eb/ClientApp/src/lib/features/shared/components/automatic-refresh-indicator-button.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

{#if canRefresh}
<div class="inline-flex h-6">
<Live liveTitle={refreshButtonTitle} class="ml-3 size-3 motion-safe:animate-none" />
<Live liveTitle={refreshButtonTitle} class="ml-2 size-2 motion-safe:animate-none" />
</div>
{:else}
<Button variant="ghost" size="icon" onclick={refresh} title={refreshButtonTitle}>
<Live live={false} notLiveTitle={refreshButtonTitle} class="size-3 motion-safe:animate-none" />
<Live live={false} notLiveTitle={refreshButtonTitle} class="size-2 motion-safe:animate-none" />
</Button>
{/if}
2 changes: 1 addition & 1 deletion ...onless.Web/ClientApp/src/lib/features/shared/components/data-table/data-table-body.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<div class="rounded-md border">
<Table.Root>
<Table.Header>
<Table.Header class="bg-card">
{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
<Table.Row>
{#each headerGroup.headers as header (header.id)}
Expand Down
2 changes: 2 additions & 0 deletions ...ess.Web/ClientApp/src/lib/features/shared/components/data-table/data-table-toolbar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import type { Snippet } from 'svelte';

import DataTableViewOptions from './data-table-view-options.svelte';
import AutomaticRefreshIndicatorButton from '$comp/automatic-refresh-indicator-button.svelte';

interface Props {
children: Snippet;
Expand All @@ -20,6 +21,7 @@
<div class="flex flex-1 flex-wrap items-center gap-x-2 gap-y-2">
{@render children()}
<div class="ml-auto flex">
<AutomaticRefreshIndicatorButton canRefresh={true} refresh={() => Promise.resolve()} />
<DataTableViewOptions {table} />
</div>
</div>
Expand Down
51 changes: 21 additions & 30 deletions src/Exceptionless.Web/ClientApp/src/routes/(app)/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,36 +197,27 @@
</script>

<div class="flex flex-col space-y-4">
<Card.Root>
<Card.Header>
<Card.Title class="text-2xl"
>Events
<AutomaticRefreshIndicatorButton {canRefresh} refresh={loadData} /></Card.Title
></Card.Header
>
<Card.Content>
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
{#snippet toolbarChildren()}
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder />
</FacetedFilter.Root>
{/snippet}
{#snippet footerChildren()}
<div class="h-9 min-w-[140px]">
{#if table.getSelectedRowModel().flatRows.length}
<EventsBulkActionsDropdownMenu {table} />
{/if}
</div>

<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
<div class="flex items-center space-x-6 lg:space-x-8">
<DataTable.PageCount {table} />
<DataTable.Pagination {table} />
</div>
{/snippet}
</EventsDataTable>
</Card.Content>
</Card.Root>
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
{#snippet toolbarChildren()}
<div class="text-lg font-medium pr-2">Events</div>
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder />
</FacetedFilter.Root>
{/snippet}
{#snippet footerChildren()}
<div class="h-9 min-w-[140px]">
{#if table.getSelectedRowModel().flatRows.length}
<EventsBulkActionsDropdownMenu {table} />
{/if}
</div>

<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
<div class="flex items-center space-x-6 lg:space-x-8">
<DataTable.PageCount {table} />
<DataTable.Pagination {table} />
</div>
{/snippet}
</EventsDataTable>
</div>

<Sheet.Root onOpenChange={() => (selectedEventId = null)} open={!!selectedEventId}>
Expand Down
45 changes: 19 additions & 26 deletions src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,32 +208,25 @@
</script>

<div class="flex flex-col space-y-4">
<Card.Root
><Card.Header>
<Card.Title class="text-2xl">Issues <AutomaticRefreshIndicatorButton {canRefresh} refresh={loadData} /></Card.Title>
</Card.Header><Card.Content>
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
{#snippet toolbarChildren()}
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder />
</FacetedFilter.Root>
{/snippet}
{#snippet footerChildren()}
<div class="h-9 min-w-[140px]">
{#if table.getSelectedRowModel().flatRows.length}
<TableStacksBulkActionsDropdownMenu {table} />
{/if}
</div>

<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
<div class="flex items-center space-x-6 lg:space-x-8">
<DataTable.PageCount {table} />
<DataTable.Pagination {table} />
</div>
{/snippet}
</EventsDataTable>
</Card.Content>
</Card.Root>
<EventsDataTable bind:limit={queryParams.limit!} isLoading={clientStatus.isLoading} rowClick={rowclick} {table}>
{#snippet toolbarChildren()}
<div class="text-lg font-medium pr-2">Issues</div>
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder />
</FacetedFilter.Root>
{/snippet}
{#snippet footerChildren()}
<div class="h-9 min-w-[140px]">
<TableStacksBulkActionsDropdownMenu {table} />
</div>

<DataTable.PageSize bind:value={queryParams.limit!} {table}></DataTable.PageSize>
<div class="flex items-center space-x-6 lg:space-x-8">
<DataTable.PageCount {table} />
<DataTable.Pagination {table} />
</div>
{/snippet}
</EventsDataTable>
</div>

<Sheet.Root onOpenChange={() => (selectedStackId = undefined)} open={eventsQuery.isSuccess}>
Expand Down
56 changes: 25 additions & 31 deletions src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,37 +213,31 @@
});
</script>

<Card.Root
><Card.Header>
<Card.Title class="text-2xl">Event Stream</Card.Title>
</Card.Header>
<Card.Content>
<DataTable.Root>
<DataTable.Toolbar {table}>
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder includeDateFacets={false} />
</FacetedFilter.Root>
</DataTable.Toolbar>
<DataTable.Body rowClick={rowclick} {table}>
{#if clientStatus.isLoading}
<DelayedRender>
<DataTable.Loading {table} />
</DelayedRender>
{:else}
<DataTable.Empty {table} />
{/if}
</DataTable.Body>
<DataTable.Footer {table}>
<div class="flex w-full items-center justify-center space-x-4">
<DataTable.PageSize bind:value={queryParams.limit!} {table} />
<div class="text-center">
<ErrorMessage message={clientResponse?.problem?.errors.general} />
</div>
</div>
</DataTable.Footer>
</DataTable.Root>
</Card.Content></Card.Root
>
<DataTable.Root>
<DataTable.Toolbar {table}>
<div class="text-lg font-medium pr-2">Event Stream</div>
<FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
<OrganizationDefaultsFacetedFilterBuilder includeDateFacets={false} />
</FacetedFilter.Root>
</DataTable.Toolbar>
<DataTable.Body rowClick={rowclick} {table}>
{#if clientStatus.isLoading}
<DelayedRender>
<DataTable.Loading {table} />
</DelayedRender>
{:else}
<DataTable.Empty {table} />
{/if}
</DataTable.Body>
<DataTable.Footer {table}>
<div class="flex w-full items-center justify-center space-x-4">
<DataTable.PageSize bind:value={queryParams.limit!} {table} />
<div class="text-center">
<ErrorMessage message={clientResponse?.problem?.errors.general} />
</div>
</div>
</DataTable.Footer>
</DataTable.Root>

<Sheet.Root onOpenChange={() => (selectedEventId = null)} open={!!selectedEventId}>
<Sheet.Content class="w-full overflow-y-auto sm:max-w-full md:w-5/6">
Expand Down
Loading