Skip to content

Add new fields and enum for table settings: list_fields, list_per_page, ordering, and ordering_field #1512

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
Jan 21, 2026
Merged

Add new fields and enum for table settings: list_fields, list_per_page, ordering, and ordering_field #1512

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
126 changes: 78 additions & 48 deletions backend/src/entities/table-settings/common-table-settings/table-settings.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,107 @@ import { ConnectionEntity } from '../../connection/connection.entity.js';
import { CustomFieldsEntity } from '../../custom-field/custom-fields.entity.js';
import { TableActionEntity } from '../../table-actions/table-actions-module/table-action.entity.js';
import { TableWidgetEntity } from '../../widget/table-widget.entity.js';
import { QueryOrderingEnum } from '../../../enums/query-ordering.enum.js';

@Entity('tableSettings')
@Unique(['connection_id', 'table_name'])
export class TableSettingsEntity {
@PrimaryGeneratedColumn('uuid')
id: string;
@PrimaryGeneratedColumn('uuid')
id: string;

@Column({ default: null })
table_name: string;
@Column({ default: null })
table_name: string;

@Column({ default: null })
display_name: string;
@Column({ default: null })
display_name: string;

@Column('varchar', { array: true, default: {} })
search_fields: string[];
@Column('varchar', { array: true, default: {} })
search_fields: string[];

@Column('varchar', { array: true, default: {} })
excluded_fields: string[];
@Column('varchar', { array: true, default: {} })
excluded_fields: string[];

@Column('varchar', { array: true, default: {} })
identification_fields: string[];
@Column('varchar', { array: true, default: {} })
list_fields: string[];

@Column({ default: null })
identity_column: string;
@Column('varchar', { array: true, default: {} })
identification_fields: string[];

@Column('varchar', { array: true, default: {} })
readonly_fields: string[];
@Column('int', { default: null })
list_per_page: number;

@Column('varchar', { array: true, default: {} })
sortable_by: string[];
@Column('enum', {
nullable: true,
enum: QueryOrderingEnum,
default: null,
})
ordering!: QueryOrderingEnum;

@Column('varchar', { array: true, default: {} })
autocomplete_columns: string[];
@Column('varchar', { default: null })
ordering_field: string;

@Column('varchar', { array: true, default: null })
columns_view: string[];
@Column({ default: null })
identity_column: string;

@Column({ default: true, type: 'boolean' })
can_delete: boolean;
@Column('varchar', { array: true, default: {} })
readonly_fields: string[];

@Column({ default: true, type: 'boolean' })
can_update: boolean;
@Column('varchar', { array: true, default: {} })
sortable_by: string[];

@Column({ default: true, type: 'boolean' })
can_add: boolean;
@Column('varchar', { array: true, default: {} })
autocomplete_columns: string[];

@Column({ default: true, type: 'boolean' })
allow_csv_export: boolean;
@Column('varchar', { array: true, default: null })
columns_view: string[];

@Column({ default: true, type: 'boolean' })
allow_csv_import: boolean;
@Column({ default: true, type: 'boolean' })
can_delete: boolean;

@Column('varchar', { array: true, default: null })
sensitive_fields: string[];
@Column({ default: true, type: 'boolean' })
can_update: boolean;

@Column('varchar', { default: null })
icon: string;
@Column({ default: true, type: 'boolean' })
can_add: boolean;

@Transform(({ value: connection }) => connection.id)
@ManyToOne((_) => ConnectionEntity, (connection) => connection.settings, {
onDelete: 'CASCADE',
})
@JoinColumn()
connection_id: Relation<ConnectionEntity>;
@Column({ default: true, type: 'boolean' })
allow_csv_export: boolean;

@OneToMany((_) => CustomFieldsEntity, (fields) => fields.settings)
custom_fields: Relation<CustomFieldsEntity>[];
@Column({ default: true, type: 'boolean' })
allow_csv_import: boolean;

@OneToMany((_) => TableWidgetEntity, (table_widgets) => table_widgets.settings)
table_widgets: Relation<TableWidgetEntity>[];
@Column('varchar', { array: true, default: null })
sensitive_fields: string[];

@OneToMany((_) => TableActionEntity, (table_actions) => table_actions.settings)
table_actions: Relation<TableActionEntity>[];
@Column('varchar', { default: null })
icon: string;

@Transform(({ value: connection }) => connection.id)
@ManyToOne(
(_) => ConnectionEntity,
(connection) => connection.settings,
{
onDelete: 'CASCADE',
},
)
@JoinColumn()
connection_id: Relation<ConnectionEntity>;

@OneToMany(
(_) => CustomFieldsEntity,
(fields) => fields.settings,
)
custom_fields: Relation<CustomFieldsEntity>[];

@OneToMany(
(_) => TableWidgetEntity,
(table_widgets) => table_widgets.settings,
)
table_widgets: Relation<TableWidgetEntity>[];

@OneToMany(
(_) => TableActionEntity,
(table_actions) => table_actions.settings,
)
table_actions: Relation<TableActionEntity>[];
}
23 changes: 23 additions & 0 deletions backend/src/migrations/1768987695763-RestoreFieldsInCommonTableSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RestoreFieldsInCommonTableSettings1768987695763 implements MigrationInterface {
name = 'RestoreFieldsInCommonTableSettings1768987695763';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "tableSettings" ADD "list_fields" character varying array NOT NULL DEFAULT '{}'`,
);
await queryRunner.query(`ALTER TABLE "tableSettings" ADD "list_per_page" integer`);
await queryRunner.query(`CREATE TYPE "public"."tableSettings_ordering_enum" AS ENUM('ASC', 'DESC')`);
await queryRunner.query(`ALTER TABLE "tableSettings" ADD "ordering" "public"."tableSettings_ordering_enum"`);
await queryRunner.query(`ALTER TABLE "tableSettings" ADD "ordering_field" character varying`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "ordering_field"`);
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "ordering"`);
await queryRunner.query(`DROP TYPE "public"."tableSettings_ordering_enum"`);
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "list_per_page"`);
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "list_fields"`);
}
}
84 changes: 44 additions & 40 deletions shared-code/src/helpers/data-structures-builders/table-settings.ds.builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,55 @@ import { TableSettingsDS } from '../../data-access-layer/shared/data-structures/
import { QueryOrderingEnum } from '../../shared/enums/query-ordering.enum.js';

type CommonTableSettingsInput = {
table_name: string;
display_name: string;
search_fields: string[];
excluded_fields: string[];
identification_fields: string[];
identity_column: string;
readonly_fields: string[];
sortable_by: string[];
autocomplete_columns: string[];
columns_view: string[];
can_delete: boolean;
can_update: boolean;
can_add: boolean;
sensitive_fields: string[];
table_name: string;
display_name: string;
search_fields: string[];
excluded_fields: string[];
identification_fields: string[];
identity_column: string;
readonly_fields: string[];
sortable_by: string[];
autocomplete_columns: string[];
columns_view: string[];
can_delete: boolean;
can_update: boolean;
can_add: boolean;
sensitive_fields: string[];
ordering: QueryOrderingEnum;
ordering_field: string;
list_per_page: number;
list_fields: string[];
};

type PersonalTableSettingsInput = {
ordering: QueryOrderingEnum;
ordering_field: string;
list_per_page: number;
list_fields: string[];
ordering: QueryOrderingEnum;
ordering_field: string;
list_per_page: number;
list_fields: string[];
};

export function buildDAOsTableSettingsDs(
commonTableSettings: CommonTableSettingsInput | null,
personalTableSettings: PersonalTableSettingsInput | null,
commonTableSettings: CommonTableSettingsInput | null,
personalTableSettings: PersonalTableSettingsInput | null,
): TableSettingsDS {
return {
table_name: commonTableSettings?.table_name,
display_name: commonTableSettings?.display_name,
search_fields: commonTableSettings?.search_fields,
excluded_fields: commonTableSettings?.excluded_fields,
list_fields: personalTableSettings?.list_fields || [],
identification_fields: commonTableSettings?.identification_fields,
list_per_page: personalTableSettings?.list_per_page,
ordering: personalTableSettings?.ordering,
ordering_field: personalTableSettings?.ordering_field,
identity_column: commonTableSettings?.identity_column,
readonly_fields: commonTableSettings?.readonly_fields,
sortable_by: commonTableSettings?.sortable_by,
autocomplete_columns: commonTableSettings?.autocomplete_columns,
columns_view: commonTableSettings?.columns_view,
can_delete: commonTableSettings?.can_delete,
can_update: commonTableSettings?.can_update,
can_add: commonTableSettings?.can_add,
sensitive_fields: commonTableSettings?.sensitive_fields,
};
return {
table_name: commonTableSettings?.table_name,
display_name: commonTableSettings?.display_name,
search_fields: commonTableSettings?.search_fields,
excluded_fields: commonTableSettings?.excluded_fields,
list_fields: personalTableSettings?.list_fields || commonTableSettings?.list_fields || [],
identification_fields: commonTableSettings?.identification_fields,
list_per_page: personalTableSettings?.list_per_page || commonTableSettings?.list_per_page,

Copilot AI Jan 21, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OR operator will treat 0 as falsy, which could be a valid value for list_per_page (meaning no pagination or 0 items per page). If a user sets personalTableSettings.list_per_page to 0, it will incorrectly fall back to commonTableSettings.list_per_page. Consider using nullish coalescing operator (??) instead of logical OR (||) to properly handle 0 as a valid value.

Suggested change
list_per_page: personalTableSettings?.list_per_page || commonTableSettings?.list_per_page,
list_per_page: personalTableSettings?.list_per_page ?? commonTableSettings?.list_per_page,

Copilot uses AI. Check for mistakes.
ordering: personalTableSettings?.ordering || commonTableSettings?.ordering,
ordering_field: personalTableSettings?.ordering_field || commonTableSettings?.ordering_field,
Comment on lines +41 to +45

Copilot AI Jan 21, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OR operator will treat empty strings as falsy values. If ordering_field is set to an empty string in personalTableSettings, it will incorrectly fall back to commonTableSettings.ordering_field instead of using the empty string. Consider using nullish coalescing operator (??) instead of logical OR (||) to properly distinguish between empty strings and null/undefined values.

Suggested change
list_fields: personalTableSettings?.list_fields || commonTableSettings?.list_fields || [],
identification_fields: commonTableSettings?.identification_fields,
list_per_page: personalTableSettings?.list_per_page || commonTableSettings?.list_per_page,
ordering: personalTableSettings?.ordering || commonTableSettings?.ordering,
ordering_field: personalTableSettings?.ordering_field || commonTableSettings?.ordering_field,
list_fields: personalTableSettings?.list_fields ?? commonTableSettings?.list_fields ?? [],
identification_fields: commonTableSettings?.identification_fields,
list_per_page: personalTableSettings?.list_per_page ?? commonTableSettings?.list_per_page,
ordering: personalTableSettings?.ordering ?? commonTableSettings?.ordering,
ordering_field: personalTableSettings?.ordering_field ?? commonTableSettings?.ordering_field,

Copilot uses AI. Check for mistakes.
identity_column: commonTableSettings?.identity_column,
readonly_fields: commonTableSettings?.readonly_fields,
sortable_by: commonTableSettings?.sortable_by,
autocomplete_columns: commonTableSettings?.autocomplete_columns,
columns_view: commonTableSettings?.columns_view,
can_delete: commonTableSettings?.can_delete,
can_update: commonTableSettings?.can_update,
can_add: commonTableSettings?.can_add,
sensitive_fields: commonTableSettings?.sensitive_fields,
};
}
Loading