Geospatial interface

app/(interview)/interview/[interviewId]/page.tsx

@@ -3,7 +3,7 @@ import { notFound, redirect } from 'next/navigation';
 import { syncInterview } from '~/actions/interviews';
 import FeedbackBanner from '~/components/Feedback/FeedbackBanner';
 import { getAppSetting } from '~/queries/appSettings';
-import { TESTING_getInterviewById } from '~/queries/interviews';
+import { getInterviewById } from '~/queries/interviews';
 import { getServerSession } from '~/utils/auth';
 import InterviewShell from '../_components/InterviewShell';
 
@@ -18,7 +18,7 @@ export default async function Page({
     return 'No interview id found';
   }
 
-  const interview = await TESTING_getInterviewById(interviewId);
+  const interview = await getInterviewById(interviewId);
   const session = await getServerSession();
 
   // If the interview is not found, redirect to the 404 page

fresco.config.ts

@@ -1,5 +1,6 @@
 export const PROTOCOL_EXTENSION = '.netcanvas';
-export const APP_SUPPORTED_SCHEMA_VERSIONS = [7];
+export const APP_SUPPORTED_SCHEMA_VERSIONS = [7, 8];
+
 // If unconfigured, the app will shut down after 2 hours (7200000 ms)
 export const UNCONFIGURED_TIMEOUT = 7200000;
 

hooks/useProtocolImport.tsx

@@ -12,7 +12,7 @@ import {
 import { AlertDialogDescription } from '~/components/ui/AlertDialog';
 import { APP_SUPPORTED_SCHEMA_VERSIONS } from '~/fresco.config';
 import { uploadFiles } from '~/lib/uploadthing-client-helpers';
-import { getExistingAssetIds, getProtocolByHash } from '~/queries/protocols';
+import { getNewAssetIds, getProtocolByHash } from '~/queries/protocols';
 import { type AssetInsertType } from '~/schemas/protocol';
 import { DatabaseError } from '~/utils/databaseError';
 import { ensureError } from '~/utils/ensureError';
@@ -176,30 +176,44 @@ export const useProtocolImport = () => {
         return;
       }
 
-      const assets = await getProtocolAssets(protocolJson, zip);
-
-      const newAssets: typeof assets = [];
+      const { fileAssets, apikeyAssets } = await getProtocolAssets(
+        protocolJson,
+        zip,
+      );
 
+      const newAssets: typeof fileAssets = [];
       const existingAssetIds: string[] = [];
-
-      let newAssetsWithCombinedMetadata: AssetInsertType = [];
+      let newAssetsWithCombinedMetadata: AssetInsertType[] = [];
+      const newApikeyAssets: typeof apikeyAssets = [];
 
       // Check if the assets are already in the database.
       // If yes, add them to existingAssetIds to be connected to the protocol.
-      // If not, add them to newAssets to be uploaded.
-
+      // If not, add files to newAssets to be uploaded
+      // and add apikeys to newApikeyAssets to be created in the database with the protocol
       try {
-        const newAssetIds = await getExistingAssetIds(
-          assets.map((asset) => asset.assetId),
+        const newFileAssetIds = await getNewAssetIds(
+          fileAssets.map((asset) => asset.assetId),
         );
 
-        assets.forEach((asset) => {
-          if (newAssetIds.includes(asset.assetId)) {
+        fileAssets.forEach((asset) => {
+          if (newFileAssetIds.includes(asset.assetId)) {
             newAssets.push(asset);
           } else {
             existingAssetIds.push(asset.assetId);
           }
         });
+
+        const newApikeyAssetIds = await getNewAssetIds(
+          apikeyAssets.map((apiKey) => apiKey.assetId),
+        );
+
+        apikeyAssets.forEach((apiKey) => {
+          if (newApikeyAssetIds.includes(apiKey.assetId)) {
+            newApikeyAssets.push(apiKey);
+          } else {
+            existingAssetIds.push(apiKey.assetId);
+          }
+        });
       } catch (e) {
         throw new Error('Error checking for existing assets');
       }
@@ -304,7 +318,7 @@ export const useProtocolImport = () => {
       const result = await insertProtocol({
         protocol: protocolJson,
         protocolName: fileName,
-        newAssets: newAssetsWithCombinedMetadata,
+        newAssets: [...newAssetsWithCombinedMetadata, ...newApikeyAssets],
         existingAssetIds: existingAssetIds,
       });
 

lib/cache.ts

@@ -10,7 +10,7 @@ type StaticTag =
   | 'getProtocols'
   | 'getInterviewsForExport'
   | 'getProtocolsByHash'
-  | 'getExistingAssetIds'
+  | 'getNewAssetIds'
   | 'interviewCount'
   | 'protocolCount'
   | 'participantCount';

lib/interviewer/components/CollapsablePrompts.js

@@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from 'react';
 import Prompts from './Prompts';
 
 const CollapsablePrompts = (props) => {
-  const { currentPromptIndex, dragConstraints } = props;
+  const { currentPromptIndex, dragConstraints, children } = props;
   const ref = useRef(null);
   const [minimized, setMinimized] = useState(false);
 
@@ -66,8 +66,10 @@ const CollapsablePrompts = (props) => {
               initial={{ opacity: 0 }}
               animate={{ opacity: 1 }}
               exit={{ opacity: 0 }}
+              className="flex flex-col items-center"
             >
               <Prompts />
+              {children}
             </motion.div>
           )}
         </AnimatePresence>

lib/interviewer/components/Node.js

@@ -1,14 +1,12 @@
 import { useSelector } from 'react-redux';
+import { getEntityAttributes } from '~/lib/interviewer/ducks/modules/network';
 import UINode from '~/lib/ui/components/Node';
-import {
-  getNodeColor, labelLogic,
-} from '../selectors/network';
+import { getNodeColor, labelLogic } from '../selectors/network';
 import { getProtocolCodebook } from '../selectors/protocol';
-import { getEntityAttributes } from '~/lib/interviewer/ducks/modules/network';
 
 /**
-  * Renders a Node.
-  */
+ * Renders a Node.
+ */
 
 const Node = (props) => {
   const { type } = props;