Merge branch 'main' into feature/chart-widget-options-config

Author: lyubov-voloshko

backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts

@@ -2,6 +2,7 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
 import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
 import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js';
 import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js';
+import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
 import * as Sentry from '@sentry/node';
 import PQueue from 'p-queue';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
@@ -78,6 +79,9 @@ export class FindTablesInConnectionUseCase
 		if (isConnectionTypeAgent(connection.type)) {
 			userEmail = await this._dbContext.userRepository.getUserEmailOrReturnNull(userId);
 		}
+
+		await validateSchemaCache(dao, userEmail);
+
 		let tables: Array<TableDS>;
 		try {
 			tables = await dao.getTablesFromDB(userEmail);

backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts

@@ -7,6 +7,7 @@ import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/dist/
 import { buildDAOsTableSettingsDs } from '@rocketadmin/shared-code/dist/src/helpers/data-structures-builders/table-settings.ds.builder.js';
 import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
 import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
+import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
 import JSON5 from 'json5';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
 import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
@@ -70,6 +71,9 @@ export class GetRowByPrimaryKeyUseCase
 		if (isConnectionTypeAgent(connection.type)) {
 			userEmail = await this._dbContext.userRepository.getUserEmailOrReturnNull(userId);
 		}
+
+		await validateSchemaCache(dao, userEmail);
+
 		let [
 			tableStructure,
 			tableWidgets,

backend/src/entities/table/use-cases/get-table-rows.use.case.ts

@@ -8,6 +8,7 @@ import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/shared/en
 import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
 import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
 import { FoundRowsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/found-rows.ds.js';
+import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
 import Sentry from '@sentry/minimal';
 import JSON5 from 'json5';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
@@ -88,6 +89,8 @@ export class GetTableRowsUseCase extends AbstractUseCase<GetTableRowsDs, FoundTa
 				userEmail = await this._dbContext.userRepository.getUserEmailOrReturnNull(userId);
 			}
 
+			await validateSchemaCache(dao, userEmail);
+
 			// eslint-disable-next-line prefer-const
 			let { tableSettings, tableCustomFields, tableWidgets } =
 				await this._dbContext.tableSettingsRepository.findTableCustoms(connectionId, tableName);

backend/src/entities/table/use-cases/get-table-structure.use.case.ts

@@ -4,6 +4,7 @@ import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-laye
 import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js';
 import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object.interface.js';
 import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/shared/interfaces/data-access-object-agent.interface.js';
+import { validateSchemaCache } from '@rocketadmin/shared-code/dist/src/caching/schema-cache-validator.js';
 import JSON5 from 'json5';
 import AbstractUseCase from '../../../common/abstract-use.case.js';
 import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
@@ -66,6 +67,9 @@ export class GetTableStructureUseCase
 			if (isConnectionTypeAgent(foundConnection.type)) {
 				userEmail = await this._dbContext.userRepository.getUserEmailOrReturnNull(userId);
 			}
+
+			await validateSchemaCache(dao, userEmail);
+
 			// eslint-disable-next-line prefer-const
 			let [tableSettings, personalTableSettings, tablePrimaryColumns, tableForeignKeys, tableStructure, tableWidgets] =
 				await Promise.all([