Skip to content

Commit 5cd0c4a

Browse files
ArtuomkaArtuomka
authored
Merge pull request #1613 from rocket-admin/backend_toon_migration
Backend toon migration
2 parents 09ce826 + 8703e11 commit 5cd0c4a

67 files changed

Lines changed: 1307 additions & 436 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎backend/src/app.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import { UserActionModule } from './entities/user-actions/user-action.module.js'
3737
import { UserSecretModule } from './entities/user-secret/user-secret.module.js';
3838
import { SignInAuditModule } from './entities/user-sign-in-audit/sign-in-audit.module.js';
3939
import { DashboardModule } from './entities/visualizations/dashboard/dashboards.module.js';
40-
import { DashboardWidgetModule } from './entities/visualizations/dashboard-widget/dashboard-widget.module.js';
41-
import { SavedDbQueryModule } from './entities/visualizations/saved-db-query/saved-db-query.module.js';
40+
import { PanelPositionModule } from './entities/visualizations/panel-position/panel-position.module.js';
41+
import { PanelModule } from './entities/visualizations/panel/panel.module.js';
4242
import { TableWidgetModule } from './entities/widget/table-widget.module.js';
4343
import { SaaSGatewayModule } from './microservices/gateways/saas-gateway.ts/saas-gateway.module.js';
4444
import { SaasModule } from './microservices/saas-microservice/saas.module.js';
@@ -95,9 +95,9 @@ import { GetHelloUseCase } from './use-cases-app/get-hello.use.case.js';
9595
SignInAuditModule,
9696
PersonalTableSettingsModule,
9797
S3WidgetModule,
98-
SavedDbQueryModule,
98+
PanelModule,
9999
DashboardModule,
100-
DashboardWidgetModule,
100+
PanelPositionModule,
101101
SelfHostedOperationsModule.register(),
102102
],
103103
controllers: [AppController],

‎backend/src/common/application/global-database-context.interface.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ import { ISignInAuditRepository } from '../../entities/user-sign-in-audit/reposi
5959
import { SignInAuditEntity } from '../../entities/user-sign-in-audit/sign-in-audit.entity.js';
6060
import { DashboardEntity } from '../../entities/visualizations/dashboard/dashboard.entity.js';
6161
import { IDashboardRepository } from '../../entities/visualizations/dashboard/repository/dashboard.repository.interface.js';
62-
import { DashboardWidgetEntity } from '../../entities/visualizations/dashboard-widget/dashboard-widget.entity.js';
63-
import { IDashboardWidgetRepository } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget.repository.interface.js';
64-
import { ISavedDbQueryRepository } from '../../entities/visualizations/saved-db-query/repository/saved-db-query.repository.interface.js';
65-
import { SavedDbQueryEntity } from '../../entities/visualizations/saved-db-query/saved-db-query.entity.js';
62+
import { PanelPositionEntity } from '../../entities/visualizations/panel-position/panel-position.entity.js';
63+
import { IPanelPositionRepository } from '../../entities/visualizations/panel-position/repository/panel-position.repository.interface.js';
64+
import { IPanelRepository } from '../../entities/visualizations/panel/repository/saved-db-query.repository.interface.js';
65+
import { PanelEntity } from '../../entities/visualizations/panel/panel.entity.js';
6666
import { ITableWidgetsRepository } from '../../entities/widget/repository/table-widgets-repository.interface.js';
6767
import { TableWidgetEntity } from '../../entities/widget/table-widget.entity.js';
6868
import { IDatabaseContext } from '../database-context.interface.js';
@@ -105,9 +105,9 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
105105
secretAccessLogRepository: Repository<SecretAccessLogEntity> & ISecretAccessLogRepository;
106106
signInAuditRepository: Repository<SignInAuditEntity> & ISignInAuditRepository;
107107
personalTableSettingsRepository: Repository<PersonalTableSettingsEntity> & IPersonalTableSettingsRepository;
108-
savedDbQueryRepository: Repository<SavedDbQueryEntity> & ISavedDbQueryRepository;
108+
panelRepository: Repository<PanelEntity> & IPanelRepository;
109109
dashboardRepository: Repository<DashboardEntity> & IDashboardRepository;
110-
dashboardWidgetRepository: Repository<DashboardWidgetEntity> & IDashboardWidgetRepository;
110+
panelPositionRepository: Repository<PanelPositionEntity> & IPanelPositionRepository;
111111
userAiChatRepository: Repository<UserAiChatEntity> & IUserAiChatRepository;
112112
aiChatMessageRepository: Repository<AiChatMessageEntity> & IAiChatMessageRepository;
113113
}

‎backend/src/common/application/global-database-context.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ import { SignInAuditEntity } from '../../entities/user-sign-in-audit/sign-in-aud
106106
import { DashboardEntity } from '../../entities/visualizations/dashboard/dashboard.entity.js';
107107
import { IDashboardRepository } from '../../entities/visualizations/dashboard/repository/dashboard.repository.interface.js';
108108
import { dashboardCustomRepositoryExtension } from '../../entities/visualizations/dashboard/repository/dashboard-custom-repository-extension.js';
109-
import { DashboardWidgetEntity } from '../../entities/visualizations/dashboard-widget/dashboard-widget.entity.js';
110-
import { IDashboardWidgetRepository } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget.repository.interface.js';
111-
import { dashboardWidgetCustomRepositoryExtension } from '../../entities/visualizations/dashboard-widget/repository/dashboard-widget-custom-repository-extension.js';
112-
import { ISavedDbQueryRepository } from '../../entities/visualizations/saved-db-query/repository/saved-db-query.repository.interface.js';
113-
import { savedDbQueryCustomRepositoryExtension } from '../../entities/visualizations/saved-db-query/repository/saved-db-query-custom-repository-extension.js';
114-
import { SavedDbQueryEntity } from '../../entities/visualizations/saved-db-query/saved-db-query.entity.js';
109+
import { PanelPositionEntity } from '../../entities/visualizations/panel-position/panel-position.entity.js';
110+
import { IPanelPositionRepository } from '../../entities/visualizations/panel-position/repository/panel-position.repository.interface.js';
111+
import { panelPositionCustomRepositoryExtension } from '../../entities/visualizations/panel-position/repository/panel-position-custom-repository-extension.js';
112+
import { IPanelRepository } from '../../entities/visualizations/panel/repository/saved-db-query.repository.interface.js';
113+
import { panelCustomRepositoryExtension } from '../../entities/visualizations/panel/repository/saved-db-query-custom-repository-extension.js';
114+
import { PanelEntity } from '../../entities/visualizations/panel/panel.entity.js';
115115
import { tableWidgetsCustomRepositoryExtension } from '../../entities/widget/repository/table-widgets-custom-repsitory-extension.js';
116116
import { ITableWidgetsRepository } from '../../entities/widget/repository/table-widgets-repository.interface.js';
117117
import { TableWidgetEntity } from '../../entities/widget/table-widget.entity.js';
@@ -159,9 +159,9 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
159159
private _secretAccessLogRepository: Repository<SecretAccessLogEntity> & ISecretAccessLogRepository;
160160
private _signInAuditRepository: Repository<SignInAuditEntity> & ISignInAuditRepository;
161161
private _personalTableSettingsRepository: Repository<PersonalTableSettingsEntity> & IPersonalTableSettingsRepository;
162-
private _savedDbQueryRepository: Repository<SavedDbQueryEntity> & ISavedDbQueryRepository;
162+
private _panelRepository: Repository<PanelEntity> & IPanelRepository;
163163
private _dashboardRepository: Repository<DashboardEntity> & IDashboardRepository;
164-
private _dashboardWidgetRepository: Repository<DashboardWidgetEntity> & IDashboardWidgetRepository;
164+
private _panelPositionRepository: Repository<PanelPositionEntity> & IPanelPositionRepository;
165165
private _userAiChatRepository: Repository<UserAiChatEntity> & IUserAiChatRepository;
166166
private _aiChatMessageRepository: Repository<AiChatMessageEntity> & IAiChatMessageRepository;
167167

@@ -264,15 +264,13 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
264264
this._personalTableSettingsRepository = this.appDataSource
265265
.getRepository(PersonalTableSettingsEntity)
266266
.extend(personalTableSettingsCustomRepositoryExtension);
267-
this._savedDbQueryRepository = this.appDataSource
268-
.getRepository(SavedDbQueryEntity)
269-
.extend(savedDbQueryCustomRepositoryExtension);
267+
this._panelRepository = this.appDataSource.getRepository(PanelEntity).extend(panelCustomRepositoryExtension);
270268
this._dashboardRepository = this.appDataSource
271269
.getRepository(DashboardEntity)
272270
.extend(dashboardCustomRepositoryExtension);
273-
this._dashboardWidgetRepository = this.appDataSource
274-
.getRepository(DashboardWidgetEntity)
275-
.extend(dashboardWidgetCustomRepositoryExtension);
271+
this._panelPositionRepository = this.appDataSource
272+
.getRepository(PanelPositionEntity)
273+
.extend(panelPositionCustomRepositoryExtension);
276274
this._userAiChatRepository = this.appDataSource
277275
.getRepository(UserAiChatEntity)
278276
.extend(userAiChatRepositoryExtension);
@@ -431,16 +429,16 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
431429
return this._personalTableSettingsRepository;
432430
}
433431

434-
public get savedDbQueryRepository(): Repository<SavedDbQueryEntity> & ISavedDbQueryRepository {
435-
return this._savedDbQueryRepository;
432+
public get panelRepository(): Repository<PanelEntity> & IPanelRepository {
433+
return this._panelRepository;
436434
}
437435

438436
public get dashboardRepository(): Repository<DashboardEntity> & IDashboardRepository {
439437
return this._dashboardRepository;
440438
}
441439

442-
public get dashboardWidgetRepository(): Repository<DashboardWidgetEntity> & IDashboardWidgetRepository {
443-
return this._dashboardWidgetRepository;
440+
public get panelPositionRepository(): Repository<PanelPositionEntity> & IPanelPositionRepository {
441+
return this._panelPositionRepository;
444442
}
445443

446444
public get userAiChatRepository(): Repository<UserAiChatEntity> & IUserAiChatRepository {

‎backend/src/common/data-injection.tokens.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ export enum UseCaseType {
203203
CREATE_DASHBOARD_WIDGET = 'CREATE_DASHBOARD_WIDGET',
204204
UPDATE_DASHBOARD_WIDGET = 'UPDATE_DASHBOARD_WIDGET',
205205
DELETE_DASHBOARD_WIDGET = 'DELETE_DASHBOARD_WIDGET',
206+
GENERATE_WIDGET_WITH_AI = 'GENERATE_WIDGET_WITH_AI',
206207

207208
IS_CONFIGURED = 'IS_CONFIGURED',
208209
CREATE_INITIAL_USER = 'CREATE_INITIAL_USER',

‎backend/src/entities/connection/connection.entity.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { TableSettingsEntity } from '../table-settings/common-table-settings/tab
2828
import { PersonalTableSettingsEntity } from '../table-settings/personal-table-settings/personal-table-settings.entity.js';
2929
import { UserEntity } from '../user/user.entity.js';
3030
import { DashboardEntity } from '../visualizations/dashboard/dashboard.entity.js';
31-
import { SavedDbQueryEntity } from '../visualizations/saved-db-query/saved-db-query.entity.js';
31+
import { PanelEntity } from '../visualizations/panel/panel.entity.js';
3232

3333
@Entity('connection')
3434
export class ConnectionEntity {
@@ -284,10 +284,10 @@ export class ConnectionEntity {
284284
table_filters: Relation<TableFiltersEntity>[];
285285

286286
@OneToMany(
287-
() => SavedDbQueryEntity,
288-
(saved_db_query) => saved_db_query.connection,
287+
() => PanelEntity,
288+
(panel) => panel.connection,
289289
)
290-
saved_db_queries: Relation<SavedDbQueryEntity>[];
290+
panels: Relation<PanelEntity>[];
291291

292292
@OneToMany(
293293
() => DashboardEntity,

‎backend/src/entities/table-categories/use-cases/find-table-categories-with-tables.use.case.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ export class FindTableCategoriesWithTablesUseCase
9090
const foundTableCategories =
9191
await this._dbContext.tableCategoriesRepository.findTableCategoriesForConnection(connectionId);
9292

93-
const sortedTables = tablesRO.sort((tableRO1, tableRO2) => {
94-
const name1 = tableRO1.display_name || tableRO1.table;
95-
const name2 = tableRO2.display_name || tableRO2.table;
96-
return name1.localeCompare(name2);
97-
});
93+
// const sortedTables = tablesRO.sort((tableRO1, tableRO2) => {
94+
// const name1 = tableRO1.display_name || tableRO1.table;
95+
// const name2 = tableRO2.display_name || tableRO2.table;
96+
// return name1.localeCompare(name2);
97+
// });
9898

9999
const allTableCategory: FoundTableCategoriesWithTablesRo = {
100100
category_id: null,
101101
category_color: null,
102102
category_name: 'All tables',
103-
tables: sortedTables,
103+
tables: tablesRO,
104104
};
105105
const foundTableCategoriesRO = foundTableCategories.map((category) => {
106-
const tablesInCategory = sortedTables.filter((tableRO) => {
106+
const tablesInCategory = tablesRO.filter((tableRO) => {
107107
return category.tables.includes(tableRO.table);
108108
});
109109
return {

‎backend/src/entities/visualizations/dashboard-widget/repository/dashboard-widget-custom-repository-extension.ts‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎backend/src/entities/visualizations/dashboard-widget/repository/dashboard-widget.repository.interface.ts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎backend/src/entities/visualizations/dashboard-widget/use-cases/dashboard-widget-use-cases.interface.ts‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎backend/src/entities/visualizations/dashboard-widget/utils/build-found-dashboard-widget-dto.util.ts‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)