5a4ebca226
## Unify the two metadata override mechanisms into one Twenty had **two** override mechanisms: - **`standardOverrides`** — a bespoke JSONB column on `objectMetadata`/`fieldMetadata` with typed DTOs and a per-locale `translations` map, resolved by two i18n-aware resolvers. - **`OverridableEntity.overrides`** — a flat, registry-driven JSONB blob on view / view-field / view-field-group / command-menu-item / page-layout-tab / page-layout-widget, resolved by a plain spread. This PR collapses them into **one** concept: a single `overrides` blob, one registry-driven overridable set, one i18n-aware read path, and one write path (`computeMetadataOverridesBlob`, extracted in #22404). Object/field **stay on `SyncableEntity`** (not reparented to `OverridableEntity`) so their `isActive` default stays **FALSE** — this sidesteps the `isActive` default conflict entirely. ### GraphQL breaking change (accepted) The `standardOverrides` field is **removed** with no deprecation alias — `overrides` (a `JSON` scalar) is exposed instead on `Object` and `Field`. Product confirmed negligible external usage; the front-end has no hand-written consumer (only generated types), which are regenerated here. ### Commit structure (reviewable commit-by-commit) 1. **Unified resolver + parity harness** — `resolveEffectiveEntityProperty` is a strict superset of the three legacy resolvers; a corpus parity spec compares it against a *frozen reference* of the old logic across every locale, `isStandardApp` branch and override shape. 2. **Registry-driven** — object/field presentation props tagged `isOverridable` + `translatable`; the overridable/translatable sets are derived from the registry (a test asserts they equal the legacy hardcoded lists). 3. **Rename + swap + delete** — `standardOverrides` → `overrides` across entities, DTOs, flat/universal types, producers, the ~12 resolve/write/create/sync call sites, mocks and specs; the reconciler's two compare entries collapse to one; the three legacy resolvers, both DTOs and the hardcoded constants/types are deleted. 4. **Migration (zero-downtime, two-phase)** — split across two releases so a rolling deploy never drops a column a previous-release pod still `SELECT`s: - **2.19 fast** — add the `overrides` column (schema only). - **2.19 slow** — backfill `overrides` from `standardOverrides` in `runDataMigration` (kept out of the schema transaction so the bulk write doesn't hold the ACCESS EXCLUSIVE lock; skipped on fresh installs, which have no data to copy). - **2.20 fast** — drop the legacy `standardOverrides` column (gated by `TWENTY_NEXT_VERSIONS`, so it stays dormant until the instance reaches 2.20). 5. **Front/client-SDK regen** — regenerated metadata GraphQL types. 6. **Integration specs + i18n** — updated the standard object/field update integration specs + snapshots, and the reworded validator message catalog entry. ### Rolling-deploy safety `standardOverrides` is retained through 2.19 and only dropped in 2.20, mirroring the codebase's deferred-drop convention (`isUIReadOnly`/`isCustom`). During the 2.19 rollout both columns exist, so old and new pods coexist without "column does not exist" errors. The backfill lives in a slow `runDataMigration` (per the `no-data-mutation-in-fast-instance-command` rule) so it doesn't stall reads. ### `isActive` guard The migration never reads or writes `isActive`; the backfill asserts the active-row count is unchanged and aborts otherwise. Verified on a real DB: apply + revert preserves the blob **and** the nested `translations` map, with `isActive` counts identical before/after. ### Verification (local) - `nx typecheck twenty-server` + `nx typecheck twenty-front` — green - `nx lint:diff-with-main twenty-server` (oxlint `--type-aware` + oxfmt) — green - `nx test twenty-server` — green (unit + parity + registry + migration tests) - `nx run twenty-server:test:integration:with-db-reset` — green - `database:reset` applies the 2.19 phases and leaves **both** columns present (2.20 drop stays dormant); backfill + revert round-trip verified on a real DB - Metadata integration suites (standard object/field update, application sync) pass end-to-end against the two-column schema - Metadata GraphQL types regenerated against a booted server; zero `standardOverrides` references remain in application code (only the migration commands + the legacy schema baseline) --------- Co-authored-by: prastoin <paul@twenty.com>
303 lines
11 KiB
TypeScript
303 lines
11 KiB
TypeScript
import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';
|
|
import {
|
|
Args,
|
|
Context,
|
|
Mutation,
|
|
Parent,
|
|
Query,
|
|
ResolveField,
|
|
} from '@nestjs/graphql';
|
|
|
|
import { PermissionFlagType } from 'twenty-shared/constants';
|
|
import { ViewType, ViewVisibility } from 'twenty-shared/types';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
|
|
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
|
|
import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';
|
|
import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
|
|
import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
|
|
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
|
|
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
|
|
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
|
|
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
|
|
import { CustomPermissionGuard } from 'src/engine/guards/custom-permission.guard';
|
|
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 { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
|
|
import { ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';
|
|
import { ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';
|
|
import { ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';
|
|
import { ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view-filter.dto';
|
|
import { ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';
|
|
import { CreateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/create-view-permission.guard';
|
|
import { DeleteViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/delete-view-permission.guard';
|
|
import { DestroyViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/destroy-view-permission.guard';
|
|
import { UpdateViewPermissionGuard } from 'src/engine/metadata-modules/view-permissions/guards/update-view-permission.guard';
|
|
import { ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';
|
|
import { CreateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/create-view.input';
|
|
import { UpdateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/update-view.input';
|
|
import { UpsertViewWidgetInput } from 'src/engine/metadata-modules/view/dtos/inputs/upsert-view-widget.input';
|
|
import { ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';
|
|
import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';
|
|
import { ViewWidgetUpsertService } from 'src/engine/metadata-modules/view/services/view-widget-upsert.service';
|
|
import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';
|
|
import { ViewGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/view/utils/view-graphql-api-exception.filter';
|
|
|
|
@MetadataResolver(() => ViewDTO)
|
|
@UseFilters(ViewGraphqlApiExceptionFilter)
|
|
@UseGuards(WorkspaceAuthGuard)
|
|
export class ViewResolver {
|
|
constructor(
|
|
private readonly viewService: ViewService,
|
|
private readonly viewWidgetUpsertService: ViewWidgetUpsertService,
|
|
private readonly i18nService: I18nService,
|
|
) {}
|
|
|
|
@ResolveField(() => String)
|
|
async name(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders } & I18nContext,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<string> {
|
|
if (view.name.includes('{objectLabelPlural}')) {
|
|
const objectMetadata = await context.loaders.objectMetadataLoader.load({
|
|
objectMetadataId: view.objectMetadataId,
|
|
workspaceId: workspace.id,
|
|
});
|
|
|
|
if (isDefined(objectMetadata)) {
|
|
const i18n = this.i18nService.getI18nInstance(context.req.locale);
|
|
const standardApplicationId =
|
|
await context.loaders.standardApplicationIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
});
|
|
const isStandardApp =
|
|
objectMetadata.applicationId === standardApplicationId;
|
|
const applicationCatalog =
|
|
await context.loaders.applicationTranslationCatalogLoader.load({
|
|
applicationId: objectMetadata.applicationId,
|
|
workspaceId: workspace.id,
|
|
locale: context.req.locale,
|
|
});
|
|
const translatedObjectLabel = resolveEffectiveEntityProperty({
|
|
metadataName: 'objectMetadata',
|
|
baseValue: objectMetadata.labelPlural,
|
|
overrides: objectMetadata.overrides ?? undefined,
|
|
property: 'labelPlural',
|
|
i18nContext: {
|
|
locale: context.req.locale,
|
|
i18nInstance: i18n,
|
|
isStandardApp,
|
|
applicationCatalog,
|
|
},
|
|
});
|
|
|
|
return this.viewService.processViewNameWithTemplate(
|
|
view.name,
|
|
view.isCustom,
|
|
translatedObjectLabel,
|
|
context.req.locale,
|
|
);
|
|
}
|
|
}
|
|
|
|
return this.viewService.processViewNameWithTemplate(
|
|
view.name,
|
|
view.isCustom,
|
|
undefined,
|
|
context.req.locale,
|
|
);
|
|
}
|
|
|
|
@Query(() => [ViewDTO])
|
|
@UseGuards(CustomPermissionGuard)
|
|
async getViews(
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
@AuthUserWorkspaceId({ allowUndefined: true })
|
|
userWorkspaceId: string | undefined,
|
|
@Args('objectMetadataId', { type: () => String, nullable: true })
|
|
objectMetadataId?: string,
|
|
@Args('viewTypes', { type: () => [ViewType], nullable: true })
|
|
viewTypes?: ViewType[],
|
|
): Promise<ViewDTO[]> {
|
|
if (objectMetadataId) {
|
|
return this.viewService.findByObjectMetadataId(
|
|
workspace.id,
|
|
objectMetadataId,
|
|
userWorkspaceId,
|
|
viewTypes,
|
|
);
|
|
}
|
|
|
|
return this.viewService.findByWorkspaceId(
|
|
workspace.id,
|
|
userWorkspaceId,
|
|
viewTypes,
|
|
);
|
|
}
|
|
|
|
@Query(() => ViewDTO, { nullable: true })
|
|
@UseGuards(NoPermissionGuard)
|
|
async getView(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<ViewDTO | null> {
|
|
const view = await this.viewService.findById(id, workspace.id);
|
|
|
|
if (!view) {
|
|
return null;
|
|
}
|
|
|
|
return view;
|
|
}
|
|
|
|
@Mutation(() => ViewDTO)
|
|
@UseGuards(CreateViewPermissionGuard)
|
|
async createView(
|
|
@Args('input') input: CreateViewInput,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
@AuthUserWorkspaceId({ allowUndefined: true })
|
|
userWorkspaceId: string | undefined,
|
|
): Promise<ViewDTO> {
|
|
const visibility = input.visibility ?? ViewVisibility.WORKSPACE;
|
|
|
|
input.visibility = visibility;
|
|
|
|
return await this.viewService.createOne({
|
|
createViewInput: input,
|
|
workspaceId: workspace.id,
|
|
createdByUserWorkspaceId: userWorkspaceId,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => ViewDTO)
|
|
@UseGuards(UpdateViewPermissionGuard)
|
|
async updateView(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@Args('input') input: UpdateViewInput,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
@AuthUserWorkspaceId({ allowUndefined: true })
|
|
userWorkspaceId: string | undefined,
|
|
): Promise<ViewDTO> {
|
|
return await this.viewService.updateOne({
|
|
updateViewInput: { ...input, id },
|
|
workspaceId: workspace.id,
|
|
userWorkspaceId,
|
|
});
|
|
}
|
|
|
|
@Mutation(() => Boolean)
|
|
@UseGuards(DeleteViewPermissionGuard)
|
|
async deleteView(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<boolean> {
|
|
const deletedView = await this.viewService.deleteOne({
|
|
deleteViewInput: { id },
|
|
workspaceId: workspace.id,
|
|
});
|
|
|
|
return isDefined(deletedView);
|
|
}
|
|
|
|
@Mutation(() => Boolean)
|
|
@UseGuards(DestroyViewPermissionGuard)
|
|
async destroyView(
|
|
@Args('id', { type: () => String }) id: string,
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
): Promise<boolean> {
|
|
const deletedView = await this.viewService.destroyOne({
|
|
destroyViewInput: { id },
|
|
workspaceId: workspace.id,
|
|
});
|
|
|
|
return isDefined(deletedView);
|
|
}
|
|
|
|
@Mutation(() => ViewDTO)
|
|
@UseGuards(SettingsPermissionGuard(PermissionFlagType.LAYOUTS))
|
|
@UsePipes(ResolverValidationPipe)
|
|
async upsertViewWidget(
|
|
@Args('input') input: UpsertViewWidgetInput,
|
|
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
|
|
): Promise<ViewEntity> {
|
|
return await this.viewWidgetUpsertService.upsertViewWidget({
|
|
input,
|
|
workspaceId,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewFieldDTO])
|
|
async viewFields(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewFieldsByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewFilterDTO])
|
|
async viewFilters(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewFiltersByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewFilterGroupDTO])
|
|
async viewFilterGroups(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewFilterGroupsByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewSortDTO])
|
|
async viewSorts(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewSortsByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewGroupDTO])
|
|
async viewGroups(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewGroupsByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
|
|
@ResolveField(() => [ViewFieldGroupDTO])
|
|
async viewFieldGroups(
|
|
@Parent() view: ViewDTO,
|
|
@Context() context: { loaders: IDataloaders },
|
|
@AuthWorkspace() workspace: WorkspaceEntity,
|
|
) {
|
|
return context.loaders.viewFieldGroupsByViewIdLoader.load({
|
|
workspaceId: workspace.id,
|
|
viewId: view.id,
|
|
});
|
|
}
|
|
}
|