Merge pull request #1162 from joshunrau/disable-upload-zod-v4

fix: disable upload for Zod v4 instruments

Author: joshunrau

apps/web/src/features/upload/pages/UploadPage.tsx

@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
 
+import { isZodType } from '@douglasneuroinformatics/libjs';
 import { Button, FileDropzone, Heading, Spinner } from '@douglasneuroinformatics/libui/components';
 import { useDownload, useNotificationsStore, useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { AnyUnilingualFormInstrument } from '@opendatacapture/runtime-core';
-import { BadgeHelpIcon, DownloadIcon } from 'lucide-react';
+import { BadgeHelpIcon, CircleAlertIcon, DownloadIcon } from 'lucide-react';
 import { useParams } from 'react-router-dom';
 
 import { PageHeader } from '@/components/PageHeader';
@@ -107,44 +108,56 @@ export const UploadPage = () => {
         </Heading>
       </PageHeader>
       {!isLoading ? (
-        <div className="mx-auto flex w-full max-w-3xl grow flex-col justify-center">
-          <FileDropzone
-            acceptedFileTypes={{
-              'text/csv': ['.csv']
-            }}
-            className="flex h-80 w-full flex-col"
-            file={file}
-            setFile={setFile}
-          />
-          <div className="mt-4 flex justify-between space-x-2">
-            <Button disabled={!(file && instrument)} variant={'primary'} onClick={() => void handleInstrumentCSV()}>
-              {t('core.submit')}
-            </Button>
-            <div className="flex justify-between space-x-1">
-              <Button className="gap-1" disabled={!instrument} variant={'primary'} onClick={handleTemplateDownload}>
-                <DownloadIcon />
-                {t({
-                  en: 'Download Template',
-                  fr: 'Télécharger le modèle'
-                })}
-              </Button>
-              <Button
-                className="gap-1"
-                disabled={!instrument}
-                variant={'primary'}
-                onClick={() => {
-                  window.open('https://opendatacapture.org/en/docs/guides/how-to-upload-data/');
-                }}
-              >
-                <BadgeHelpIcon />
-                {t({
-                  en: 'Help',
-                  fr: 'Aide'
-                })}
+        isZodType(instrument.validationSchema, { version: 4 }) ? (
+          <div className="mb-2 flex items-center gap-2 rounded-md bg-red-300 p-4 dark:bg-red-800">
+            <CircleAlertIcon style={{ height: '20px', strokeWidth: '2px', width: '20px' }} />
+            <h5 className="font-medium tracking-tight">
+              {t({
+                en: 'Upload is Not Supported for Zod v4 Instruments',
+                fr: "Le téléchargement n'est pas pris en charge pour les instruments utilisant Zod v4"
+              })}
+            </h5>
+          </div>
+        ) : (
+          <div className="mx-auto flex w-full max-w-3xl grow flex-col justify-center">
+            <FileDropzone
+              acceptedFileTypes={{
+                'text/csv': ['.csv']
+              }}
+              className="flex h-80 w-full flex-col"
+              file={file}
+              setFile={setFile}
+            />
+            <div className="mt-4 flex justify-between space-x-2">
+              <Button disabled={!(file && instrument)} variant={'primary'} onClick={() => void handleInstrumentCSV()}>
+                {t('core.submit')}
               </Button>
+              <div className="flex justify-between space-x-1">
+                <Button className="gap-1" disabled={!instrument} variant={'primary'} onClick={handleTemplateDownload}>
+                  <DownloadIcon />
+                  {t({
+                    en: 'Download Template',
+                    fr: 'Télécharger le modèle'
+                  })}
+                </Button>
+                <Button
+                  className="gap-1"
+                  disabled={!instrument}
+                  variant={'primary'}
+                  onClick={() => {
+                    window.open('https://opendatacapture.org/en/docs/guides/how-to-upload-data/');
+                  }}
+                >
+                  <BadgeHelpIcon />
+                  {t({
+                    en: 'Help',
+                    fr: 'Aide'
+                  })}
+                </Button>
+              </div>
             </div>
           </div>
-        </div>
+        )
       ) : (
         <>
           <div className="mx-auto flex w-full max-w-3xl grow flex-col justify-center">

packages/instrument-library/src/forms/DNP_HAPPINESS_QUESTIONNAIRE/index.ts

@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { pick, sum } from '/runtime/v1/[email protected]';
-import { z } from '/runtime/v1/[email protected]';
+import { z } from '/runtime/v1/[email protected]/v4';
 
 export default defineInstrument({
   kind: 'FORM',