fix: remove usage of probability field (#5877)

- fixes #5735

---------

Co-authored-by: Marie Stoppa <marie.stoppa@essec.edu>
This commit is contained in:
Siddhant Rai
2024-07-16 13:54:35 +05:30
committed by GitHub
parent c0f6f52669
commit 364caf0fdf
18 changed files with 14 additions and 64 deletions

View File

@ -333,7 +333,6 @@ export enum FieldMetadataType {
Numeric = 'NUMERIC', Numeric = 'NUMERIC',
Phone = 'PHONE', Phone = 'PHONE',
Position = 'POSITION', Position = 'POSITION',
Probability = 'PROBABILITY',
Rating = 'RATING', Rating = 'RATING',
RawJson = 'RAW_JSON', RawJson = 'RAW_JSON',
Relation = 'RELATION', Relation = 'RELATION',

View File

@ -246,7 +246,6 @@ export enum FieldMetadataType {
Numeric = 'NUMERIC', Numeric = 'NUMERIC',
Phone = 'PHONE', Phone = 'PHONE',
Position = 'POSITION', Position = 'POSITION',
Probability = 'PROBABILITY',
Rating = 'RATING', Rating = 'RATING',
RawJson = 'RAW_JSON', RawJson = 'RAW_JSON',
Relation = 'RELATION', Relation = 'RELATION',

View File

@ -39,11 +39,6 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({
return acc; return acc;
} }
// Todo: remove once Rating fieldtype is implemented
if (field.name === 'probability') {
return acc;
}
return [...acc, formatFieldMetadataItemAsFilterDefinition({ field })]; return [...acc, formatFieldMetadataItemAsFilterDefinition({ field })];
}, [] as FilterDefinition[]); }, [] as FilterDefinition[]);

View File

@ -82,7 +82,7 @@ export const usePersistField = () => {
isFieldBoolean(fieldDefinition) && isFieldBoolean(fieldDefinition) &&
isFieldBooleanValue(valueToPersist); isFieldBooleanValue(valueToPersist);
const fieldIsProbability = const fieldIsRating =
isFieldRating(fieldDefinition) && isFieldRatingValue(valueToPersist); isFieldRating(fieldDefinition) && isFieldRatingValue(valueToPersist);
const fieldIsNumber = const fieldIsNumber =
@ -119,7 +119,7 @@ export const usePersistField = () => {
fieldIsText || fieldIsText ||
fieldIsBoolean || fieldIsBoolean ||
fieldIsEmail || fieldIsEmail ||
fieldIsProbability || fieldIsRating ||
fieldIsNumber || fieldIsNumber ||
fieldIsDateTime || fieldIsDateTime ||
fieldIsDate || fieldIsDate ||

View File

@ -51,19 +51,17 @@ type AssertFieldMetadataFunction = <
? FieldNumberMetadata ? FieldNumberMetadata
: E extends 'PHONE' : E extends 'PHONE'
? FieldPhoneMetadata ? FieldPhoneMetadata
: E extends 'PROBABILITY' : E extends 'RELATION'
? FieldRatingMetadata ? FieldRelationMetadata
: E extends 'RELATION' : E extends 'TEXT'
? FieldRelationMetadata ? FieldTextMetadata
: E extends 'TEXT' : E extends 'UUID'
? FieldTextMetadata ? FieldUuidMetadata
: E extends 'UUID' : E extends 'ADDRESS'
? FieldUuidMetadata ? FieldAddressMetadata
: E extends 'ADDRESS' : E extends 'RAW_JSON'
? FieldAddressMetadata ? FieldRawJsonMetadata
: E extends 'RAW_JSON' : never,
? FieldRawJsonMetadata
: never,
>( >(
fieldType: E, fieldType: E,
fieldTypeGuard: ( fieldTypeGuard: (

View File

@ -102,11 +102,6 @@ export const SETTINGS_FIELD_TYPE_CONFIGS = {
Icon: IconPhone, Icon: IconPhone,
defaultValue: '+1234-567-890', defaultValue: '+1234-567-890',
}, },
[FieldMetadataType.Probability]: {
label: 'Rating',
Icon: IconTwentyStar,
defaultValue: '3',
},
[FieldMetadataType.Rating]: { [FieldMetadataType.Rating]: {
label: 'Rating', label: 'Rating',
Icon: IconTwentyStar, Icon: IconTwentyStar,

View File

@ -161,7 +161,7 @@ export const SettingsObjectNewFieldStep2 = () => {
// FieldMetadataType.FullName, // FieldMetadataType.FullName,
FieldMetadataType.Link, FieldMetadataType.Link,
FieldMetadataType.Numeric, FieldMetadataType.Numeric,
FieldMetadataType.Probability, // FieldMetadataType.Probability,
// FieldMetadataType.Uuid, // FieldMetadataType.Uuid,
// FieldMetadataType.Phone, // FieldMetadataType.Phone,
] as const ] as const

View File

@ -145,13 +145,6 @@ const fieldNumericMock = {
defaultValue: null, defaultValue: null,
}; };
const fieldProbabilityMock = {
name: 'fieldProbability',
type: FieldMetadataType.PROBABILITY,
isNullable: true,
defaultValue: null,
};
const fieldFullNameMock = { const fieldFullNameMock = {
name: 'fieldFullName', name: 'fieldFullName',
type: FieldMetadataType.FULL_NAME, type: FieldMetadataType.FULL_NAME,
@ -206,7 +199,6 @@ export const fields = [
fieldBooleanMock, fieldBooleanMock,
fieldNumberMock, fieldNumberMock,
fieldNumericMock, fieldNumericMock,
fieldProbabilityMock,
fieldLinkMock, fieldLinkMock,
fieldLinksMock, fieldLinksMock,
fieldCurrencyMock, fieldCurrencyMock,

View File

@ -73,7 +73,6 @@ export class TypeMapperService {
), ),
], ],
[FieldMetadataType.NUMERIC, BigFloatScalarType], [FieldMetadataType.NUMERIC, BigFloatScalarType],
[FieldMetadataType.PROBABILITY, GraphQLFloat],
[FieldMetadataType.POSITION, PositionScalarType], [FieldMetadataType.POSITION, PositionScalarType],
[FieldMetadataType.RAW_JSON, RawJSONScalar], [FieldMetadataType.RAW_JSON, RawJSONScalar],
]); ]);
@ -109,7 +108,6 @@ export class TypeMapperService {
), ),
], ],
[FieldMetadataType.NUMERIC, BigFloatFilterType], [FieldMetadataType.NUMERIC, BigFloatFilterType],
[FieldMetadataType.PROBABILITY, FloatFilterType],
[FieldMetadataType.POSITION, FloatFilterType], [FieldMetadataType.POSITION, FloatFilterType],
[FieldMetadataType.RAW_JSON, RawJsonFilterType], [FieldMetadataType.RAW_JSON, RawJsonFilterType],
]); ]);
@ -130,7 +128,6 @@ export class TypeMapperService {
[FieldMetadataType.BOOLEAN, OrderByDirectionType], [FieldMetadataType.BOOLEAN, OrderByDirectionType],
[FieldMetadataType.NUMBER, OrderByDirectionType], [FieldMetadataType.NUMBER, OrderByDirectionType],
[FieldMetadataType.NUMERIC, OrderByDirectionType], [FieldMetadataType.NUMERIC, OrderByDirectionType],
[FieldMetadataType.PROBABILITY, OrderByDirectionType],
[FieldMetadataType.RATING, OrderByDirectionType], [FieldMetadataType.RATING, OrderByDirectionType],
[FieldMetadataType.SELECT, OrderByDirectionType], [FieldMetadataType.SELECT, OrderByDirectionType],
[FieldMetadataType.MULTI_SELECT, OrderByDirectionType], [FieldMetadataType.MULTI_SELECT, OrderByDirectionType],

View File

@ -55,9 +55,6 @@ describe('computeSchemaComponents', () => {
fieldNumeric: { fieldNumeric: {
type: 'number', type: 'number',
}, },
fieldProbability: {
type: 'number',
},
fieldLink: { fieldLink: {
properties: { properties: {
label: { type: 'string' }, label: { type: 'string' },

View File

@ -35,7 +35,6 @@ const getFieldProperties = (type: FieldMetadataType): Property => {
case FieldMetadataType.NUMBER: case FieldMetadataType.NUMBER:
return { type: 'integer' }; return { type: 'integer' };
case FieldMetadataType.NUMERIC: case FieldMetadataType.NUMERIC:
case FieldMetadataType.PROBABILITY:
case FieldMetadataType.RATING: case FieldMetadataType.RATING:
case FieldMetadataType.POSITION: case FieldMetadataType.POSITION:
return { type: 'number' }; return { type: 'number' };

View File

@ -31,7 +31,6 @@ export enum FieldMetadataType {
BOOLEAN = 'BOOLEAN', BOOLEAN = 'BOOLEAN',
NUMBER = 'NUMBER', NUMBER = 'NUMBER',
NUMERIC = 'NUMERIC', NUMERIC = 'NUMERIC',
PROBABILITY = 'PROBABILITY',
LINK = 'LINK', LINK = 'LINK',
LINKS = 'LINKS', LINKS = 'LINKS',
CURRENCY = 'CURRENCY', CURRENCY = 'CURRENCY',

View File

@ -35,7 +35,6 @@ type FieldMetadataDefaultValueMapping = {
[FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber; [FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.POSITION]: FieldMetadataDefaultValueNumber; [FieldMetadataType.POSITION]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.NUMERIC]: FieldMetadataDefaultValueString; [FieldMetadataType.NUMERIC]: FieldMetadataDefaultValueString;
[FieldMetadataType.PROBABILITY]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.LINK]: FieldMetadataDefaultValueLink; [FieldMetadataType.LINK]: FieldMetadataDefaultValueLink;
[FieldMetadataType.LINKS]: FieldMetadataDefaultValueLinks; [FieldMetadataType.LINKS]: FieldMetadataDefaultValueLinks;
[FieldMetadataType.CURRENCY]: FieldMetadataDefaultValueCurrency; [FieldMetadataType.CURRENCY]: FieldMetadataDefaultValueCurrency;

View File

@ -78,18 +78,6 @@ describe('validateDefaultValueForType', () => {
).toBe(false); ).toBe(false);
}); });
it('should validate number default value for PROBABILITY type', () => {
expect(
validateDefaultValueForType(FieldMetadataType.PROBABILITY, 0.5).isValid,
).toBe(true);
});
it('should return false for invalid number default value for PROBABILITY type', () => {
expect(
validateDefaultValueForType(FieldMetadataType.PROBABILITY, '50%').isValid,
).toBe(false);
});
it('should validate boolean default value for BOOLEAN type', () => { it('should validate boolean default value for BOOLEAN type', () => {
expect( expect(
validateDefaultValueForType(FieldMetadataType.BOOLEAN, true).isValid, validateDefaultValueForType(FieldMetadataType.BOOLEAN, true).isValid,

View File

@ -41,7 +41,6 @@ export const defaultValueValidatorsMap = {
[FieldMetadataType.BOOLEAN]: [FieldMetadataDefaultValueBoolean], [FieldMetadataType.BOOLEAN]: [FieldMetadataDefaultValueBoolean],
[FieldMetadataType.NUMBER]: [FieldMetadataDefaultValueNumber], [FieldMetadataType.NUMBER]: [FieldMetadataDefaultValueNumber],
[FieldMetadataType.NUMERIC]: [FieldMetadataDefaultValueString], [FieldMetadataType.NUMERIC]: [FieldMetadataDefaultValueString],
[FieldMetadataType.PROBABILITY]: [FieldMetadataDefaultValueNumber],
[FieldMetadataType.LINK]: [FieldMetadataDefaultValueLink], [FieldMetadataType.LINK]: [FieldMetadataDefaultValueLink],
[FieldMetadataType.CURRENCY]: [FieldMetadataDefaultValueCurrency], [FieldMetadataType.CURRENCY]: [FieldMetadataDefaultValueCurrency],
[FieldMetadataType.FULL_NAME]: [FieldMetadataDefaultValueFullName], [FieldMetadataType.FULL_NAME]: [FieldMetadataDefaultValueFullName],

View File

@ -25,7 +25,6 @@ export type BasicFieldMetadataType =
| FieldMetadataType.EMAIL | FieldMetadataType.EMAIL
| FieldMetadataType.NUMERIC | FieldMetadataType.NUMERIC
| FieldMetadataType.NUMBER | FieldMetadataType.NUMBER
| FieldMetadataType.PROBABILITY
| FieldMetadataType.BOOLEAN | FieldMetadataType.BOOLEAN
| FieldMetadataType.POSITION | FieldMetadataType.POSITION
| FieldMetadataType.DATE_TIME | FieldMetadataType.DATE_TIME

View File

@ -22,7 +22,6 @@ export const fieldMetadataTypeToColumnType = <Type extends FieldMetadataType>(
case FieldMetadataType.NUMERIC: case FieldMetadataType.NUMERIC:
return 'numeric'; return 'numeric';
case FieldMetadataType.NUMBER: case FieldMetadataType.NUMBER:
case FieldMetadataType.PROBABILITY:
case FieldMetadataType.POSITION: case FieldMetadataType.POSITION:
return 'float'; return 'float';
case FieldMetadataType.BOOLEAN: case FieldMetadataType.BOOLEAN:

View File

@ -72,10 +72,6 @@ export class WorkspaceMigrationFactory {
[FieldMetadataType.NUMBER, { factory: this.basicColumnActionFactory }], [FieldMetadataType.NUMBER, { factory: this.basicColumnActionFactory }],
[FieldMetadataType.POSITION, { factory: this.basicColumnActionFactory }], [FieldMetadataType.POSITION, { factory: this.basicColumnActionFactory }],
[FieldMetadataType.RAW_JSON, { factory: this.basicColumnActionFactory }], [FieldMetadataType.RAW_JSON, { factory: this.basicColumnActionFactory }],
[
FieldMetadataType.PROBABILITY,
{ factory: this.basicColumnActionFactory },
],
[FieldMetadataType.BOOLEAN, { factory: this.basicColumnActionFactory }], [FieldMetadataType.BOOLEAN, { factory: this.basicColumnActionFactory }],
[FieldMetadataType.DATE_TIME, { factory: this.basicColumnActionFactory }], [FieldMetadataType.DATE_TIME, { factory: this.basicColumnActionFactory }],
[FieldMetadataType.DATE, { factory: this.basicColumnActionFactory }], [FieldMetadataType.DATE, { factory: this.basicColumnActionFactory }],