-
+
- {activityType}
-
- );
+ return
-
);
},
},
{
id: 'network',
+ enableSorting: false,
accessorFn: (row) => {
- const network = row.network as NcNetwork;
+ const network = row.network;
const nodeCount = network?.nodes?.length ?? 0;
const edgeCount = network?.edges?.length ?? 0;
return nodeCount + edgeCount;
@@ -154,8 +155,8 @@ export const InterviewColumns = (): ColumnDef<
return {progress.toFixed(0)}%
+ {progress.toFixed(0)}%
-
+
-
+
-
Fresco
{env.APP_VERSION}
diff --git a/app/dashboard/_components/ParticipantsTable/ActionsDropdown.tsx b/app/dashboard/_components/ParticipantsTable/ActionsDropdown.tsx
index bcf099ee2..0e28e5466 100644
--- a/app/dashboard/_components/ParticipantsTable/ActionsDropdown.tsx
+++ b/app/dashboard/_components/ParticipantsTable/ActionsDropdown.tsx
@@ -1,4 +1,8 @@
+import type { Participant } from '~/lib/db/generated/client';
+import type { Row } from '@tanstack/react-table';
import { MoreHorizontal } from 'lucide-react';
+import { useState } from 'react';
+import ParticipantModal from '~/app/dashboard/participants/_components/ParticipantModal';
import { Button } from '~/components/ui/Button';
import {
DropdownMenu,
@@ -7,11 +11,7 @@ import {
DropdownMenuLabel,
DropdownMenuTrigger,
} from '~/components/ui/dropdown-menu';
-import type { Row } from '@tanstack/react-table';
-import { useState } from 'react';
-import ParticipantModal from '~/app/dashboard/participants/_components/ParticipantModal';
-import type { ParticipantWithInterviews } from '~/types/types';
-import type { Participant } from '~/lib/db/generated/client';
+import type { ParticipantWithInterviews } from './ParticipantsTableClient';
export const ActionsDropdown = ({
row,
diff --git a/app/dashboard/_components/ParticipantsTable/Columns.tsx b/app/dashboard/_components/ParticipantsTable/Columns.tsx
index bd96e707a..b85d9ab04 100644
--- a/app/dashboard/_components/ParticipantsTable/Columns.tsx
+++ b/app/dashboard/_components/ParticipantsTable/Columns.tsx
@@ -1,19 +1,19 @@
import { type ColumnDef } from '@tanstack/react-table';
-import { DataTableColumnHeader } from '~/components/DataTable/ColumnHeader';
-import { Checkbox } from '~/components/ui/checkbox';
-import { GenerateParticipationURLButton } from './GenerateParticipantURLButton';
-import { type ParticipantWithInterviews } from '~/types/types';
+import { InfoIcon } from 'lucide-react';
import Image from 'next/image';
+import { DataTableColumnHeader } from '~/components/DataTable/ColumnHeader';
import InfoTooltip from '~/components/InfoTooltip';
-import { InfoIcon } from 'lucide-react';
-import Heading from '~/components/ui/typography/Heading';
-import Paragraph from '~/components/ui/typography/Paragraph';
+import Heading from '~/components/typography/Heading';
+import Paragraph from '~/components/typography/Paragraph';
import { buttonVariants } from '~/components/ui/Button';
import { Badge } from '~/components/ui/badge';
-import type { GetProtocolsReturnType } from '~/queries/protocols';
+import { Checkbox } from '~/components/ui/checkbox';
+import type { ProtocolWithInterviews } from '../ProtocolsTable/ProtocolsTableClient';
+import { GenerateParticipationURLButton } from './GenerateParticipantURLButton';
+import type { ParticipantWithInterviews } from './ParticipantsTableClient';
export function getParticipantColumns(
- protocols: Awaited,
+ protocols: ProtocolWithInterviews[],
): ColumnDef[] {
return [
{
diff --git a/app/dashboard/_components/ParticipantsTable/GenerateParticipantURLButton.tsx b/app/dashboard/_components/ParticipantsTable/GenerateParticipantURLButton.tsx
index 62f7b2646..0dfca0b74 100644
--- a/app/dashboard/_components/ParticipantsTable/GenerateParticipantURLButton.tsx
+++ b/app/dashboard/_components/ParticipantsTable/GenerateParticipantURLButton.tsx
@@ -12,20 +12,21 @@ import {
import { PopoverTrigger } from '@radix-ui/react-popover';
import { Check, Copy } from 'lucide-react';
+import Paragraph from '~/components/typography/Paragraph';
import { Button } from '~/components/ui/Button';
import { Popover, PopoverContent } from '~/components/ui/popover';
-import Paragraph from '~/components/ui/typography/Paragraph';
import { useToast } from '~/components/ui/use-toast';
-import type { GetProtocolsReturnType } from '~/queries/protocols';
+import type { ProtocolWithInterviews } from '../ProtocolsTable/ProtocolsTableClient';
export const GenerateParticipationURLButton = ({
participant,
protocols,
}: {
participant: Participant;
- protocols: Awaited;
+ protocols: ProtocolWithInterviews[];
}) => {
- const [selectedProtocol, setSelectedProtocol] = useState();
+ const [selectedProtocol, setSelectedProtocol] =
+ useState | null>();
const { toast } = useToast();
@@ -69,7 +70,7 @@ export const GenerateParticipationURLButton = ({
onValueChange={(value) => {
const protocol = protocols.find(
(protocol) => protocol.id === value,
- );
+ ) as Protocol;
setSelectedProtocol(protocol);
handleCopy(
diff --git a/app/dashboard/_components/ParticipantsTable/ParticipantsTableClient.tsx b/app/dashboard/_components/ParticipantsTable/ParticipantsTableClient.tsx
index 18463d060..1635a417f 100644
--- a/app/dashboard/_components/ParticipantsTable/ParticipantsTableClient.tsx
+++ b/app/dashboard/_components/ParticipantsTable/ParticipantsTableClient.tsx
@@ -3,6 +3,7 @@
import { type ColumnDef } from '@tanstack/react-table';
import { Trash } from 'lucide-react';
import { use, useCallback, useMemo, useState } from 'react';
+import SuperJSON from 'superjson';
import {
deleteAllParticipants,
deleteParticipants,
@@ -12,12 +13,19 @@ import { getParticipantColumns } from '~/app/dashboard/_components/ParticipantsT
import { DeleteParticipantsDialog } from '~/app/dashboard/participants/_components/DeleteParticipantsDialog';
import { DataTable } from '~/components/DataTable/DataTable';
import { Button } from '~/components/ui/Button';
-import type { GetParticipantsReturnType } from '~/queries/participants';
-import type { GetProtocolsReturnType } from '~/queries/protocols';
-import type { ParticipantWithInterviews } from '~/types/types';
+import type {
+ GetParticipantsQuery,
+ GetParticipantsReturnType,
+} from '~/queries/participants';
+import type {
+ GetProtocolsQuery,
+ GetProtocolsReturnType,
+} from '~/queries/protocols';
import AddParticipantButton from '../../participants/_components/AddParticipantButton';
import { GenerateParticipantURLs } from '../../participants/_components/ExportParticipants/GenerateParticipantURLsButton';
+export type ParticipantWithInterviews = GetParticipantsQuery[number];
+
export const ParticipantsTableClient = ({
participantsPromise,
protocolsPromise,
@@ -25,8 +33,10 @@ export const ParticipantsTableClient = ({
participantsPromise: GetParticipantsReturnType;
protocolsPromise: GetProtocolsReturnType;
}) => {
- const participants = use(participantsPromise);
- const protocols = use(protocolsPromise);
+ const rawParticiapnts = use(participantsPromise);
+ const rawProtocols = use(protocolsPromise);
+ const participants = SuperJSON.parse(rawParticiapnts);
+ const protocols = SuperJSON.parse(rawProtocols);
// Memoize the columns so they don't re-render on every render
const columns = useMemo[]>(
diff --git a/app/dashboard/_components/ProtocolUploader.tsx b/app/dashboard/_components/ProtocolUploader.tsx
index c7feb1ad8..795edc0c5 100644
--- a/app/dashboard/_components/ProtocolUploader.tsx
+++ b/app/dashboard/_components/ProtocolUploader.tsx
@@ -58,8 +58,8 @@ function ProtocolUploader({
className={cn(
isActive &&
cn(
- 'bg-linear-to-r from-cyber-grape via-neon-coral to-cyber-grape text-white',
- 'pointer-events-none animate-background-gradient cursor-wait bg-[length:400%]',
+ 'from-cyber-grape via-neon-coral to-cyber-grape bg-linear-to-r text-white',
+ 'animate-background-gradient pointer-events-none cursor-wait bg-[length:400%]',
),
className,
)}
@@ -80,7 +80,7 @@ function ProtocolUploader({
diff --git a/app/dashboard/_components/ProtocolsTable/ActionsDropdown.tsx b/app/dashboard/_components/ProtocolsTable/ActionsDropdown.tsx
index c2dabc44d..64c3cc840 100644
--- a/app/dashboard/_components/ProtocolsTable/ActionsDropdown.tsx
+++ b/app/dashboard/_components/ProtocolsTable/ActionsDropdown.tsx
@@ -1,6 +1,9 @@
'use client';
+import type { Row } from '@tanstack/react-table';
import { MoreHorizontal } from 'lucide-react';
+import { useState } from 'react';
+import { DeleteProtocolsDialog } from '~/app/dashboard/protocols/_components/DeleteProtocolsDialog';
import { Button } from '~/components/ui/Button';
import {
DropdownMenu,
@@ -9,10 +12,7 @@ import {
DropdownMenuLabel,
DropdownMenuTrigger,
} from '~/components/ui/dropdown-menu';
-import type { Row } from '@tanstack/react-table';
-import { useState } from 'react';
-import type { ProtocolWithInterviews } from '~/types/types';
-import { DeleteProtocolsDialog } from '~/app/dashboard/protocols/_components/DeleteProtocolsDialog';
+import type { ProtocolWithInterviews } from './ProtocolsTableClient';
export const ActionsDropdown = ({
row,
diff --git a/app/dashboard/_components/ProtocolsTable/Columns.tsx b/app/dashboard/_components/ProtocolsTable/Columns.tsx
index 2074deb1f..aa716f748 100644
--- a/app/dashboard/_components/ProtocolsTable/Columns.tsx
+++ b/app/dashboard/_components/ProtocolsTable/Columns.tsx
@@ -1,18 +1,18 @@
'use client';
import { type ColumnDef } from '@tanstack/react-table';
-import { Checkbox } from '~/components/ui/checkbox';
-import { DataTableColumnHeader } from '~/components/DataTable/ColumnHeader';
-import type { ProtocolWithInterviews } from '~/types/types';
-import { AnonymousRecruitmentURLButton } from './AnonymousRecruitmentURLButton';
-import TimeAgo from '~/components/ui/TimeAgo';
+import { InfoIcon } from 'lucide-react';
import Image from 'next/image';
-import { buttonVariants } from '~/components/ui/Button';
+import { DataTableColumnHeader } from '~/components/DataTable/ColumnHeader';
import InfoTooltip from '~/components/InfoTooltip';
-import Paragraph from '~/components/ui/typography/Paragraph';
-import Heading from '~/components/ui/typography/Heading';
import Link from '~/components/Link';
-import { InfoIcon } from 'lucide-react';
+import Heading from '~/components/typography/Heading';
+import Paragraph from '~/components/typography/Paragraph';
+import { buttonVariants } from '~/components/ui/Button';
+import { Checkbox } from '~/components/ui/checkbox';
+import TimeAgo from '~/components/ui/TimeAgo';
+import { AnonymousRecruitmentURLButton } from './AnonymousRecruitmentURLButton';
+import type { ProtocolWithInterviews } from './ProtocolsTableClient';
export const getProtocolColumns = (
allowAnonRecruitment = false,
diff --git a/app/dashboard/_components/ProtocolsTable/ProtocolsTable.tsx b/app/dashboard/_components/ProtocolsTable/ProtocolsTable.tsx
index b49876875..8b41eba56 100644
--- a/app/dashboard/_components/ProtocolsTable/ProtocolsTable.tsx
+++ b/app/dashboard/_components/ProtocolsTable/ProtocolsTable.tsx
@@ -1,4 +1,3 @@
-import { unstable_noStore } from 'next/cache';
import { Suspense } from 'react';
import { DataTableSkeleton } from '~/components/data-table/data-table-skeleton';
import { getAppSetting } from '~/queries/appSettings';
@@ -6,8 +5,6 @@ import { getProtocols } from '~/queries/protocols';
import ProtocolsTableClient from './ProtocolsTableClient';
async function getData() {
- unstable_noStore();
-
return Promise.all([
getProtocols(),
getAppSetting('allowAnonymousRecruitment'),
diff --git a/app/dashboard/_components/ProtocolsTable/ProtocolsTableClient.tsx b/app/dashboard/_components/ProtocolsTable/ProtocolsTableClient.tsx
index 4159b33c3..b180897d6 100644
--- a/app/dashboard/_components/ProtocolsTable/ProtocolsTableClient.tsx
+++ b/app/dashboard/_components/ProtocolsTable/ProtocolsTableClient.tsx
@@ -1,17 +1,21 @@
'use client';
import { use, useState } from 'react';
+import { SuperJSON } from 'superjson';
import { DeleteProtocolsDialog } from '~/app/dashboard/protocols/_components/DeleteProtocolsDialog';
import { DataTable } from '~/components/DataTable/DataTable';
-import type { ProtocolWithInterviews } from '~/types/types';
+import type { GetProtocolsQuery } from '~/queries/protocols';
import ProtocolUploader from '../ProtocolUploader';
import { ActionsDropdown } from './ActionsDropdown';
import { getProtocolColumns } from './Columns';
import { type GetData } from './ProtocolsTable';
+export type ProtocolWithInterviews = GetProtocolsQuery[number];
+
const ProtocolsTableClient = ({ dataPromise }: { dataPromise: GetData }) => {
- const [protocols, allowAnonymousRecruitment, hasUploadThingToken] =
+ const [rawProtocols, allowAnonymousRecruitment, hasUploadThingToken] =
use(dataPromise);
+ const protocols = SuperJSON.parse(rawProtocols);
const [showAlertDialog, setShowAlertDialog] = useState(false);
const [protocolsToDelete, setProtocolsToDelete] =
diff --git a/app/dashboard/_components/RecruitmentTestSection.tsx b/app/dashboard/_components/RecruitmentTestSection.tsx
index 3d5b31394..0646cc70e 100644
--- a/app/dashboard/_components/RecruitmentTestSection.tsx
+++ b/app/dashboard/_components/RecruitmentTestSection.tsx
@@ -3,6 +3,7 @@ import type { Participant, Protocol } from '~/lib/db/generated/client';
import { type Route } from 'next';
import { useRouter } from 'next/navigation';
import { use, useEffect, useState } from 'react';
+import { SuperJSON } from 'superjson';
import { Button } from '~/components/ui/Button';
import {
Select,
@@ -11,8 +12,14 @@ import {
SelectTrigger,
SelectValue,
} from '~/components/ui/select';
-import { type GetParticipantsReturnType } from '~/queries/participants';
-import { type GetProtocolsReturnType } from '~/queries/protocols';
+import {
+ type GetParticipantsQuery,
+ type GetParticipantsReturnType,
+} from '~/queries/participants';
+import {
+ type GetProtocolsQuery,
+ type GetProtocolsReturnType,
+} from '~/queries/protocols';
export default function RecruitmentTestSection({
protocolsPromise,
@@ -23,11 +30,13 @@ export default function RecruitmentTestSection({
participantsPromise: GetParticipantsReturnType;
allowAnonymousRecruitmentPromise: Promise;
}) {
- const protocols = use(protocolsPromise);
- const participants = use(participantsPromise);
+ const rawProtocols = use(protocolsPromise);
+ const protocols = SuperJSON.parse(rawProtocols);
+ const rawParticipants = use(participantsPromise);
+ const participants = SuperJSON.parse(rawParticipants);
const allowAnonymousRecruitment = use(allowAnonymousRecruitmentPromise);
- const [selectedProtocol, setSelectedProtocol] = useState();
+ const [selectedProtocol, setSelectedProtocol] = useState>();
const [selectedParticipant, setSelectedParticipant] = useState();
const router = useRouter();
@@ -56,7 +65,7 @@ export default function RecruitmentTestSection({
onValueChange={(value) => {
const protocol = protocols.find(
(protocol) => protocol.id === value,
- );
+ ) as Protocol;
setSelectedProtocol(protocol);
}}
diff --git a/app/dashboard/_components/RecruitmentTestSectionServer.tsx b/app/dashboard/_components/RecruitmentTestSectionServer.tsx
index 0a3fc5ec7..8a36f468f 100644
--- a/app/dashboard/_components/RecruitmentTestSectionServer.tsx
+++ b/app/dashboard/_components/RecruitmentTestSectionServer.tsx
@@ -1,6 +1,6 @@
import { Suspense } from 'react';
import SettingsSection from '~/components/layout/SettingsSection';
-import Paragraph from '~/components/ui/typography/Paragraph';
+import Paragraph from '~/components/typography/Paragraph';
import { getAppSetting } from '~/queries/appSettings';
import { getParticipants } from '~/queries/participants';
import { getProtocols } from '~/queries/protocols';
diff --git a/app/dashboard/_components/SummaryStatistics/Icons.tsx b/app/dashboard/_components/SummaryStatistics/Icons.tsx
index 5a92bfb0b..abe0ce19d 100644
--- a/app/dashboard/_components/SummaryStatistics/Icons.tsx
+++ b/app/dashboard/_components/SummaryStatistics/Icons.tsx
@@ -1,29 +1,29 @@
export const ProtocolIcon = () => (
-
+
-
+
);
}
@@ -159,12 +154,18 @@ const NetworkSummary = ({
return acc;
}, {}) ?? {},
).map(([nodeType, count]) => {
- // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
- const nodeInfo = codebook.node?.[nodeType]!;
+ const nodeInfo = codebook.node?.[nodeType];
+
+ if (!nodeInfo) {
+ // eslint-disable-next-line no-console
+ console.warn(`Node type ${nodeType} not found in codebook`);
+ return null;
+ }
+
return (
{typeName} ({count})
-
+
{nodeSummaries}
- {edgeSummaries}
+
+ {nodeSummaries}
+ {edgeSummaries}
);
};
diff --git a/app/dashboard/_components/NavigationBar.tsx b/app/dashboard/_components/NavigationBar.tsx
index 7783aa907..3b93558f9 100644
--- a/app/dashboard/_components/NavigationBar.tsx
+++ b/app/dashboard/_components/NavigationBar.tsx
@@ -6,7 +6,7 @@ import Image from 'next/image';
import Link from 'next/link';
import { usePathname } from 'next/navigation';
import type { UrlObject } from 'url';
-import Heading from '~/components/ui/typography/Heading';
+import Heading from '~/components/typography/Heading';
import { env } from '~/env';
import { cn } from '~/utils/shadcn';
import UserMenu from './UserMenu';
@@ -25,7 +25,7 @@ const NavButton = ({
@@ -34,7 +34,7 @@ const NavButton = ({
{isActive && (
+
-
-
+
+
-
-
+
);
export const InterviewIcon = () => (
-
+
+
({
+export default function UpdateSettingsValue({
+ key,
initialValue,
- updateValue,
- schema,
readOnly,
+ schema,
}: {
- initialValue?: T;
- updateValue: (value: T) => Promise;
- schema: z.ZodSchema;
+ key: AppSetting;
+ initialValue?: string;
readOnly?: boolean;
+ schema: z.ZodType;
}) {
const [newValue, setNewValue] = useState(initialValue);
const [error, setError] = useState(null);
@@ -28,7 +30,7 @@ export default function UpdateSettingsValue({
if (!result.success) {
setError(
- `Invalid: ${result.error.errors.map((e) => e.message).join(', ')}`,
+ `Invalid: ${result.error.issues.map((e) => e.message).join(', ')}`,
);
} else {
setError(null);
@@ -47,7 +49,7 @@ export default function UpdateSettingsValue({
if (!newValue) return;
setSaving(true);
- await updateValue(newValue);
+ await setAppSetting(key, newValue);
setSaving(false);
};
diff --git a/app/dashboard/_components/UploadThingModal.tsx b/app/dashboard/_components/UploadThingModal.tsx
index 3c47e4ffa..888e70e2e 100644
--- a/app/dashboard/_components/UploadThingModal.tsx
+++ b/app/dashboard/_components/UploadThingModal.tsx
@@ -5,6 +5,7 @@ import { useState } from 'react';
import { setAppSetting } from '~/actions/appSettings';
import { UploadThingTokenForm } from '~/app/(blobs)/(setup)/_components/UploadThingTokenForm';
import Link from '~/components/Link';
+import Paragraph from '~/components/typography/Paragraph';
import {
Dialog,
DialogContent,
@@ -13,7 +14,6 @@ import {
DialogTitle,
} from '~/components/ui/dialog';
import { Divider } from '~/components/ui/Divider';
-import Paragraph from '~/components/ui/typography/Paragraph';
function UploadThingModal() {
const [open, setOpen] = useState(true);
@@ -36,7 +36,7 @@ function UploadThingModal() {
Updating the key should take a matter of minutes, and can be
completed using the following steps:
-
-
-
+
+
-
+
diff --git a/app/dashboard/_components/SummaryStatistics/StatCard.tsx b/app/dashboard/_components/SummaryStatistics/StatCard.tsx
index 064a4ba66..10e453e9f 100644
--- a/app/dashboard/_components/SummaryStatistics/StatCard.tsx
+++ b/app/dashboard/_components/SummaryStatistics/StatCard.tsx
@@ -1,6 +1,6 @@
import { use } from 'react';
+import Heading from '~/components/typography/Heading';
import { Skeleton } from '~/components/ui/skeleton';
-import Heading from '~/components/ui/typography/Heading';
import { cn } from '~/utils/shadcn';
const statCardClasses = cn(
diff --git a/app/dashboard/_components/SummaryStatistics/SummaryStatistics.tsx b/app/dashboard/_components/SummaryStatistics/SummaryStatistics.tsx
index e2cf2012a..c0b11195f 100644
--- a/app/dashboard/_components/SummaryStatistics/SummaryStatistics.tsx
+++ b/app/dashboard/_components/SummaryStatistics/SummaryStatistics.tsx
@@ -1,7 +1,7 @@
import Image from 'next/image';
import Link from 'next/link';
import { Suspense } from 'react';
-import ResponsiveContainer from '~/components/ResponsiveContainer';
+import ResponsiveContainer from '~/components/layout/ResponsiveContainer';
import { getSummaryStatistics } from '~/queries/summaryStatistics';
import { InterviewIcon, ProtocolIcon } from './Icons';
import StatCard, { StatCardSkeleton } from './StatCard';
diff --git a/app/dashboard/_components/UpdateSettingsValue.tsx b/app/dashboard/_components/UpdateSettingsValue.tsx
index df50e22bd..0680302c1 100644
--- a/app/dashboard/_components/UpdateSettingsValue.tsx
+++ b/app/dashboard/_components/UpdateSettingsValue.tsx
@@ -1,20 +1,22 @@
import { Loader2 } from 'lucide-react';
import { useState } from 'react';
-import { type z } from 'zod';
+import type z from 'zod';
+import { setAppSetting } from '~/actions/appSettings';
import { Button } from '~/components/ui/Button';
import { Input } from '~/components/ui/Input';
+import { type AppSetting } from '~/schemas/appSettings';
import ReadOnlyEnvAlert from '../settings/ReadOnlyEnvAlert';
-export default function UpdateSettingsValue
-
-
+
+
-
-
+
+
-
+
-
Visit the{' '}
diff --git a/app/dashboard/interviews/_components/ExportCSVInterviewURLs.tsx b/app/dashboard/interviews/_components/ExportCSVInterviewURLs.tsx
index bd3631a60..45017949b 100644
--- a/app/dashboard/interviews/_components/ExportCSVInterviewURLs.tsx
+++ b/app/dashboard/interviews/_components/ExportCSVInterviewURLs.tsx
@@ -6,15 +6,15 @@ import { useState } from 'react';
import { Button } from '~/components/ui/Button';
import { useToast } from '~/components/ui/use-toast';
import { useDownload } from '~/hooks/useDownload';
-import type { GetInterviewsReturnType } from '~/queries/interviews';
-import type { GetProtocolsReturnType } from '~/queries/protocols';
+import type { GetInterviewsQuery } from '~/queries/interviews';
+import type { ProtocolWithInterviews } from '../../_components/ProtocolsTable/ProtocolsTableClient';
function ExportCSVInterviewURLs({
protocol,
interviews,
}: {
- protocol?: Awaited
[number]; - interviews: Awaited ; + protocol?: ProtocolWithInterviews; + interviews: Awaited ; }) { const download = useDownload(); const [isExporting, setIsExporting] = useState(false); diff --git a/app/dashboard/interviews/_components/ExportInterviewsDialog.tsx b/app/dashboard/interviews/_components/ExportInterviewsDialog.tsx index 2a70f53af..3c628e60b 100644 --- a/app/dashboard/interviews/_components/ExportInterviewsDialog.tsx +++ b/app/dashboard/interviews/_components/ExportInterviewsDialog.tsx @@ -2,12 +2,15 @@ import type { Interview } from '~/lib/db/generated/client'; import { DialogDescription } from '@radix-ui/react-dialog'; import { FileWarning, Loader2, XCircle } from 'lucide-react'; import { useState } from 'react'; +import superjson from 'superjson'; import { exportSessions, + type FormattedProtocols, prepareExportData, updateExportTime, } from '~/actions/interviews'; import { deleteZipFromUploadThing } from '~/actions/uploadThing'; +import Heading from '~/components/typography/Heading'; import { Button } from '~/components/ui/Button'; import { cardClasses } from '~/components/ui/card'; import { @@ -17,19 +20,21 @@ import { DialogHeader, DialogTitle, } from '~/components/ui/dialog'; -import Heading from '~/components/ui/typography/Heading'; import { useToast } from '~/components/ui/use-toast'; import { useDownload } from '~/hooks/useDownload'; import useSafeLocalStorage from '~/hooks/useSafeLocalStorage'; import trackEvent from '~/lib/analytics'; -import { ExportOptionsSchema } from '~/lib/network-exporters/utils/types'; +import { + ExportOptionsSchema, + type FormattedSession, +} from '~/lib/network-exporters/utils/types'; import { ensureError } from '~/utils/ensureError'; import { cn } from '~/utils/shadcn'; import ExportOptionsView from './ExportOptionsView'; const ExportingStateAnimation = () => { return ( - +(formattedSessions); + const parsedFormattedProtocols = + superjson.parse(formattedProtocols); + // export the data const { zipUrl, zipKey, status, error } = await exportSessions( - formattedSessions, - formattedProtocols, + parsedFormattedSessions, + parsedFormattedProtocols, interviewIds, exportOptions, ); diff --git a/app/dashboard/interviews/_components/ExportOptionsView.tsx b/app/dashboard/interviews/_components/ExportOptionsView.tsx index 23f5fb163..634fcca6a 100644 --- a/app/dashboard/interviews/_components/ExportOptionsView.tsx +++ b/app/dashboard/interviews/_components/ExportOptionsView.tsx @@ -1,8 +1,8 @@ import { type Dispatch, type SetStateAction } from 'react'; +import Heading from '~/components/typography/Heading'; +import Paragraph from '~/components/typography/Paragraph'; import { cardClasses } from '~/components/ui/card'; import { Switch } from '~/components/ui/switch'; -import Heading from '~/components/ui/typography/Heading'; -import Paragraph from '~/components/ui/typography/Paragraph'; import type { ExportOptions } from '~/lib/network-exporters/utils/types'; import { cn } from '~/utils/shadcn'; diff --git a/app/dashboard/interviews/_components/GenerateInterviewURLs.tsx b/app/dashboard/interviews/_components/GenerateInterviewURLs.tsx index 5b774954c..479be4e8a 100644 --- a/app/dashboard/interviews/_components/GenerateInterviewURLs.tsx +++ b/app/dashboard/interviews/_components/GenerateInterviewURLs.tsx @@ -2,6 +2,7 @@ import { FileUp } from 'lucide-react'; import { use, useEffect, useState } from 'react'; +import superjson from 'superjson'; import { Button } from '~/components/ui/Button'; import { Dialog, @@ -19,18 +20,22 @@ import { SelectValue, } from '~/components/ui/select'; import { Skeleton } from '~/components/ui/skeleton'; -import type { GetInterviewsReturnType } from '~/queries/interviews'; -import type { GetProtocolsReturnType } from '~/queries/protocols'; +import type { GetInterviewsQuery } from '~/queries/interviews'; +import type { + GetProtocolsQuery, + GetProtocolsReturnType, +} from '~/queries/protocols'; import ExportCSVInterviewURLs from './ExportCSVInterviewURLs'; export const GenerateInterviewURLs = ({ interviews, protocolsPromise, }: { - interviews: Awaited ; + interviews: Awaited ; protocolsPromise: GetProtocolsReturnType; }) => { - const protocols = use(protocolsPromise); + const rawProtocols = use(protocolsPromise); + const protocols = superjson.parse (rawProtocols); const [interviewsToExport, setInterviewsToExport] = useState< typeof interviews @@ -81,7 +86,7 @@ export const GenerateInterviewURLs = ({ {!protocols ? ( -+ ) : (