storage works

apps/server/prisma/seed.ts

@@ -238,7 +238,7 @@ async function main() {
       id: '339cf78e-d13f-4069-b1f7-dee0c64afb31',
       firstName: 'Kai',
       lastName: 'Zheng',
-      email: '[email protected]',
+      email: '[email protected]',
       positionId: CHIEF_FIN_OFFICER_UUID,
     },
     {

apps/web/src/components/FormInstance.tsx

@@ -34,7 +34,7 @@ const FormInstance = ({
   const router = useRouter();
   const toast = useToast();
   const { user } = useAuth();
-  const { mockBlob: formBlob } = useStorage(formInstance);
+  const { formBlob } = useStorage(formInstance);
 
   const signFormInstanceMutation = useMutation({
     mutationFn: async ({

apps/web/src/components/createFormInstance/CreateFormInstanceModal.tsx

@@ -47,7 +47,7 @@ const CreateFormInstanceModal: React.FC<CreateFormInstanceModalProps> = ({
   const [isFormTypeDropdownOpen, setIsFormTypeDropdownOpen] = useState(false);
   const [selectedFormTemplate, setSelectedFormTemplate] =
     useState<FormTemplateEntity | null>(null);
-  const { mockBlob: formBlob } = useStorage(selectedFormTemplate);
+  const { formBlob } = useStorage(selectedFormTemplate);
   const [formTypeSelected, setFormTypeSelected] = useState(false);
   const [signaturePositions, setSignaturePositions] = useState<
     (Option | null)[]

apps/web/src/components/createFormTemplate/CreateFormTemplateModal.tsx

@@ -25,7 +25,7 @@ import { SignatureField } from './SignatureField';
 import { TempSignatureField } from './types';
 import { v4 as uuidv4 } from 'uuid';
 import { queryClient } from '@web/pages/_app';
-import { mockStorage } from '@web/services/storage.service';
+import { storage } from '@web/services/storage.service';
 
 const variants = {
   notDragging: {
@@ -106,7 +106,7 @@ export const CreateFormTemplateModal = ({
         handleModalClose();
         if (pdfFile) {
           // change to storage.uploadBlob when storage is set up
-          await mockStorage.uploadBlob(
+          await storage.uploadBlob(
             pdfFile,
             response.name.replaceAll(' ', '_') + '_' + uuid,
           );

apps/web/src/hooks/useStorage.ts

@@ -1,41 +1,27 @@
 import { FormInstanceEntity, FormTemplateEntity } from '@web/client';
 import { useEffect, useState } from 'react';
-import { mockStorage } from './../services/storage.service';
+import { storage } from './../services/storage.service';
 
 // hook to fetch form blob from storage
 export const useStorage = (
   form: FormInstanceEntity | FormTemplateEntity | null,
 ) => {
   const [formBlob, setFormBlob] = useState<Blob | null>(null);
-  const [mockBlob, setMockBlob] = useState<Blob | null>(null);
 
   // This needs to be uncommented once storage is set up
-  // useEffect(() => {
-  //   async function fetchFormBlob() {
-  //     const blob = (await storage.downloadBlob(form?.formDocLink!)) as Blob;
-  //     const arrayBuffer = await blob.arrayBuffer();
-  //     setFormBlob(new Blob([arrayBuffer], { type: 'application/pdf' }));
-  //   }
-
-  //   async function fetchMockBlob() {}
-
-  //   if (form) {
-  //     fetchFormBlob();
-  //   }
-  // }, [form]);
-
   useEffect(() => {
-    async function fetchMockBlob() {
-      const blob = (await mockStorage.downloadBlob('mockBlobLink')) as Blob;
+    async function fetchFormBlob() {
+      const blob = (await storage.downloadBlob(form?.formDocLink!)) as Blob;
       const arrayBuffer = await blob.arrayBuffer();
-      setMockBlob(new Blob([arrayBuffer], { type: 'application/pdf' }));
+      setFormBlob(new Blob([arrayBuffer], { type: 'application/pdf' }));
     }
 
-    fetchMockBlob();
+    if (form) {
+      fetchFormBlob();
+    }
   }, [form]);
 
   return {
     formBlob,
-    mockBlob,
   };
 };

apps/web/src/services/storage.service.ts

@@ -25,27 +25,5 @@ class BlobStorage {
   }
 }
 
-class MockBlobStorage {
-  async uploadBlob(file: File, blobName: string) {
-    console.log('Uploading Blob', blobName);
-  }
-
-  async downloadBlob(blobLink: string) {
-    console.log('Downloading Blob', blobLink);
-
-    async function downloadBlob(blobLink: string) {
-      const response = await fetch(blobLink);
-      const blob = await response.blob();
-      return blob;
-    }
-
-    const blob = await downloadBlob(
-      'https://s29.q4cdn.com/175625835/files/doc_downloads/test.pdf',
-    );
-    return blob;
-  }
-}
-
 const storage = new BlobStorage(process.env.STORAGE_BLOB_URL as string);
-const mockStorage = new MockBlobStorage();
-export { storage, mockStorage };
+export { storage };