[Bug] Select options names can't start with a number (#7079)
This PR was created by [GitStart](https://gitstart.com/) to address the requirements from this ticket: [TWNTY-6980](https://clients.gitstart.com/twenty/5449/tickets/TWNTY-6980). This ticket was imported from: [TWNTY-6980](https://github.com/twentyhq/twenty/issues/6980) --- ### Description - **fix**: added a transformation step that prefixes the newly added option with an underscore before the Graphql enum is generated so it saves successfully and passes the default GraphQL validation. ### Demo - <https://www.loom.com/share/feda2198ed8b4e558f96520a0d051725> ### Refs #6980 Fixes #6980 Co-authored-by: gitstart-twenty <gitstart-twenty@users.noreply.github.com> Co-authored-by: Weiko <corentin@twenty.com>
This commit is contained in:
committed by
GitHub
parent
e0ada0a8ee
commit
b3ed6cb903
@ -2,7 +2,6 @@ import { themeColorSchema } from 'twenty-ui';
|
|||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
|
import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
|
||||||
import { getOptionValueFromLabel } from '@/settings/data-model/fields/forms/select/utils/getOptionValueFromLabel';
|
|
||||||
import { computeOptionValueFromLabelOrThrow } from '~/pages/settings/data-model/utils/compute-option-value-from-label.utils';
|
import { computeOptionValueFromLabelOrThrow } from '~/pages/settings/data-model/utils/compute-option-value-from-label.utils';
|
||||||
|
|
||||||
const selectOptionSchema = z
|
const selectOptionSchema = z
|
||||||
@ -13,9 +12,6 @@ const selectOptionSchema = z
|
|||||||
position: z.number(),
|
position: z.number(),
|
||||||
value: z.string(),
|
value: z.string(),
|
||||||
})
|
})
|
||||||
.refine((option) => option.value === getOptionValueFromLabel(option.label), {
|
|
||||||
message: 'Value does not match label',
|
|
||||||
})
|
|
||||||
.refine(
|
.refine(
|
||||||
(option) => {
|
(option) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -3,15 +3,16 @@ import { Injectable, Logger } from '@nestjs/common';
|
|||||||
import { GraphQLEnumType } from 'graphql';
|
import { GraphQLEnumType } from 'graphql';
|
||||||
|
|
||||||
import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
|
import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
|
||||||
import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
|
|
||||||
import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
|
import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
|
||||||
|
import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
|
||||||
|
|
||||||
import { pascalCase } from 'src/utils/pascal-case';
|
|
||||||
import {
|
import {
|
||||||
FieldMetadataComplexOption,
|
FieldMetadataComplexOption,
|
||||||
FieldMetadataDefaultOption,
|
FieldMetadataDefaultOption,
|
||||||
} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
|
} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
|
||||||
import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
|
import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
|
||||||
|
import { transformEnumValue } from 'src/engine/utils/transform-enum-value';
|
||||||
|
import { pascalCase } from 'src/utils/pascal-case';
|
||||||
|
|
||||||
export interface EnumTypeDefinition {
|
export interface EnumTypeDefinition {
|
||||||
target: string;
|
target: string;
|
||||||
@ -53,7 +54,7 @@ export class EnumTypeDefinitionFactory {
|
|||||||
): GraphQLEnumType {
|
): GraphQLEnumType {
|
||||||
// FixMe: It's a hack until Typescript get fixed on union types for reduce function
|
// FixMe: It's a hack until Typescript get fixed on union types for reduce function
|
||||||
// https://github.com/microsoft/TypeScript/issues/36390
|
// https://github.com/microsoft/TypeScript/issues/36390
|
||||||
const enumOptions = fieldMetadata.options as Array<
|
const enumOptions = transformEnumValue(fieldMetadata.options) as Array<
|
||||||
FieldMetadataDefaultOption | FieldMetadataComplexOption
|
FieldMetadataDefaultOption | FieldMetadataComplexOption
|
||||||
>;
|
>;
|
||||||
|
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import {
|
|||||||
QueryOptions,
|
QueryOptions,
|
||||||
Relation,
|
Relation,
|
||||||
} from '@ptc-org/nestjs-query-graphql';
|
} from '@ptc-org/nestjs-query-graphql';
|
||||||
|
import { Transform } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsBoolean,
|
IsBoolean,
|
||||||
IsDateString,
|
IsDateString,
|
||||||
@ -30,11 +31,13 @@ import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadat
|
|||||||
|
|
||||||
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
|
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
|
||||||
import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
|
import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
|
||||||
|
import { FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
|
||||||
import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
|
import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
|
||||||
import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
|
import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
|
||||||
import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
|
import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
|
||||||
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
|
import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
|
||||||
import { RelationMetadataDTO } from 'src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto';
|
import { RelationMetadataDTO } from 'src/engine/metadata-modules/relation-metadata/dtos/relation-metadata.dto';
|
||||||
|
import { transformEnumValue } from 'src/engine/utils/transform-enum-value';
|
||||||
|
|
||||||
registerEnumType(FieldMetadataType, {
|
registerEnumType(FieldMetadataType, {
|
||||||
name: 'FieldMetadataType',
|
name: 'FieldMetadataType',
|
||||||
@ -120,6 +123,9 @@ export class FieldMetadataDTO<
|
|||||||
@Field(() => GraphQLJSON, { nullable: true })
|
@Field(() => GraphQLJSON, { nullable: true })
|
||||||
defaultValue?: FieldMetadataDefaultValue<T>;
|
defaultValue?: FieldMetadataDefaultValue<T>;
|
||||||
|
|
||||||
|
@Transform(({ value }) =>
|
||||||
|
transformEnumValue(value as FieldMetadataDefaultOption[]),
|
||||||
|
)
|
||||||
@Validate(IsFieldMetadataOptions)
|
@Validate(IsFieldMetadataOptions)
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@Field(() => GraphQLJSON, { nullable: true })
|
@Field(() => GraphQLJSON, { nullable: true })
|
||||||
|
|||||||
@ -0,0 +1,14 @@
|
|||||||
|
import { FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
|
||||||
|
|
||||||
|
export function transformEnumValue(options?: FieldMetadataDefaultOption[]) {
|
||||||
|
return options?.map((option) => {
|
||||||
|
if (/^\d/.test(option.value)) {
|
||||||
|
return {
|
||||||
|
...option,
|
||||||
|
value: `_${option.value}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return option;
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user