Browse Source

chore: fix some eslint/typescript issues

Kristian Vos 1 year ago
parent
commit
2d4b0ec702

+ 2 - 1
backend/.eslintrc

@@ -83,7 +83,8 @@
 				"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
 			}
 		],
-		"import/prefer-default-export": "off"
+		"import/prefer-default-export": "off",
+		"@typescript-eslint/no-explicit-any": 0
 	},
 	"overrides": [
 		{

+ 6 - 3
backend/src/JobContext.ts

@@ -6,7 +6,10 @@ import DataModule from "@/modules/DataModule";
 import { UserModel } from "@/modules/DataModule/models/users/schema";
 import { JobDerived } from "./types/JobDerived";
 import assertJobDerived from "./utils/assertJobDerived";
-import { GetModelPermissionsResult } from "./modules/DataModule/models/users/jobs/GetModelPermissions";
+import {
+	GetMultipleModelPermissionsResult,
+	GetSingleModelPermissionsResult
+} from "./modules/DataModule/models/users/jobs/GetModelPermissions";
 import { GetPermissionsResult } from "./modules/DataModule/models/users/jobs/GetPermissions";
 
 const permissionRegex =
@@ -107,7 +110,7 @@ export default class JobContext {
 			const permissions = (await this.executeJob(GetModelPermissions, {
 				modelName: modelOrJobName,
 				modelId
-			})) as GetModelPermissionsResult;
+			})) as GetSingleModelPermissionsResult;
 
 			let modelPermission = `data.${modelOrJobName}.${jobName}`;
 
@@ -199,7 +202,7 @@ export default class JobContext {
 						modelName,
 						modelIds
 					}
-				)) as GetModelPermissionsResult;
+				)) as GetMultipleModelPermissionsResult;
 
 				dataPermissionsForThisModel.forEach(
 					({

+ 0 - 1
backend/src/main.ts

@@ -1,5 +1,4 @@
 import * as readline from "node:readline";
-import mongoose from "mongoose";
 import ModuleManager from "@/ModuleManager";
 import LogBook from "@/LogBook";
 import JobQueue from "@/JobQueue";

+ 7 - 2
backend/src/modules/DataModule/models/users/jobs/GetModelPermissions.ts

@@ -6,9 +6,14 @@ import ModuleManager from "@/ModuleManager";
 import GetPermissions, { GetPermissionsResult } from "./GetPermissions";
 import DataModuleJob from "@/modules/DataModule/DataModuleJob";
 
+export type GetSingleModelPermissionsResult = Record<string, boolean>; // Returned when getting permissions for a single modelId
+export type GetMultipleModelPermissionsResult = Record<
+	string,
+	Record<string, boolean>
+>; // Returned when getting permissions for several modelIds
 export type GetModelPermissionsResult =
-	| Record<string, boolean>
-	| Record<string, Record<string, boolean>>;
+	| GetSingleModelPermissionsResult
+	| GetMultipleModelPermissionsResult;
 
 export default class GetModelPermissions extends DataModuleJob {
 	protected static _modelName = "users";

+ 0 - 1
backend/src/modules/EventsModule/jobs/SubscribeMany.ts

@@ -1,4 +1,3 @@
-import { forEachIn } from "@common/utils/forEachIn";
 import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";