From f5e765adff1e7b32250eb503c9724a4ac99117f3 Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Mon, 18 Sep 2023 17:39:20 -0400
Subject: prepare merge

---
 src/client/util/reportManager/ReportManager.tsx     | 1 +
 src/client/util/reportManager/reportManagerUtils.ts | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/client/util')

diff --git a/src/client/util/reportManager/ReportManager.tsx b/src/client/util/reportManager/ReportManager.tsx
index e684bd637..e6de410a7 100644
--- a/src/client/util/reportManager/ReportManager.tsx
+++ b/src/client/util/reportManager/ReportManager.tsx
@@ -128,6 +128,7 @@ export class ReportManager extends React.Component<{}> {
         let formattedLinks: string[] = [];
         if (this.formData.mediaFiles.length > 0) {
             const links = await uploadFilesToServer(this.formData.mediaFiles);
+            console.log('Links', links);
             if (links) {
                 formattedLinks = links;
             }
diff --git a/src/client/util/reportManager/reportManagerUtils.ts b/src/client/util/reportManager/reportManagerUtils.ts
index b95417aa1..1bbb60f7a 100644
--- a/src/client/util/reportManager/reportManagerUtils.ts
+++ b/src/client/util/reportManager/reportManagerUtils.ts
@@ -111,6 +111,7 @@ export const uploadFilesToServer = async (mediaFiles: FileData[]): Promise<strin
     try {
         // need to always upload to browndash
         const links = await Networking.UploadFilesToServer(mediaFiles.map(file => ({ file: file.file })));
+        console.log('Raw links', links);
         return (links ?? []).map(getServerPath).map(fileLinktoServerLink);
     } catch (err) {
         if (err instanceof Error) {
-- 
cgit v1.2.3-70-g09d2


From 0d6c1aa1869963e548374c634a65b27f0ea32de9 Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Thu, 21 Sep 2023 13:24:03 -0400
Subject: fix non-image (video still broken)

---
 src/client/util/reportManager/reportManagerUtils.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/client/util')

diff --git a/src/client/util/reportManager/reportManagerUtils.ts b/src/client/util/reportManager/reportManagerUtils.ts
index 1bbb60f7a..948229442 100644
--- a/src/client/util/reportManager/reportManagerUtils.ts
+++ b/src/client/util/reportManager/reportManagerUtils.ts
@@ -89,7 +89,13 @@ export const fileLinktoServerLink = (fileLink: string): string => {
     const regex = 'public';
     const publicIndex = fileLink.indexOf(regex) + regex.length;
 
-    const finalUrl = `${serverUrl}${fileLink.substring(publicIndex + 1).replace('.', '_l.')}`;
+    let finalUrl: string = '';
+    if (fileLink.includes('.png') || fileLink.includes('.jpg') || fileLink.includes('.jpeg') || fileLink.includes('.gif')) {
+        finalUrl = `${serverUrl}${fileLink.substring(publicIndex + 1).replace('.', '_l.')}`;
+    } else {
+        finalUrl = `${serverUrl}${fileLink.substring(publicIndex + 1)}`;
+    }
+
     return finalUrl;
 };
 
@@ -108,6 +114,7 @@ export const getServerPath = (link: any): string => {
  * @returns the server paths or undefined on error
  */
 export const uploadFilesToServer = async (mediaFiles: FileData[]): Promise<string[] | undefined> => {
+    console.log(mediaFiles);
     try {
         // need to always upload to browndash
         const links = await Networking.UploadFilesToServer(mediaFiles.map(file => ({ file: file.file })));
-- 
cgit v1.2.3-70-g09d2


From 51d74db190ba898af9f62906ccfd1da097330fb4 Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Fri, 22 Sep 2023 03:14:03 -0400
Subject: fix: fix report manager for videos, only add _l suffix for images

---
 src/client/util/reportManager/ReportManager.tsx    | 28 +++++++---------------
 .../util/reportManager/reportManagerUtils.ts       |  3 ---
 src/server/ApiManagers/UploadManager.ts            |  9 +++----
 3 files changed, 14 insertions(+), 26 deletions(-)

(limited to 'src/client/util')

diff --git a/src/client/util/reportManager/ReportManager.tsx b/src/client/util/reportManager/ReportManager.tsx
index 802a2f09f..e8c69f909 100644
--- a/src/client/util/reportManager/ReportManager.tsx
+++ b/src/client/util/reportManager/ReportManager.tsx
@@ -333,25 +333,15 @@ export class ReportManager extends React.Component<{}> {
                         fillWidth
                     />
                 </div>
-                <Dropzone
-                    onDrop={this.onDrop}
-                    accept={{
-                        'image/*': ['.png', '.jpg', '.jpeg', '.gif'],
-                        'video/*': ['.mp4', '.mpeg', '.webm', '.mov'],
-                        'audio/mpeg': ['.mp3'],
-                        'audio/wav': ['.wav'],
-                        'audio/ogg': ['.ogg'],
-                    }}>
-                    {({ getRootProps, getInputProps }) => (
-                        <div {...getRootProps({ className: 'dropzone' })} style={{ borderColor: isDarkMode(StrCast(Doc.UserDoc().userBackgroundColor)) ? darkColors.border : lightColors.border }}>
-                            <input {...getInputProps()} />
-                            <div className="dropzone-instructions">
-                                <AiOutlineUpload size={25} />
-                                <p>Drop or select media that shows the bug (optional)</p>
-                            </div>
-                        </div>
-                    )}
-                </Dropzone>
+                <input
+                    type="file"
+                    accept="image/*, video/*, audio/*"
+                    multiple
+                    onChange={e => {
+                        if (!e.target.files) return;
+                        this.setFormData({ ...this.formData, mediaFiles: [...this.formData.mediaFiles, ...Array.from(e.target.files).map(file => ({ _id: v4(), file }))] });
+                    }}
+                />
                 {this.formData.mediaFiles.length > 0 && <ul className="file-list">{this.formData.mediaFiles.map(file => this.getMediaPreview(file))}</ul>}
                 {this.submitting ? (
                     <Button
diff --git a/src/client/util/reportManager/reportManagerUtils.ts b/src/client/util/reportManager/reportManagerUtils.ts
index 948229442..22e5eebbb 100644
--- a/src/client/util/reportManager/reportManagerUtils.ts
+++ b/src/client/util/reportManager/reportManagerUtils.ts
@@ -88,7 +88,6 @@ export const fileLinktoServerLink = (fileLink: string): string => {
 
     const regex = 'public';
     const publicIndex = fileLink.indexOf(regex) + regex.length;
-
     let finalUrl: string = '';
     if (fileLink.includes('.png') || fileLink.includes('.jpg') || fileLink.includes('.jpeg') || fileLink.includes('.gif')) {
         finalUrl = `${serverUrl}${fileLink.substring(publicIndex + 1).replace('.', '_l.')}`;
@@ -114,11 +113,9 @@ export const getServerPath = (link: any): string => {
  * @returns the server paths or undefined on error
  */
 export const uploadFilesToServer = async (mediaFiles: FileData[]): Promise<string[] | undefined> => {
-    console.log(mediaFiles);
     try {
         // need to always upload to browndash
         const links = await Networking.UploadFilesToServer(mediaFiles.map(file => ({ file: file.file })));
-        console.log('Raw links', links);
         return (links ?? []).map(getServerPath).map(fileLinktoServerLink);
     } catch (err) {
         if (err instanceof Error) {
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index c337144c8..e322bde2d 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -79,6 +79,7 @@ export default class UploadManager extends ApiManager {
                 form.uploadDir = pathToDirectory(Directory.parsed_files);
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
+                        console.log('filesss', files);
                         const results: Upload.FileResponse[] = [];
                         if (_err?.message) {
                             results.push({
@@ -264,10 +265,10 @@ export default class UploadManager extends ApiManager {
                                         if (extension !== '.pdf') {
                                             const { pngs, jpgs } = AcceptableMedia;
                                             const resizers = [
-                                                    { resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Small },
-                                                    { resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Medium },
-                                                    { resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Large },
-                                                ];
+                                                { resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Small },
+                                                { resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Medium },
+                                                { resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Large },
+                                            ];
                                             let isImage = false;
                                             if (pngs.includes(extension)) {
                                                 resizers.forEach(element => {
-- 
cgit v1.2.3-70-g09d2


From 780bfc84ab965abdae2e1bb1678db3ddbdb1453b Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Fri, 22 Sep 2023 03:16:29 -0400
Subject: remove prints

---
 src/client/util/reportManager/ReportManager.tsx | 1 -
 src/server/ApiManagers/UploadManager.ts         | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/client/util')

diff --git a/src/client/util/reportManager/ReportManager.tsx b/src/client/util/reportManager/ReportManager.tsx
index e8c69f909..b25d51b41 100644
--- a/src/client/util/reportManager/ReportManager.tsx
+++ b/src/client/util/reportManager/ReportManager.tsx
@@ -126,7 +126,6 @@ export class ReportManager extends React.Component<{}> {
         let formattedLinks: string[] = [];
         if (this.formData.mediaFiles.length > 0) {
             const links = await uploadFilesToServer(this.formData.mediaFiles);
-            console.log('Links', links);
             if (links) {
                 formattedLinks = links;
             }
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index e322bde2d..ea5d8cb33 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -79,7 +79,6 @@ export default class UploadManager extends ApiManager {
                 form.uploadDir = pathToDirectory(Directory.parsed_files);
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
-                        console.log('filesss', files);
                         const results: Upload.FileResponse[] = [];
                         if (_err?.message) {
                             results.push({
-- 
cgit v1.2.3-70-g09d2