From 934f78eb90dd4aa16929e1b89c7c05f4f24b5c07 Mon Sep 17 00:00:00 2001
From: Michael Foiani <sotech117@michaels-mbp-5.devices.brown.edu>
Date: Thu, 11 Aug 2022 11:37:39 -0400
Subject: add basic way to view issues. videos still won't play/show controls.

---
 src/client/util/ReportManager.scss | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/client/util/ReportManager.scss

(limited to 'src/client/util/ReportManager.scss')

diff --git a/src/client/util/ReportManager.scss b/src/client/util/ReportManager.scss
new file mode 100644
index 000000000..1f008a426
--- /dev/null
+++ b/src/client/util/ReportManager.scss
@@ -0,0 +1,55 @@
+@import '../views/global/globalCssVariables';
+
+.issue-list-wrapper {
+    position: relative;
+    min-width: 250px;
+    background-color: $light-blue;
+    overflow-y: scroll;
+}
+
+.issue-list {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 5px;
+    margin: 5px;
+    border-radius: 5px;
+    border: 1px solid grey;
+    background-color: lightgoldenrodyellow;
+}
+
+// issue should pop up when the user hover over the issue
+.issue-list:hover {
+    box-shadow: 2px;
+    cursor: pointer;
+    border: 3px solid #252b33;
+}
+
+.issue-content {
+    background-color: white;
+    padding: 10px;
+    flex: 1 1 auto;
+    overflow-y: scroll;
+}
+
+.issue-title {
+    font-size: 20px;
+    font-weight: 600;
+    color: black;
+}
+
+.issue-body {
+    padding: 0 10px;
+    width: 100%;
+    text-align: left;
+}
+
+.issue-body > * {
+    margin-top: 5px;
+}
+
+.issue-body img,
+.issue-body video {
+    display: block;
+    max-width: 100%;
+}
-- 
cgit v1.2.3-70-g09d2


From a41d3546cbf34313b1d0a2caa7050fd04e7eee0f Mon Sep 17 00:00:00 2001
From: Michael Foiani <sotech117@Michaels-MacBook-Pro-5.local>
Date: Thu, 18 Aug 2022 00:47:30 +0200
Subject: add button to create an issue - also can upload files.

---
 src/client/util/ReportManager.scss | 14 ++++++
 src/client/util/ReportManager.tsx  | 95 +++++++++++++++++++++++++++++---------
 2 files changed, 86 insertions(+), 23 deletions(-)

(limited to 'src/client/util/ReportManager.scss')

diff --git a/src/client/util/ReportManager.scss b/src/client/util/ReportManager.scss
index 1f008a426..4bcbdc566 100644
--- a/src/client/util/ReportManager.scss
+++ b/src/client/util/ReportManager.scss
@@ -53,3 +53,17 @@
     display: block;
     max-width: 100%;
 }
+
+.report-issue-fab {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+}
+
+.loading-center {
+    margin: auto 0;
+}
diff --git a/src/client/util/ReportManager.tsx b/src/client/util/ReportManager.tsx
index fa9a0513b..75102ec8e 100644
--- a/src/client/util/ReportManager.tsx
+++ b/src/client/util/ReportManager.tsx
@@ -37,9 +37,11 @@ export class ReportManager extends React.Component<{}> {
     @observable public issues: any[] = [];
     @action setIssues = action((issues: any[]) => { this.issues = issues; });
     
-    @observable public selectedIssue: any = null;
+    // undefined is the default - null is if the user is making an issue
+    @observable public selectedIssue: any = undefined;
     @action setSelectedIssue = action((issue: any) => { this.selectedIssue = issue; });
 
+    // only get the open issues
     @observable public shownIssues = this.issues.filter(issue => issue.state === 'open');
     
     public updateIssueSearch = action((query: string = '') => {
@@ -98,11 +100,12 @@ export class ReportManager extends React.Component<{}> {
 
     public async reportIssue() {
         if (this.toGithub) {
+
             const req = await this.octokit.request('POST /repos/{owner}/{repo}/issues', {
                 owner: 'brown-dash',
                 repo: 'Dash-Web',
                 title: this.formatTitle(this.bugTitle, Doc.CurrentUserEmail),
-                body: this.bugDescription,
+                body: `${this.bugDescription} \n\nfileLinks:\n${(this.fileLinks ?? []).join('\n')}`,
                 labels: [
                     'from-dash-app',
                 ]
@@ -123,31 +126,85 @@ export class ReportManager extends React.Component<{}> {
         this.bugTitle = '';
         this.bugDescription = '';
         this.toGithub = false;
+        this.setFileLinks([])
         this.close();
     }
 
+    @observable public fileLinks: any = [];
+    @action setFileLinks = action((links: any) => { this.fileLinks = links; });
+
+    private getServerPath = (link: any) => { return link.result.accessPaths.agnostic.server }
+
+    private uploadFiles = (input: any) => {
+        this.setFileLinks(null);
+        // upload the files to the server
+        if (input.files && input.files.length !== 0) {
+            const fileArray: File[] = Array.from(input.files);
+            Networking.UploadFilesToServer(fileArray).then(links => {
+                console.log('finshed uploading', links.map(this.getServerPath));
+                this.setFileLinks(links.map(this.getServerPath));
+            })
+        }
+        
+    }
+
+
     private renderIssue = (issue: any) => {
-        const { title, body, number, html_url } = issue;
 
-        return (
+        const isReportingIssue = issue === null;
+
+        return isReportingIssue ?
+            // report issue
+            (<div className="settings-content">
+                <h3 style={{ 'textDecoration': 'underline'}}>Report an Issue</h3>
+                <label>Please leave a title for the bug.</label><br />
+                <input type="text" placeholder='title' onChange={(e) => this.bugTitle = e.target.value} required/>
+                <br />
+                <label>Please leave a description for the bug and how it can be recreated.</label>
+                <textarea placeholder='description' onChange={(e) => this.bugDescription = e.target.value} required/>
+                <br /><br />
+                {/* {<label>Send to github issues? </label>
+                <input type="checkbox" onChange={(e) => this.toGithub = e.target.checked} />
+                <br /> } */}
+
+                <div>
+                    <label>Choose file(s) to upload to show the bug (optional)</label>
+                    <input type="file" name="file" multiple accept='audio/*, video/*' onChange={e => this.uploadFiles(e.target)}/>
+                </div>
+                <br />
+                    <button onClick={() => this.reportIssue()} disabled={this.fileLinks === null}>{this.fileLinks === null ? 'Uploading...' : 'Submit'}</button>
+            </div>)
+            :
+            // view issue
+            (
             <div className='issue-container'>
-                <h5 style={{'textAlign': "left"}}><a href={html_url} target="_blank">Issue #{number}</a></h5>
+                <h5 style={{'textAlign': "left"}}><a href={issue.html_url} target="_blank">Issue #{issue.number}</a></h5>
                 <div className='issue-title'>
-                    {title}
+                    {issue.title}
                 </div>
-                <ReactMarkdown children={body} className='issue-body' linkTarget={"_blank"} remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeRaw]} />
+                <ReactMarkdown children={issue.body} className='issue-body' linkTarget={"_blank"} remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeRaw]} />
             </div>
         );
     }
 
+    private showReportIssueScreen = () => {
+        this.setSelectedIssue(null);
+    }
+
+    private closeReportIssueScreen = () => {
+        this.setSelectedIssue(undefined);
+    }
+
     private get reportInterface() {
 
+        const isReportingIssue = this.selectedIssue === null;
+
         return (
             <div className="settings-interface">
                 <div className='issue-list-wrapper'>
                     <h3>Current Issues</h3>
                     <input type="text" placeholder='search issues' onChange={(e => this.updateIssueSearch(e.target.value))}></input><br />
-                    {this.issues.length === 0 ? <ReactLoading/> : this.shownIssues.map(issue => <div className='issue-list' key={issue.number} onClick={() => this.setSelectedIssue(issue)}>{issue.title}</div>)}
+                    {this.issues.length === 0 ? <ReactLoading className='loading-center'/> : this.shownIssues.map(issue => <div className='issue-list' key={issue.number} onClick={() => this.setSelectedIssue(issue)}>{issue.title}</div>)}
 
                     {/* <div className="settings-user">
                         <button onClick={() => this.getAllIssues().then(issues => this.issues = issues)}>Poll Issues</button>
@@ -158,23 +215,15 @@ export class ReportManager extends React.Component<{}> {
                     <FontAwesomeIcon icon={'times'} color="black" size={'lg'} />
                 </div>
 
-                <div className="issue-content">
-                    {this.selectedIssue === null ? "no issue selected" : this.renderIssue(this.selectedIssue)}
+                <div className="issue-content" style={{'paddingTop' : this.selectedIssue === undefined ? '50px' : 'inherit'}}>
+                    {this.selectedIssue === undefined ? "no issue selected" : this.renderIssue(this.selectedIssue)}
                 </div>
 
-                {/* <div className="settings-content">
-                    <h3 style={{ 'textDecoration': 'underline'}}>Report an Issue</h3>
-                    <label>Please leave a title for the bug.</label><br />
-                    <input type="text" placeholder='title' onChange={(e) => this.bugTitle = e.target.value} />
-                    <br />
-                    <label>Please leave a description for the bug and how it can be recreated.</label>
-                    <textarea placeholder='description' onChange={(e) => this.bugDescription = e.target.value}/>
-                    <br /><br />
-                    {/* <label>Send to github issues? </label>
-                    <input type="checkbox" onChange={(e) => this.toGithub = e.target.checked} />
-                    <br /> }
-                    <button onClick={() => this.reportIssue()}>Submit</button>
-                </div> */}
+                <div className='report-issue-fab'>
+                    <button
+                        onClick={() => isReportingIssue ? this.closeReportIssueScreen() : this.showReportIssueScreen()}
+                    >{isReportingIssue ? 'Cancel' : 'Report New Issue'}</button>
+                </div>
 
 
             </div>
-- 
cgit v1.2.3-70-g09d2


From 31995aa918e2683256c2f817d81c0fc892939486 Mon Sep 17 00:00:00 2001
From: Michael Foiani <sotech117@Michaels-MacBook-Pro-5.local>
Date: Thu, 18 Aug 2022 16:17:31 +0200
Subject: add option to select labels for bug. other style changes and bug
 fixes.

---
 src/client/util/ReportManager.scss | 19 ++++++++++++++++
 src/client/util/ReportManager.tsx  | 46 +++++++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 5 deletions(-)

(limited to 'src/client/util/ReportManager.scss')

diff --git a/src/client/util/ReportManager.scss b/src/client/util/ReportManager.scss
index 4bcbdc566..5a2f2fcad 100644
--- a/src/client/util/ReportManager.scss
+++ b/src/client/util/ReportManager.scss
@@ -67,3 +67,22 @@
 .loading-center {
     margin: auto 0;
 }
+
+.settings-content label {
+    margin-top: 10px;
+}
+
+.report-disclaimer {
+    font-size: 8px;
+    color: grey;
+    padding-right: 50px;
+    font-style: italic;
+    text-align: left;
+}
+
+.flex-select {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+}
diff --git a/src/client/util/ReportManager.tsx b/src/client/util/ReportManager.tsx
index 223c7ff7d..ed9a4fc89 100644
--- a/src/client/util/ReportManager.tsx
+++ b/src/client/util/ReportManager.tsx
@@ -79,6 +79,10 @@ export class ReportManager extends React.Component<{}> {
     @action setBugTitle = action((title: string) => { this.bugTitle = title; });
     @observable private bugDescription = '';
     @action setBugDescription = action((description: string) => { this.bugDescription = description; });
+    @observable private bugType = '';
+    @action setBugType = action((type: string) => { this.bugType = type; });
+    @observable private bugPriority = '';
+    @action setBugPriority = action((priortiy: string) => { this.bugPriority = priortiy; });
 
     // private toGithub = false;
     // will always be set to true - no alterntive option yet
@@ -101,6 +105,13 @@ export class ReportManager extends React.Component<{}> {
     }
 
     public async reportIssue() {
+        if (this.bugTitle === '' || this.bugDescription === ''
+            || this.bugType === '' || this.bugPriority === '') {
+            alert('Please fill out all required fields to report an issue.');
+            return;
+        }
+
+
         if (this.toGithub) {
 
             const req = await this.octokit.request('POST /repos/{owner}/{repo}/issues', {
@@ -110,6 +121,8 @@ export class ReportManager extends React.Component<{}> {
                 body: `${this.bugDescription} \n\nfileLinks:\n${(this.fileLinks ?? []).join('\n')}`,
                 labels: [
                     'from-dash-app',
+                    this.bugType,
+                    this.bugPriority
                 ]
             });
 
@@ -124,11 +137,13 @@ export class ReportManager extends React.Component<{}> {
             // if not going to github issues, not sure what to do yet...
         }
 
-        // if we're down here, then we're good to go.
+        // if we're down here, then we're good to go. reset the fields.
         this.setBugTitle('');
         this.setBugDescription('');
         this.toGithub = false;
-        this.setFileLinks([])
+        this.setFileLinks([]);
+        this.setBugType('');
+        this.setBugPriority('');
         this.close();
     }
 
@@ -138,6 +153,7 @@ export class ReportManager extends React.Component<{}> {
     private getServerPath = (link: any) => { return link.result.accessPaths.agnostic.server }
 
     private uploadFiles = (input: any) => {
+        // keep null while uploading
         this.setFileLinks(null);
         // upload the files to the server
         if (input.files && input.files.length !== 0) {
@@ -164,17 +180,36 @@ export class ReportManager extends React.Component<{}> {
                 <br />
                 <label>Please leave a description for the bug and how it can be recreated.</label>
                 <textarea placeholder='description' onChange={(e) => this.bugDescription = e.target.value} required/>
-                <br /><br />
+                <br />
                 {/* {<label>Send to github issues? </label>
                 <input type="checkbox" onChange={(e) => this.toGithub = e.target.checked} />
                 <br /> } */}
 
+                <label>Please label the issue</label>
+                <div className='flex-select'>
+                    <select name="bugType">
+                    <option value="" disabled selected>Type</option>
+                    <option value="bug">Bug</option>
+                    <option value="cosmetic">Poor Design or Cosmetic</option>
+                    <option value="documentation">Poor Documentation</option>
+                    </select>
+
+                    <select name="bigPriority">
+                        <option value="" disabled selected>Priority</option>
+                        <option value="priority-low">Low</option>
+                        <option value="priority-medium">Medium</option>
+                        <option value="priority-high">High</option>
+                    </select>
+                </div>
+
+
                 <div>
-                    <label>Choose file(s) to upload to show the bug (optional)</label>
+                    <label>Upload media that shows the bug (optional)</label>
                     <input type="file" name="file" multiple accept='audio/*, video/*' onChange={e => this.uploadFiles(e.target)}/>
                 </div>
                 <br />
-                <button onClick={() => this.reportIssue()} disabled={this.fileLinks === null} style={{ backgroundColor: this.fileLinks === null ? 'grey' : 'inherit'}}>{this.fileLinks === null ? 'Uploading...' : 'Submit'}</button>
+
+                <button onClick={() => this.reportIssue()} disabled={this.fileLinks === null} style={{ backgroundColor: this.fileLinks === null ? 'grey' : '' }}>{this.fileLinks === null ? 'Uploading...' : 'Submit'}</button>
             </div>)
             :
             // view issue
@@ -222,6 +257,7 @@ export class ReportManager extends React.Component<{}> {
                 </div>
 
                 <div className='report-issue-fab'>
+                    <span className='report-disclaimer' hidden={!isReportingIssue}>Note: issue reporting is not anonymous.</span>
                     <button
                         onClick={() => isReportingIssue ? this.closeReportIssueScreen() : this.showReportIssueScreen()}
                     >{isReportingIssue ? 'Cancel' : 'Report New Issue'}</button>
-- 
cgit v1.2.3-70-g09d2