Merge branch 'master' into zach-starter

1 files changed, 7 insertions, 7 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 4cb3d8baf..b2624f654 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -144,7 +144,7 @@ export default class UploadManager extends ApiManager {
                     ids[id] = uuid.v4();
                     return ids[id];
                 };
-                const mapFn = (docIn: any) => {
+                const mapFn = (docIn: { id: string; fields: any[] }) => {
                     const doc = docIn;
                     if (doc.id) {
                         doc.id = getId(doc.id);
@@ -170,10 +170,10 @@ export default class UploadManager extends ApiManager {
                             mapFn(field);
                         } else if (typeof field === 'string') {
                             const re = /("(?:dataD|d)ocumentId"\s*:\s*")([\w-]*)"/g;
-                            doc.fields[key] = (field as any).replace(re, (match: any, p1: string, p2: string) => `${p1}${getId(p2)}"`);
+                            doc.fields[key] = field.replace(re, (match: string, p1: string, p2: string) => `${p1}${getId(p2)}"`);
                         } else if (field.__type === 'RichTextField') {
                             const re = /("href"\s*:\s*")(.*?)"/g;
-                            field.Data = field.Data.replace(re, (match: any, p1: string, p2: string) => `${p1}${getId(p2)}"`);
+                            field.Data = field.Data.replace(re, (match: string, p1: string, p2: string) => `${p1}${getId(p2)}"`);
                         }
                     }
                 };
@@ -192,7 +192,7 @@ export default class UploadManager extends ApiManager {
                                     if (!f) continue;
                                     const path2 = f[0]; // what about the rest of the array? are we guaranteed only one value is set?
                                     const zip = new AdmZip(path2.filepath);
-                                    zip.getEntries().forEach((entry: any) => {
+                                    zip.getEntries().forEach(entry => {
                                         const entryName = entry.entryName.replace(/%%%/g, '/');
                                         if (!entryName.startsWith('files/')) {
                                             return;
@@ -245,7 +245,7 @@ export default class UploadManager extends ApiManager {
                                 }
                             }
                             SolrManager.update();
-                            res.send(JSON.stringify({ id, docids, linkids } || 'error'));
+                            res.send(JSON.stringify({ id, docids, linkids }) || 'error');
                         } catch (e) {
                             console.log(e);
                         }
@@ -282,8 +282,8 @@ export default class UploadManager extends ApiManager {
                     const serverPath = serverPathToFile(Directory.images, '');
                     const regex = new RegExp(`${deleteFiles}.*`);
                     fs.readdirSync(serverPath)
-                        .filter((f: any) => regex.test(f))
-                        .map((f: any) => fs.unlinkSync(serverPath + f));
+                        .filter(f => regex.test(f))
+                        .map(f => fs.unlinkSync(serverPath + f));
                 }
                 imageDataUri.outputFile(uri, serverPathToFile(Directory.images, InjectSize(filename, origSuffix))).then((savedName: string) => {
                     const ext = path.extname(savedName).toLowerCase();