The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: add navigation links between admin org pages (#2243)
Ephraim Duncan14db9b82032b
diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisation-insights.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisation-insights.$id.tsxindex 560c25c3b..e53cc04ff 100644--- a/apps/remix/app/routes/_authenticated+/admin+/organisation-insights.$id.tsx+++ b/apps/remix/app/routes/_authenticated+/admin+/organisation-insights.$id.tsx@@ -1,6 +1,10 @@+import { Trans } from '@lingui/react/macro';+import { Link } from 'react-router';+import { getOrganisationDetailedInsights } from '@documenso/lib/server-only/admin/get-organisation-detailed-insights';import type { DateRange } from '@documenso/lib/types/search-params';import { getAdminOrganisation } from '@documenso/trpc/server/admin-router/get-admin-organisation';+import { Button } from '@documenso/ui/primitives/button';import { OrganisationInsightsTable } from '~/components/tables/organisation-insights-table';@@ -38,12 +42,17 @@ export async function loader({ params, request }: Route.LoaderArgs) {}export default function OrganisationInsights({ loaderData }: Route.ComponentProps) {- const { insights, page, perPage, dateRange, view, organisationName } = loaderData;+ const { insights, page, perPage, dateRange, view, organisationName, organisationId } = loaderData;return (<div><div className="flex items-center justify-between"><h2 className="text-4xl font-semibold">{organisationName}</h2>+ <Button variant="outline" asChild>+ <Link to={`/admin/organisations/${organisationId}`}>+ <Trans>Manage organisation</Trans>+ </Link>+ </Button></div><div className="mt-8"><OrganisationInsightsTablediff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsxindex 8f459cb4e..58a8449c7 100644--- a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx@@ -162,7 +162,13 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen<SettingsHeadertitle={t`Manage organisation`}subtitle={t`Manage the ${organisation.name} organisation`}- />+ >+ <Button variant="outline" asChild>+ <Link to={`/admin/organisation-insights/${organisationId}`}>+ <Trans>View insights</Trans>+ </Link>+ </Button>+ </SettingsHeader><GenericOrganisationAdminForm organisation={organisation} />diff --git a/package.json b/package.jsonindex 6db510625..1affb7e39 100644--- a/package.json+++ b/package.json@@ -20,7 +20,7 @@"commitlint": "commitlint --edit","clean": "turbo run clean && rimraf node_modules","d": "npm run dx && npm run translate:compile && npm run dev",- "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev && npm run prisma:seed",+ "dx": "npm ci && npm run dx:up && npm run prisma:migrate-dev && npm run prisma:seed","dx:up": "docker compose -f docker/development/compose.yml up -d","dx:down": "docker compose -f docker/development/compose.yml down","ci": "turbo run build --filter=@documenso/remix && turbo run test:e2e",