Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,10 @@ export class CreateTableSettingsDs {

@ApiProperty()
allow_csv_import: boolean;

@ApiProperty()
save_ordering_by_default: boolean;

@ApiProperty({ required: false })
save_ordering_by_default_columns?: { [columnName: string]: boolean };
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,10 @@ export class FoundTableSettingsDs {

@ApiProperty()
allow_csv_import: boolean;

@ApiProperty()
save_ordering_by_default: boolean;

@ApiProperty({ required: false })
save_ordering_by_default_columns?: { [columnName: string]: boolean };
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ export class TableSettingsController {
@Body('icon') icon: string,
@Body('allow_csv_export') allow_csv_export: boolean,
@Body('allow_csv_import') allow_csv_import: boolean,
@Body('save_ordering_by_default') save_ordering_by_default: boolean,
@Body('save_ordering_by_default_columns') save_ordering_by_default_columns: { [columnName: string]: boolean },
@UserId() userId: string,
@MasterPassword() masterPwd: string,
): Promise<FoundTableSettingsDs> {
Expand Down Expand Up @@ -150,6 +152,8 @@ export class TableSettingsController {
icon: icon,
allow_csv_export: allow_csv_export,
allow_csv_import: allow_csv_import,
save_ordering_by_default: save_ordering_by_default,
save_ordering_by_default_columns: save_ordering_by_default_columns,
};

const errors = this.validateParameters(inputData);
Expand Down Expand Up @@ -200,6 +204,8 @@ export class TableSettingsController {
@Body('icon') icon: string,
@Body('allow_csv_export') allow_csv_export: boolean,
@Body('allow_csv_import') allow_csv_import: boolean,
@Body('save_ordering_by_default') save_ordering_by_default: boolean,
@Body('save_ordering_by_default_columns') save_ordering_by_default_columns: { [columnName: string]: boolean },
@UserId() userId: string,
@MasterPassword() masterPwd: string,
): Promise<FoundTableSettingsDs> {
Expand Down Expand Up @@ -229,6 +235,8 @@ export class TableSettingsController {
icon: icon,
allow_csv_export: allow_csv_export,
allow_csv_import: allow_csv_import,
save_ordering_by_default: save_ordering_by_default,
save_ordering_by_default_columns: save_ordering_by_default_columns,
};

const errors = this.validateParameters(inputData);
Expand Down
6 changes: 6 additions & 0 deletions backend/src/entities/table-settings/table-settings.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ export class TableSettingsEntity {
@Column({ default: true, type: 'boolean' })
allow_csv_import: boolean;

@Column({ default: false, type: 'boolean' })
save_ordering_by_default: boolean;

@Column('jsonb', { default: null, nullable: true })
save_ordering_by_default_columns: { [columnName: string]: boolean } | null;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export function buildFoundTableSettingsDs(tableSettings: TableSettingsEntity): F
icon,
allow_csv_export,
allow_csv_import,
save_ordering_by_default,
save_ordering_by_default_columns,
} = tableSettings;
let connection_id = tableSettings.connection_id as unknown;
if (connection_id instanceof ConnectionEntity) {
Expand Down Expand Up @@ -61,5 +63,7 @@ export function buildFoundTableSettingsDs(tableSettings: TableSettingsEntity): F
icon: icon,
allow_csv_export: allow_csv_export,
allow_csv_import: allow_csv_import,
save_ordering_by_default: save_ordering_by_default,
save_ordering_by_default_columns: save_ordering_by_default_columns || undefined,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export function buildNewTableSettingsEntity(
icon,
allow_csv_export,
allow_csv_import,
save_ordering_by_default,
save_ordering_by_default_columns,
} = settings;
newSettings.connection_id = connection;
newSettings.display_name = display_name;
Expand All @@ -58,5 +60,7 @@ export function buildNewTableSettingsEntity(
newSettings.icon = icon;
newSettings.allow_csv_export = allow_csv_export;
newSettings.allow_csv_import = allow_csv_import;
newSettings.save_ordering_by_default = save_ordering_by_default;
newSettings.save_ordering_by_default_columns = save_ordering_by_default_columns || null;
return newSettings;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

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

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "tableSettings" ADD "save_ordering_by_default" boolean NOT NULL DEFAULT false`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "save_ordering_by_default"`);
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

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

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "tableSettings" ADD "save_ordering_by_default_columns" jsonb DEFAULT NULL`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "tableSettings" DROP COLUMN "save_ordering_by_default_columns"`);
}
}

3 changes: 3 additions & 0 deletions frontend/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ export class AppComponent {
this.matIconRegistry.addSvgIcon("github", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/github.svg"));
this.matIconRegistry.addSvgIcon("google", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/google.svg"));
this.matIconRegistry.addSvgIcon("ai_rocket", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/ai-rocket.svg"));
this.matIconRegistry.addSvgIcon("sort_ascending", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/sort-ascending.svg"));
this.matIconRegistry.addSvgIcon("sort_descending", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/sort-descending.svg"));
this.matIconRegistry.addSvgIcon("sorting", this.domSanitizer.bypassSecurityTrustResourceUrl("/assets/icons/sorting.svg"));
angulartics2Amplitude.startTracking();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export class DbTableSettingsComponent implements OnInit {
allow_csv_export: true,
allow_csv_import: true,
can_delete: true,
save_ordering_by_default: false,
}
public tableSettings: TableSettings = null;
public defaultIcons = ['favorite', 'star', 'done', 'arrow_forward', 'key', 'lock', 'visibility', 'language', 'notifications', 'schedule'];
Expand Down
Loading