From e5c2c25f9d27e718eb34ec5f05c72c4cd1c22987 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 6 Dec 2023 13:27:41 -0500
Subject: catch mongo errors. delete (some) sessions from mongo.  more package
 updates.  cleanup of express-validator.

---
 src/client/util/History.ts                      | 2 +-
 src/client/util/reportManager/ReportManager.tsx | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/client/util')

diff --git a/src/client/util/History.ts b/src/client/util/History.ts
index 18aee6444..2f1a336cc 100644
--- a/src/client/util/History.ts
+++ b/src/client/util/History.ts
@@ -85,7 +85,7 @@ export namespace HistoryUtil {
     };
 
     function addParser(type: string, requiredFields: Parser, optionalFields: Parser, customParser?: (pathname: string[], opts: qs.ParsedQuery, current: ParsedUrl) => ParsedUrl | null | undefined) {
-        function parse(parser: ParserValue, value: string | string[] | null | undefined) {
+        function parse(parser: ParserValue, value: string | (string | null)[] | null | undefined) {
             if (value === undefined || value === null) {
                 return value;
             }
diff --git a/src/client/util/reportManager/ReportManager.tsx b/src/client/util/reportManager/ReportManager.tsx
index b25d51b41..738902a31 100644
--- a/src/client/util/reportManager/ReportManager.tsx
+++ b/src/client/util/reportManager/ReportManager.tsx
@@ -1,13 +1,11 @@
 import * as React from 'react';
-import v4 = require('uuid/v4');
+import * as uuid from 'uuid';
 import '.././SettingsManager.scss';
 import './ReportManager.scss';
-import Dropzone from 'react-dropzone';
 import ReactLoading from 'react-loading';
 import { action, observable } from 'mobx';
 import { BsX, BsArrowsAngleExpand, BsArrowsAngleContract } from 'react-icons/bs';
 import { CgClose } from 'react-icons/cg';
-import { AiOutlineUpload } from 'react-icons/ai';
 import { HiOutlineArrowLeft } from 'react-icons/hi';
 import { Issue } from './reportManagerSchema';
 import { observer } from 'mobx-react';
@@ -156,7 +154,7 @@ export class ReportManager extends React.Component<{}> {
      * @param files uploaded files
      */
     private onDrop = (files: File[]) => {
-        this.setFormData({ ...this.formData, mediaFiles: [...this.formData.mediaFiles, ...files.map(file => ({ _id: v4(), file }))] });
+        this.setFormData({ ...this.formData, mediaFiles: [...this.formData.mediaFiles, ...files.map(file => ({ _id: uuid.v4(), file }))] });
     };
 
     /**
@@ -338,7 +336,7 @@ export class ReportManager extends React.Component<{}> {
                     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.setFormData({ ...this.formData, mediaFiles: [...this.formData.mediaFiles, ...Array.from(e.target.files).map(file => ({ _id: uuid.v4(), file }))] });
                     }}
                 />
                 {this.formData.mediaFiles.length > 0 && <ul className="file-list">{this.formData.mediaFiles.map(file => this.getMediaPreview(file))}</ul>}
-- 
cgit v1.2.3-70-g09d2