Fix file upload (#13)

* fix file uppload * fix
customeros · Feb 18, 2025 · 6de04b8 · 6de04b8
1 parent 24d21fd
commit 6de04b8
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 33 deletions.
diff --git a/middleware/index.js b/middleware/index.js
@@ -229,6 +229,19 @@ async function createServer() {
     followRedirects: true,
   });
 
+  const filesApiProxy = createProxyMiddleware({
+    pathFilter: '/files',
+    pathRewrite: { '^/files': '' },
+    target: process.env.CUSTOMER_OS_API_PATH + '/files/v1/files',
+    changeOrigin: true,
+    headers: {
+      'X-Openline-API-KEY': process.env.INTERNAL_API_KEY,
+    },
+    logger: console,
+    preserveHeaderKeyCase: true,
+    followRedirects: true,
+  });
+
   const basConfigProxy = createProxyMiddleware({
     pathFilter: '/bas',
     pathRewrite: { '^/bas': '' },
@@ -243,6 +256,7 @@ async function createServer() {
   app.use(customerOsApiRestProxy);
   app.use(customerOsApiRestProxyForTenant);
   app.use(internalApiProxy);
+  app.use(filesApiProxy);
   app.use(basConfigProxy);
 
   //login button

diff --git a/src/routes/finder/src/components/Columns/contacts/Cells/contactName/ContactNameCell.tsx b/src/routes/finder/src/components/Columns/contacts/Cells/contactName/ContactNameCell.tsx
@@ -59,18 +59,20 @@ export const ContactNameCell = observer(
             {contactName}
           </p>
         )}
-        <Icon
-          name={'eye'}
-          className='text-gray-400 ml-2 opacity-0 group-hover/contact-preview:opacity-100 cursor-pointer'
-          onClick={() => {
-            if (store.ui.showPreviewCard && store.ui.focusRow === contactId) {
-              store.ui.setShowPreviewCard(false);
-            } else {
-              store.ui.setFocusRow(contactId);
-              store.ui.setShowPreviewCard(true);
-            }
-          }}
-        />
+        <div>
+          <Icon
+            name={'eye'}
+            className='text-gray-400 ml-2 opacity-0 group-hover/contact-preview:opacity-100 cursor-pointer'
+            onClick={() => {
+              if (store.ui.showPreviewCard && store.ui.focusRow === contactId) {
+                store.ui.setShowPreviewCard(false);
+              } else {
+                store.ui.setFocusRow(contactId);
+                store.ui.setShowPreviewCard(true);
+              }
+            }}
+          />
+        </div>
       </div>
     );
   },

diff --git a/...anel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx b/...anel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx
@@ -80,15 +80,15 @@ export const ContractUploader = observer(
             label='Upload a document'
           >
             <FileUploadTrigger
-              apiBaseUrl='/fs'
+              apiBaseUrl='/files'
               name='contractUpload'
               onError={handleError}
               onLoadStart={handelLoad}
               onLoadEnd={handleLoadEnd}
               onSuccess={handleAddAttachment}
               endpointOptions={{
                 fileKeyName: 'file',
-                uploadUrl: '/files',
+                uploadUrl: '',
               }}
               onChange={(file, refId) => {
                 setFiles((prev) => [...prev, { file, refId }]);
@@ -105,18 +105,18 @@ export const ContractUploader = observer(
         </div>
 
         <FileDropUploader
+          apiBaseUrl='/files'
           onError={handleError}
           onLoadStart={handelLoad}
           onLoadEnd={handleLoadEnd}
-          apiBaseUrl='/internal/files'
           onSuccess={handleAddAttachment}
           onDragOverChange={setIsDragging}
-          onChange={(file, refId) => {
-            setFiles((prev) => [...prev, { file, refId }]);
-          }}
           endpointOptions={{
             fileKeyName: 'file',
-            uploadUrl: '/internal/files',
+            uploadUrl: '',
+          }}
+          onChange={(file, refId) => {
+            setFiles((prev) => [...prev, { file, refId }]);
           }}
         >
           <div className='min-h-5 gap-2'>
@@ -132,8 +132,8 @@ export const ContractUploader = observer(
                 id={id}
                 key={id}
                 fileName={fileName}
+                href={`/files/${id}/download`}
                 onRemove={handleRemoveAttachment}
-                href={`/internal/files/${id}/download`}
               />
             ))}
 

diff --git a/src/routes/settings/src/components/LogoUploadComponent/LogoUploader.tsx b/src/routes/settings/src/components/LogoUploadComponent/LogoUploader.tsx
@@ -71,16 +71,16 @@ export const LogoUploader = observer(() => {
         </p>
 
         <FileUploadTrigger
-          apiBaseUrl='/fs'
           onChange={setFile}
+          apiBaseUrl='/files'
           name='logoUploader'
           onError={handleError}
           onLoadStart={handelLoad}
           onLoadEnd={handleLoadEnd}
           onSuccess={handleTenantLogoUpdate}
           endpointOptions={{
             fileKeyName: 'file',
-            uploadUrl: '/files',
+            uploadUrl: '',
           }}
           className={cn(
             ghostButton({ colorScheme: 'gray' }),
@@ -93,16 +93,16 @@ export const LogoUploader = observer(() => {
       </div>
 
       <FileDropUploader
-        apiBaseUrl='/fs'
         onChange={setFile}
+        apiBaseUrl='/files'
         onError={handleError}
         onLoadStart={handelLoad}
         onLoadEnd={handleLoadEnd}
         onDragOverChange={setIsDragging}
         onSuccess={handleTenantLogoUpdate}
         endpointOptions={{
           fileKeyName: 'file',
-          uploadUrl: '/files',
+          uploadUrl: '',
         }}
       >
         {isDragging ? (

diff --git a/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx b/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx
@@ -90,15 +90,15 @@ export const General = () => {
 
           <FileDropUploader
             onChange={setFile}
+            apiBaseUrl='/files'
             onError={handleError}
             onLoadStart={handelLoad}
             onLoadEnd={handleLoadEnd}
-            apiBaseUrl='/internal/files'
             onDragOverChange={setIsDragging}
             onSuccess={handleTenantLogoUpdate}
             endpointOptions={{
               fileKeyName: 'file',
-              uploadUrl: '/files',
+              uploadUrl: '',
             }}
           >
             {isDragging ? (
@@ -117,16 +117,16 @@ export const General = () => {
                     label='Upload a square logo no bigger than 1MB'
                   >
                     <FileUploadTrigger
-                      apiBaseUrl='/fs'
                       onChange={setFile}
+                      apiBaseUrl='/files'
                       name='logoUploader'
                       onError={handleError}
                       onLoadStart={handelLoad}
                       onLoadEnd={handleLoadEnd}
                       onSuccess={handleTenantLogoUpdate}
                       endpointOptions={{
                         fileKeyName: 'file',
-                        uploadUrl: '/files',
+                        uploadUrl: '',
                       }}
                       className={cn(
                         outlineButton({ colorScheme: 'gray' }),

diff --git a/src/store/Files/Files.store.ts b/src/store/Files/Files.store.ts
@@ -20,7 +20,7 @@ export class FilesStore {
       this.loaders.set(fileId, true);
 
       const res = await this.transport.http.get(
-        `/fs/files/${fileId}/download?inline=true`,
+        `/files/${fileId}/download?inline=true`,
         {
           responseType: 'blob',
         },
@@ -67,10 +67,9 @@ export class FilesStore {
     try {
       this.loaders.set(fileId, true);
 
-      const res = await this.transport.http.get(
-        `/fs/files/${fileId}/download`,
-        { responseType: 'blob' },
-      );
+      const res = await this.transport.http.get(`/files/${fileId}/download`, {
+        responseType: 'blob',
+      });
       const mimeType = res.data.type;
       const blobUrl = window.URL.createObjectURL(res.data);
       const fileExtension = this.getFileExtension(mimeType);