admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Convert metadata tables to camelCase (#2400)

Browse Source 
* Convert metadata tables to camelCase

* datasourcemetadataid to datasourceid

* refactor metadata folders

* fix command

* move commands out of metadata

* fix seed

* rename objectId and fieldId in objectMetadataId and fieldMetadataId in FE

* fix field-metadata

* Fix

* Fix

* remove logs

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Weiko
2023-11-09 20:06:10 +01:00
committed by GitHub
parent 5622f42e7a
commit 1cf08c797f
238 changed files with 1851 additions and 2252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
front/src/generated-metadata/graphql.ts
View File

@ -173,7 +173,7 @@ export type CreateFieldInput = {
icon?: InputMaybe<Scalars['String']['input']>;
label: Scalars['String']['input'];
name: Scalars['String']['input'];
objectId: Scalars['String']['input'];
objectMetadataId: Scalars['String']['input'];
type: FieldMetadataType;
};
@ -196,6 +196,21 @@ export type CreateOneObjectInput = {
object: CreateObjectInput;
};
export type CreateOneRelationInput = {
/** The record to create */
relation: CreateRelationInput;
};
export type CreateRelationInput = {
description?: InputMaybe<Scalars['String']['input']>;
fromObjectMetadataId: Scalars['String']['input'];
icon?: InputMaybe<Scalars['String']['input']>;
label: Scalars['String']['input'];
name: Scalars['String']['input'];
relationType: Scalars['String']['input'];
toObjectMetadataId: Scalars['String']['input'];
};
export enum Currency {
Aed = 'AED',
Afn = 'AFN',
@ -437,6 +452,7 @@ export enum FieldMetadataType {
Money = 'MONEY',
Number = 'NUMBER',
Phone = 'PHONE',
Relation = 'RELATION',
Text = 'TEXT',
Url = 'URL',
Uuid = 'UUID'
@ -446,6 +462,7 @@ export type Mutation = {
__typename?: 'Mutation';
createOneField: Field;
createOneObject: Object;
createOneRelation: Relation;
deleteOneField: FieldDeleteResponse;
deleteOneObject: ObjectDeleteResponse;
updateOneField: Field;
@ -463,6 +480,11 @@ export type MutationCreateOneObjectArgs = {
};
export type MutationCreateOneRelationArgs = {
input: CreateOneRelationInput;
};
export type MutationDeleteOneFieldArgs = {
input: DeleteOneFieldInput;
};
@ -611,6 +633,7 @@ export type Query = {
fields: FieldConnection;
object: Object;
objects: ObjectConnection;
relation: Relation;
};
@ -633,6 +656,11 @@ export type QueryObjectsArgs = {
paging?: CursorPaging;
};
export type QueryRelationArgs = {
id: Scalars['ID']['input'];
};
export type Support = {
__typename?: 'Support';
supportDriver: Scalars['String']['output'];
@ -769,6 +797,7 @@ export type Field = {
__typename?: 'field';
createdAt: Scalars['DateTime']['output'];
description?: Maybe<Scalars['String']['output']>;
fromRelationMetadata?: Maybe<Relation>;
icon?: Maybe<Scalars['String']['output']>;
id: Scalars['ID']['output'];
isActive: Scalars['Boolean']['output'];
@ -778,6 +807,7 @@ export type Field = {
name: Scalars['String']['output'];
/** @deprecated Use label name instead */
placeholder?: Maybe<Scalars['String']['output']>;
toRelationMetadata?: Maybe<Relation>;
type: FieldMetadataType;
updatedAt: Scalars['DateTime']['output'];
};
@ -820,6 +850,28 @@ export type ObjectEdge = {
node: Object;
};
export type Relation = {
__typename?: 'relation';
createdAt: Scalars['DateTime']['output'];
fromFieldMetadataId: Scalars['String']['output'];
fromObjectMetadata: Object;
fromObjectMetadataId: Scalars['String']['output'];
id: Scalars['ID']['output'];
relationType: Scalars['String']['output'];
toFieldMetadataId: Scalars['String']['output'];
toObjectMetadata: Object;
toObjectMetadataId: Scalars['String']['output'];
updatedAt: Scalars['DateTime']['output'];
};
export type RelationEdge = {
__typename?: 'relationEdge';
/** Cursor for this node. */
cursor: Scalars['ConnectionCursor']['output'];
/** The node containing the relation */
node: Relation;
};
export type CreateOneObjectMetadataItemMutationVariables = Exact<{
input: CreateOneObjectInput;
}>;

39
front/src/generated/graphql.tsx
View File

@ -1322,6 +1322,7 @@ export enum FieldMetadataType {
Money = 'MONEY',
Number = 'NUMBER',
Phone = 'PHONE',
Relation = 'RELATION',
Text = 'TEXT',
Url = 'URL',
Uuid = 'UUID'
@ -1391,6 +1392,7 @@ export type Mutation = {
createOneApiKey: ApiKeyToken;
createOneComment: Comment;
createOneCompany: Company;
createOneField: Field;
createOneObject: Object;
createOnePerson: Person;
createOnePipelineProgress: PipelineProgress;
@ -1402,6 +1404,7 @@ export type Mutation = {
deleteManyCompany: AffectedRows;
deleteManyPerson: AffectedRows;
deleteManyPipelineProgress: AffectedRows;
deleteOneField: FieldDeleteResponse;
deleteOneObject: ObjectDeleteResponse;
deleteOnePipelineStage: PipelineStage;
deleteOneWebHook: WebHook;
@ -1414,6 +1417,7 @@ export type Mutation = {
updateOneActivity: Activity;
updateOneCompany?: Maybe<Company>;
updateOneFavorites: Favorite;
updateOneField: Field;
updateOneObject: Object;
updateOnePerson?: Maybe<Person>;
updateOnePipelineProgress?: Maybe<PipelineProgress>;
@ -2404,6 +2408,8 @@ export type Query = {
clientConfig: ClientConfig;
currentUser: User;
currentWorkspace: Workspace;
field: Field;
fields: FieldConnection;
findFavorites: Array<Favorite>;
findManyActivities: Array<Activity>;
findManyApiKey: Array<ApiKey>;
@ -2593,6 +2599,15 @@ export type Support = {
supportFrontChatId?: Maybe<Scalars['String']>;
};
export type TUser = {
__typename?: 'TUser';
email: Scalars['String'];
emailVerified: Scalars['Boolean'];
firstName?: Maybe<Scalars['String']>;
id: Scalars['ID'];
lastName?: Maybe<Scalars['String']>;
};
export type Telemetry = {
__typename?: 'Telemetry';
anonymizationEnabled: Scalars['Boolean'];
@ -3093,6 +3108,7 @@ export type Field = {
__typename?: 'field';
createdAt: Scalars['DateTime'];
description?: Maybe<Scalars['String']>;
fromRelationMetadata?: Maybe<Relation>;
icon?: Maybe<Scalars['String']>;
id: Scalars['ID'];
isActive: Scalars['Boolean'];
@ -3102,6 +3118,7 @@ export type Field = {
name: Scalars['String'];
/** @deprecated Use label name instead */
placeholder?: Maybe<Scalars['String']>;
toRelationMetadata?: Maybe<Relation>;
type: FieldMetadataType;
updatedAt: Scalars['DateTime'];
};
@ -3144,6 +3161,28 @@ export type ObjectEdge = {
node: Object;
};
export type Relation = {
__typename?: 'relation';
createdAt: Scalars['DateTime'];
fromFieldMetadataId: Scalars['String'];
fromObjectMetadata: Object;
fromObjectMetadataId: Scalars['String'];
id: Scalars['ID'];
relationType: Scalars['String'];
toFieldMetadataId: Scalars['String'];
toObjectMetadata: Object;
toObjectMetadataId: Scalars['String'];
updatedAt: Scalars['DateTime'];
};
export type RelationEdge = {
__typename?: 'relationEdge';
/** Cursor for this node. */
cursor: Scalars['ConnectionCursor'];
/** The node containing the relation */
node: Relation;
};
export type ActivityWithTargetsFragment = { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, companyId?: string | null, personId?: string | null }> | null };
export type ActivityQueryFragmentFragment = { __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, companyId?: string | null, personId?: string | null, company?: { __typename?: 'Company', id: string, name: string, domainName: string } | null, person?: { __typename?: 'Person', id: string, displayName: string, avatarUrl?: string | null } | null }> | null };

2
front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx
View File

@ -23,7 +23,7 @@ export const ActivityAssigneeEditableField = ({
entityId: activity.id,
recoilScopeId: 'assignee',
fieldDefinition: {
fieldId: 'assignee',
fieldMetadataId: 'assignee',
label: 'Assignee',
Icon: IconUserCircle,
type: 'RELATION',

2
front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx
View File

@ -21,7 +21,7 @@ export const ActivityEditorDateField = ({
entityId: activityId,
recoilScopeId: 'activityDueAt',
fieldDefinition: {
fieldId: 'activityDueAt',
fieldMetadataId: 'activityDueAt',
label: 'Due date',
Icon: IconCalendar,
type: 'DATE',

2
front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
View File

@ -17,7 +17,7 @@ export const useCurrentUserTaskCount = () => {
completedAt: { equals: null },
...(currentUser
? turnFilterIntoWhereClause({
fieldId: 'assigneeId',
fieldMetadataId: 'assigneeId',
value: currentUser.id,
operand: ViewFilterOperand.Is,
displayValue: currentUser.displayName,

6
front/src/modules/companies/components/CompanyBoardCard.tsx
View File

@ -222,13 +222,13 @@ export const CompanyBoardCard = () => {
<StyledBoardCardBody>
<AnimatedEaseInOut isOpen={!showCompactView}>
{visibleBoardCardFields.map((viewField) => (
<PreventSelectOnClickContainer key={viewField.fieldId}>
<PreventSelectOnClickContainer key={viewField.fieldMetadataId}>
<FieldContext.Provider
value={{
entityId: boardCardId,
recoilScopeId: boardCardId + viewField.fieldId,
recoilScopeId: boardCardId + viewField.fieldMetadataId,
fieldDefinition: {
fieldId: viewField.fieldId,
fieldMetadataId: viewField.fieldMetadataId,
label: viewField.label,
Icon: viewField.Icon,
type: viewField.type,

24
front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx
View File

@ -28,7 +28,7 @@ import { User } from '~/generated/graphql';
export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =
[
{
fieldId: 'name',
fieldMetadataId: 'name',
label: 'Name',
Icon: IconBuildingSkyscraper,
size: 180,
@ -45,7 +45,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
basePathToShowPage: '/companies/',
} satisfies ColumnDefinition<FieldChipMetadata>,
{
fieldId: 'domainName',
fieldMetadataId: 'domainName',
label: 'URL',
Icon: IconLink,
size: 100,
@ -60,7 +60,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
'The company website URL. We use this url to fetch the company icon.',
} satisfies ColumnDefinition<FieldURLMetadata>,
{
fieldId: 'accountOwner',
fieldMetadataId: 'accountOwner',
label: 'Account Owner',
Icon: IconUserCircle,
size: 150,
@ -82,7 +82,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
},
} satisfies ColumnDefinition<FieldRelationMetadata>,
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Creation',
Icon: IconCalendarEvent,
size: 150,
@ -95,7 +95,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
infoTooltipContent: "Date when the company's record was created.",
} satisfies ColumnDefinition<FieldDateMetadata>,
{
fieldId: 'employees',
fieldMetadataId: 'employees',
label: 'Employees',
Icon: IconUsers,
size: 150,
@ -110,7 +110,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
infoTooltipContent: 'Number of employees in the company.',
} satisfies ColumnDefinition<FieldNumberMetadata>,
{
fieldId: 'linkedin',
fieldMetadataId: 'linkedin',
label: 'LinkedIn',
Icon: IconBrandLinkedin,
size: 170,
@ -124,7 +124,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
infoTooltipContent: 'The company Linkedin account.',
} satisfies ColumnDefinition<FieldURLMetadata>,
{
fieldId: 'address',
fieldMetadataId: 'address',
label: 'Address',
Icon: IconMap,
size: 170,
@ -138,7 +138,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
infoTooltipContent: 'The company address.',
} satisfies ColumnDefinition<FieldTextMetadata>,
{
fieldId: 'idealCustomerProfile',
fieldMetadataId: 'idealCustomerProfile',
label: 'ICP',
Icon: IconTarget,
size: 150,
@ -152,7 +152,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
'Ideal Customer Profile: Indicates whether the company is the most suitable and valuable customer for you.',
} satisfies ColumnDefinition<FieldBooleanMetadata>,
{
fieldId: 'annualRecurringRevenue',
fieldMetadataId: 'annualRecurringRevenue',
label: 'ARR',
Icon: IconMoneybag,
size: 150,
@ -166,7 +166,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
'Annual Recurring Revenue: The actual or estimated annual revenue of the company.',
} satisfies ColumnDefinition<FieldMoneyMetadata>,
{
fieldId: 'xUrl',
fieldMetadataId: 'xUrl',
label: 'Twitter',
Icon: IconBrandX,
size: 150,
@ -184,7 +184,7 @@ export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>
export const suppliersAvailableColumnDefinitions: ColumnDefinition<FieldMetadata>[] =
[
{
fieldId: 'name',
fieldMetadataId: 'name',
label: 'Name',
Icon: IconBuildingSkyscraper,
size: 180,
@ -199,7 +199,7 @@ export const suppliersAvailableColumnDefinitions: ColumnDefinition<FieldMetadata
basePathToShowPage: '/companies/',
} satisfies ColumnDefinition<FieldTextMetadata>,
{
fieldId: 'city',
fieldMetadataId: 'city',
label: 'City',
Icon: IconBuildingSkyscraper,
size: 180,

8
front/src/modules/metadata/components/RecordShowPage.tsx
View File

@ -29,9 +29,9 @@ import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';
export const RecordShowPage = () => {
const { objectNameSingular, objectId } = useParams<{
const { objectNameSingular, objectMetadataId } = useParams<{
objectNameSingular: string;
objectId: string;
objectMetadataId: string;
}>();
const { icons } = useLazyLoadIcons();
@ -41,11 +41,11 @@ export const RecordShowPage = () => {
});
const [, setEntityFields] = useRecoilState(
entityFieldsFamilyState(objectId ?? ''),
entityFieldsFamilyState(objectMetadataId ?? ''),
);
const { object } = useFindOneObject({
objectId: objectId,
objectMetadataId: objectMetadataId,
objectNameSingular,
onCompleted: (data) => {
setEntityFields(data);

1
front/src/modules/metadata/hooks/useCreateOneObject.ts
View File

@ -14,6 +14,7 @@ const defaultFieldValues: Record<FieldMetadataType, unknown> = {
[FieldMetadataType.Email]: '',
[FieldMetadataType.Enum]: null,
[FieldMetadataType.Number]: null,
[FieldMetadataType.Relation]: null,
[FieldMetadataType.Phone]: '',
[FieldMetadataType.Text]: '',
[FieldMetadataType.Url]: { link: '', text: '' },

10
front/src/modules/metadata/hooks/useFindOneObject.ts
View File

@ -8,10 +8,10 @@ export const useFindOneObject = <
ObjectType extends { id: string } & Record<string, any>,
>({
objectNameSingular,
objectId,
objectMetadataId,
onCompleted,
}: Pick<ObjectMetadataItemIdentifier, 'objectNameSingular'> & {
objectId: string | undefined;
objectMetadataId: string | undefined;
onCompleted?: (data: ObjectType) => void;
}) => {
const { foundObjectMetadataItem, objectNotFoundInMetadata, findOneQuery } =
@ -21,11 +21,11 @@ export const useFindOneObject = <
const { data, loading, error } = useQuery<
{ [nameSingular: string]: ObjectType },
{ objectId: string }
{ objectMetadataId: string }
>(findOneQuery, {
skip: !foundObjectMetadataItem || !objectId,
skip: !foundObjectMetadataItem || !objectMetadataId,
variables: {
objectId: objectId ?? '',
objectMetadataId: objectMetadataId ?? '',
},
onCompleted: (data) => {
if (onCompleted && objectNameSingular) {

10
front/src/modules/metadata/hooks/useMetadataField.ts
View File

@ -14,13 +14,13 @@ export const useMetadataField = () => {
const createMetadataField = (
input: Pick<Field, 'label' | 'icon' | 'description'> & {
objectId: string;
objectMetadataId: string;
type: MetadataFieldDataType;
},
) =>
createOneMetadataField({
...formatMetadataFieldInput(input),
objectId: input.objectId,
objectMetadataId: input.objectMetadataId,
type: input.type,
});
@ -28,19 +28,19 @@ export const useMetadataField = () => {
input: Pick<Field, 'id' | 'label' | 'icon' | 'description'>,
) =>
updateOneMetadataField({
fieldIdToUpdate: input.id,
fieldMetadataIdToUpdate: input.id,
updatePayload: formatMetadataFieldInput(input),
});
const activateMetadataField = (metadataField: Field) =>
updateOneMetadataField({
fieldIdToUpdate: metadataField.id,
fieldMetadataIdToUpdate: metadataField.id,
updatePayload: { isActive: true },
});
const disableMetadataField = (metadataField: Field) =>
updateOneMetadataField({
fieldIdToUpdate: metadataField.id,
fieldMetadataIdToUpdate: metadataField.id,
updatePayload: { isActive: false },
});

6
front/src/modules/metadata/hooks/useUpdateOneMetadataField.ts
View File

@ -22,10 +22,10 @@ export const useUpdateOneMetadataField = () => {
});
const updateOneMetadataField = async ({
fieldIdToUpdate,
fieldMetadataIdToUpdate,
updatePayload,
}: {
fieldIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
fieldMetadataIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
updatePayload: Pick<
UpdateOneMetadataFieldMutationVariables['updatePayload'],
'description' | 'icon' | 'isActive' | 'label' | 'name'
@ -33,7 +33,7 @@ export const useUpdateOneMetadataField = () => {
}) => {
return await mutate({
variables: {
idToUpdate: fieldIdToUpdate,
idToUpdate: fieldMetadataIdToUpdate,
updatePayload: {
...updatePayload,
label: updatePayload.label ?? undefined,

2
front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts
View File

@ -19,7 +19,7 @@ export const formatMetadataFieldAsColumnDefinition = ({
icons: Record<string, IconComponent>;
}): ColumnDefinition<FieldMetadata> => ({
position,
fieldId: field.id,
fieldMetadataId: field.id,
label: field.label,
size: 100,
type: parseFieldType(field.type),

2
front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts
View File

@ -9,7 +9,7 @@ export const formatMetadataFieldAsFilterDefinition = ({
field: ObjectMetadataItem['fields'][0];
icons: Record<string, any>;
}): FilterDefinition => ({
fieldId: field.id,
fieldMetadataId: field.id,
label: field.label,
Icon: icons[field.icon ?? 'Icon123'],
type: 'TEXT',

2
front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts
View File

@ -9,7 +9,7 @@ export const formatMetadataFieldAsSortDefinition = ({
field: ObjectMetadataItem['fields'][0];
icons: Record<string, any>;
}): SortDefinition => ({
fieldId: field.id,
fieldMetadataId: field.id,
label: field.label,
Icon: icons[field.icon ?? 'Icon123'],
});

4
front/src/modules/metadata/utils/generateFindOneCustomObjectQuery.ts
View File

@ -10,10 +10,10 @@ export const generateFindOneCustomObjectQuery = ({
objectMetadataItem: ObjectMetadataItem;
}) => {
return gql`
query FindOne${objectMetadataItem.nameSingular}($objectId: UUID!) {
query FindOne${objectMetadataItem.nameSingular}($objectMetadataId: UUID!) {
${objectMetadataItem.nameSingular}(filter: {
id: {
eq: $objectId
eq: $objectMetadataId
}
}){
id

18
front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx
View File

@ -27,7 +27,7 @@ import { getLogoUrlFromDomainName } from '~/utils';
export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =
[
{
fieldId: 'displayName',
fieldMetadataId: 'displayName',
label: 'People',
Icon: IconUser,
size: 210,
@ -45,7 +45,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
basePathToShowPage: '/person/',
} satisfies ColumnDefinition<FieldDoubleTextChipMetadata>,
{
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
Icon: IconMail,
size: 150,
@ -58,7 +58,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Contact’s Email.',
} satisfies ColumnDefinition<FieldEmailMetadata>,
{
fieldId: 'company',
fieldMetadataId: 'company',
label: 'Company',
Icon: IconBuildingSkyscraper,
size: 150,
@ -78,7 +78,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
},
} satisfies ColumnDefinition<FieldRelationMetadata>,
{
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
Icon: IconPhone,
size: 150,
@ -91,7 +91,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Contact’s phone number.',
} satisfies ColumnDefinition<FieldPhoneMetadata>,
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Creation',
Icon: IconCalendarEvent,
size: 150,
@ -103,7 +103,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Date when the contact was added.',
} satisfies ColumnDefinition<FieldDateMetadata>,
{
fieldId: 'city',
fieldMetadataId: 'city',
label: 'City',
Icon: IconMap,
size: 150,
@ -116,7 +116,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Contact’s city.',
} satisfies ColumnDefinition<FieldTextMetadata>,
{
fieldId: 'jobTitle',
fieldMetadataId: 'jobTitle',
label: 'Job title',
Icon: IconBriefcase,
size: 150,
@ -129,7 +129,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Contact’s job title.',
} satisfies ColumnDefinition<FieldTextMetadata>,
{
fieldId: 'linkedin',
fieldMetadataId: 'linkedin',
label: 'LinkedIn',
Icon: IconBrandLinkedin,
size: 150,
@ -142,7 +142,7 @@ export const peopleAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[]
infoTooltipContent: 'Contact’s Linkedin account.',
} satisfies ColumnDefinition<FieldURLMetadata>,
{
fieldId: 'x',
fieldMetadataId: 'x',
label: 'Twitter',
Icon: IconBrandX,
size: 150,

8
front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx
View File

@ -18,7 +18,7 @@ import { Person } from '~/generated/graphql';
export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =
[
{
fieldId: 'closeDate',
fieldMetadataId: 'closeDate',
label: 'Close Date',
Icon: IconCalendarEvent,
position: 0,
@ -32,7 +32,7 @@ export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[
'Specified date by which an opportunity must be completed.',
} satisfies ColumnDefinition<FieldDateMetadata>,
{
fieldId: 'amount',
fieldMetadataId: 'amount',
label: 'Amount',
Icon: IconCurrencyDollar,
position: 1,
@ -46,7 +46,7 @@ export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[
infoTooltipContent: 'Potential monetary value of a business opportunity.',
} satisfies ColumnDefinition<FieldNumberMetadata>,
{
fieldId: 'probability',
fieldMetadataId: 'probability',
label: 'Probability',
Icon: IconProgressCheck,
position: 2,
@ -60,7 +60,7 @@ export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[
"Level of certainty in the lead's potential to convert into a success.",
} satisfies ColumnDefinition<FieldProbabilityMetadata>,
{
fieldId: 'pointOfContact',
fieldMetadataId: 'pointOfContact',
label: 'Point of Contact',
Icon: IconUser,
position: 3,

2
front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
View File

@ -141,7 +141,7 @@ export const SettingsObjectFieldPreview = ({
fieldDefinition: {
type: parseFieldType(fieldType as FieldMetadataType),
Icon: FieldIcon,
fieldId: '',
fieldMetadataId: '',
label: fieldLabel,
metadata: { fieldName: fieldName || 'new-field' },
},

2
front/src/modules/types/AppPath.ts
View File

@ -19,7 +19,7 @@ export enum AppPath {
OpportunitiesPage = '/opportunities',
RecordTablePage = '/objects/:objectNamePlural',
RecordShowPage = '/object/:objectNameSingular/:objectId',
RecordShowPage = '/object/:objectNameSingular/:objectMetadataId',
SettingsCatchAll = `/settings/*`,
DevelopersCatchAll = `/developers/*`,

2
front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts
View File

@ -19,7 +19,7 @@ export const useBoardCardFields = () => {
) => {
setBoardCardFields((previousFields) =>
previousFields.map((previousField) =>
previousField.fieldId === field.fieldId
previousField.fieldMetadataId === field.fieldMetadataId
? { ...previousField, isVisible: !field.isVisible }
: previousField,
),

2
front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts
View File

@ -12,5 +12,5 @@ export const boardCardFieldsByKeyScopedSelector = selectorFamily({
({ get }) =>
get(boardCardFieldsScopedState(scopeId)).reduce<
Record<string, BoardFieldDefinition<FieldMetadata>>
>((result, field) => ({ ...result, [field.fieldId]: field }), {}),
>((result, field) => ({ ...result, [field.fieldMetadataId]: field }), {}),
});

4
front/src/modules/ui/layout/board/states/selectors/hiddenBoardCardFieldsScopedSelector.ts
View File

@ -9,10 +9,10 @@ export const hiddenBoardCardFieldsScopedSelector = selectorFamily({
(scopeId: string) =>
({ get }) => {
const fields = get(boardCardFieldsScopedState(scopeId));
const fieldKeys = fields.map(({ fieldId }) => fieldId);
const fieldKeys = fields.map(({ fieldMetadataId }) => fieldMetadataId);
const otherAvailableKeys = get(
availableBoardCardFieldsScopedState(scopeId),
).filter(({ fieldId }) => !fieldKeys.includes(fieldId));
).filter(({ fieldMetadataId }) => !fieldKeys.includes(fieldMetadataId));
return [
...fields.filter((field) => !field.isVisible),

2
front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts
View File

@ -12,5 +12,5 @@ export const savedBoardCardFieldsByKeyFamilySelector = selectorFamily({
({ get }) =>
get(savedBoardCardFieldsFamilyState(viewId)).reduce<
Record<string, BoardFieldDefinition<FieldMetadata>>
>((result, field) => ({ ...result, [field.fieldId]: field }), {}),
>((result, field) => ({ ...result, [field.fieldMetadataId]: field }), {}),
});

2
front/src/modules/ui/object/field/hooks/useFieldInitialValue.ts
View File

@ -9,7 +9,7 @@ export const useFieldInitialValue = () => {
const fieldInitialValue = useRecoilValue(
entityFieldInitialValueFamilyState({
fieldId: fieldDefinition.fieldId,
fieldMetadataId: fieldDefinition.fieldMetadataId,
entityId,
}),
);

2
front/src/modules/ui/object/field/hooks/useIsFieldEmpty.ts
View File

@ -10,7 +10,7 @@ export const useIsFieldEmpty = () => {
const isFieldEmpty = useRecoilValue(
isEntityFieldEmptyFamilySelector({
fieldDefinition: {
fieldId: fieldDefinition.fieldId,
fieldMetadataId: fieldDefinition.fieldMetadataId,
label: fieldDefinition.label,
type: fieldDefinition.type,
metadata: fieldDefinition.metadata,

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
View File

@ -27,7 +27,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'date',
fieldMetadataId: 'date',
label: 'Date',
type: 'DATE',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx
View File

@ -32,7 +32,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'double-text',
fieldMetadataId: 'double-text',
label: 'Double-Text',
type: 'DOUBLE_TEXT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
View File

@ -26,7 +26,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
type: 'EMAIL',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx
View File

@ -25,7 +25,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'money',
fieldMetadataId: 'money',
label: 'Money',
type: 'MONEY_AMOUNT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
View File

@ -25,7 +25,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'number',
fieldMetadataId: 'number',
label: 'Number',
type: 'NUMBER',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
View File

@ -26,7 +26,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
type: 'PHONE',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
View File

@ -25,7 +25,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'text',
fieldMetadataId: 'text',
label: 'Text',
type: 'TEXT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx
View File

@ -26,7 +26,7 @@ const meta: Meta = {
value={{
entityId: '',
fieldDefinition: {
fieldId: 'URL',
fieldMetadataId: 'URL',
label: 'URL',
type: 'URL',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
View File

@ -34,7 +34,7 @@ const BooleanFieldInputWithContext = ({
return (
<FieldContextProvider
fieldDefinition={{
fieldId: 'boolean',
fieldMetadataId: 'boolean',
label: 'Boolean',
type: 'BOOLEAN',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx
View File

@ -44,7 +44,7 @@ const ChipFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'chip',
fieldMetadataId: 'chip',
label: 'Chip',
type: 'CHIP',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
View File

@ -44,7 +44,7 @@ const DateFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'date',
fieldMetadataId: 'date',
label: 'Date',
type: 'DATE',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx
View File

@ -57,7 +57,7 @@ const DoubleTextChipFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'double-text-chip',
fieldMetadataId: 'double-text-chip',
label: 'Double-Text-Chip',
type: 'DOUBLE_TEXT_CHIP',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx
View File

@ -55,7 +55,7 @@ const DoubleTextFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'double-text',
fieldMetadataId: 'double-text',
label: 'Double-Text',
type: 'DOUBLE_TEXT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const EmailFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
type: 'EMAIL',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const MoneyFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'moneyAmount',
fieldMetadataId: 'moneyAmount',
label: 'MoneyAmout',
type: 'MONEY_AMOUNT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const NumberFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'number',
fieldMetadataId: 'number',
label: 'Number',
type: 'NUMBER',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const PhoneFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
type: 'PHONE',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx
View File

@ -41,7 +41,7 @@ const ProbabilityFieldInputWithContext = ({
return (
<FieldContextProvider
fieldDefinition={{
fieldId: 'probability',
fieldMetadataId: 'probability',
label: 'Probability',
type: 'PROBABILITY',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
View File

@ -46,7 +46,7 @@ const RelationFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'relation',
fieldMetadataId: 'relation',
label: 'Relation',
type: 'RELATION',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const TextFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'text',
fieldMetadataId: 'text',
label: 'Text',
type: 'TEXT',
metadata: {

2
front/src/modules/ui/object/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx
View File

@ -43,7 +43,7 @@ const URLFieldInputWithContext = ({
<div>
<FieldContextProvider
fieldDefinition={{
fieldId: 'url',
fieldMetadataId: 'url',
label: 'URL',
type: 'URL',
metadata: {

2
front/src/modules/ui/object/field/states/entityFieldInitialValueFamilyState.ts
View File

@ -4,7 +4,7 @@ import { FieldInitialValue } from '../types/FieldInitialValue';
export const entityFieldInitialValueFamilyState = atomFamily<
FieldInitialValue | undefined,
{ entityId: string; fieldId: string }
{ entityId: string; fieldMetadataId: string }
>({
key: 'entityFieldInitialValueFamilyState',
default: undefined,

2
front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
View File

@ -33,7 +33,7 @@ export const isEntityFieldEmptyFamilySelector = selectorFamily({
}: {
fieldDefinition: Pick<
FieldDefinition<FieldMetadata>,
'type' | 'metadata' | 'fieldId' | 'label'
'type' | 'metadata' | 'fieldMetadataId' | 'label'
>;
entityId: string;
}) => {

2
front/src/modules/ui/object/field/types/FieldDefinition.ts
View File

@ -5,7 +5,7 @@ import { FieldMetadata } from './FieldMetadata';
import { FieldType } from './FieldType';
export type FieldDefinition<T extends FieldMetadata> = {
fieldId: string;
fieldMetadataId: string;
label: string;
Icon?: IconComponent;
type: FieldType;

2
front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
View File

@ -14,7 +14,7 @@ export const ObjectFilterDropdownDateSearchInput = () => {
if (!filterDefinitionUsedInDropdown || !selectedOperandInDropdown) return;
selectFilter?.({
fieldId: filterDefinitionUsedInDropdown.fieldId,
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
value: date.toISOString(),
operand: selectedOperandInDropdown,
displayValue: date.toLocaleDateString(),

4
front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
View File

@ -42,7 +42,7 @@ export const ObjectFilterDropdownEntitySearchSelect = ({
selectFilter?.({
displayValue: selectedEntity.name,
fieldId: filterDefinitionUsedInDropdown.fieldId,
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
operand: selectedOperandInDropdown,
value: selectedEntity.id,
displayAvatarUrl: selectedEntity.avatarUrl,
@ -72,7 +72,7 @@ export const ObjectFilterDropdownEntitySearchSelect = ({
selectFilter?.({
displayValue: filterDefinitionUsedInDropdown.selectAllLabel,
fieldId: filterDefinitionUsedInDropdown.fieldId,
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
operand: ViewFilterOperand.IsNotNull,
value: '',
definition: filterDefinitionUsedInDropdown,

2
front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
View File

@ -20,7 +20,7 @@ export const ObjectFilterDropdownNumberSearchInput = () => {
placeholder={filterDefinitionUsedInDropdown.label}
onChange={(event: ChangeEvent<HTMLInputElement>) => {
selectFilter?.({
fieldId: filterDefinitionUsedInDropdown.fieldId,
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
value: event.target.value,
operand: selectedOperandInDropdown,
displayValue: event.target.value,

2
front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
View File

@ -26,7 +26,7 @@ export const ObjectFilterDropdownOperandSelect = () => {
if (filterDefinitionUsedInDropdown && selectedFilter) {
selectFilter?.({
fieldId: selectedFilter.fieldId,
fieldMetadataId: selectedFilter.fieldMetadataId,
displayValue: selectedFilter.displayValue,
operand: newOperand,
value: selectedFilter.value,

2
front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
View File

@ -26,7 +26,7 @@ export const ObjectFilterDropdownTextSearchInput = () => {
setObjectFilterDropdownSearchInput(event.target.value);
selectFilter?.({
fieldId: filterDefinitionUsedInDropdown.fieldId,
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
value: event.target.value,
operand: selectedOperandInDropdown,
displayValue: event.target.value,

2
front/src/modules/ui/object/object-filter-dropdown/types/Filter.ts
View File

@ -3,7 +3,7 @@ import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { FilterDefinition } from './FilterDefinition';
export type Filter = {
fieldId: string;
fieldMetadataId: string;
value: string;
displayValue: string;
displayAvatarUrl?: string;

2
front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinition.ts
View File

@ -3,7 +3,7 @@ import { IconComponent } from '@/ui/display/icon/types/IconComponent';
import { FilterType } from './FilterType';
export type FilterDefinition = {
fieldId: string;
fieldMetadataId: string;
label: string;
Icon: IconComponent;
type: FilterType;

2
front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinitionByEntity.ts
View File

@ -1,5 +1,5 @@
import { FilterDefinition } from './FilterDefinition';
export type FilterDefinitionByEntity<T> = FilterDefinition & {
fieldId: keyof T;
fieldMetadataId: keyof T;
};

18
front/src/modules/ui/object/object-filter-dropdown/utils/turnFilterIntoWhereClause.ts
View File

@ -18,7 +18,7 @@ export const turnFilterIntoWhereClause = (
switch (filter.operand) {
case ViewFilterOperand.IsNotNull:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
not: null,
},
};
@ -28,14 +28,14 @@ export const turnFilterIntoWhereClause = (
switch (filter.operand) {
case ViewFilterOperand.Contains:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
contains: filter.value,
mode: QueryMode.Insensitive,
},
};
case ViewFilterOperand.DoesNotContain:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
not: {
contains: filter.value,
mode: QueryMode.Insensitive,
@ -51,13 +51,13 @@ export const turnFilterIntoWhereClause = (
switch (filter.operand) {
case ViewFilterOperand.GreaterThan:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
gte: parseFloat(filter.value),
},
};
case ViewFilterOperand.LessThan:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
lte: parseFloat(filter.value),
},
};
@ -70,13 +70,13 @@ export const turnFilterIntoWhereClause = (
switch (filter.operand) {
case ViewFilterOperand.GreaterThan:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
gte: filter.value,
},
};
case ViewFilterOperand.LessThan:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
lte: filter.value,
},
};
@ -89,13 +89,13 @@ export const turnFilterIntoWhereClause = (
switch (filter.operand) {
case ViewFilterOperand.Is:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
equals: filter.value,
},
};
case ViewFilterOperand.IsNot:
return {
[filter.fieldId]: {
[filter.fieldMetadataId]: {
not: { equals: filter.value },
},
};

4
front/src/modules/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClauseV2.ts
View File

@ -17,11 +17,11 @@ export const turnFiltersIntoWhereClauseV2 = (
filters.forEach((filter) => {
const correspondingField = fields.find(
(field) => field.id === filter.fieldId,
(field) => field.id === filter.fieldMetadataId,
);
if (!correspondingField) {
throw new Error(
`Could not find field ${filter.fieldId} in metadata object`,
`Could not find field ${filter.fieldMetadataId} in metadata object`,
);
}

2
front/src/modules/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
View File

@ -50,7 +50,7 @@ export const ObjectSortDropdownButton = ({
const handleAddSort = (selectedSortDefinition: SortDefinition) => {
toggleDropdown();
onSortSelect?.({
fieldId: selectedSortDefinition.fieldId,
fieldMetadataId: selectedSortDefinition.fieldMetadataId,
direction: selectedSortDirection,
definition: selectedSortDefinition,
});

2
front/src/modules/ui/object/object-sort-dropdown/types/Sort.ts
View File

@ -2,7 +2,7 @@ import { SortDefinition } from './SortDefinition';
import { SortDirection } from './SortDirection';
export type Sort = {
fieldId: string;
fieldMetadataId: string;
direction: SortDirection;
definition: SortDefinition;
};

2
front/src/modules/ui/object/object-sort-dropdown/types/SortDefinition.ts
View File

@ -3,7 +3,7 @@ import { IconComponent } from '@/ui/display/icon/types/IconComponent';
import { SortDirection } from './SortDirection';
export type SortDefinition = {
fieldId: string;
fieldMetadataId: string;
label: string;
Icon?: IconComponent;
getOrderByTemplate?: (direction: SortDirection) => any[];

2
front/src/modules/ui/object/object-sort-dropdown/utils/helpers.ts
View File

@ -10,7 +10,7 @@ export const reduceSortsToOrderBy = (sorts: Sort[]): any[] =>
if (sort.definition.getOrderByTemplate) {
return sort.definition.getOrderByTemplate(direction);
} else {
return [{ [sort.definition.fieldId]: direction }];
return [{ [sort.definition.fieldMetadataId]: direction }];
}
})
.flat();

4
front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2.ts
View File

@ -9,11 +9,11 @@ export const turnSortsIntoOrderByV2 = (
const sortsObject: Record<string, 'AscNullsFirst' | 'DescNullsLast'> = {};
sorts.forEach((sort) => {
const correspondingField = fields.find(
(field) => field.id === sort.fieldId,
(field) => field.id === sort.fieldMetadataId,
);
if (!correspondingField) {
throw new Error(
`Could not find field ${sort.fieldId} in metadata object`,
`Could not find field ${sort.fieldMetadataId} in metadata object`,
);
}
const direction =

4
front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
View File

@ -21,7 +21,7 @@ export const ColumnHeadWithDropdown = ({
primaryColumnKey,
}: ColumnHeadWithDropdownProps) => {
return (
<DropdownScope dropdownScopeId={column.fieldId + '-header'}>
<DropdownScope dropdownScopeId={column.fieldMetadataId + '-header'}>
<Dropdown
clickableComponent={<ColumnHead column={column} />}
dropdownComponents={
@ -34,7 +34,7 @@ export const ColumnHeadWithDropdown = ({
}
dropdownOffset={{ x: -1 }}
dropdownPlacement="bottom-start"
dropdownHotkeyScope={{ scope: column.fieldId + '-header' }}
dropdownHotkeyScope={{ scope: column.fieldMetadataId + '-header' }}
/>
</DropdownScope>
);

2
front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
View File

@ -46,7 +46,7 @@ export const RecordTableColumnDropdownMenu = ({
handleColumnVisibilityChange(column);
};
return column.fieldId === primaryColumnKey ? (
return column.fieldMetadataId === primaryColumnKey ? (
<></>
) : (
<DropdownMenuItemsContainer>

25
front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
View File

@ -156,7 +156,7 @@ export const RecordTableHeader = () => {
if (nextWidth !== tableColumnsByKey[resizedFieldKey].size) {
const nextColumns = tableColumns.map((column) =>
column.fieldId === resizedFieldKey
column.fieldMetadataId === resizedFieldKey
? { ...column, size: nextWidth }
: column,
);
@ -194,11 +194,13 @@ export const RecordTableHeader = () => {
</th>
{visibleTableColumns.map((column) => (
<StyledColumnHeaderCell
key={column.fieldId}
isResizing={resizedFieldKey === column.fieldId}
key={column.fieldMetadataId}
isResizing={resizedFieldKey === column.fieldMetadataId}
columnWidth={Math.max(
tableColumnsByKey[column.fieldId].size +
(resizedFieldKey === column.fieldId ? resizeFieldOffset : 0),
tableColumnsByKey[column.fieldMetadataId].size +
(resizedFieldKey === column.fieldMetadataId
? resizeFieldOffset
: 0),
COLUMN_MIN_WIDTH,
)}
>
@ -209,20 +211,21 @@ export const RecordTableHeader = () => {
isLastColumn={
column.position === visibleTableColumns.length - 1
}
primaryColumnKey={primaryColumn?.fieldId || ''}
primaryColumnKey={primaryColumn?.fieldMetadataId || ''}
/>
</StyledColumnHeadContainer>
<StyledResizeHandler
className="cursor-col-resize"
role="separator"
onPointerDown={() => {
setResizedFieldKey(column.fieldId);
setResizedFieldKey(column.fieldMetadataId);
}}
/>
</StyledColumnHeaderCell>
))}
{hiddenTableColumns.length > 0 && (
<StyledPlusIconHeaderCell>
<StyledPlusIconHeaderCell>
{hiddenTableColumns.length > 0 && (
<DropdownScope
dropdownScopeId={HIDDEN_TABLE_COLUMN_DROPDOWN_SCOPE_ID}
>
@ -239,8 +242,8 @@ export const RecordTableHeader = () => {
}}
/>
</DropdownScope>
</StyledPlusIconHeaderCell>
)}
)}
</StyledPlusIconHeaderCell>
</tr>
</StyledTableHead>
);

2
front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
View File

@ -32,7 +32,7 @@ export const RecordTableHeaderPlusButtonContent = () => {
<DropdownMenuItemsContainer>
{hiddenTableColumns.map((column) => (
<MenuItem
key={column.fieldId}
key={column.fieldMetadataId}
iconButtons={[
{
Icon: IconPlus,

2
front/src/modules/ui/object/record-table/components/RecordTableRow.tsx
View File

@ -42,7 +42,7 @@ export const RecordTableRow = forwardRef<
.sort((columnA, columnB) => columnA.position - columnB.position)
.map((column, columnIndex) => {
return (
<ColumnContext.Provider value={column} key={column.fieldId}>
<ColumnContext.Provider value={column} key={column.fieldMetadataId}>
<RecordTableCell cellIndex={columnIndex} />
</ColumnContext.Provider>
);

10
front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
View File

@ -47,13 +47,14 @@ export const useTableColumns = () => {
viewField: Omit<ColumnDefinition<FieldMetadata>, 'size' | 'position'>,
) => {
const isNewColumn = !tableColumns.some(
(tableColumns) => tableColumns.fieldId === viewField.fieldId,
(tableColumns) =>
tableColumns.fieldMetadataId === viewField.fieldMetadataId,
);
if (isNewColumn) {
const newColumn = availableTableColumns.find(
(availableTableColumn) =>
availableTableColumn.fieldId === viewField.fieldId,
availableTableColumn.fieldMetadataId === viewField.fieldMetadataId,
);
if (!newColumn) return;
@ -65,7 +66,7 @@ export const useTableColumns = () => {
await handleColumnsChange(nextColumns);
} else {
const nextColumns = tableColumns.map((previousColumn) =>
previousColumn.fieldId === viewField.fieldId
previousColumn.fieldMetadataId === viewField.fieldMetadataId
? { ...previousColumn, isVisible: !viewField.isVisible }
: previousColumn,
);
@ -82,7 +83,8 @@ export const useTableColumns = () => {
column: ColumnDefinition<FieldMetadata>,
) => {
const currentColumnArrayIndex = visibleTableColumns.findIndex(
(visibleColumn) => visibleColumn.fieldId === column.fieldId,
(visibleColumn) =>
visibleColumn.fieldMetadataId === column.fieldMetadataId,
);
const columns = handleColumnMove(

2
front/src/modules/ui/object/record-table/record-table-cell/hooks/useTableCell.ts
View File

@ -42,7 +42,7 @@ export const useTableCell = () => {
const [, setFieldInitialValue] = useRecoilState(
entityFieldInitialValueFamilyState({
entityId,
fieldId: fieldDefinition.fieldId,
fieldMetadataId: fieldDefinition.fieldMetadataId,
}),
);

4
front/src/modules/ui/object/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
View File

@ -9,10 +9,10 @@ export const hiddenTableColumnsScopedSelector = selectorFamily({
(scopeId: string) =>
({ get }) => {
const columns = get(tableColumnsScopedState({ scopeId }));
const columnKeys = columns.map(({ fieldId }) => fieldId);
const columnKeys = columns.map(({ fieldMetadataId }) => fieldMetadataId);
const otherAvailableColumns = get(
availableTableColumnsScopedState({ scopeId }),
).filter(({ fieldId }) => !columnKeys.includes(fieldId));
).filter(({ fieldMetadataId }) => !columnKeys.includes(fieldMetadataId));
return [
...columns.filter((column) => !column.isVisible),

5
front/src/modules/ui/object/record-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
View File

@ -12,5 +12,8 @@ export const savedTableColumnsByKeyFamilySelector = selectorFamily({
({ get }) =>
get(savedTableColumnsFamilyState(viewId)).reduce<
Record<string, ColumnDefinition<FieldMetadata>>
>((result, column) => ({ ...result, [column.fieldId]: column }), {}),
>(
(result, column) => ({ ...result, [column.fieldMetadataId]: column }),
{},
),
});

5
front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
View File

@ -12,5 +12,8 @@ export const tableColumnsByKeyScopedSelector = selectorFamily({
({ get }) =>
get(tableColumnsScopedState({ scopeId })).reduce<
Record<string, ColumnDefinition<FieldMetadata>>
>((result, column) => ({ ...result, [column.fieldId]: column }), {}),
>(
(result, column) => ({ ...result, [column.fieldMetadataId]: column }),
{},
),
});

5
front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
View File

@ -11,12 +11,13 @@ export const visibleTableColumnsScopedSelector = selectorFamily({
const columns = get(tableColumnsScopedState({ scopeId }));
const availableColumnKeys = get(
availableTableColumnsScopedState({ scopeId }),
).map(({ fieldId }) => fieldId);
).map(({ fieldMetadataId }) => fieldMetadataId);
return [...columns]
.filter(
(column) =>
column.isVisible && availableColumnKeys.includes(column.fieldId),
column.isVisible &&
availableColumnKeys.includes(column.fieldMetadataId),
)
.sort((a, b) => a.position - b.position);
},

12
front/src/modules/views/components/ViewBarDetails.tsx
View File

@ -126,12 +126,12 @@ export const ViewBarDetails = ({
{currentViewSorts?.map((sort) => {
return (
<SortOrFilterChip
key={sort.fieldId}
testId={sort.fieldId}
key={sort.fieldMetadataId}
testId={sort.fieldMetadataId}
labelValue={sort.definition.label}
Icon={sort.direction === 'desc' ? IconArrowDown : IconArrowUp}
isSort
onRemove={() => removeViewSort(sort.fieldId)}
onRemove={() => removeViewSort(sort.fieldMetadataId)}
/>
);
})}
@ -143,15 +143,15 @@ export const ViewBarDetails = ({
{currentViewFilters?.map((filter) => {
return (
<SortOrFilterChip
key={filter.fieldId}
testId={filter.fieldId}
key={filter.fieldMetadataId}
testId={filter.fieldMetadataId}
labelKey={filter.definition.label}
labelValue={`${getOperandLabelShort(filter.operand)} ${
filter.displayValue
}`}
Icon={filter.definition.Icon}
onRemove={() => {
removeViewFilter(filter.fieldId);
removeViewFilter(filter.fieldMetadataId);
}}
/>
);

11
front/src/modules/views/components/ViewBarEffect.tsx
View File

@ -35,14 +35,14 @@ export const ViewBarEffect = () => {
useFindManyObjects({
objectNamePlural: 'viewsV2',
filter: { type: { eq: viewType }, objectId: { eq: viewObjectId } },
filter: { type: { eq: viewType }, objectMetadataId: { eq: viewObjectId } },
onCompleted: useRecoilCallback(
({ snapshot, set }) =>
async (data: PaginatedObjectTypeResults<View>) => {
const nextViews = data.edges.map((view) => ({
id: view.node.id,
name: view.node.name,
objectId: view.node.objectId,
objectMetadataId: view.node.objectMetadataId,
}));
const { viewsState } = getViewScopedStatesFromSnapshot({
@ -132,7 +132,8 @@ export const ViewBarEffect = () => {
const queriedViewFilters = data.edges
.map(({ node }) => {
const availableFilterDefinition = availableFilterDefinitions.find(
(filterDefinition) => filterDefinition.fieldId === node.fieldId,
(filterDefinition) =>
filterDefinition.fieldMetadataId === node.fieldMetadataId,
);
if (!availableFilterDefinition) return null;
@ -185,14 +186,14 @@ export const ViewBarEffect = () => {
const queriedViewSorts = data.edges
.map(({ node }) => {
const availableSortDefinition = availableSortDefinitions.find(
(sort) => sort.fieldId === node.fieldId,
(sort) => sort.fieldMetadataId === node.fieldMetadataId,
);
if (!availableSortDefinition) return null;
return {
id: node.id,
fieldId: node.fieldId,
fieldMetadataId: node.fieldMetadataId,
direction: node.direction,
definition: availableSortDefinition,
};

8
front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
View File

@ -97,12 +97,12 @@ export const ViewFieldsVisibilityDropdownSection = ({
.sort((a, b) => a.position - b.position)
.map((field, index) => (
<DraggableItem
key={field.fieldId}
draggableId={field.fieldId}
key={field.fieldMetadataId}
draggableId={field.fieldMetadataId}
index={index + 1}
itemComponent={
<MenuItemDraggable
key={field.fieldId}
key={field.fieldMetadataId}
LeftIcon={field.Icon}
iconButtons={getIconButtons(index + 1, field)}
isTooltipOpen={openToolTipIndex === index + 1}
@ -120,7 +120,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
) : (
fields.map((field, index) => (
<MenuItem
key={field.fieldId}
key={field.fieldMetadataId}
LeftIcon={field.Icon}
iconButtons={getIconButtons(index, field)}
isTooltipOpen={openToolTipIndex === index}

16
front/src/modules/views/hooks/internal/useViewFields.ts
View File

@ -40,7 +40,7 @@ export const useViewFields = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewField.fieldId,
fieldMetadataId: viewField.fieldMetadataId,
viewId: viewIdToPersist,
isVisible: viewField.isVisible,
size: viewField.size,
@ -76,18 +76,18 @@ export const useViewFields = (viewScopeId: string) => {
};
const viewFieldsToCreate = viewFieldsToPersist.filter(
(viewField) => !savedViewFieldsByKey[viewField.fieldId],
(viewField) => !savedViewFieldsByKey[viewField.fieldMetadataId],
);
const viewFieldsToUpdate = viewFieldsToPersist.filter(
(viewFieldToPersit) =>
savedViewFieldsByKey[viewFieldToPersit.fieldId] &&
(savedViewFieldsByKey[viewFieldToPersit.fieldId].size !==
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId] &&
(savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId].size !==
viewFieldToPersit.size ||
savedViewFieldsByKey[viewFieldToPersit.fieldId].position !==
viewFieldToPersit.position ||
savedViewFieldsByKey[viewFieldToPersit.fieldId].isVisible !==
viewFieldToPersit.isVisible),
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
.position !== viewFieldToPersit.position ||
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
.isVisible !== viewFieldToPersit.isVisible),
);
await _createViewFields(viewFieldsToCreate);

25
front/src/modules/views/hooks/internal/useViewFilters.ts
View File

@ -53,7 +53,7 @@ export const useViewFilters = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewFilter.fieldId,
fieldMetadataId: viewFilter.fieldMetadataId,
viewId: viewId ?? currentViewId,
value: viewFilter.value,
displayValue: viewFilter.displayValue,
@ -102,19 +102,23 @@ export const useViewFilters = (viewScopeId: string) => {
};
const filtersToCreate = currentViewFilters.filter(
(filter) => !savedViewFiltersByKey[filter.fieldId],
(filter) => !savedViewFiltersByKey[filter.fieldMetadataId],
);
await createViewFilters(filtersToCreate);
const filtersToUpdate = currentViewFilters.filter(
(filter) =>
savedViewFiltersByKey[filter.fieldId] &&
(savedViewFiltersByKey[filter.fieldId].operand !== filter.operand ||
savedViewFiltersByKey[filter.fieldId].value !== filter.value),
savedViewFiltersByKey[filter.fieldMetadataId] &&
(savedViewFiltersByKey[filter.fieldMetadataId].operand !==
filter.operand ||
savedViewFiltersByKey[filter.fieldMetadataId].value !==
filter.value),
);
await updateViewFilters(filtersToUpdate);
const filterKeys = currentViewFilters.map((filter) => filter.fieldId);
const filterKeys = currentViewFilters.map(
(filter) => filter.fieldMetadataId,
);
const filterKeysToDelete = Object.keys(savedViewFiltersByKey).filter(
(previousFilterKey) => !filterKeys.includes(previousFilterKey),
);
@ -159,12 +163,13 @@ export const useViewFilters = (viewScopeId: string) => {
}
const existingSavedFilterId =
savedViewFiltersByKey[filterToUpsert.fieldId]?.id;
savedViewFiltersByKey[filterToUpsert.fieldMetadataId]?.id;
set(currentViewFiltersState, (filters) => {
const newViewFilters = produce(filters, (filtersDraft) => {
const existingFilterIndex = filtersDraft.findIndex(
(filter) => filter.fieldId === filterToUpsert.fieldId,
(filter) =>
filter.fieldMetadataId === filterToUpsert.fieldMetadataId,
);
if (existingFilterIndex === -1) {
@ -189,7 +194,7 @@ export const useViewFilters = (viewScopeId: string) => {
const removeViewFilter = useRecoilCallback(
({ snapshot, set }) =>
(fieldId: string) => {
(fieldMetadataId: string) => {
const { currentViewId, currentViewFilters, onViewFiltersChange } =
getViewScopedStateValuesFromSnapshot({
snapshot,
@ -201,7 +206,7 @@ export const useViewFilters = (viewScopeId: string) => {
}
const newViewFilters = currentViewFilters.filter((filter) => {
return filter.fieldId !== fieldId;
return filter.fieldMetadataId !== fieldMetadataId;
});
set(currentViewFiltersState, newViewFilters);
onViewFiltersChange?.(newViewFilters);

19
front/src/modules/views/hooks/internal/useViewSorts.ts
View File

@ -54,7 +54,7 @@ export const useViewSorts = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewSort.fieldId,
fieldMetadataId: viewSort.fieldMetadataId,
viewId: viewId ?? currentViewId,
direction: viewSort.direction,
},
@ -99,19 +99,20 @@ export const useViewSorts = (viewScopeId: string) => {
};
const sortsToCreate = currentViewSorts.filter(
(sort) => !savedViewSortsByKey[sort.fieldId],
(sort) => !savedViewSortsByKey[sort.fieldMetadataId],
);
await createViewSorts(sortsToCreate);
const sortsToUpdate = currentViewSorts.filter(
(sort) =>
savedViewSortsByKey[sort.fieldId] &&
savedViewSortsByKey[sort.fieldId].direction !== sort.direction,
savedViewSortsByKey[sort.fieldMetadataId] &&
savedViewSortsByKey[sort.fieldMetadataId].direction !==
sort.direction,
);
await updateViewSorts(sortsToUpdate);
const sortKeys = currentViewSorts.map((sort) => sort.fieldId);
const sortKeys = currentViewSorts.map((sort) => sort.fieldMetadataId);
const sortKeysToDelete = Object.keys(savedViewSortsByKey).filter(
(previousSortKey) => !sortKeys.includes(previousSortKey),
);
@ -155,12 +156,12 @@ export const useViewSorts = (viewScopeId: string) => {
}
const existingSavedSortId =
savedViewSortsByKey[sortToUpsert.fieldId]?.id;
savedViewSortsByKey[sortToUpsert.fieldMetadataId]?.id;
set(currentViewSortsState, (sorts) => {
const newViewSorts = produce(sorts, (sortsDraft) => {
const existingSortIndex = sortsDraft.findIndex(
(sort) => sort.fieldId === sortToUpsert.fieldId,
(sort) => sort.fieldMetadataId === sortToUpsert.fieldMetadataId,
);
if (existingSortIndex === -1) {
@ -182,7 +183,7 @@ export const useViewSorts = (viewScopeId: string) => {
const removeViewSort = useRecoilCallback(
({ snapshot, set }) =>
(fieldId: string) => {
(fieldMetadataId: string) => {
const { currentViewId, onViewSortsChange, currentViewSorts } =
getViewScopedStateValuesFromSnapshot({
snapshot,
@ -194,7 +195,7 @@ export const useViewSorts = (viewScopeId: string) => {
}
const newViewSorts = currentViewSorts.filter((filter) => {
return filter.fieldId !== fieldId;
return filter.fieldMetadataId !== fieldMetadataId;
});
set(currentViewSortsState, newViewSorts);
onViewSortsChange?.(newViewSorts);

2
front/src/modules/views/hooks/internal/useViews.ts
View File

@ -34,7 +34,7 @@ export const useViews = (scopeId: string) => {
variables: {
input: {
...view,
objectId: viewObjectId,
objectMetadataId: viewObjectId,
type: viewType,
},
},

2
front/src/modules/views/states/selectors/savedViewFieldByKeyScopedFamilySelector.ts
View File

@ -25,7 +25,7 @@ export const savedViewFieldByKeyScopedFamilySelector = selectorFamily({
familyKey: viewId,
}),
).reduce<Record<string, ViewField>>(
(result, column) => ({ ...result, [column.fieldId]: column }),
(result, column) => ({ ...result, [column.fieldMetadataId]: column }),
{},
);
},

2
front/src/modules/views/states/selectors/savedViewFiltersByKeyScopedFamilySelector.ts
View File

@ -18,7 +18,7 @@ export const savedViewFiltersByKeyScopedFamilySelector = selectorFamily({
familyKey: viewId,
}),
).reduce<Record<string, ViewFilter>>(
(result, filter) => ({ ...result, [filter.fieldId]: filter }),
(result, filter) => ({ ...result, [filter.fieldMetadataId]: filter }),
{},
);
},

2
front/src/modules/views/states/selectors/savedViewSortsByKeyScopedFamilySelector.ts
View File

@ -18,7 +18,7 @@ export const savedViewSortsByKeyScopedFamilySelector = selectorFamily({
familyKey: viewId,
}),
).reduce<Record<string, ViewSort>>(
(result, sort) => ({ ...result, [sort.fieldId]: sort }),
(result, sort) => ({ ...result, [sort.fieldMetadataId]: sort }),
{},
);
},

2
front/src/modules/views/types/View.ts
View File

@ -1 +1 @@
export type View = { id: string; name: string; objectId: string };
export type View = { id: string; name: string; objectMetadataId: string };

2
front/src/modules/views/types/ViewField.ts
View File

@ -3,7 +3,7 @@ import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinitio
export type ViewField = {
id: string;
fieldId: string;
fieldMetadataId: string;
position: number;
isVisible: boolean;
size: number;

2
front/src/modules/views/types/ViewFilter.ts
View File

@ -4,7 +4,7 @@ import { ViewFilterOperand } from './ViewFilterOperand';
export type ViewFilter = {
id?: string;
fieldId: string;
fieldMetadataId: string;
operand: ViewFilterOperand;
value: string;
displayValue: string;

2
front/src/modules/views/types/ViewSort.ts
View File

@ -3,7 +3,7 @@ import { SortDirection } from '@/ui/object/object-sort-dropdown/types/SortDirect
export type ViewSort = {
id?: string;
fieldId: string;
fieldMetadataId: string;
direction: SortDirection;
definition: SortDefinition;
};

2
front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
View File

@ -8,7 +8,7 @@ export const mapColumnDefinitionsToViewFields = (
): ViewField[] => {
return columnDefinitions.map((columnDefinition) => ({
id: columnDefinition.viewFieldId || '',
fieldId: columnDefinition.fieldId,
fieldMetadataId: columnDefinition.fieldMetadataId,
position: columnDefinition.position,
size: columnDefinition.size,
isVisible: columnDefinition.isVisible ?? true,

4
front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
View File

@ -11,12 +11,12 @@ export const mapViewFieldsToBoardFieldDefinitions = (
return viewFields
.map((viewField) => {
const correspondingFieldMetadata = fieldsMetadata.find(
({ fieldId }) => viewField.fieldId === fieldId,
({ fieldMetadataId }) => viewField.fieldMetadataId === fieldMetadataId,
);
return correspondingFieldMetadata
? {
fieldId: viewField.fieldId,
fieldMetadataId: viewField.fieldMetadataId,
label: correspondingFieldMetadata.label,
metadata: correspondingFieldMetadata.metadata,
entityChipDisplayMapper:

4
front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
View File

@ -11,12 +11,12 @@ export const mapViewFieldsToColumnDefinitions = (
return viewFields
.map((viewField) => {
const correspondingFieldMetadata = fieldsMetadata.find(
({ fieldId }) => viewField.fieldId === fieldId,
({ fieldMetadataId }) => viewField.fieldMetadataId === fieldMetadataId,
);
return correspondingFieldMetadata
? {
fieldId: viewField.fieldId,
fieldMetadataId: viewField.fieldMetadataId,
label: correspondingFieldMetadata.label,
metadata: correspondingFieldMetadata.metadata,
entityChipDisplayMapper:

2
front/src/modules/views/utils/mapViewFiltersToFilters.ts
View File

@ -7,7 +7,7 @@ export const mapViewFiltersToFilters = (
): Filter[] => {
return viewFilters.map((viewFilter) => {
return {
fieldId: viewFilter.fieldId,
fieldMetadataId: viewFilter.fieldMetadataId,
value: viewFilter.value,
displayValue: viewFilter.displayValue,
operand: viewFilter.operand,

2
front/src/modules/views/utils/mapViewSortsToSorts.ts
View File

@ -5,7 +5,7 @@ import { ViewSort } from '../types/ViewSort';
export const mapViewSortsToSorts = (viewSorts: ViewSort[]): Sort[] => {
return viewSorts.map((viewSort) => {
return {
fieldId: viewSort.fieldId,
fieldMetadataId: viewSort.fieldMetadataId,
direction: viewSort.direction,
definition: viewSort.definition,
};

5
front/src/pages/companies/CompanyShow.tsx
View File

@ -93,10 +93,11 @@ export const CompanyShow = () => {
{companyShowFieldDefinitions.map((fieldDefinition) => {
return (
<FieldContext.Provider
key={company.id + fieldDefinition.fieldId}
key={company.id + fieldDefinition.fieldMetadataId}
value={{
entityId: company.id,
recoilScopeId: company.id + fieldDefinition.fieldId,
recoilScopeId:
company.id + fieldDefinition.fieldMetadataId,
fieldDefinition,
useUpdateEntityMutation: useUpdateOneCompanyMutation,
hotkeyScope: InlineCellHotkeyScope.InlineCell,

14
front/src/pages/companies/constants/companyShowFieldDefinitions.tsx
View File

@ -22,7 +22,7 @@ import { User } from '~/generated/graphql';
export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
{
fieldId: 'domainName',
fieldMetadataId: 'domainName',
label: 'Domain name',
Icon: IconLink,
type: 'URL',
@ -32,7 +32,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldURLMetadata>,
{
fieldId: 'accountOwner',
fieldMetadataId: 'accountOwner',
label: 'Account owner',
Icon: IconUserCircle,
type: 'RELATION',
@ -49,7 +49,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldRelationMetadata>,
{
fieldId: 'employees',
fieldMetadataId: 'employees',
label: 'Employees',
Icon: IconUsers,
type: 'NUMBER',
@ -59,7 +59,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldNumberMetadata>,
{
fieldId: 'address',
fieldMetadataId: 'address',
label: 'Address',
Icon: IconMap,
type: 'TEXT',
@ -69,7 +69,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldTextMetadata>,
{
fieldId: 'idealCustomerProfile',
fieldMetadataId: 'idealCustomerProfile',
label: 'ICP',
Icon: IconTarget,
type: 'BOOLEAN',
@ -78,7 +78,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldBooleanMetadata>,
{
fieldId: 'xUrl',
fieldMetadataId: 'xUrl',
label: 'Twitter',
Icon: IconBrandX,
type: 'URL',
@ -88,7 +88,7 @@ export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldURLMetadata>,
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Created at',
Icon: IconCalendar,
type: 'DATE',

12
front/src/pages/companies/constants/companyTableFilterDefinitions.tsx
View File

@ -13,37 +13,37 @@ import { Company } from '~/generated/graphql';
export const companyTableFilterDefinitions: FilterDefinitionByEntity<Company>[] =
[
{
fieldId: 'name',
fieldMetadataId: 'name',
label: 'Name',
Icon: IconBuildingSkyscraper,
type: 'TEXT',
},
{
fieldId: 'employees',
fieldMetadataId: 'employees',
label: 'Employees',
Icon: IconUsers,
type: 'NUMBER',
},
{
fieldId: 'domainName',
fieldMetadataId: 'domainName',
label: 'URL',
Icon: IconLink,
type: 'TEXT',
},
{
fieldId: 'address',
fieldMetadataId: 'address',
label: 'Address',
Icon: IconMap,
type: 'TEXT',
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Created at',
Icon: IconCalendarEvent,
type: 'DATE',
},
{
fieldId: 'accountOwnerId',
fieldMetadataId: 'accountOwnerId',
label: 'Account owner',
Icon: IconUser,
type: 'ENTITY',

10
front/src/pages/companies/constants/companyTableSortDefinitions.tsx
View File

@ -9,27 +9,27 @@ import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefin
export const companyTableSortDefinitions: SortDefinition[] = [
{
fieldId: 'name',
fieldMetadataId: 'name',
label: 'Name',
Icon: IconBuildingSkyscraper,
},
{
fieldId: 'employees',
fieldMetadataId: 'employees',
label: 'Employees',
Icon: IconUsers,
},
{
fieldId: 'domainName',
fieldMetadataId: 'domainName',
label: 'Url',
Icon: IconLink,
},
{
fieldId: 'address',
fieldMetadataId: 'address',
label: 'Address',
Icon: IconMap,
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Creation',
Icon: IconCalendarEvent,
},

8
front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
View File

@ -13,26 +13,26 @@ import { FilterDropdownPeopleSearchSelect } from '../../../modules/people/compon
export const opportunityBoardFilterDefinitions: FilterDefinitionByEntity<PipelineProgress>[] =
[
{
fieldId: 'amount',
fieldMetadataId: 'amount',
label: 'Amount',
Icon: IconCurrencyDollar,
type: 'NUMBER',
},
{
fieldId: 'closeDate',
fieldMetadataId: 'closeDate',
label: 'Close date',
Icon: IconCalendarEvent,
type: 'DATE',
},
{
fieldId: 'companyId',
fieldMetadataId: 'companyId',
label: 'Company',
Icon: IconBuildingSkyscraper,
type: 'ENTITY',
entitySelectComponent: <FilterDropdownCompanySearchSelect />,
},
{
fieldId: 'pointOfContactId',
fieldMetadataId: 'pointOfContactId',
label: 'Point of contact',
Icon: IconUser,
type: 'ENTITY',

Some files were not shown because too many files have changed in this diff Show More