From 47a8a1559880bba1bf0fca1591b40af9b224acad Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Thu, 18 Dec 2025 12:15:29 +0100 Subject: [PATCH] Metadata modules for `PageLayoutTab` `PageLayoutWidget` (#16662) # Introduction Creating dedicated folders and module for both `page-layout-tab` and `page-layout-widget` The addition diff with deletion is due to the module being added --- ...ge-layout-universal-identifiers.command.ts | 4 +- .../1-13-upgrade-version-command.module.ts | 4 +- ...ny-or-all-flat-entity-maps-cache.module.ts | 4 +- .../all-flat-entity-types-by-metadata-name.ts | 4 +- .../flat-page-layout-tab.module.ts | 4 +- ...-flat-page-layout-tab-map-cache.service.ts | 4 +- .../types/flat-page-layout-tab.type.ts | 4 +- ...-to-flat-page-layout-tab-to-create.util.ts | 2 +- ...t-to-flat-page-layout-tab-or-throw.util.ts | 2 +- ...t-to-flat-page-layout-tab-or-throw.util.ts | 2 +- ...t-to-flat-page-layout-tab-or-throw.util.ts | 2 +- ...page-layout-tab-to-update-or-throw.util.ts | 4 +- ...tab-entity-to-flat-page-layout-tab.util.ts | 2 +- .../flat-page-layout-widget.module.ts | 2 +- ...at-page-layout-widget-map-cache.service.ts | 2 +- .../types/flat-page-layout-widget.type.ts | 4 +- ...-flat-page-layout-widget-to-create.util.ts | 4 +- ...o-flat-page-layout-widget-or-throw.util.ts | 4 +- ...o-flat-page-layout-widget-or-throw.util.ts | 4 +- ...-entity-to-flat-page-layout-widget.util.ts | 2 +- ...o-flat-page-layout-widget-or-throw.util.ts | 2 +- ...e-layout-widget-to-update-or-throw.util.ts | 4 +- .../flat-page-layout.module.ts | 2 +- ...pace-flat-page-layout-map-cache.service.ts | 2 +- .../types/flat-page-layout.type.ts | 2 +- .../controllers/page-layout-tab.controller.ts | 12 +++--- .../inputs/create-page-layout-tab.input.ts | 0 ...date-page-layout-tab-with-widgets.input.ts | 2 +- .../inputs/update-page-layout-tab.input.ts | 0 .../dtos/page-layout-tab.dto.ts | 2 +- .../entities/page-layout-tab.entity.ts | 2 +- .../exceptions/page-layout-tab.exception.ts | 0 ...ge-layout-tab-rest-api-exception.filter.ts | 2 +- .../page-layout-tab/page-layout-tab.module.ts | 41 +++++++++++++++++++ .../resolvers/page-layout-tab.resolver.ts | 8 ++-- .../services/page-layout-tab.service.ts | 12 +++--- ...-layout-tab-to-page-layout-tab-dto.util.ts | 2 +- ...ith-widgets-to-page-layout-tab-dto.util.ts | 6 +-- .../widget-grid-max-columns.constant.ts | 0 .../widget-grid-max-rows.constant.ts | 0 .../page-layout-widget.controller.ts | 12 +++--- .../dtos/aggregate-chart-configuration.dto.ts | 4 +- .../dtos/bar-chart-configuration.dto.ts | 10 ++--- .../dtos/gauge-chart-configuration.dto.ts | 2 +- .../dtos/iframe-configuration.dto.ts | 0 .../inputs/create-page-layout-widget.input.ts | 4 +- .../inputs/delete-page-layout-widget.input.ts | 0 .../destroy-page-layout-widget.input.ts | 0 .../dtos/inputs/grid-position.input.ts | 2 +- ...update-page-layout-widget-with-id.input.ts | 4 +- .../inputs/update-page-layout-widget.input.ts | 4 +- .../dtos/line-chart-configuration.dto.ts | 8 ++-- .../dtos/page-layout-widget.dto.ts | 4 +- .../dtos/pie-chart-configuration.dto.ts | 6 +-- .../dtos/ratio-aggregate-config.dto.ts | 0 .../dtos/rich-text-v2-body.dto.ts | 0 .../standalone-rich-text-configuration.dto.ts | 2 +- .../dtos/widget-configuration.interface.ts | 18 ++++---- .../entities/page-layout-widget.entity.ts | 8 ++-- .../enums/axis-name-display.enum.ts | 0 .../enums/bar-chart-group-mode.enum.ts | 0 .../enums/date-granularity.enum.ts | 0 .../enums/graph-order-by.enum.ts | 0 .../enums/graph-type.enum.ts | 0 .../enums/widget-configuration-type.enum.ts | 0 .../enums/widget-type.enum.ts | 0 .../page-layout-widget.exception.ts | 0 ...layout-widget-rest-api-exception.filter.ts | 2 +- .../page-layout-widget.module.ts | 39 ++++++++++++++++++ .../resolvers/page-layout-widget.resolver.ts | 12 +++--- .../services/page-layout-widget.service.ts | 18 ++++---- .../types/grid-position.type.ts | 0 ...ransform-widget-configuration.util.spec.ts | 4 +- ...validate-widget-grid-position.util.spec.ts | 8 ++-- ...t-widget-to-page-layout-widget-dto.util.ts | 2 +- ...widget-configuration-discriminator.util.ts | 6 +-- ...and-transform-widget-configuration.util.ts | 22 +++++----- .../validate-widget-grid-position.util.ts | 6 +-- .../update-page-layout-with-tabs.input.ts | 2 +- .../page-layout/dtos/page-layout.dto.ts | 2 +- .../entities/page-layout.entity.ts | 2 +- .../page-layout/page-layout.module.ts | 36 ++++------------ .../services/page-layout-update.service.ts | 4 +- ...abs-and-widgets-to-page-layout-dto.util.ts | 2 +- ...yout-graphql-api-exception-handler.util.ts | 4 +- ...age-layout-graphql-api-exception.filter.ts | 4 +- ...t-page-layout-widget-data-seeds-v2.util.ts | 4 +- .../get-page-layout-widget-data-seeds.util.ts | 6 +-- .../utils/seed-page-layout-widgets.util.ts | 2 +- ...at-page-layout-widget-validator.service.ts | 4 +- ...-page-layout-tab-action-handler.service.ts | 2 +- ...-page-layout-tab-action-handler.service.ts | 2 +- ...-page-layout-tab-action-handler.service.ts | 2 +- ...ge-layout-widget-action-handler.service.ts | 2 +- ...ge-layout-widget-action-handler.service.ts | 2 +- ...ge-layout-widget-action-handler.service.ts | 2 +- .../dashboard-create-one.pre-query.hook.ts | 2 +- .../dashboard-query-hook.module.ts | 3 +- .../tools/add-dashboard-widget.tool.ts | 2 +- .../tools/create-complete-dashboard.tool.ts | 2 +- .../dashboard/tools/dashboard-tools.module.ts | 4 ++ .../dashboard/tools/schemas/widget.schema.ts | 4 +- .../dashboard-tool.workspace-service.ts | 4 +- .../types/dashboard-tool-dependencies.type.ts | 4 +- .../tools/update-dashboard-widget.tool.ts | 2 +- ...idget-configuration-test-data.constants.ts | 6 +-- ...-dashboard-duplication.integration-spec.ts | 2 +- ...ge-layout-tab-creation.integration-spec.ts | 2 +- ...-one-page-layout-tab-query-factory.util.ts | 2 +- .../utils/create-one-page-layout-tab.util.ts | 2 +- .../utils/find-one-page-layout-tab.util.ts | 2 +- .../utils/find-page-layout-tabs.util.ts | 2 +- .../utils/restore-one-page-layout-tab.util.ts | 2 +- ...-one-page-layout-tab-query-factory.util.ts | 2 +- .../utils/update-one-page-layout-tab.util.ts | 2 +- ...layout-widget-creation.integration-spec.ts | 2 +- ...layout-widget-creation.integration-spec.ts | 2 +- ...e-layout-widget-update.integration-spec.ts | 2 +- ...e-page-layout-widget-query-factory.util.ts | 2 +- .../create-one-page-layout-widget.util.ts | 2 +- .../delete-one-page-layout-widget.util.ts | 2 +- .../utils/find-one-page-layout-widget.util.ts | 2 +- .../utils/find-page-layout-widgets.util.ts | 2 +- .../restore-one-page-layout-widget.util.ts | 2 +- ...e-page-layout-widget-query-factory.util.ts | 2 +- .../update-one-page-layout-widget.util.ts | 2 +- ...ayout-with-tabs-update.integration-spec.ts | 2 +- ...ayout-with-tabs-update.integration-spec.ts | 4 +- .../utils/page-layout-tab-test.util.ts | 2 +- .../utils/page-layout-widget-test.util.ts | 2 +- 130 files changed, 301 insertions(+), 238 deletions(-) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/controllers/page-layout-tab.controller.ts (88%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/dtos/inputs/create-page-layout-tab.input.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/dtos/inputs/update-page-layout-tab-with-widgets.input.ts (90%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/dtos/inputs/update-page-layout-tab.input.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/dtos/page-layout-tab.dto.ts (94%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/entities/page-layout-tab.entity.ts (96%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/exceptions/page-layout-tab.exception.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/filters/page-layout-tab-rest-api-exception.filter.ts (93%) create mode 100644 packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/resolvers/page-layout-tab.resolver.ts (94%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/services/page-layout-tab.service.ts (96%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts (92%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-tab}/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts (74%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/constants/widget-grid-max-columns.constant.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/constants/widget-grid-max-rows.constant.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/controllers/page-layout-widget.controller.ts (87%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/aggregate-chart-configuration.dto.ts (96%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/bar-chart-configuration.dto.ts (94%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/gauge-chart-configuration.dto.ts (98%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/iframe-configuration.dto.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/create-page-layout-widget.input.ts (93%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/delete-page-layout-widget.input.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/destroy-page-layout-widget.input.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/grid-position.input.ts (93%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/update-page-layout-widget-with-id.input.ts (93%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/inputs/update-page-layout-widget.input.ts (92%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/line-chart-configuration.dto.ts (95%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/page-layout-widget.dto.ts (91%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/pie-chart-configuration.dto.ts (95%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/ratio-aggregate-config.dto.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/rich-text-v2-body.dto.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/standalone-rich-text-configuration.dto.ts (90%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/dtos/widget-configuration.interface.ts (82%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/entities/page-layout-widget.entity.ts (92%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/axis-name-display.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/bar-chart-group-mode.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/date-granularity.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/graph-order-by.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/graph-type.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/widget-configuration-type.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/enums/widget-type.enum.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/exceptions/page-layout-widget.exception.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/filters/page-layout-widget-rest-api-exception.filter.ts (93%) create mode 100644 packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/resolvers/page-layout-widget.resolver.ts (91%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/services/page-layout-widget.service.ts (96%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/types/grid-position.type.ts (100%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts (99%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/__tests__/validate-widget-grid-position.util.spec.ts (94%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts (91%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/inject-widget-configuration-discriminator.util.ts (87%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/validate-and-transform-widget-configuration.util.ts (90%) rename packages/twenty-server/src/engine/metadata-modules/{page-layout => page-layout-widget}/utils/validate-widget-grid-position.util.ts (90%) diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-backfill-page-layout-universal-identifiers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-backfill-page-layout-universal-identifiers.command.ts index 2e51c96bcc..1b80f55d54 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-backfill-page-layout-universal-identifiers.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-backfill-page-layout-universal-identifiers.command.ts @@ -9,8 +9,8 @@ import { RunOnWorkspaceArgs } from 'src/database/commands/command-runners/worksp import { ApplicationService } from 'src/engine/core-modules/application/application.service'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager'; import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service'; diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-upgrade-version-command.module.ts index e529ee3210..c43ca1b1d0 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-upgrade-version-command.module.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-upgrade-version-command.module.ts @@ -18,8 +18,8 @@ import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/ import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity'; import { ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts index a7cdfa4193..6a19174edb 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module.ts @@ -16,8 +16,8 @@ import { WorkspaceFlatViewMapCacheService } from 'src/engine/metadata-modules/fl import { IndexFieldMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-field-metadata.entity'; import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity'; import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts index ded0fa71bd..acbac0643a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/types/all-flat-entity-types-by-metadata-name.ts @@ -20,8 +20,8 @@ import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat- import { type IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity'; import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { type PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; -import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { type RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity'; import { type RoleEntity } from 'src/engine/metadata-modules/role/role.entity'; import { type RouteTriggerEntity } from 'src/engine/metadata-modules/route-trigger/route-trigger.entity'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts index bc85144dd4..582e50ef9c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module.ts @@ -3,8 +3,8 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module'; import { WorkspaceFlatPageLayoutTabMapCacheService } from 'src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; @Module({ imports: [ diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service.ts index 5c1af29ecc..359b93aecc 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/services/workspace-flat-page-layout-tab-map-cache.service.ts @@ -8,8 +8,8 @@ import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/wo import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant'; import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type'; import { transformPageLayoutTabEntityToFlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/utils/transform-page-layout-tab-entity-to-flat-page-layout-tab.util'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator'; import { regroupEntitiesByRelatedEntityId } from 'src/engine/workspace-cache/utils/regroup-entities-by-related-entity-id'; import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration-v2/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type.ts index 657c0fc8f5..9228562d0e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type.ts @@ -1,12 +1,12 @@ import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type'; -import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; export const pageLayoutTabEntityRelationProperties = [ 'workspace', 'pageLayout', 'widgets', 'application', -] as const; +] as const satisfies (keyof PageLayoutTabEntity)[]; export type PageLayoutTabEntityRelationProperties = (typeof pageLayoutTabEntityRelationProperties)[number]; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-create-page-layout-tab-input-to-flat-page-layout-tab-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-create-page-layout-tab-input-to-flat-page-layout-tab-to-create.util.ts index e442c67ccf..db0767d6e8 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-create-page-layout-tab-input-to-flat-page-layout-tab-to-create.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-create-page-layout-tab-input-to-flat-page-layout-tab-to-create.util.ts @@ -2,7 +2,7 @@ import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from 'tw import { v4 } from 'uuid'; import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type'; -import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; +import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; export type FromCreatePageLayoutTabInputToFlatPageLayoutTabToCreateArgs = { createPageLayoutTabInput: CreatePageLayoutTabInput; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-delete-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-delete-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts index 0f4caa77f0..597c0272f1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-delete-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-delete-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts @@ -9,7 +9,7 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-la import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; export type DeletePageLayoutTabInput = { id: string; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-destroy-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-destroy-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts index d7b7c76310..34dbdb43c3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-destroy-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-destroy-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts @@ -9,7 +9,7 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-la import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; export type DestroyPageLayoutTabInput = { id: string; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-restore-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-restore-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts index a519fe6425..ec985dd064 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-restore-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-restore-page-layout-tab-input-to-flat-page-layout-tab-or-throw.util.ts @@ -9,7 +9,7 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-la import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; export type RestorePageLayoutTabInput = { id: string; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts index b981ff7c33..c93dbd181f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util.ts @@ -7,11 +7,11 @@ import { import { FLAT_PAGE_LAYOUT_TAB_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-page-layout-tab/constants/flat-page-layout-tab-editable-properties.constant'; import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type'; import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type'; -import { type UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input'; +import { type UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input'; import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util'; export type UpdatePageLayoutTabInputWithId = { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/transform-page-layout-tab-entity-to-flat-page-layout-tab.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/transform-page-layout-tab-entity-to-flat-page-layout-tab.util.ts index 001723e58e..d884f1a3a8 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/transform-page-layout-tab-entity-to-flat-page-layout-tab.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-tab/utils/transform-page-layout-tab-entity-to-flat-page-layout-tab.util.ts @@ -1,5 +1,5 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type'; -import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; export const transformPageLayoutTabEntityToFlatPageLayoutTab = ( pageLayoutTabEntity: PageLayoutTabEntity, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts index 223c032d5a..70efd38288 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { WorkspaceFlatPageLayoutWidgetMapCacheService } from 'src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; @Module({ imports: [TypeOrmModule.forFeature([PageLayoutWidgetEntity])], diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service.ts index 219ccf66b2..c950020538 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/services/workspace-flat-page-layout-widget-map-cache.service.ts @@ -8,7 +8,7 @@ import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/wo import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant'; import { FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type'; import { fromPageLayoutWidgetEntityToFlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator'; import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration-v2/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type.ts index 1d184096b6..befe9c3992 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type.ts @@ -2,8 +2,8 @@ import { type ApplicationEntity } from 'src/engine/core-modules/application/appl import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/types/flat-entity.type'; import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { type ExtractRecordTypeOrmRelationProperties } from 'src/engine/workspace-manager/workspace-migration-v2/types/extract-record-typeorm-relation-properties.type'; export type PageLayoutWidgetEntityRelationProperties = diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts index 10ffbce93b..094d38e850 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts @@ -2,8 +2,8 @@ import { trimAndRemoveDuplicatedWhitespacesFromObjectStringProperties } from 'tw import { v4 } from 'uuid'; import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; export type FromCreatePageLayoutWidgetInputToFlatPageLayoutWidgetToCreateArgs = { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-delete-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-delete-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts index 6f44c68522..4ffc9d5fc8 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-delete-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-delete-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts @@ -6,11 +6,11 @@ import { import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type'; import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type DeletePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/delete-page-layout-widget.input'; +import { type DeletePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/delete-page-layout-widget.input'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; export const fromDeletePageLayoutWidgetInputToFlatPageLayoutWidgetOrThrow = ({ deletePageLayoutWidgetInput: rawDeletePageLayoutWidgetInput, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-destroy-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-destroy-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts index 211d56a02e..42d75340e9 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-destroy-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-destroy-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts @@ -6,11 +6,11 @@ import { import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type'; import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type DestroyPageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/destroy-page-layout-widget.input'; +import { type DestroyPageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/destroy-page-layout-widget.input'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; export const fromDestroyPageLayoutWidgetInputToFlatPageLayoutWidgetOrThrow = ({ destroyPageLayoutWidgetInput, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts index c580df772d..73640c4cc4 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts @@ -2,7 +2,7 @@ import { removePropertiesFromRecord } from 'twenty-shared/utils'; import { PAGE_LAYOUT_WIDGET_ENTITY_RELATION_PROPERTIES } from 'src/engine/metadata-modules/flat-page-layout-widget/constants/page-layout-widget-entity-relation-properties.constant'; import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; export const fromPageLayoutWidgetEntityToFlatPageLayoutWidget = ( pageLayoutWidgetEntity: PageLayoutWidgetEntity, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-restore-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-restore-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts index e99ab59aa8..8d0cb5cfe5 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-restore-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-restore-page-layout-widget-input-to-flat-page-layout-widget-or-throw.util.ts @@ -9,7 +9,7 @@ import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; export type RestorePageLayoutWidgetInput = { id: string; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts index 02941e94e7..14b284f035 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts @@ -7,11 +7,11 @@ import { import { FLAT_PAGE_LAYOUT_WIDGET_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-page-layout-widget/constants/flat-page-layout-widget-editable-properties.constant'; import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type'; import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input'; +import { type UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util'; export type UpdatePageLayoutWidgetInputWithId = { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts index cc149ba8f3..5f7ca9e672 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/flat-page-layout.module.ts @@ -2,7 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { WorkspaceFlatPageLayoutMapCacheService } from 'src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; @Module({ diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts index 4a204fe075..ea535ea3fa 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service.ts @@ -8,7 +8,7 @@ import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/wo import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant'; import { type FlatPageLayoutMaps } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout-maps.type'; import { transformPageLayoutEntityToFlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator'; import { regroupEntitiesByRelatedEntityId } from 'src/engine/workspace-cache/utils/regroup-entities-by-related-entity-id'; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type.ts index e112334493..9e8ab0d6ff 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type.ts @@ -6,7 +6,7 @@ export const pageLayoutEntityRelationProperties = [ 'objectMetadata', 'tabs', 'application', -] as const; +] as const satisfies (keyof PageLayoutEntity)[]; export type PageLayoutEntityRelationProperties = (typeof pageLayoutEntityRelationProperties)[number]; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-tab.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts similarity index 88% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-tab.controller.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts index f9b16cb877..40ce11346e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-tab.controller.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts @@ -14,17 +14,17 @@ import { import { isDefined } from 'twenty-shared/utils'; import { PermissionFlagType } from 'twenty-shared/constants'; -import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; -import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; +import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; import { generatePageLayoutTabExceptionMessage, PageLayoutTabException, PageLayoutTabExceptionCode, PageLayoutTabExceptionMessageKey, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; -import { PageLayoutTabRestApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/filters/page-layout-tab-rest-api-exception.filter'; -import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; +import { PageLayoutTabRestApiExceptionFilter } from 'src/engine/metadata-modules/page-layout-tab/filters/page-layout-tab-rest-api-exception.filter'; +import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator'; import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard'; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab-with-widgets.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input.ts similarity index 90% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab-with-widgets.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input.ts index 9ce566caeb..8d0c826d25 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab-with-widgets.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input.ts @@ -11,7 +11,7 @@ import { } from 'class-validator'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { UpdatePageLayoutWidgetWithIdInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget-with-id.input'; +import { UpdatePageLayoutWidgetWithIdInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget-with-id.input'; @InputType() export class UpdatePageLayoutTabWithWidgetsInput { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts similarity index 94% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts index 10c182f741..8393f4fb9d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto.ts @@ -3,7 +3,7 @@ import { Field, Float, ObjectType } from '@nestjs/graphql'; import { IDField } from '@ptc-org/nestjs-query-graphql'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; @ObjectType('PageLayoutTab') export class PageLayoutTabDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts similarity index 96% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts index b72ac0c59b..a70e945c86 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity.ts @@ -17,7 +17,7 @@ import { import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/interfaces/syncable-entity.interface'; import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; @Entity({ name: 'pageLayoutTab', schema: 'core' }) diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-tab-rest-api-exception.filter.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/filters/page-layout-tab-rest-api-exception.filter.ts similarity index 93% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-tab-rest-api-exception.filter.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/filters/page-layout-tab-rest-api-exception.filter.ts index d5f04bbfdc..289482b236 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-tab-rest-api-exception.filter.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/filters/page-layout-tab-rest-api-exception.filter.ts @@ -10,7 +10,7 @@ import { HttpExceptionHandlerService } from 'src/engine/core-modules/exception-h import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; @Catch(PageLayoutTabException) export class PageLayoutTabRestApiExceptionFilter implements ExceptionFilter { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts new file mode 100644 index 0000000000..1dcff8dab0 --- /dev/null +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/page-layout-tab.module.ts @@ -0,0 +1,41 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; + +import { ApplicationModule } from 'src/engine/core-modules/application/application.module'; +import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module'; +import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; +import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module'; +import { FlatPageLayoutTabModule } from 'src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module'; +import { FlatPageLayoutWidgetModule } from 'src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module'; +import { PageLayoutTabController } from 'src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { PageLayoutTabResolver } from 'src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver'; +import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; +import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module'; +import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module'; +import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module'; +import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor'; +import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([PageLayoutTabEntity, WorkspaceEntity]), + TwentyORMModule, + PermissionsModule, + FeatureFlagModule, + WorkspaceCacheStorageModule, + WorkspaceMigrationV2Module, + WorkspaceManyOrAllFlatEntityMapsCacheModule, + FlatPageLayoutTabModule, + FlatPageLayoutWidgetModule, + ApplicationModule, + ], + controllers: [PageLayoutTabController], + providers: [ + PageLayoutTabService, + PageLayoutTabResolver, + WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor, + ], + exports: [PageLayoutTabService], +}) +export class PageLayoutTabModule {} diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-tab.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts similarity index 94% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-tab.resolver.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts index f78afba041..c087e0ea0e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-tab.resolver.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/resolvers/page-layout-tab.resolver.ts @@ -15,10 +15,10 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard'; import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard'; import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard'; -import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; -import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input'; -import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; -import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; +import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; +import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input'; +import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; +import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter'; import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor'; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-tab.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts similarity index 96% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-tab.service.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts index f76dbfcf48..0cabac9a3f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-tab.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts @@ -16,17 +16,17 @@ import { } from 'src/engine/metadata-modules/flat-page-layout-tab/utils/from-update-page-layout-tab-input-to-flat-page-layout-tab-to-update-or-throw.util'; import { reconstructFlatPageLayoutTabWithWidgets } from 'src/engine/metadata-modules/flat-page-layout-tab/utils/reconstruct-flat-page-layout-tab-with-widgets.util'; import { FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type'; -import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; -import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; +import { UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; import { PageLayoutTabException, PageLayoutTabExceptionCode, PageLayoutTabExceptionMessageKey, generatePageLayoutTabExceptionMessage, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; -import { fromFlatPageLayoutTabToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util'; -import { fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; +import { fromFlatPageLayoutTabToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util'; +import { fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util'; import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2'; import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service'; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts similarity index 92% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts index 9dccf9ea30..2ea6ee982d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util.ts @@ -1,5 +1,5 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const fromFlatPageLayoutTabToPageLayoutTabDto = ( flatPageLayoutTab: FlatPageLayoutTab, diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts similarity index 74% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts index 7a53673bd0..004b03230a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util.ts @@ -1,7 +1,7 @@ import { type FlatPageLayoutTabWithWidgets } from 'src/engine/metadata-modules/flat-page-layout-tab/utils/reconstruct-flat-page-layout-tab-with-widgets.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; -import { fromFlatPageLayoutTabToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util'; -import { fromFlatPageLayoutWidgetToPageLayoutWidgetDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; +import { fromFlatPageLayoutTabToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-to-page-layout-tab-dto.util'; +import { fromFlatPageLayoutWidgetToPageLayoutWidgetDto } from 'src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util'; export const fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto = ( flatPageLayoutTabWithWidgets: FlatPageLayoutTabWithWidgets, diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/widget-grid-max-columns.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-columns.constant.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/constants/widget-grid-max-columns.constant.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-columns.constant.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/constants/widget-grid-max-rows.constant.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-rows.constant.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/constants/widget-grid-max-rows.constant.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-rows.constant.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-widget.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts similarity index 87% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-widget.controller.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts index 489f026980..f0bc3faa07 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout-widget.controller.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts @@ -19,17 +19,17 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard'; import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard'; import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard'; -import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; -import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; +import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; import { generatePageLayoutWidgetExceptionMessage, PageLayoutWidgetException, PageLayoutWidgetExceptionCode, PageLayoutWidgetExceptionMessageKey, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; -import { PageLayoutWidgetRestApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/filters/page-layout-widget-rest-api-exception.filter'; -import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout/services/page-layout-widget.service'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; +import { PageLayoutWidgetRestApiExceptionFilter } from 'src/engine/metadata-modules/page-layout-widget/filters/page-layout-widget-rest-api-exception.filter'; +import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service'; @Controller('rest/metadata/pageLayoutWidgets') @UseGuards(WorkspaceAuthGuard) diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/aggregate-chart-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/aggregate-chart-configuration.dto.ts similarity index 96% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/aggregate-chart-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/aggregate-chart-configuration.dto.ts index 45af92fb20..cdf9b3ae8f 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/aggregate-chart-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/aggregate-chart-configuration.dto.ts @@ -21,8 +21,8 @@ import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-build import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { RatioAggregateConfigDTO } from 'src/engine/metadata-modules/page-layout/dtos/ratio-aggregate-config.dto'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { RatioAggregateConfigDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/ratio-aggregate-config.dto'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; @ObjectType('AggregateChartConfiguration') export class AggregateChartConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/bar-chart-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/bar-chart-configuration.dto.ts similarity index 94% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/bar-chart-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/bar-chart-configuration.dto.ts index d8c9d8e7a1..e0dcda2159 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/bar-chart-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/bar-chart-configuration.dto.ts @@ -21,11 +21,11 @@ import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-build import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout/enums/axis-name-display.enum'; -import { BarChartGroupMode } from 'src/engine/metadata-modules/page-layout/enums/bar-chart-group-mode.enum'; -import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout/enums/date-granularity.enum'; -import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout/enums/graph-order-by.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum'; +import { BarChartGroupMode } from 'src/engine/metadata-modules/page-layout-widget/enums/bar-chart-group-mode.enum'; +import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout-widget/enums/date-granularity.enum'; +import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; @ObjectType('BarChartConfiguration') export class BarChartConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/gauge-chart-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/gauge-chart-configuration.dto.ts similarity index 98% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/gauge-chart-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/gauge-chart-configuration.dto.ts index 6badcec5fb..a55fc06795 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/gauge-chart-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/gauge-chart-configuration.dto.ts @@ -19,7 +19,7 @@ import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-build import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; @ObjectType('GaugeChartConfiguration') export class GaugeChartConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/iframe-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/iframe-configuration.dto.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/iframe-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/iframe-configuration.dto.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input.ts similarity index 93% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input.ts index aab057e3b7..bd050e5e18 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input.ts @@ -13,8 +13,8 @@ import { import { GraphQLJSON } from 'graphql-type-json'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { GridPositionInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { GridPositionInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; @InputType() export class CreatePageLayoutWidgetInput { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/delete-page-layout-widget.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/delete-page-layout-widget.input.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/delete-page-layout-widget.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/delete-page-layout-widget.input.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/destroy-page-layout-widget.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/destroy-page-layout-widget.input.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/destroy-page-layout-widget.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/destroy-page-layout-widget.input.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input.ts similarity index 93% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input.ts index 6e051413f3..29523c188c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input.ts @@ -2,7 +2,7 @@ import { Field, InputType } from '@nestjs/graphql'; import { IsInt, IsNotEmpty, Min } from 'class-validator'; -import { GridPosition } from 'src/engine/metadata-modules/page-layout/types/grid-position.type'; +import { GridPosition } from 'src/engine/metadata-modules/page-layout-widget/types/grid-position.type'; @InputType('GridPositionInput') export class GridPositionInput implements GridPosition { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget-with-id.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget-with-id.input.ts similarity index 93% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget-with-id.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget-with-id.input.ts index d7fe49aab6..74a32b46ef 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget-with-id.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget-with-id.input.ts @@ -13,8 +13,8 @@ import { import { GraphQLJSON } from 'graphql-type-json'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { GridPositionInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { GridPositionInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; @InputType() export class UpdatePageLayoutWidgetWithIdInput { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts similarity index 92% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts index 8ca6e0199b..c66199ea07 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts @@ -12,8 +12,8 @@ import { import { GraphQLJSON } from 'graphql-type-json'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { GridPositionInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/grid-position.input'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { GridPositionInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/grid-position.input'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; @InputType() export class UpdatePageLayoutWidgetInput { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/line-chart-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/line-chart-configuration.dto.ts similarity index 95% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/line-chart-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/line-chart-configuration.dto.ts index b60f93613a..672b512dcf 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/line-chart-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/line-chart-configuration.dto.ts @@ -20,10 +20,10 @@ import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-build import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout/enums/axis-name-display.enum'; -import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout/enums/date-granularity.enum'; -import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout/enums/graph-order-by.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum'; +import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout-widget/enums/date-granularity.enum'; +import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; @ObjectType('LineChartConfiguration') export class LineChartConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts similarity index 91% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts index 32277a5f9c..8e808f1427 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto.ts @@ -6,8 +6,8 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/ import { WidgetConfiguration, WidgetConfigurationInterface, -} from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +} from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; registerEnumType(WidgetType, { name: 'WidgetType' }); diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/pie-chart-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/pie-chart-configuration.dto.ts similarity index 95% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/pie-chart-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/pie-chart-configuration.dto.ts index ff3366a485..409cfea92a 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/pie-chart-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/pie-chart-configuration.dto.ts @@ -19,9 +19,9 @@ import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-build import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout/enums/date-granularity.enum'; -import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout/enums/graph-order-by.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { ObjectRecordGroupByDateGranularity } from 'src/engine/metadata-modules/page-layout-widget/enums/date-granularity.enum'; +import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; @ObjectType('PieChartConfiguration') export class PieChartConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/ratio-aggregate-config.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/ratio-aggregate-config.dto.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/ratio-aggregate-config.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/ratio-aggregate-config.dto.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/rich-text-v2-body.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/rich-text-v2-body.dto.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/rich-text-v2-body.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/rich-text-v2-body.dto.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/standalone-rich-text-configuration.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/standalone-rich-text-configuration.dto.ts similarity index 90% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/standalone-rich-text-configuration.dto.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/standalone-rich-text-configuration.dto.ts index 81ff6e749d..ec39e45bb3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/standalone-rich-text-configuration.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/standalone-rich-text-configuration.dto.ts @@ -3,7 +3,7 @@ import { Field, ObjectType } from '@nestjs/graphql'; import { Type } from 'class-transformer'; import { IsNotEmpty, ValidateNested } from 'class-validator'; -import { RichTextV2BodyDTO } from 'src/engine/metadata-modules/page-layout/dtos/rich-text-v2-body.dto'; +import { RichTextV2BodyDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/rich-text-v2-body.dto'; @ObjectType('StandaloneRichTextConfiguration') export class StandaloneRichTextConfigurationDTO { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface.ts similarity index 82% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface.ts index f59970c90f..1699f776f1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface.ts @@ -1,14 +1,14 @@ import { createUnionType } from '@nestjs/graphql'; -import { AggregateChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/aggregate-chart-configuration.dto'; -import { BarChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/bar-chart-configuration.dto'; -import { GaugeChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/gauge-chart-configuration.dto'; -import { IframeConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/iframe-configuration.dto'; -import { LineChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/line-chart-configuration.dto'; -import { PieChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/pie-chart-configuration.dto'; -import { StandaloneRichTextConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/standalone-rich-text-configuration.dto'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; -import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout/enums/widget-configuration-type.enum'; +import { AggregateChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/aggregate-chart-configuration.dto'; +import { BarChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/bar-chart-configuration.dto'; +import { GaugeChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/gauge-chart-configuration.dto'; +import { IframeConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/iframe-configuration.dto'; +import { LineChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/line-chart-configuration.dto'; +import { PieChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/pie-chart-configuration.dto'; +import { StandaloneRichTextConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/standalone-rich-text-configuration.dto'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; +import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.enum'; export const WidgetConfiguration = createUnionType({ name: 'WidgetConfiguration', diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts similarity index 92% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts index 0e30457ab2..078e2080c3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts @@ -17,10 +17,10 @@ import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/inte import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; -import { GridPosition } from 'src/engine/metadata-modules/page-layout/types/grid-position.type'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; +import { WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; +import { GridPosition } from 'src/engine/metadata-modules/page-layout-widget/types/grid-position.type'; @Entity({ name: 'pageLayoutWidget', schema: 'core' }) @ObjectType('PageLayoutWidget') diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/axis-name-display.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/axis-name-display.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/bar-chart-group-mode.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/bar-chart-group-mode.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/bar-chart-group-mode.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/bar-chart-group-mode.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/date-granularity.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/date-granularity.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/date-granularity.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/date-granularity.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/graph-order-by.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/graph-order-by.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/graph-type.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/graph-type.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/widget-configuration-type.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/widget-configuration-type.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/enums/widget-type.enum.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/enums/widget-type.enum.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-widget-rest-api-exception.filter.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/filters/page-layout-widget-rest-api-exception.filter.ts similarity index 93% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-widget-rest-api-exception.filter.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/filters/page-layout-widget-rest-api-exception.filter.ts index ed6520c397..676f466bf2 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/filters/page-layout-widget-rest-api-exception.filter.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/filters/page-layout-widget-rest-api-exception.filter.ts @@ -10,7 +10,7 @@ import { HttpExceptionHandlerService } from 'src/engine/core-modules/exception-h import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; @Catch(PageLayoutWidgetException) export class PageLayoutWidgetRestApiExceptionFilter implements ExceptionFilter { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts new file mode 100644 index 0000000000..d36bc3b1cc --- /dev/null +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/page-layout-widget.module.ts @@ -0,0 +1,39 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; + +import { ApplicationModule } from 'src/engine/core-modules/application/application.module'; +import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module'; +import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; +import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module'; +import { FlatPageLayoutWidgetModule } from 'src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module'; +import { PageLayoutWidgetController } from 'src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; +import { PageLayoutWidgetResolver } from 'src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver'; +import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service'; +import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module'; +import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module'; +import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module'; +import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor'; +import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module'; + +@Module({ + imports: [ + TypeOrmModule.forFeature([PageLayoutWidgetEntity, WorkspaceEntity]), + TwentyORMModule, + PermissionsModule, + FeatureFlagModule, + WorkspaceCacheStorageModule, + WorkspaceMigrationV2Module, + WorkspaceManyOrAllFlatEntityMapsCacheModule, + FlatPageLayoutWidgetModule, + ApplicationModule, + ], + controllers: [PageLayoutWidgetController], + providers: [ + PageLayoutWidgetService, + PageLayoutWidgetResolver, + WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor, + ], + exports: [PageLayoutWidgetService], +}) +export class PageLayoutWidgetModule {} diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-widget.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts similarity index 91% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-widget.resolver.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts index d189fe1eaa..03b8a17781 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/resolvers/page-layout-widget.resolver.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/resolvers/page-layout-widget.resolver.ts @@ -21,12 +21,12 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard'; import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard'; import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard'; -import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; -import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input'; -import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; -import { WidgetConfiguration } from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout/services/page-layout-widget.service'; -import { injectWidgetConfigurationDiscriminator } from 'src/engine/metadata-modules/page-layout/utils/inject-widget-configuration-discriminator.util'; +import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; +import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input'; +import { PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; +import { WidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service'; +import { injectWidgetConfigurationDiscriminator } from 'src/engine/metadata-modules/page-layout-widget/utils/inject-widget-configuration-discriminator.util'; import { PageLayoutGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter'; import { WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration-v2/interceptors/workspace-migration-builder-graphql-api-exception.interceptor'; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-widget.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts similarity index 96% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-widget.service.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts index c548e30795..a57c68b238 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-widget.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts @@ -17,20 +17,20 @@ import { fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThrow, type UpdatePageLayoutWidgetInputWithId, } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util'; -import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; -import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; -import { WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; +import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; +import { WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, PageLayoutWidgetExceptionMessageKey, generatePageLayoutWidgetExceptionMessage, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; -import { fromFlatPageLayoutWidgetToPageLayoutWidgetDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util'; -import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util'; -import { validateWidgetGridPosition } from 'src/engine/metadata-modules/page-layout/utils/validate-widget-grid-position.util'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; +import { fromFlatPageLayoutWidgetToPageLayoutWidgetDto } from 'src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util'; +import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util'; +import { validateWidgetGridPosition } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-widget-grid-position.util'; import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2'; import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service'; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/types/grid-position.type.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/types/grid-position.type.ts similarity index 100% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/types/grid-position.type.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/types/grid-position.type.ts diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts similarity index 99% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts index 2400bc6725..acace9ca95 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-and-transform-widget-configuration.util.spec.ts @@ -22,8 +22,8 @@ import { TEST_VERTICAL_BAR_CHART_CONFIG_MINIMAL, } from 'test/integration/constants/widget-configuration-test-data.constants'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; -import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; +import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util'; jest.mock( 'src/engine/core-modules/record-transformer/utils/transform-rich-text-v2.util', diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-widget-grid-position.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-widget-grid-position.util.spec.ts similarity index 94% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-widget-grid-position.util.spec.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-widget-grid-position.util.spec.ts index 63e528f0c6..d2357af9b3 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/__tests__/validate-widget-grid-position.util.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/__tests__/validate-widget-grid-position.util.spec.ts @@ -1,7 +1,7 @@ -import { WIDGET_GRID_MAX_COLUMNS } from 'src/engine/metadata-modules/page-layout/constants/widget-grid-max-columns.constant'; -import { WIDGET_GRID_MAX_ROWS } from 'src/engine/metadata-modules/page-layout/constants/widget-grid-max-rows.constant'; -import { PageLayoutWidgetException } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; -import { validateWidgetGridPosition } from 'src/engine/metadata-modules/page-layout/utils/validate-widget-grid-position.util'; +import { WIDGET_GRID_MAX_COLUMNS } from 'src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-columns.constant'; +import { WIDGET_GRID_MAX_ROWS } from 'src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-rows.constant'; +import { PageLayoutWidgetException } from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; +import { validateWidgetGridPosition } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-widget-grid-position.util'; describe('validateWidgetGridPosition', () => { const validGridPosition = { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts similarity index 91% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts index 92dc032d5d..98dcb6679d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/from-flat-page-layout-widget-to-page-layout-widget-dto.util.ts @@ -1,5 +1,5 @@ import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const fromFlatPageLayoutWidgetToPageLayoutWidgetDto = ( flatPageLayoutWidget: FlatPageLayoutWidget, diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/inject-widget-configuration-discriminator.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/inject-widget-configuration-discriminator.util.ts similarity index 87% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/inject-widget-configuration-discriminator.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/inject-widget-configuration-discriminator.util.ts index 1c976c4da3..f45a522a17 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/inject-widget-configuration-discriminator.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/inject-widget-configuration-discriminator.util.ts @@ -1,6 +1,6 @@ -import { type WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout/enums/widget-configuration-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { type WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; type ConfigurationWithDiscriminator = WidgetConfigurationInterface & { configurationType: WidgetConfigurationType; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util.ts similarity index 90% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util.ts index 23eb2a81ee..d1c2731b8d 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util.ts @@ -3,17 +3,17 @@ import { validateSync, type ValidationError } from 'class-validator'; import { isDefined } from 'twenty-shared/utils'; import { transformRichTextV2Value } from 'src/engine/core-modules/record-transformer/utils/transform-rich-text-v2.util'; -import { AggregateChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/aggregate-chart-configuration.dto'; -import { BarChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/bar-chart-configuration.dto'; -import { GaugeChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/gauge-chart-configuration.dto'; -import { IframeConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/iframe-configuration.dto'; -import { LineChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/line-chart-configuration.dto'; -import { PieChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/pie-chart-configuration.dto'; -import { StandaloneRichTextConfigurationDTO } from 'src/engine/metadata-modules/page-layout/dtos/standalone-rich-text-configuration.dto'; -import { type WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout/dtos/widget-configuration.interface'; -import { BarChartGroupMode } from 'src/engine/metadata-modules/page-layout/enums/bar-chart-group-mode.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { AggregateChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/aggregate-chart-configuration.dto'; +import { BarChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/bar-chart-configuration.dto'; +import { GaugeChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/gauge-chart-configuration.dto'; +import { IframeConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/iframe-configuration.dto'; +import { LineChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/line-chart-configuration.dto'; +import { PieChartConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/pie-chart-configuration.dto'; +import { StandaloneRichTextConfigurationDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/standalone-rich-text-configuration.dto'; +import { type WidgetConfigurationInterface } from 'src/engine/metadata-modules/page-layout-widget/dtos/widget-configuration.interface'; +import { BarChartGroupMode } from 'src/engine/metadata-modules/page-layout-widget/enums/bar-chart-group-mode.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; const formatValidationErrors = (errors: ValidationError[]): string => { return errors diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-widget-grid-position.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-widget-grid-position.util.ts similarity index 90% rename from packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-widget-grid-position.util.ts rename to packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-widget-grid-position.util.ts index a608b991f7..f05974e28e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/validate-widget-grid-position.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/utils/validate-widget-grid-position.util.ts @@ -1,11 +1,11 @@ -import { WIDGET_GRID_MAX_COLUMNS } from 'src/engine/metadata-modules/page-layout/constants/widget-grid-max-columns.constant'; -import { WIDGET_GRID_MAX_ROWS } from 'src/engine/metadata-modules/page-layout/constants/widget-grid-max-rows.constant'; +import { WIDGET_GRID_MAX_COLUMNS } from 'src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-columns.constant'; +import { WIDGET_GRID_MAX_ROWS } from 'src/engine/metadata-modules/page-layout-widget/constants/widget-grid-max-rows.constant'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, PageLayoutWidgetExceptionMessageKey, generatePageLayoutWidgetExceptionMessage, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; type GridPosition = { row: number; diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input.ts index b9f7289df0..d96045c370 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input.ts @@ -13,7 +13,7 @@ import { } from 'class-validator'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { UpdatePageLayoutTabWithWidgetsInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab-with-widgets.input'; +import { UpdatePageLayoutTabWithWidgetsInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; @InputType() diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout.dto.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout.dto.ts index 9f78813706..1ab47473df 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout.dto.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/dtos/page-layout.dto.ts @@ -3,7 +3,7 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql'; import { IDField } from '@ptc-org/nestjs-query-graphql'; import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars'; -import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; registerEnumType(PageLayoutType, { name: 'PageLayoutType' }); diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts index 1f19aed3b0..55570f3d37 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/entities/page-layout.entity.ts @@ -18,7 +18,7 @@ import { SyncableEntity } from 'src/engine/workspace-manager/workspace-sync/inte import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; @Entity({ name: 'pageLayout', schema: 'core' }) diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts index 36fdf2f541..fb635922de 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/page-layout.module.ts @@ -9,20 +9,14 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata import { FlatPageLayoutTabModule } from 'src/engine/metadata-modules/flat-page-layout-tab/flat-page-layout-tab.module'; import { FlatPageLayoutWidgetModule } from 'src/engine/metadata-modules/flat-page-layout-widget/flat-page-layout-widget.module'; import { FlatPageLayoutModule } from 'src/engine/metadata-modules/flat-page-layout/flat-page-layout.module'; -import { PageLayoutTabController } from 'src/engine/metadata-modules/page-layout/controllers/page-layout-tab.controller'; -import { PageLayoutWidgetController } from 'src/engine/metadata-modules/page-layout/controllers/page-layout-widget.controller'; import { PageLayoutController } from 'src/engine/metadata-modules/page-layout/controllers/page-layout.controller'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity'; -import { PageLayoutTabResolver } from 'src/engine/metadata-modules/page-layout/resolvers/page-layout-tab.resolver'; -import { PageLayoutWidgetResolver } from 'src/engine/metadata-modules/page-layout/resolvers/page-layout-widget.resolver'; import { PageLayoutResolver } from 'src/engine/metadata-modules/page-layout/resolvers/page-layout.resolver'; import { PageLayoutDuplicationService } from 'src/engine/metadata-modules/page-layout/services/page-layout-duplication.service'; -import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; import { PageLayoutUpdateService } from 'src/engine/metadata-modules/page-layout/services/page-layout-update.service'; -import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout/services/page-layout-widget.service'; import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service'; +import { PageLayoutTabModule } from 'src/engine/metadata-modules/page-layout-tab/page-layout-tab.module'; +import { PageLayoutWidgetModule } from 'src/engine/metadata-modules/page-layout-widget/page-layout-widget.module'; import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module'; import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module'; import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module'; @@ -31,12 +25,7 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa @Module({ imports: [ - TypeOrmModule.forFeature([ - PageLayoutEntity, - PageLayoutTabEntity, - PageLayoutWidgetEntity, - WorkspaceEntity, - ]), + TypeOrmModule.forFeature([PageLayoutEntity, WorkspaceEntity]), TwentyORMModule, PermissionsModule, FeatureFlagModule, @@ -48,28 +37,17 @@ import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspa FlatPageLayoutTabModule, FlatPageLayoutWidgetModule, ApplicationModule, + PageLayoutTabModule, + PageLayoutWidgetModule, ], - controllers: [ - PageLayoutController, - PageLayoutTabController, - PageLayoutWidgetController, - ], + controllers: [PageLayoutController], providers: [ PageLayoutService, - PageLayoutTabService, - PageLayoutWidgetService, PageLayoutDuplicationService, PageLayoutResolver, - PageLayoutTabResolver, - PageLayoutWidgetResolver, PageLayoutUpdateService, WorkspaceMigrationBuilderGraphqlApiExceptionInterceptor, ], - exports: [ - PageLayoutService, - PageLayoutTabService, - PageLayoutWidgetService, - PageLayoutDuplicationService, - ], + exports: [PageLayoutService, PageLayoutDuplicationService], }) export class PageLayoutModule {} diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts index a75b4cad1c..74b4109f69 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts @@ -12,8 +12,8 @@ import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat- import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type'; import { reconstructFlatPageLayoutWithTabsAndWidgets } from 'src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util'; -import { UpdatePageLayoutTabWithWidgetsInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab-with-widgets.input'; -import { UpdatePageLayoutWidgetWithIdInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget-with-id.input'; +import { UpdatePageLayoutTabWithWidgetsInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input'; +import { UpdatePageLayoutWidgetWithIdInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget-with-id.input'; import { UpdatePageLayoutWithTabsInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-with-tabs.input'; import { PageLayoutDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout.dto'; import { diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util.ts index 6ff7a8acf6..2e0b7141b1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util.ts @@ -1,6 +1,6 @@ import { type FlatPageLayoutWithTabsAndWidgets } from 'src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util'; import { type PageLayoutDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout.dto'; -import { fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util'; +import { fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto } from 'src/engine/metadata-modules/page-layout-tab/utils/from-flat-page-layout-tab-with-widgets-to-page-layout-tab-dto.util'; import { fromFlatPageLayoutToPageLayoutDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-to-page-layout-dto.util'; export const fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto = ( diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception-handler.util.ts index 0fa9508932..8c395c3071 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception-handler.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception-handler.util.ts @@ -8,11 +8,11 @@ import { import { PageLayoutTabException, PageLayoutTabExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; +} from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; import { PageLayoutWidgetException, PageLayoutWidgetExceptionCode, -} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +} from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; import { PageLayoutException, PageLayoutExceptionCode, diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter.ts index 0a3738559c..ef8700d0b0 100644 --- a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter.ts +++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception.filter.ts @@ -9,8 +9,8 @@ import { GqlExecutionContext } from '@nestjs/graphql'; import { SOURCE_LOCALE } from 'twenty-shared/translations'; import { I18nService } from 'src/engine/core-modules/i18n/i18n.service'; -import { PageLayoutTabException } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; -import { PageLayoutWidgetException } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +import { PageLayoutTabException } from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; +import { PageLayoutWidgetException } from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; import { PageLayoutException } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout.exception'; import { pageLayoutGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/page-layout/utils/page-layout-graphql-api-exception-handler.util'; import { WorkspaceMigrationBuilderExceptionV2 } from 'src/engine/workspace-manager/workspace-migration-v2/exceptions/workspace-migration-builder-exception-v2'; diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds-v2.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds-v2.util.ts index ec0ef65840..fed493fd03 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds-v2.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds-v2.util.ts @@ -4,8 +4,8 @@ import { isDefined } from 'twenty-shared/utils'; import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout/enums/axis-name-display.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { PAGE_LAYOUT_TAB_SEEDS } from 'src/engine/workspace-manager/dev-seeder/core/constants/page-layout-tab-seeds.constant'; import { PAGE_LAYOUT_WIDGET_SEEDS } from 'src/engine/workspace-manager/dev-seeder/core/constants/page-layout-widget-seeds.constant'; import { generateSeedId } from 'src/engine/workspace-manager/dev-seeder/core/utils/generate-seed-id.util'; diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds.util.ts index 064bdac8b3..3e3ce4b22a 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds.util.ts @@ -4,9 +4,9 @@ import { isDefined } from 'twenty-shared/utils'; import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout/enums/axis-name-display.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { PAGE_LAYOUT_TAB_SEEDS } from 'src/engine/workspace-manager/dev-seeder/core/constants/page-layout-tab-seeds.constant'; import { PAGE_LAYOUT_WIDGET_SEEDS } from 'src/engine/workspace-manager/dev-seeder/core/constants/page-layout-widget-seeds.constant'; import { generateSeedId } from 'src/engine/workspace-manager/dev-seeder/core/utils/generate-seed-id.util'; diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-page-layout-widgets.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-page-layout-widgets.util.ts index 9758466793..348924c326 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-page-layout-widgets.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-page-layout-widgets.util.ts @@ -2,7 +2,7 @@ import { type DataSource } from 'typeorm'; import { v4 } from 'uuid'; import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout/utils/validate-and-transform-widget-configuration.util'; +import { validateAndTransformWidgetConfiguration } from 'src/engine/metadata-modules/page-layout-widget/utils/validate-and-transform-widget-configuration.util'; import { getPageLayoutWidgetDataSeeds } from 'src/engine/workspace-manager/dev-seeder/core/utils/get-page-layout-widget-data-seeds.util'; export const seedPageLayoutWidgets = async ({ diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-page-layout-widget-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-page-layout-widget-validator.service.ts index b63885e1f4..bf6001a9d1 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-page-layout-widget-validator.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/validators/services/flat-page-layout-widget-validator.service.ts @@ -6,8 +6,8 @@ import { isDefined } from 'twenty-shared/utils'; import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util'; import { FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type'; -import { PageLayoutTabExceptionCode } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-tab.exception'; -import { PageLayoutWidgetExceptionCode } from 'src/engine/metadata-modules/page-layout/exceptions/page-layout-widget.exception'; +import { PageLayoutTabExceptionCode } from 'src/engine/metadata-modules/page-layout-tab/exceptions/page-layout-tab.exception'; +import { PageLayoutWidgetExceptionCode } from 'src/engine/metadata-modules/page-layout-widget/exceptions/page-layout-widget.exception'; import { FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/types/failed-flat-entity-validation.type'; import { FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-update-validation-args.type'; import { FlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/types/flat-entity-validation-args.type'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/create-page-layout-tab-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/create-page-layout-tab-action-handler.service.ts index 82b5a0810e..0f60a1aae4 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/create-page-layout-tab-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/create-page-layout-tab-action-handler.service.ts @@ -7,7 +7,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { CreatePageLayoutTabAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-tab/types/workspace-migration-page-layout-tab-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/delete-page-layout-tab-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/delete-page-layout-tab-action-handler.service.ts index 30228ae51f..0926282214 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/delete-page-layout-tab-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/delete-page-layout-tab-action-handler.service.ts @@ -7,7 +7,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { deleteFlatEntityFromFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/delete-flat-entity-from-flat-entity-maps-or-throw.util'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { DeletePageLayoutTabAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-tab/types/workspace-migration-page-layout-tab-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/update-page-layout-tab-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/update-page-layout-tab-action-handler.service.ts index ccbf5d7550..6a01a453b6 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/update-page-layout-tab-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-tab/services/update-page-layout-tab-action-handler.service.ts @@ -8,7 +8,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util'; import { replaceFlatEntityInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/replace-flat-entity-in-flat-entity-maps-or-throw.util'; -import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; import { UpdatePageLayoutTabAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-tab/types/workspace-migration-page-layout-tab-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; import { fromFlatEntityPropertiesUpdatesToPartialFlatEntity } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/utils/from-flat-entity-properties-updates-to-partial-flat-entity'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts index f43c2ef59b..5b71df5915 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts @@ -7,7 +7,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { CreatePageLayoutWidgetAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-widget/types/workspace-migration-page-layout-widget-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/delete-page-layout-widget-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/delete-page-layout-widget-action-handler.service.ts index 69366bc563..951e96b944 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/delete-page-layout-widget-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/delete-page-layout-widget-action-handler.service.ts @@ -7,7 +7,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { deleteFlatEntityFromFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/delete-flat-entity-from-flat-entity-maps-or-throw.util'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { DeletePageLayoutWidgetAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-widget/types/workspace-migration-page-layout-widget-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts index 18c57ada3f..1ac20bacc4 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts @@ -8,7 +8,7 @@ import { import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type'; import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util'; import { replaceFlatEntityInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/replace-flat-entity-in-flat-entity-maps-or-throw.util'; -import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; import { UpdatePageLayoutWidgetAction } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-builder-v2/builders/page-layout-widget/types/workspace-migration-page-layout-widget-action-v2.type'; import { WorkspaceMigrationActionRunnerArgs } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/types/workspace-migration-action-runner-args.type'; import { fromFlatEntityPropertiesUpdatesToPartialFlatEntity } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-runner-v2/utils/from-flat-entity-properties-updates-to-partial-flat-entity'; diff --git a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook.ts b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook.ts index 47c492f47f..b9669e7896 100644 --- a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook.ts +++ b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook.ts @@ -9,7 +9,7 @@ import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runne import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type'; import { WorkspaceNotFoundDefaultError } from 'src/engine/core-modules/workspace/workspace.exception'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; -import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; +import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service'; import { type DashboardWorkspaceEntity } from 'src/modules/dashboard/standard-objects/dashboard.workspace-entity'; diff --git a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts index 654f2f611c..f19970cdf5 100644 --- a/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts +++ b/packages/twenty-server/src/modules/dashboard/query-hooks/dashboard-query-hook.module.ts @@ -1,10 +1,11 @@ import { Module } from '@nestjs/common'; +import { PageLayoutTabModule } from 'src/engine/metadata-modules/page-layout-tab/page-layout-tab.module'; import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module'; import { DashboardCreateOnePreQueryHook } from 'src/modules/dashboard/query-hooks/dashboard-create-one.pre-query.hook'; @Module({ - imports: [PageLayoutModule], + imports: [PageLayoutModule, PageLayoutTabModule], providers: [DashboardCreateOnePreQueryHook], }) export class DashboardQueryHookModule {} diff --git a/packages/twenty-server/src/modules/dashboard/tools/add-dashboard-widget.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/add-dashboard-widget.tool.ts index a6108e9625..49c566d681 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/add-dashboard-widget.tool.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/add-dashboard-widget.tool.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import { type WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { type WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { gridPositionSchema, widgetConfigurationSchema, diff --git a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts index 60133f68bf..ccac71a4d2 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/create-complete-dashboard.tool.ts @@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid'; import { z } from 'zod'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; -import { type WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { type WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util'; import { gridPositionSchema, diff --git a/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts b/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts index 9432ce87c0..1b137cf090 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/dashboard-tools.module.ts @@ -3,6 +3,8 @@ import { Global, Module } from '@nestjs/common'; import { ApplicationModule } from 'src/engine/core-modules/application/application.module'; import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module'; import { DASHBOARD_TOOL_SERVICE_TOKEN } from 'src/engine/core-modules/tool-provider/constants/dashboard-tool-service.token'; +import { PageLayoutTabModule } from 'src/engine/metadata-modules/page-layout-tab/page-layout-tab.module'; +import { PageLayoutWidgetModule } from 'src/engine/metadata-modules/page-layout-widget/page-layout-widget.module'; import { PageLayoutModule } from 'src/engine/metadata-modules/page-layout/page-layout.module'; import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module'; @@ -12,6 +14,8 @@ import { DashboardToolWorkspaceService } from './services/dashboard-tool.workspa @Module({ imports: [ PageLayoutModule, + PageLayoutTabModule, + PageLayoutWidgetModule, RecordPositionModule, TwentyORMModule, ApplicationModule, diff --git a/packages/twenty-server/src/modules/dashboard/tools/schemas/widget.schema.ts b/packages/twenty-server/src/modules/dashboard/tools/schemas/widget.schema.ts index 654859de9b..1e1ee4481d 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/schemas/widget.schema.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/schemas/widget.schema.ts @@ -1,8 +1,8 @@ import { z } from 'zod'; import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; export const gridPositionSchema = z.object({ row: z.number().min(0).describe('Row position (0-based)'), diff --git a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts index 1a1ad54bb1..25f0755d5b 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/services/dashboard-tool.workspace-service.ts @@ -4,8 +4,8 @@ import { type ToolSet } from 'ai'; import { ApplicationService } from 'src/engine/core-modules/application/application.service'; import { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service'; -import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; -import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout/services/page-layout-widget.service'; +import { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; +import { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service'; import { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service'; import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager'; import { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config'; diff --git a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts index 86c1c66071..58ca12cab9 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/types/dashboard-tool-dependencies.type.ts @@ -1,7 +1,7 @@ import type { ApplicationService } from 'src/engine/core-modules/application/application.service'; import type { RecordPositionService } from 'src/engine/core-modules/record-position/services/record-position.service'; -import type { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout/services/page-layout-tab.service'; -import type { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout/services/page-layout-widget.service'; +import type { PageLayoutTabService } from 'src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service'; +import type { PageLayoutWidgetService } from 'src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service'; import type { PageLayoutService } from 'src/engine/metadata-modules/page-layout/services/page-layout.service'; import type { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager'; import type { RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config'; diff --git a/packages/twenty-server/src/modules/dashboard/tools/update-dashboard-widget.tool.ts b/packages/twenty-server/src/modules/dashboard/tools/update-dashboard-widget.tool.ts index b68c28970b..f8b4df6e42 100644 --- a/packages/twenty-server/src/modules/dashboard/tools/update-dashboard-widget.tool.ts +++ b/packages/twenty-server/src/modules/dashboard/tools/update-dashboard-widget.tool.ts @@ -1,7 +1,7 @@ import { isDefined } from 'twenty-shared/utils'; import { z } from 'zod'; -import { type WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { type WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { gridPositionSchema, widgetConfigurationSchema, diff --git a/packages/twenty-server/test/integration/constants/widget-configuration-test-data.constants.ts b/packages/twenty-server/test/integration/constants/widget-configuration-test-data.constants.ts index e4381b9450..af2f451a8d 100644 --- a/packages/twenty-server/test/integration/constants/widget-configuration-test-data.constants.ts +++ b/packages/twenty-server/test/integration/constants/widget-configuration-test-data.constants.ts @@ -1,7 +1,7 @@ import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; -import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout/enums/axis-name-display.enum'; -import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout/enums/graph-order-by.enum'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { AxisNameDisplay } from 'src/engine/metadata-modules/page-layout-widget/enums/axis-name-display.enum'; +import { GraphOrderBy } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-order-by.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; export const TEST_FIELD_METADATA_ID_1 = '20202020-1111-4111-a111-111111111111'; export const TEST_FIELD_METADATA_ID_2 = '20202020-2222-4222-a222-222222222222'; diff --git a/packages/twenty-server/test/integration/metadata/suites/dashboard/successful-dashboard-duplication.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/dashboard/successful-dashboard-duplication.integration-spec.ts index aa8d59bc1e..68b14eeed3 100644 --- a/packages/twenty-server/test/integration/metadata/suites/dashboard/successful-dashboard-duplication.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/dashboard/successful-dashboard-duplication.integration-spec.ts @@ -18,7 +18,7 @@ import { } from 'twenty-shared/testing'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; type TestContext = { id: string; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/failing-page-layout-tab-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/failing-page-layout-tab-creation.integration-spec.ts index 091e7afc1e..d1c7e69b8e 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/failing-page-layout-tab-creation.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/failing-page-layout-tab-creation.integration-spec.ts @@ -4,7 +4,7 @@ import { createOnePageLayoutTab } from 'test/integration/metadata/suites/page-la import { createOnePageLayout } from 'test/integration/metadata/suites/page-layout/utils/create-one-page-layout.util'; import { destroyOnePageLayout } from 'test/integration/metadata/suites/page-layout/utils/destroy-one-page-layout.util'; -import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; +import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; describe('Page layout tab creation should fail', () => { let testPageLayoutId: string; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab-query-factory.util.ts index e5898861af..5844844b64 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab-query-factory.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab-query-factory.util.ts @@ -2,7 +2,7 @@ import gql from 'graphql-tag'; import { WIDGET_CONFIGURATION_GQL_FIELDS } from 'test/integration/metadata/suites/page-layout-widget/constants/widget-configuration-gql-fields.constant'; import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type'; -import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-tab.input'; +import { type CreatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/create-page-layout-tab.input'; export type CreateOnePageLayoutTabFactoryInput = CreatePageLayoutTabInput; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab.util.ts index 670cb4cda8..9cfbb99587 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/create-one-page-layout-tab.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const createOnePageLayoutTab = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-one-page-layout-tab.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-one-page-layout-tab.util.ts index 4e764d1d30..3616244d81 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-one-page-layout-tab.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-one-page-layout-tab.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const findOnePageLayoutTab = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-page-layout-tabs.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-page-layout-tabs.util.ts index 6a0775a074..832142c63e 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-page-layout-tabs.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/find-page-layout-tabs.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const findPageLayoutTabs = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/restore-one-page-layout-tab.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/restore-one-page-layout-tab.util.ts index 383e1d61b3..42d8c4b53a 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/restore-one-page-layout-tab.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/restore-one-page-layout-tab.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const restoreOnePageLayoutTab = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab-query-factory.util.ts index 0b737dd456..6bf13c104e 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab-query-factory.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab-query-factory.util.ts @@ -1,7 +1,7 @@ import gql from 'graphql-tag'; import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type'; -import { type UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-tab.input'; +import { type UpdatePageLayoutTabInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab.input'; export type UpdateOnePageLayoutTabFactoryInput = { id: string; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab.util.ts index a339fa2823..29349df84d 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-tab/utils/update-one-page-layout-tab.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-tab.dto'; +import { type PageLayoutTabDTO } from 'src/engine/metadata-modules/page-layout-tab/dtos/page-layout-tab.dto'; export const updateOnePageLayoutTab = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/failing-page-layout-widget-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/failing-page-layout-widget-creation.integration-spec.ts index 0f514137c4..1d1fbf1124 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/failing-page-layout-widget-creation.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/failing-page-layout-widget-creation.integration-spec.ts @@ -6,7 +6,7 @@ import { createOnePageLayoutWidget } from 'test/integration/metadata/suites/page import { createOnePageLayout } from 'test/integration/metadata/suites/page-layout/utils/create-one-page-layout.util'; import { destroyOnePageLayout } from 'test/integration/metadata/suites/page-layout/utils/destroy-one-page-layout.util'; -import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; +import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; describe('Page layout widget creation should fail', () => { let testPageLayoutId: string; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-creation.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-creation.integration-spec.ts index f462266806..fb29c6bb17 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-creation.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-creation.integration-spec.ts @@ -10,7 +10,7 @@ import { eachTestingContextFilter, } from 'twenty-shared/testing'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; type TestContext = { input: { diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-update.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-update.integration-spec.ts index c9aefbdb30..4076c9d03e 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-update.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/successful-page-layout-widget-update.integration-spec.ts @@ -11,7 +11,7 @@ import { eachTestingContextFilter, } from 'twenty-shared/testing'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; type TestContext = { input: { diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget-query-factory.util.ts index 6efd07c98a..45c7149665 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget-query-factory.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget-query-factory.util.ts @@ -2,7 +2,7 @@ import gql from 'graphql-tag'; import { WIDGET_CONFIGURATION_GQL_FIELDS } from 'test/integration/metadata/suites/page-layout-widget/constants/widget-configuration-gql-fields.constant'; import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type'; -import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/create-page-layout-widget.input'; +import { type CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input'; export type CreateOnePageLayoutWidgetFactoryInput = CreatePageLayoutWidgetInput; const DEFAULT_PAGE_LAYOUT_WIDGET_GQL_FIELDS = ` diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget.util.ts index 2ee98d817c..13b4e39847 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/create-one-page-layout-widget.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const createOnePageLayoutWidget = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/delete-one-page-layout-widget.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/delete-one-page-layout-widget.util.ts index 70aab81cdd..7fec055876 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/delete-one-page-layout-widget.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/delete-one-page-layout-widget.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const deleteOnePageLayoutWidget = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-one-page-layout-widget.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-one-page-layout-widget.util.ts index 246185a23e..40ed12c7d6 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-one-page-layout-widget.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-one-page-layout-widget.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const findOnePageLayoutWidget = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-page-layout-widgets.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-page-layout-widgets.util.ts index 7cabc2397a..01a01299d5 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-page-layout-widgets.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/find-page-layout-widgets.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const findPageLayoutWidgets = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/restore-one-page-layout-widget.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/restore-one-page-layout-widget.util.ts index 80402f4fb3..15298cb42c 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/restore-one-page-layout-widget.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/restore-one-page-layout-widget.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const restoreOnePageLayoutWidget = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget-query-factory.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget-query-factory.util.ts index eccdc7a918..c940112e38 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget-query-factory.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget-query-factory.util.ts @@ -2,7 +2,7 @@ import gql from 'graphql-tag'; import { WIDGET_CONFIGURATION_GQL_FIELDS } from 'test/integration/metadata/suites/page-layout-widget/constants/widget-configuration-gql-fields.constant'; import { type PerformMetadataQueryParams } from 'test/integration/metadata/types/perform-metadata-query.type'; -import { type UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout/dtos/inputs/update-page-layout-widget.input'; +import { type UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input'; export type UpdateOnePageLayoutWidgetFactoryInput = { id: string; diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget.util.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget.util.ts index f652beb155..8ed8fbba51 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget.util.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout-widget/utils/update-one-page-layout-widget.util.ts @@ -8,7 +8,7 @@ import { type PerformMetadataQueryParams } from 'test/integration/metadata/types import { warnIfErrorButNotExpectedToFail } from 'test/integration/metadata/utils/warn-if-error-but-not-expected-to-fail.util'; import { warnIfNoErrorButExpectedToFail } from 'test/integration/metadata/utils/warn-if-no-error-but-expected-to-fail.util'; -import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout/dtos/page-layout-widget.dto'; +import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto'; export const updateOnePageLayoutWidget = async ({ input, diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout/failing-page-layout-with-tabs-update.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout/failing-page-layout-with-tabs-update.integration-spec.ts index b9c447a545..3883ef8fa4 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout/failing-page-layout-with-tabs-update.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout/failing-page-layout-with-tabs-update.integration-spec.ts @@ -2,7 +2,7 @@ import { expectOneNotInternalServerErrorSnapshot } from 'test/integration/graphq import { updateOnePageLayoutWithTabsAndWidgets } from 'test/integration/metadata/suites/page-layout/utils/update-one-page-layout-with-tabs-and-widgets.util'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; describe('Page layout with tabs update should fail', () => { it('when updating a non-existent page layout', async () => { diff --git a/packages/twenty-server/test/integration/metadata/suites/page-layout/successful-page-layout-with-tabs-update.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/page-layout/successful-page-layout-with-tabs-update.integration-spec.ts index 03972d8422..729f0d1871 100644 --- a/packages/twenty-server/test/integration/metadata/suites/page-layout/successful-page-layout-with-tabs-update.integration-spec.ts +++ b/packages/twenty-server/test/integration/metadata/suites/page-layout/successful-page-layout-with-tabs-update.integration-spec.ts @@ -11,9 +11,9 @@ import { import { v4 } from 'uuid'; import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant'; -import { GraphType } from 'src/engine/metadata-modules/page-layout/enums/graph-type.enum'; +import { GraphType } from 'src/engine/metadata-modules/page-layout-widget/enums/graph-type.enum'; +import { WidgetType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-type.enum'; import { PageLayoutType } from 'src/engine/metadata-modules/page-layout/enums/page-layout-type.enum'; -import { WidgetType } from 'src/engine/metadata-modules/page-layout/enums/widget-type.enum'; const MOCK_PIE_CHART_CONFIGURATION = { graphType: GraphType.PIE, diff --git a/packages/twenty-server/test/integration/utils/page-layout-tab-test.util.ts b/packages/twenty-server/test/integration/utils/page-layout-tab-test.util.ts index dfa6b35fd2..99eab9ee04 100644 --- a/packages/twenty-server/test/integration/utils/page-layout-tab-test.util.ts +++ b/packages/twenty-server/test/integration/utils/page-layout-tab-test.util.ts @@ -1,4 +1,4 @@ -import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-tab.entity'; +import { type PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity'; export const cleanupPageLayoutTabRecords = async (): Promise => { await global.testDataSource.query(`DELETE from "core"."pageLayoutTab"`); diff --git a/packages/twenty-server/test/integration/utils/page-layout-widget-test.util.ts b/packages/twenty-server/test/integration/utils/page-layout-widget-test.util.ts index 939939c85a..00393707e0 100644 --- a/packages/twenty-server/test/integration/utils/page-layout-widget-test.util.ts +++ b/packages/twenty-server/test/integration/utils/page-layout-widget-test.util.ts @@ -1,4 +1,4 @@ -import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout-widget.entity'; +import { type PageLayoutWidgetEntity } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity'; export const cleanupPageLayoutWidgetRecords = async (): Promise => { await global.testDataSource.query(`DELETE from "core"."pageLayoutWidget"`);