Skip to content

feat: add table settings list fields actualization according available tables #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artuomka merged 1 commit into from
Sep 18, 2025
Merged

feat: add table settings list fields actualization according available tables #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/entities/table-settings/application/data-structures/find-table-settings.ds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export class FindTableSettingsDs {
connectionId: string;
tableName: string;
masterPassword: string;
}
2 changes: 2 additions & 0 deletions backend/src/entities/table-settings/table-settings.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export class TableSettingsController {
async findAll(
@QueryUuid('connectionId') connectionId: string,
@QueryTableName() tableName: string,
@MasterPassword() masterPwd: string,
): Promise<FoundTableSettingsDs> {
if (!connectionId) {
throw new HttpException(
Expand All @@ -78,6 +79,7 @@ export class TableSettingsController {
const inputData: FindTableSettingsDs = {
connectionId: connectionId,
tableName: tableName,
masterPassword: masterPwd,
};
return await this.findTableSettingsUseCase.execute(inputData, InTransactionEnum.OFF);
}
Expand Down
24 changes: 22 additions & 2 deletions backend/src/entities/table-settings/use-cases/find-table-settings.use.case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { Inject, Injectable } from '@nestjs/common';
import { Inject, Injectable, NotFoundException } from '@nestjs/common';
import AbstractUseCase from '../../../common/abstract-use.case.js';
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
import { BaseType } from '../../../common/data-injection.tokens.js';
import { FindTableSettingsDs } from '../application/data-structures/find-table-settings.ds.js';
import { FoundTableSettingsDs } from '../application/data-structures/found-table-settings.ds.js';
import { buildFoundTableSettingsDs } from '../utils/build-found-table-settings-ds.js';
import { IFindTableSettings } from './use-cases.interface.js';
import { Messages } from '../../../exceptions/text/messages.js';
import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js';
import { findAvailableFields } from '../../table/utils/find-available-fields.utils.js';

@Injectable()
export class FindTableSettingsUseCase
Expand All @@ -19,11 +22,28 @@ export class FindTableSettingsUseCase
super();
}
protected async implementation(inputData: FindTableSettingsDs): Promise<FoundTableSettingsDs> {
const { connectionId, tableName } = inputData;
const { connectionId, tableName, masterPassword } = inputData;
const tableSettings = await this._dbContext.tableSettingsRepository.findTableSettings(connectionId, tableName);
if (!tableSettings) {
return {} as FoundTableSettingsDs;
}

const foundConnection = await this._dbContext.connectionRepository.findAndDecryptConnection(
connectionId,
masterPassword,
);
if (!foundConnection) {
throw new NotFoundException(Messages.CONNECTION_NOT_FOUND);
}
const dao = getDataAccessObject(foundConnection);
const tableStructure = await dao.getTableStructure(tableName, null);

const availableFields = findAvailableFields(tableSettings, tableStructure);
if (tableSettings.list_fields?.length && tableSettings.list_fields?.length !== availableFields.length) {
tableSettings.list_fields = availableFields;
await this._dbContext.tableSettingsRepository.saveNewOrUpdatedSettings(tableSettings);
}

return buildFoundTableSettingsDs(tableSettings);
}
}
6 changes: 4 additions & 2 deletions backend/test/ava-tests/non-saas-tests/non-saas-user-admin-permissions-e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ let app: INestApplication;
let testUtils: TestUtils;
let currentTest: string;


const mockFactory = new MockFactory();
const newConnectionToPostgres = mockFactory.generateConnectionToTestPostgresDBInDocker();

Expand Down Expand Up @@ -3138,7 +3137,10 @@ test.serial(`${currentTest} should return table settings when it was created`, a
t.is(getTableSettingsRO.display_name, createTableSettingsDTO.display_name);
t.is(JSON.stringify(getTableSettingsRO.search_fields), JSON.stringify(createTableSettingsDTO.search_fields));
t.is(JSON.stringify(getTableSettingsRO.excluded_fields), JSON.stringify(createTableSettingsDTO.excluded_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields));
t.is(
JSON.stringify(getTableSettingsRO.list_fields),
JSON.stringify(createTableSettingsDTO.list_fields.concat(['id', 'created_at', 'updated_at'])),
);
t.is(JSON.stringify(getTableSettingsRO.identification_fields), JSON.stringify([]));
t.is(getTableSettingsRO.list_per_page, createTableSettingsDTO.list_per_page);
t.is(getTableSettingsRO.ordering, createTableSettingsDTO.ordering);
Expand Down
2 changes: 1 addition & 1 deletion backend/test/ava-tests/non-saas-tests/non-saas-user-group-edit-permissions-e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@ test.serial(`${currentTest} 'should return table settings when it was created`,
t.is(getTableSettingsRO.display_name, createTableSettingsDTO.display_name);
t.is(JSON.stringify(getTableSettingsRO.search_fields), JSON.stringify(createTableSettingsDTO.search_fields));
t.is(JSON.stringify(getTableSettingsRO.excluded_fields), JSON.stringify(createTableSettingsDTO.excluded_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields.concat(['id', 'created_at', 'updated_at'])));
t.is(JSON.stringify(getTableSettingsRO.identification_fields), JSON.stringify([]));
t.is(getTableSettingsRO.list_per_page, createTableSettingsDTO.list_per_page);
t.is(getTableSettingsRO.ordering, createTableSettingsDTO.ordering);
Expand Down
5 changes: 4 additions & 1 deletion backend/test/ava-tests/saas-tests/user-admin-permissions-e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3134,7 +3134,10 @@ test.serial(`${currentTest} should return table settings when it was created`, a
t.is(getTableSettingsRO.display_name, createTableSettingsDTO.display_name);
t.is(JSON.stringify(getTableSettingsRO.search_fields), JSON.stringify(createTableSettingsDTO.search_fields));
t.is(JSON.stringify(getTableSettingsRO.excluded_fields), JSON.stringify(createTableSettingsDTO.excluded_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields));
t.is(
JSON.stringify(getTableSettingsRO.list_fields),
JSON.stringify(createTableSettingsDTO.list_fields.concat(['id', 'created_at', 'updated_at'])),
);
t.is(JSON.stringify(getTableSettingsRO.identification_fields), JSON.stringify([]));
t.is(getTableSettingsRO.list_per_page, createTableSettingsDTO.list_per_page);
t.is(getTableSettingsRO.ordering, createTableSettingsDTO.ordering);
Expand Down
2 changes: 1 addition & 1 deletion backend/test/ava-tests/saas-tests/user-group-edit-permissions-e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2389,7 +2389,7 @@ test.serial(`${currentTest} 'should return table settings when it was created`,
t.is(getTableSettingsRO.display_name, createTableSettingsDTO.display_name);
t.is(JSON.stringify(getTableSettingsRO.search_fields), JSON.stringify(createTableSettingsDTO.search_fields));
t.is(JSON.stringify(getTableSettingsRO.excluded_fields), JSON.stringify(createTableSettingsDTO.excluded_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields));
t.is(JSON.stringify(getTableSettingsRO.list_fields), JSON.stringify(createTableSettingsDTO.list_fields.concat(['id', 'created_at', 'updated_at'])));
t.is(JSON.stringify(getTableSettingsRO.identification_fields), JSON.stringify([]));
t.is(getTableSettingsRO.list_per_page, createTableSettingsDTO.list_per_page);
t.is(getTableSettingsRO.ordering, createTableSettingsDTO.ordering);
Expand Down
Loading