Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8,982 changes: 0 additions & 8,982 deletions web/apps/admin/package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions web/apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@hookform/resolvers": "^3.0.1",
"@radix-ui/react-form": "^0.0.2",
"@radix-ui/react-icons": "^1.3.0",
"@raystack/apsara": "^0.53.2",
"@raystack/apsara": "^0.56.2",
"@raystack/frontier": "workspace:^",
"@raystack/proton": "0.1.0-b1687af73f994fa9612a023c850aa97c35735af8",
"@stitches/react": "^1.2.8",
Expand Down Expand Up @@ -56,4 +56,4 @@
"vite": "^4.5.9",
"vite-plugin-svgr": "^4.3.0"
}
}
}
31 changes: 22 additions & 9 deletions web/apps/admin/src/pages/organizations/list/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ export const getColumns = ({
accessorKey: "title",
header: "Name",
classNames: {
cell: styles["name-column"],
header: styles["name-column"],
cell: styles['name-column'],
header: styles['name-column']
},
styles: {
cell: { flex: '0 0 300px' },
header: { flex: '0 0 300px' }
},
cell: ({ row }) => {
const avatarColor = getAvatarColor(row?.original?.id || "");
Expand All @@ -74,15 +78,27 @@ export const getColumns = ({
enableSorting: true,
},
{
accessorKey: "createdBy",
header: "Creator",
accessorKey: 'createdBy',
header: 'Creator',
classNames: {
cell: styles['creator-column'],
header: styles['creator-column']
},
styles: {
cell: { flex: '0 0 300px' },
header: { flex: '0 0 300px' }
},
cell: ({ getValue }) => {
return getValue();
},
},
{
accessorKey: "planName",
header: "Plan",
accessorKey: 'planName',
header: 'Plan',
styles: {
cell: { flex: '0 0 250px' },
header: { flex: '0 0 250px' }
},
cell: ({ getValue }) => {
return planMap[getValue() as string];
},
Expand Down Expand Up @@ -120,9 +136,6 @@ export const getColumns = ({
return getValue();
},
enableHiding: true,
classNames: {
cell: styles["country-column"],
},
},
{
accessorKey: "paymentMode",
Expand Down
4 changes: 3 additions & 1 deletion web/apps/admin/src/pages/organizations/list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,15 @@ export const OrganizationList = () => {
openCreatePanel={openCreateOrgPanel}
/>
<DataTable.Toolbar />
<DataTable.Content
<DataTable.VirtualizedContent
classNames={{
root: styles["table-wrapper"],
table: tableClassName,
header: styles["table-header"],
}}
emptyState={<NoOrganizations />}
rowHeight={48}
groupHeaderHeight={48}
/>
</Flex>
</DataTable>
Expand Down
10 changes: 7 additions & 3 deletions web/apps/admin/src/pages/organizations/list/list.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@

.name-column {
padding-left: var(--rs-space-7);
max-width: 200px;
min-width: 300px;
}

.creator-column {
min-width: 300px;
}

.country-column {
Expand All @@ -35,8 +39,8 @@

.table-wrapper {
/* Navbar Height + Toolbar height */
max-height: calc(100vh - 90px);
overflow: scroll;
height: calc(100vh - 90px);
overflow: auto;
}

.table-header {
Expand Down
6 changes: 3 additions & 3 deletions web/apps/admin/src/pages/users/list/list.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

.name-column {
padding-left: var(--rs-space-7);
max-width: 200px;
min-width: 300px;
}

.country-column {
Expand All @@ -35,8 +35,8 @@

.table-wrapper {
/* Navbar Height + Toolbar height */
max-height: calc(100vh - 90px);
overflow: scroll;
height: calc(100vh - 90px);
overflow: auto;
}

.table-header {
Expand Down
4 changes: 3 additions & 1 deletion web/apps/admin/src/pages/users/list/list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,15 @@ export const UsersList = () => {
<Flex direction="column" style={{ width: "100%" }}>
<Navbar searchQuery={tableQuery.search} />
<DataTable.Toolbar />
<DataTable.Content
<DataTable.VirtualizedContent
classNames={{
root: styles["table-wrapper"],
table: tableClassName,
header: styles["table-header"],
}}
emptyState={<NoUsers />}
rowHeight={48}
groupHeaderHeight={48}
/>
</Flex>
</DataTable>
Expand Down
8 changes: 4 additions & 4 deletions web/lib/admin/views/audit-logs/audit-logs.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

.name-column {
padding-left: var(--rs-space-7);
max-width: 240px;
min-width: 300px;
}
.org-column {
max-width: 200px;
min-width: 300px;
}

.table-wrapper {
Expand All @@ -53,8 +53,8 @@
.table-content-container {
width: 100%;
height: 100%;
max-height: calc(100vh - 90px);
overflow: scroll;
height: calc(100vh - 90px);
overflow: auto;
position: relative;
}

Expand Down
4 changes: 3 additions & 1 deletion web/lib/admin/views/audit-logs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

export type AuditLogsViewProps = {
appName?: string;
onExportCsv?: (query: RQLRequest) => Promise<void>;

Check warning on line 65 in web/lib/admin/views/audit-logs/index.tsx

View workflow job for this annotation

GitHub Actions / JS SDK Lint

'query' is defined but never used
};

export default function AuditLogsView({ appName, onExportCsv }: AuditLogsViewProps = {}) {
Expand Down Expand Up @@ -131,7 +131,7 @@
rqlRequest: updatedRQLRequest,
});
},
[queryClient],

Check warning on line 134 in web/lib/admin/views/audit-logs/index.tsx

View workflow job for this annotation

GitHub Actions / JS SDK Lint

React Hook useCallback has a missing dependency: 'setTableQuery'. Either include it or remove the dependency array
);

const handleLoadMore = async () => {
Expand Down Expand Up @@ -200,13 +200,15 @@
<Navbar searchQuery={tableQuery.query.search} onExportCsv={onExportCsv} />
<DataTable.Toolbar />
<Flex className={styles["table-content-container"]}>
<DataTable.Content
<DataTable.VirtualizedContent
classNames={{
root: styles["table-wrapper"],
table: tableClassName,
header: styles["table-header"],
}}
emptyState={<NoAuditLogs />}
rowHeight={60}
groupHeaderHeight={48}
/>
{sidePanelOpen && (
<SidePanelDetails
Expand Down
4 changes: 3 additions & 1 deletion web/lib/admin/views/invoices/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,15 @@ export default function InvoicesView({ appName }: InvoicesViewProps = {}) {
<Flex direction="column" style={{ width: "100%" }}>
<InvoicesNavabar searchQuery={tableQuery.search || ""} />
<DataTable.Toolbar />
<DataTable.Content
<DataTable.VirtualizedContent
classNames={{
root: styles["table-wrapper"],
table: tableClassName,
header: styles["table-header"],
}}
emptyState={<NoInvoices />}
rowHeight={48}
groupHeaderHeight={48}
/>
</Flex>
</DataTable>
Expand Down
4 changes: 2 additions & 2 deletions web/lib/admin/views/invoices/invoices.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

.table-wrapper {
/* Navbar Height + Toolbar height */
max-height: calc(100vh - 90px);
overflow: scroll;
height: calc(100vh - 90px);
overflow: auto;
}

.table-header {
Expand Down
37 changes: 2 additions & 35 deletions web/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading