Skip to content

Commit 9fc2d5c

Browse files
authored
Merge pull request #676 from appwrite/fix-project-usage-collapsible
fix: project usage dropdown
2 parents 207b68b + 0b3f30d commit 9fc2d5c

3 files changed

Lines changed: 26 additions & 28 deletions

File tree

src/lib/components/cardGrid.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16">
1111
<slot />
1212
</div>
13-
<div class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16">
13+
<div class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0">
1414
<slot name="aside" />
1515
</div>
1616
</div>

src/lib/components/collapsibleItem.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<details class="collapsible-wrapper" {open}>
1010
<!-- svelte-ignore a11y-no-redundant-roles -->
1111
<summary
12-
class="collapsible-button"
12+
class="collapsible-button u-position-relative"
1313
on:keyup={clickOnEnter}
1414
on:click
1515
role="button"

src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import { Collapsible, CollapsibleItem } from '$lib/components';
44
import {
55
TableBody,
6-
TableCell,
76
TableCellLink,
87
TableCellHead,
98
TableHeader,
109
TableRow,
11-
Table
10+
TableScroll,
11+
TableCellText
1212
} from '$lib/elements/table';
1313
import { abbreviateNumber } from '$lib/helpers/numbers';
1414
import { humanFileSize } from '$lib/helpers/sizeConvertion';
@@ -55,29 +55,27 @@
5555
<Collapsible>
5656
<CollapsibleItem>
5757
<svelte:fragment slot="title">Project breakdown</svelte:fragment>
58-
<div class="table-wrapper" data-sveltekit-preload-data="off">
59-
<Table noMargin noStyles>
60-
<TableHeader>
61-
<TableCellHead width={285}>Project</TableCellHead>
62-
<TableCellHead>Usage</TableCellHead>
63-
<TableCellHead width={140} />
64-
</TableHeader>
65-
<TableBody>
66-
{#each groupByProject(metric).sort((a, b) => b.usage - a.usage) as project}
67-
<TableRow>
68-
<TableCell title="Project">
69-
{getProjectName(project.projectId)}
70-
</TableCell>
71-
<TableCell title="Usage">{format(project.usage)}</TableCell>
72-
<TableCellLink
73-
title="Go to project usage"
74-
href={getProjectUsageLink(project.projectId)}>
75-
View project usage
76-
</TableCellLink>
77-
</TableRow>
78-
{/each}
79-
</TableBody>
80-
</Table>
81-
</div>
58+
<TableScroll noMargin>
59+
<TableHeader>
60+
<TableCellHead width={185}>Project</TableCellHead>
61+
<TableCellHead width={100}>Usage</TableCellHead>
62+
<TableCellHead width={140} />
63+
</TableHeader>
64+
<TableBody>
65+
{#each groupByProject(metric).sort((a, b) => b.usage - a.usage) as project}
66+
<TableRow>
67+
<TableCellText title="Project">
68+
{getProjectName(project.projectId)}
69+
</TableCellText>
70+
<TableCellText title="Usage">{format(project.usage)}</TableCellText>
71+
<TableCellLink
72+
title="Go to project usage"
73+
href={getProjectUsageLink(project.projectId)}>
74+
View project usage
75+
</TableCellLink>
76+
</TableRow>
77+
{/each}
78+
</TableBody>
79+
</TableScroll>
8280
</CollapsibleItem>
8381
</Collapsible>

0 commit comments

Comments
 (0)