From ebd8e58a648b6f279ceb0e09ff5838a810369627 Mon Sep 17 00:00:00 2001
From: Daneryl <daneryl@gmail.com>
Date: Tue, 4 Feb 2025 11:01:51 +0100
Subject: [PATCH] fix eslint and ts errors

---
 app/api/entities/entities.js                |  5 ++---
 app/api/entities/routes.js                  |  6 +++---
 app/api/files/specs/storage.spec.ts         |  6 +++---
 app/api/files/storage.ts                    |  2 +-
 app/api/odm/sessionsContext.ts              | 10 +++++++---
 app/api/utils/specs/withTransaction.spec.ts |  6 +++---
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/api/entities/entities.js b/app/api/entities/entities.js
index f7653f5560..1158119f18 100644
--- a/app/api/entities/entities.js
+++ b/app/api/entities/entities.js
@@ -332,12 +332,11 @@ const validateWritePermissions = (ids, entitiesToUpdate) => {
   }
 };
 
-const withDocuments = async (entities, documentsFullText, options = {}) => {
+const withDocuments = async (entities, documentsFullText) => {
   const sharedIds = entities.map(entity => entity.sharedId);
   const allFiles = await files.get(
     { entity: { $in: sharedIds } },
-    documentsFullText ? '+fullText ' : ' ',
-    options
+    documentsFullText ? '+fullText ' : ' '
   );
   const idFileMap = new Map();
   allFiles.forEach(file => {
diff --git a/app/api/entities/routes.js b/app/api/entities/routes.js
index 8910aeea75..c716c86a2f 100644
--- a/app/api/entities/routes.js
+++ b/app/api/entities/routes.js
@@ -83,18 +83,18 @@ export default app => {
       try {
         const result = await withTransaction(async ({ abort }) => {
           const entityToSave = req.body.entity ? JSON.parse(req.body.entity) : req.body;
-          const result = await saveEntity(entityToSave, {
+          const saveResult = await saveEntity(entityToSave, {
             user: req.user,
             language: req.language,
             socketEmiter: req.emitToSessionSocket,
             files: req.files,
           });
-          const { entity, errors } = result;
+          const { entity, errors } = saveResult;
           await updateThesauriWithEntity(entity, req);
           if (errors.length) {
             await abort();
           }
-          return req.body.entity ? result : entity;
+          return req.body.entity ? saveResult : entity;
         });
         res.json(result);
       } catch (e) {
diff --git a/app/api/files/specs/storage.spec.ts b/app/api/files/specs/storage.spec.ts
index 5f19cac679..bf7688a06d 100644
--- a/app/api/files/specs/storage.spec.ts
+++ b/app/api/files/specs/storage.spec.ts
@@ -426,9 +426,9 @@ describe('storage', () => {
 
     it('should rollback already uploaded files if an error occurs', async () => {
       const files = [
-        { filename: 'file1.txt', file: Readable.from(['content1']), type: 'document' },
-        { filename: 'file2.txt', file: Readable.from(['content2']), type: 'document' },
-        { filename: 'file3.txt', file: Readable.from(['content3']), type: 'document' },
+        { filename: 'file1.txt', file: Readable.from(['content1']), type: 'document' as const },
+        { filename: 'file2.txt', file: Readable.from(['content2']), type: 'document' as const },
+        { filename: 'file3.txt', file: Readable.from(['content3']), type: 'document' as const },
       ];
 
       const originalStoreFile = storage.storeFile.bind(storage);
diff --git a/app/api/files/storage.ts b/app/api/files/storage.ts
index a9ad693464..b282539345 100644
--- a/app/api/files/storage.ts
+++ b/app/api/files/storage.ts
@@ -25,7 +25,7 @@ import {
 } from './filesystem';
 import { S3Storage } from './S3Storage';
 
-type FileTypes = NonNullable<FileType['type']> | 'activitylog' | 'segmentation';
+export type FileTypes = NonNullable<FileType['type']> | 'activitylog' | 'segmentation';
 
 let s3Instance: S3Storage;
 const s3 = () => {
diff --git a/app/api/odm/sessionsContext.ts b/app/api/odm/sessionsContext.ts
index b77c76df8e..6d2dc60fef 100644
--- a/app/api/odm/sessionsContext.ts
+++ b/app/api/odm/sessionsContext.ts
@@ -5,6 +5,7 @@ import { tenants } from 'api/tenants';
 import { appContext } from 'api/utils/AppContext';
 
 import { DB } from './DB';
+import { FileTypes } from 'api/files/storage';
 
 export const dbSessionContext = {
   getSession() {
@@ -20,8 +21,11 @@ export const dbSessionContext = {
 
   getFileOperations() {
     return (
-      (appContext.get('fileOperations') as { filename: string; file: Readable; type: string }[]) ||
-      []
+      (appContext.get('fileOperations') as {
+        filename: string;
+        file: Readable;
+        type: FileTypes;
+      }[]) || []
     );
   },
 
@@ -49,7 +53,7 @@ export const dbSessionContext = {
     appContext.set('reindexOperations', reindexOperations);
   },
 
-  registerFileOperation(args: { filename: string; file: Readable; type: string }) {
+  registerFileOperation(args: { filename: string; file: Readable; type: FileTypes }) {
     const fileOperations = dbSessionContext.getFileOperations();
     fileOperations.push(args);
     appContext.set('fileOperations', fileOperations);
diff --git a/app/api/utils/specs/withTransaction.spec.ts b/app/api/utils/specs/withTransaction.spec.ts
index 0a6a481e25..882cc14e84 100644
--- a/app/api/utils/specs/withTransaction.spec.ts
+++ b/app/api/utils/specs/withTransaction.spec.ts
@@ -1,18 +1,18 @@
 import { ClientSession } from 'mongodb';
-import { model, Schema } from 'mongoose';
+import { Schema } from 'mongoose';
 
 import entities from 'api/entities';
 import { instanceModel } from 'api/odm/model';
 import { dbSessionContext } from 'api/odm/sessionsContext';
 import { EntitySchema } from 'shared/types/entityType';
 
+import { storage } from 'api/files';
+import { Readable } from 'stream';
 import { appContext } from '../AppContext';
 import { elasticTesting } from '../elastic_testing';
 import { getFixturesFactory } from '../fixturesFactory';
 import { testingEnvironment } from '../testingEnvironment';
 import { withTransaction } from '../withTransaction';
-import { storage } from 'api/files';
-import { Readable } from 'stream';
 
 const factory = getFixturesFactory();