diff --git a/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts b/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts index 14f6ec67c6..2e0aa838d6 100644 --- a/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts +++ b/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts @@ -15,8 +15,8 @@ beforeEach(() => { describe('eligibleModules', () => { it('should consider all default modules eligible', () => { - // 'data-store' isn't (yet) eligible module by default - const expectedModules = MODULE_NAMES.filter((name) => name !== 'data-store'); + // 'data-table' isn't (yet) eligible module by default + const expectedModules = MODULE_NAMES.filter((name) => name !== 'data-table'); expect(Container.get(ModuleRegistry).eligibleModules).toEqual(expectedModules); }); @@ -29,12 +29,12 @@ describe('eligibleModules', () => { }); it('should consider a module eligible if it was enabled via env var', () => { - process.env.N8N_ENABLED_MODULES = 'data-store'; + process.env.N8N_ENABLED_MODULES = 'data-table'; expect(Container.get(ModuleRegistry).eligibleModules).toEqual([ 'insights', 'external-secrets', 'community-packages', - 'data-store', + 'data-table', ]); }); diff --git a/packages/@n8n/backend-common/src/modules/modules.config.ts b/packages/@n8n/backend-common/src/modules/modules.config.ts index 6b9006ad5a..1ebc035bc5 100644 --- a/packages/@n8n/backend-common/src/modules/modules.config.ts +++ b/packages/@n8n/backend-common/src/modules/modules.config.ts @@ -6,7 +6,7 @@ export const MODULE_NAMES = [ 'insights', 'external-secrets', 'community-packages', - 'data-store', + 'data-table', ] as const; export type ModuleName = (typeof MODULE_NAMES)[number]; diff --git a/packages/@n8n/config/src/configs/logging.config.ts b/packages/@n8n/config/src/configs/logging.config.ts index 924f8e9342..a68675c153 100644 --- a/packages/@n8n/config/src/configs/logging.config.ts +++ b/packages/@n8n/config/src/configs/logging.config.ts @@ -19,7 +19,7 @@ export const LOG_SCOPES = [ 'insights', 'workflow-activation', 'ssh-client', - 'data-store', + 'data-table', 'cron', 'community-nodes', 'legacy-sqlite-execution-recovery', diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts index ac9e229ff3..93147ead05 100644 --- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts +++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts @@ -24,7 +24,7 @@ import { SubworkflowPolicyChecker, } from '@/executions/pre-execution-checks'; import { ExternalHooks } from '@/external-hooks'; -import { DataStoreProxyService } from '@/modules/data-store/data-store-proxy.service'; +import { DataStoreProxyService } from '@/modules/data-table/data-store-proxy.service'; import { UrlService } from '@/services/url.service'; import { WorkflowStatisticsService } from '@/services/workflow-statistics.service'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/src/modules/data-store/__tests__/data-store-aggregate.controller.test.ts b/packages/cli/src/modules/data-table/__tests__/data-store-aggregate.controller.test.ts similarity index 99% rename from packages/cli/src/modules/data-store/__tests__/data-store-aggregate.controller.test.ts rename to packages/cli/src/modules/data-table/__tests__/data-store-aggregate.controller.test.ts index 012b4d2c3e..9c104dde0d 100644 --- a/packages/cli/src/modules/data-store/__tests__/data-store-aggregate.controller.test.ts +++ b/packages/cli/src/modules/data-table/__tests__/data-store-aggregate.controller.test.ts @@ -6,11 +6,12 @@ import { testDb, } from '@n8n/backend-test-utils'; import type { Project, User } from '@n8n/db'; +import { DateTime } from 'luxon'; + import { createDataStore } from '@test-integration/db/data-stores'; import { createOwner, createMember, createAdmin } from '@test-integration/db/users'; import type { SuperAgentTest } from '@test-integration/types'; import * as utils from '@test-integration/utils'; -import { DateTime } from 'luxon'; let owner: User; let member: User; @@ -22,8 +23,8 @@ let ownerProject: Project; let memberProject: Project; const testServer = utils.setupTestServer({ - endpointGroups: ['data-store'], - modules: ['data-store'], + endpointGroups: ['data-table'], + modules: ['data-table'], }); beforeAll(async () => { diff --git a/packages/cli/src/modules/data-store/__tests__/data-store-aggregate.service.test.ts b/packages/cli/src/modules/data-table/__tests__/data-store-aggregate.service.test.ts similarity index 99% rename from packages/cli/src/modules/data-store/__tests__/data-store-aggregate.service.test.ts rename to packages/cli/src/modules/data-table/__tests__/data-store-aggregate.service.test.ts index b2465216b9..493b2ba95b 100644 --- a/packages/cli/src/modules/data-store/__tests__/data-store-aggregate.service.test.ts +++ b/packages/cli/src/modules/data-table/__tests__/data-store-aggregate.service.test.ts @@ -10,7 +10,7 @@ import { DataStoreAggregateService } from '../data-store-aggregate.service'; import { DataStoreService } from '../data-store.service'; beforeAll(async () => { - await testModules.loadModules(['data-store']); + await testModules.loadModules(['data-table']); await testDb.init(); }); diff --git a/packages/cli/src/modules/data-store/__tests__/data-store-proxy.service.test.ts b/packages/cli/src/modules/data-table/__tests__/data-store-proxy.service.test.ts similarity index 99% rename from packages/cli/src/modules/data-store/__tests__/data-store-proxy.service.test.ts rename to packages/cli/src/modules/data-table/__tests__/data-store-proxy.service.test.ts index 8a083460ee..510a72311f 100644 --- a/packages/cli/src/modules/data-store/__tests__/data-store-proxy.service.test.ts +++ b/packages/cli/src/modules/data-table/__tests__/data-store-proxy.service.test.ts @@ -19,7 +19,7 @@ import type { DataStoreService } from '../data-store.service'; const PROJECT_ID = 'project-id'; beforeAll(async () => { - await testModules.loadModules(['data-store']); + await testModules.loadModules(['data-table']); await testDb.init(); }); describe('DataStoreProxyService', () => { diff --git a/packages/cli/src/modules/data-store/__tests__/data-store.controller.test.ts b/packages/cli/src/modules/data-table/__tests__/data-store.controller.test.ts similarity index 99% rename from packages/cli/src/modules/data-store/__tests__/data-store.controller.test.ts rename to packages/cli/src/modules/data-table/__tests__/data-store.controller.test.ts index 82bdbd099a..ed42336ffd 100644 --- a/packages/cli/src/modules/data-store/__tests__/data-store.controller.test.ts +++ b/packages/cli/src/modules/data-table/__tests__/data-store.controller.test.ts @@ -29,8 +29,8 @@ let ownerProject: Project; let memberProject: Project; const testServer = utils.setupTestServer({ - endpointGroups: ['data-store'], - modules: ['data-store'], + endpointGroups: ['data-table'], + modules: ['data-table'], }); let projectRepository: ProjectRepository; let dataStoreRepository: DataStoreRepository; diff --git a/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts b/packages/cli/src/modules/data-table/__tests__/data-store.service.test.ts similarity index 99% rename from packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts rename to packages/cli/src/modules/data-table/__tests__/data-store.service.test.ts index c08bd1f680..1bd5da3f26 100644 --- a/packages/cli/src/modules/data-store/__tests__/data-store.service.test.ts +++ b/packages/cli/src/modules/data-table/__tests__/data-store.service.test.ts @@ -13,7 +13,7 @@ import { DataStoreNotFoundError } from '../errors/data-store-not-found.error'; import { DataStoreValidationError } from '../errors/data-store-validation.error'; beforeAll(async () => { - await testModules.loadModules(['data-store']); + await testModules.loadModules(['data-table']); await testDb.init(); }); diff --git a/packages/cli/src/modules/data-store/__tests__/sql-utils.test.ts b/packages/cli/src/modules/data-table/__tests__/sql-utils.test.ts similarity index 100% rename from packages/cli/src/modules/data-store/__tests__/sql-utils.test.ts rename to packages/cli/src/modules/data-table/__tests__/sql-utils.test.ts diff --git a/packages/cli/src/modules/data-store/data-store-aggregate.controller.ts b/packages/cli/src/modules/data-table/data-store-aggregate.controller.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store-aggregate.controller.ts rename to packages/cli/src/modules/data-table/data-store-aggregate.controller.ts diff --git a/packages/cli/src/modules/data-store/data-store-aggregate.service.ts b/packages/cli/src/modules/data-table/data-store-aggregate.service.ts similarity index 95% rename from packages/cli/src/modules/data-store/data-store-aggregate.service.ts rename to packages/cli/src/modules/data-table/data-store-aggregate.service.ts index af89fb2c66..908d2ddff3 100644 --- a/packages/cli/src/modules/data-store/data-store-aggregate.service.ts +++ b/packages/cli/src/modules/data-table/data-store-aggregate.service.ts @@ -14,7 +14,7 @@ export class DataStoreAggregateService { private readonly projectService: ProjectService, private readonly logger: Logger, ) { - this.logger = this.logger.scoped('data-store'); + this.logger = this.logger.scoped('data-table'); } async start() {} async shutdown() {} diff --git a/packages/cli/src/modules/data-store/data-store-column.entity.ts b/packages/cli/src/modules/data-table/data-store-column.entity.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store-column.entity.ts rename to packages/cli/src/modules/data-table/data-store-column.entity.ts diff --git a/packages/cli/src/modules/data-store/data-store-column.repository.ts b/packages/cli/src/modules/data-table/data-store-column.repository.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store-column.repository.ts rename to packages/cli/src/modules/data-table/data-store-column.repository.ts diff --git a/packages/cli/src/modules/data-store/data-store-proxy.service.ts b/packages/cli/src/modules/data-table/data-store-proxy.service.ts similarity index 98% rename from packages/cli/src/modules/data-store/data-store-proxy.service.ts rename to packages/cli/src/modules/data-table/data-store-proxy.service.ts index e5d53f9191..b765708421 100644 --- a/packages/cli/src/modules/data-store/data-store-proxy.service.ts +++ b/packages/cli/src/modules/data-table/data-store-proxy.service.ts @@ -30,7 +30,7 @@ export class DataStoreProxyService implements DataStoreProxyProvider { private readonly ownershipService: OwnershipService, private readonly logger: Logger, ) { - this.logger = this.logger.scoped('data-store'); + this.logger = this.logger.scoped('data-table'); } private validateRequest(node: INode) { diff --git a/packages/cli/src/modules/data-store/data-store-rows.repository.ts b/packages/cli/src/modules/data-table/data-store-rows.repository.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store-rows.repository.ts rename to packages/cli/src/modules/data-table/data-store-rows.repository.ts diff --git a/packages/cli/src/modules/data-store/data-store.controller.ts b/packages/cli/src/modules/data-table/data-store.controller.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store.controller.ts rename to packages/cli/src/modules/data-table/data-store.controller.ts diff --git a/packages/cli/src/modules/data-store/data-store.entity.ts b/packages/cli/src/modules/data-table/data-store.entity.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store.entity.ts rename to packages/cli/src/modules/data-table/data-store.entity.ts diff --git a/packages/cli/src/modules/data-store/data-store.repository.ts b/packages/cli/src/modules/data-table/data-store.repository.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store.repository.ts rename to packages/cli/src/modules/data-table/data-store.repository.ts diff --git a/packages/cli/src/modules/data-store/data-store.service.ts b/packages/cli/src/modules/data-table/data-store.service.ts similarity index 99% rename from packages/cli/src/modules/data-store/data-store.service.ts rename to packages/cli/src/modules/data-table/data-store.service.ts index ca9ad4f905..5eb2080eea 100644 --- a/packages/cli/src/modules/data-store/data-store.service.ts +++ b/packages/cli/src/modules/data-table/data-store.service.ts @@ -30,7 +30,7 @@ export class DataStoreService { private readonly dataStoreRowsRepository: DataStoreRowsRepository, private readonly logger: Logger, ) { - this.logger = this.logger.scoped('data-store'); + this.logger = this.logger.scoped('data-table'); } async start() {} diff --git a/packages/cli/src/modules/data-store/data-store.types.ts b/packages/cli/src/modules/data-table/data-store.types.ts similarity index 100% rename from packages/cli/src/modules/data-store/data-store.types.ts rename to packages/cli/src/modules/data-table/data-store.types.ts diff --git a/packages/cli/src/modules/data-store/data-store.module.ts b/packages/cli/src/modules/data-table/data-table.module.ts similarity index 92% rename from packages/cli/src/modules/data-store/data-store.module.ts rename to packages/cli/src/modules/data-table/data-table.module.ts index 87e4419bf0..a2c3798eab 100644 --- a/packages/cli/src/modules/data-store/data-store.module.ts +++ b/packages/cli/src/modules/data-table/data-table.module.ts @@ -3,8 +3,8 @@ import { BackendModule, OnShutdown } from '@n8n/decorators'; import { Container } from '@n8n/di'; import { BaseEntity } from '@n8n/typeorm'; -@BackendModule({ name: 'data-store' }) -export class DataStoreModule implements ModuleInterface { +@BackendModule({ name: 'data-table' }) +export class DataTableModule implements ModuleInterface { async init() { await import('./data-store.controller'); await import('./data-store-aggregate.controller'); diff --git a/packages/cli/src/modules/data-store/errors/data-store-column-name-conflict.error.ts b/packages/cli/src/modules/data-table/errors/data-store-column-name-conflict.error.ts similarity index 100% rename from packages/cli/src/modules/data-store/errors/data-store-column-name-conflict.error.ts rename to packages/cli/src/modules/data-table/errors/data-store-column-name-conflict.error.ts diff --git a/packages/cli/src/modules/data-store/errors/data-store-column-not-found.error.ts b/packages/cli/src/modules/data-table/errors/data-store-column-not-found.error.ts similarity index 100% rename from packages/cli/src/modules/data-store/errors/data-store-column-not-found.error.ts rename to packages/cli/src/modules/data-table/errors/data-store-column-not-found.error.ts diff --git a/packages/cli/src/modules/data-store/errors/data-store-name-conflict.error.ts b/packages/cli/src/modules/data-table/errors/data-store-name-conflict.error.ts similarity index 100% rename from packages/cli/src/modules/data-store/errors/data-store-name-conflict.error.ts rename to packages/cli/src/modules/data-table/errors/data-store-name-conflict.error.ts diff --git a/packages/cli/src/modules/data-store/errors/data-store-not-found.error.ts b/packages/cli/src/modules/data-table/errors/data-store-not-found.error.ts similarity index 100% rename from packages/cli/src/modules/data-store/errors/data-store-not-found.error.ts rename to packages/cli/src/modules/data-table/errors/data-store-not-found.error.ts diff --git a/packages/cli/src/modules/data-store/errors/data-store-validation.error.ts b/packages/cli/src/modules/data-table/errors/data-store-validation.error.ts similarity index 100% rename from packages/cli/src/modules/data-store/errors/data-store-validation.error.ts rename to packages/cli/src/modules/data-table/errors/data-store-validation.error.ts diff --git a/packages/cli/src/modules/data-store/utils/sql-utils.ts b/packages/cli/src/modules/data-table/utils/sql-utils.ts similarity index 100% rename from packages/cli/src/modules/data-store/utils/sql-utils.ts rename to packages/cli/src/modules/data-table/utils/sql-utils.ts diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts index db26083137..8e0395c546 100644 --- a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts +++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts @@ -23,7 +23,7 @@ import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.serv import { JobProcessor } from '../job-processor'; import type { Job } from '../scaling.types'; -import { DataStoreProxyService } from '@/modules/data-store/data-store-proxy.service'; +import { DataStoreProxyService } from '@/modules/data-table/data-store-proxy.service'; mockInstance(VariablesService, { getAllCached: jest.fn().mockResolvedValue([]), diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index 73226d9492..7c27f0eee1 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -378,9 +378,9 @@ export async function getBase( const eventService = Container.get(EventService); const moduleRegistry = Container.get(ModuleRegistry); - const dataStoreProxyProvider = moduleRegistry.isActive('data-store') + const dataStoreProxyProvider = moduleRegistry.isActive('data-table') ? Container.get( - (await import('@/modules/data-store/data-store-proxy.service')).DataStoreProxyService, + (await import('@/modules/data-table/data-store-proxy.service')).DataStoreProxyService, ) : undefined; diff --git a/packages/cli/test/integration/shared/db/data-stores.ts b/packages/cli/test/integration/shared/db/data-stores.ts index ceb2fc041d..1e56da78fe 100644 --- a/packages/cli/test/integration/shared/db/data-stores.ts +++ b/packages/cli/test/integration/shared/db/data-stores.ts @@ -4,9 +4,9 @@ import type { Project } from '@n8n/db'; import { Container } from '@n8n/di'; import type { DataStoreRows } from 'n8n-workflow'; -import { DataStoreColumnRepository } from '@/modules/data-store/data-store-column.repository'; -import { DataStoreRowsRepository } from '@/modules/data-store/data-store-rows.repository'; -import { DataStoreRepository } from '@/modules/data-store/data-store.repository'; +import { DataStoreColumnRepository } from '@/modules/data-table/data-store-column.repository'; +import { DataStoreRowsRepository } from '@/modules/data-table/data-store-rows.repository'; +import { DataStoreRepository } from '@/modules/data-table/data-store.repository'; export const createDataStore = async ( project: Project, diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts index f3e08d85cd..fc4a1fc098 100644 --- a/packages/cli/test/integration/shared/types.ts +++ b/packages/cli/test/integration/shared/types.ts @@ -43,10 +43,10 @@ type EndpointGroup = | 'ai' | 'folder' | 'insights' - | 'data-store' + | 'data-table' | 'module-settings'; -type ModuleName = 'insights' | 'external-secrets' | 'community-packages' | 'data-store'; +type ModuleName = 'insights' | 'external-secrets' | 'community-packages' | 'data-table'; export interface SetupProps { endpointGroups?: EndpointGroup[]; diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts index 2e5f09e61f..55476b6237 100644 --- a/packages/cli/test/integration/shared/utils/test-server.ts +++ b/packages/cli/test/integration/shared/utils/test-server.ts @@ -306,8 +306,8 @@ export const setupTestServer = ({ await import('@/modules/insights/insights.module'); break; - case 'data-store': - await import('@/modules/data-store/data-store.module'); + case 'data-table': + await import('@/modules/data-table/data-table.module'); break; case 'module-settings': diff --git a/packages/frontend/editor-ui/src/features/dataStore/constants.ts b/packages/frontend/editor-ui/src/features/dataStore/constants.ts index 409e505ded..6efaaf5473 100644 --- a/packages/frontend/editor-ui/src/features/dataStore/constants.ts +++ b/packages/frontend/editor-ui/src/features/dataStore/constants.ts @@ -25,4 +25,4 @@ export const MIN_LOADING_TIME = 500; // ms export const NULL_VALUE = 'Null'; export const EMPTY_VALUE = 'Empty'; -export const DATA_STORE_MODULE_NAME = 'data-store'; +export const DATA_STORE_MODULE_NAME = 'data-table'; diff --git a/packages/frontend/editor-ui/src/features/dataStore/module.descriptor.ts b/packages/frontend/editor-ui/src/features/dataStore/module.descriptor.ts index fe3bb01a09..f39277d32e 100644 --- a/packages/frontend/editor-ui/src/features/dataStore/module.descriptor.ts +++ b/packages/frontend/editor-ui/src/features/dataStore/module.descriptor.ts @@ -15,7 +15,7 @@ const DataStoreDetailsView = async () => await import('@/features/dataStore/DataStoreDetailsView.vue'); export const DataStoreModule: FrontendModuleDescription = { - id: 'data-store', + id: 'data-table', name: 'Data Store', description: 'Manage and store data efficiently with the Data Store module.', icon: 'database', diff --git a/packages/frontend/editor-ui/src/stores/ui.store.ts b/packages/frontend/editor-ui/src/stores/ui.store.ts index 0f74210935..e13b7ce9b1 100644 --- a/packages/frontend/editor-ui/src/stores/ui.store.ts +++ b/packages/frontend/editor-ui/src/stores/ui.store.ts @@ -250,11 +250,11 @@ export const useUIStore = defineStore(STORES.UI, () => { * Module name is also added to the key so that we can check if the module is active * when tabs are rendered.\ * @example - * uiStore.registerCustomTabs('overview', 'data-store', [ + * uiStore.registerCustomTabs('overview', 'data-table', [ * { - * label: 'Data Store', - * value: 'data-store', - * to: { name: 'data-store' }, + * label: 'Data Table', + * value: 'data-table', + * to: { name: 'data-table' }, * }, * ]); */