feat: add ITranslateFunction, IAdminUserExpressRequest and ITranslateExpressRequest data types

Author: yaroslav8765

adminforth/documentation/docs/tutorial/03-Customization/06-customPages.md

@@ -310,7 +310,7 @@ Open `index.ts` file and add the following code *BEFORE* `admin.express.serve(`
 
 app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
   admin.express.authorize(
-    async (req:any, res:any) => {
+    async (req:IAdminUserExpressRequest, res:any) => {
       const days = req.body.days || 7;
       const apartsByDays = admin.resource('aparts').dataConnector.client.prepare(
         `SELECT 

adminforth/types/Back.ts

@@ -1,4 +1,4 @@
-import type { Express } from 'express';
+import type { Express, Request } from 'express';
 import type { Writable } from 'stream';
 
 import { ActionCheckSource, AdminForthFilterOperators, AdminForthSortDirections, AllowedActionsEnum, 
@@ -105,6 +105,25 @@ export interface IExpressHttpServer extends IHttpServer {
   authorize(callable: Function): void;
 }
 
+export interface ITranslateFunction {
+  (
+    msg: string,
+    category: string,
+    lang: string,
+    params: any,
+    pluralizationNumber?: number
+  ): Promise<string>;
+}
+
+export interface IAdminUserExpressRequest extends Request {
+  adminUser: AdminUser;
+}
+
+export interface ITranslateExpressRequest extends Request {
+  tr: ITranslateFunction;
+}
+
+
 
 export interface IAdminForthSingleFilter {
   field?: string;
@@ -332,7 +351,7 @@ export interface IAdminForth {
 
   formatAdminForth(): string;
 
-  tr(msg: string, category: string, lang: string, params: any, pluralizationNumber?: number): Promise<string>;
+  tr: ITranslateFunction;
 
   createResourceRecord(
     params: { resource: AdminForthResource, record: any, adminUser: AdminUser, extra?: HttpExtra }

dev-demo/index.ts

@@ -1,7 +1,7 @@
 import betterSqlite3 from 'better-sqlite3';
 import express from 'express';
 import AdminForth, { AdminUser, Filters } from '../adminforth/index.js';
-
+import type { IAdminUserExpressRequest, ITranslateExpressRequest } from '../adminforth/spa/src/types/Back.js';
 import clicksResource from './resources/clicks.js';
 import apartmentsResource from './resources/apartments.js';
 import apartmentBuyersResource from './resources/apartment_buyers.js';
@@ -355,7 +355,7 @@ const port = process.env.PORT || 3000;
 app.get(
   '/api/testtest/', 
   admin.express.authorize(
-    async (req: express.Request, res: express.Response, next: express.NextFunction) => { 
+    async (req: IAdminUserExpressRequest, res: express.Response, next: express.NextFunction) => { 
         res.json({ ok: true, data: [1,2,3], adminUser: req.adminUser });
     }
   )
@@ -364,7 +364,7 @@ app.get(
 app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
   admin.express.authorize(
     admin.express.translatable(
-      async (req: any, res: express.Response) => {
+      async (req: IAdminUserExpressRequest & ITranslateExpressRequest, res: express.Response) => {
         const days = req.body.days || 7;
         const apartsByDays = await admin.resource('aparts').dataConnector.client.prepare( 
           `SELECT 
@@ -464,7 +464,7 @@ app.get(`${ADMIN_BASE_URL}/api/dashboard/`,
 
 app.get(`${ADMIN_BASE_URL}/api/aparts-by-room-percentages/`,
   admin.express.authorize(
-    async (req, res) => {
+    async (req:IAdminUserExpressRequest, res) => {
       const roomPercentages = await admin.resource('aparts').dataConnector.client.prepare(
         `SELECT 
           number_of_rooms,