Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const findStandardFlatFieldMetadatawOrThrow = ({
}) => {
const objectFlatFieldMetadata = findManyFlatEntityByIdInFlatEntityMapsOrThrow(
{
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
},
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
});

const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class BackfillUpdatedByFieldCommand extends ActiveOrSuspendedWorkspacesMi
}

const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class BackfillOpportunityOwnerFieldCommand extends ActiveOrSuspendedWorks
}

const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityIds: opportunityObjectMetadata.fieldMetadataIds,
flatEntityIds: opportunityObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export class UpdateTaskOnDeleteActionCommand extends ActiveOrSuspendedWorkspaces
}

const taskTargetFields = findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityIds: taskTargetObjectMetadata.fieldMetadataIds,
flatEntityIds: taskTargetObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class CommonSelectedFieldsHandler {
| { [key: string]: boolean | { [key: string]: boolean } };
} = {};

for (const fieldId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldId of flatObjectMetadata.fieldIds) {
const field = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityId: fieldId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('getConflictingFields', () => {
createdAt: new Date(),
updatedAt: new Date(),
universalIdentifier: objectMetadataId,
fieldMetadataIds: fields.map((f) => f.id),
fieldIds: fields.map((f) => f.id),
indexMetadataIds: [],
viewIds: [],
applicationId: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const mockPersonFlatObjectMetadata = (
workspaceId,
universalIdentifier: objectMetadataId,
indexMetadataIds: [],
fieldMetadataIds: mockFieldMetadatas.map((field) => field.id),
fieldIds: mockFieldMetadatas.map((field) => field.id),
viewIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class GraphqlQueryOrderGroupByParser {
}): Record<string, OrderByClause>[] {
const parsedOrderBy: Record<string, OrderByClause>[] = [];

const fields = this.flatObjectMetadata.fieldMetadataIds
const fields = this.flatObjectMetadata.fieldIds
.map((id) => this.flatFieldMetadataMaps.byId[id])
.filter(isDefined);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class GraphqlQuerySelectedFieldsAggregateParser {
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
accumulator: GraphqlQuerySelectedFieldsResult,
): void {
const fields = flatObjectMetadata.fieldMetadataIds
const fields = flatObjectMetadata.fieldIds
.map((id) => flatFieldMetadataMaps.byId[id])
.filter(isDefined);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class GraphqlQuerySelectedFieldsParser {
accumulator: GraphqlQuerySelectedFieldsResult,
isFromOneToManyRelation?: boolean,
): void {
for (const fieldMetadataId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldMetadataId of flatObjectMetadata.fieldIds) {
const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityId: fieldMetadataId,
flatEntityMaps: this.flatFieldMetadataMaps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export class ObjectRecordsToGraphqlConnectionHelper {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const processedObjectRecord: Record<string, any> = {};

for (const fieldId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldId of flatObjectMetadata.fieldIds) {
const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityId: fieldId,
flatEntityMaps: this.flatFieldMetadataMaps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('buildColumnsToSelect', () => {
createdAt: new Date('2025-07-10T10:58:54.536Z'),
updatedAt: new Date('2025-07-10T10:58:54.536Z'),
universalIdentifier: personObjectId,
fieldMetadataIds: fieldIds,
fieldIds: fieldIds,
indexMetadataIds: [],
viewIds: [],
applicationId: null,
Expand Down Expand Up @@ -162,7 +162,7 @@ describe('buildColumnsToSelect', () => {
id: companyObjectId,
nameSingular: 'company',
namePlural: 'companies',
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
} as unknown as FlatObjectMetadata;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const getRequiredRelationColumns = (
): string[] => {
const requiredColumns: string[] = [];

for (const fieldId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldId of flatObjectMetadata.fieldIds) {
const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityId: fieldId,
flatEntityMaps: flatFieldMetadataMaps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const getFlatFieldsFromFlatObjectMetadata = (
flatObjectMetadata: FlatObjectMetadata,
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,
): FlatFieldMetadata[] => {
return flatObjectMetadata.fieldMetadataIds
return flatObjectMetadata.fieldIds
.map((fieldId) => flatFieldMetadataMaps.byId[fieldId])
.filter(isDefined);
};
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class RestToCommonSelectedFieldsHandler {

let relationsSelectFields: SelectFields = {};

for (const fieldId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldId of flatObjectMetadata.fieldIds) {
const flatField = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityId: fieldId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('getAllSelectableFields', () => {
createdAt: new Date(),
updatedAt: new Date(),
universalIdentifier: 'object-id',
fieldMetadataIds: fieldIds,
fieldIds: fieldIds,
indexMetadataIds: [],
viewIds: [],
applicationId: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const getAllSelectableFields = ({
}): SelectableFieldsStructured => {
const result: SelectableFieldsStructured = {};

for (const fieldId of flatObjectMetadata.fieldMetadataIds) {
for (const fieldId of flatObjectMetadata.fieldIds) {
const flatField = findFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityId: fieldId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('computeCursorArgFilter', () => {
createdAt: new Date(),
updatedAt: new Date(),
universalIdentifier: objectMetadataId,
fieldMetadataIds: ['name-id', 'age-id', 'fullname-id'],
fieldIds: ['name-id', 'age-id', 'fullname-id'],
indexMetadataIds: [],
viewIds: [],
applicationId: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [
labelIdentifierFieldMetadataId: personNameFieldId,
imageIdentifierFieldMetadataId: null,
workspaceId,
fieldMetadataIds: [personNameFieldId],
fieldIds: [personNameFieldId],
universalIdentifier: 'person-universal-id',
applicationId: workspaceId,
}),
Expand All @@ -45,7 +45,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [
labelIdentifierFieldMetadataId: companyNameFieldId,
imageIdentifierFieldMetadataId: null,
workspaceId,
fieldMetadataIds: [companyNameFieldId, companyDomainNameFieldId],
fieldIds: [companyNameFieldId, companyDomainNameFieldId],
universalIdentifier: 'company-universal-id',
applicationId: workspaceId,
}),
Expand All @@ -62,7 +62,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [
labelIdentifierFieldMetadataId: customObjectNameFieldId,
imageIdentifierFieldMetadataId: customObjectImageFieldId,
workspaceId,
fieldMetadataIds: [customObjectNameFieldId, customObjectImageFieldId],
fieldIds: [customObjectNameFieldId, customObjectImageFieldId],
universalIdentifier: 'custom-object-universal-id',
applicationId: workspaceId,
}),
Expand All @@ -80,7 +80,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [
labelIdentifierFieldMetadataId: null,
imageIdentifierFieldMetadataId: null,
workspaceId,
fieldMetadataIds: [],
fieldIds: [],
universalIdentifier: 'non-searchable-object-universal-id',
applicationId: workspaceId,
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const personFlatObject = getFlatObjectMetadataMock({
imageIdentifierFieldMetadataId: null,
workspaceId,
universalIdentifier: '20202020-8dec-43d5-b2ff-6eef05095bec',
fieldMetadataIds: [personNameFieldId],
fieldIds: [personNameFieldId],
indexMetadataIds: [],
viewIds: [],
});
Expand All @@ -61,7 +61,7 @@ const companyFlatObject = getFlatObjectMetadataMock({
imageIdentifierFieldMetadataId: null,
workspaceId,
universalIdentifier: '20202020-c03c-45d6-a4b0-04afe1357c5c',
fieldMetadataIds: [companyNameFieldId, companyDomainNameFieldId],
fieldIds: [companyNameFieldId, companyDomainNameFieldId],
indexMetadataIds: [],
viewIds: [],
});
Expand All @@ -86,7 +86,7 @@ const customObjectFlatObject = getFlatObjectMetadataMock({
imageIdentifierFieldMetadataId: customObjectImageFieldId,
workspaceId,
universalIdentifier: '20202020-3d75-4aab-bacd-ee176c5f63ca',
fieldMetadataIds: [customObjectNameFieldId, customObjectImageFieldId],
fieldIds: [customObjectNameFieldId, customObjectImageFieldId],
indexMetadataIds: [],
viewIds: [],
});
Expand All @@ -111,7 +111,7 @@ const nonSearchableFlatObject = getFlatObjectMetadataMock({
imageIdentifierFieldMetadataId: null,
workspaceId,
universalIdentifier: '20202020-540c-4397-b872-2a90ea2fb809',
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ describe('ActorFromAuthContextService', () => {
'person-id': {
id: 'person-id',
nameSingular: 'person',
fieldMetadataIds: ['createdBy-id'],
fieldIds: ['createdBy-id'],
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const mockObjectMetadata = {
isAuditLogged: true,
isSearchable: true,
indexMetadataIds: [],
fieldMetadataIds: [],
fieldIds: [],
viewIds: [],
applicationId: 'test-application-id',
isLabelSyncedWithName: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('computeSchemaComponents', () => {
const flatObjectMetadata: FlatObjectMetadata = {
...objectMetadataItemMock,
universalIdentifier: 'objectName',
fieldMetadataIds: objectMetadataItemMock.fields.map((f) => f.id),
fieldIds: objectMetadataItemMock.fields.map((f) => f.id),
} as any;

const flatFieldMetadataMaps = {
Expand All @@ -29,7 +29,7 @@ describe('computeSchemaComponents', () => {
nameSingular: 'relationTargetObject',
namePlural: 'relationTargetObjects',
universalIdentifier: 'relationTargetObject',
fieldMetadataIds: [],
fieldIds: [],
} as any;

const flatObjectMetadataMaps = {
Expand Down Expand Up @@ -858,7 +858,7 @@ describe('computeSchemaComponents', () => {
nameSingular: 'objectName',
namePlural: 'objectsName',
universalIdentifier: 'objectName',
fieldMetadataIds: [field.id],
fieldIds: [field.id],
} as any;

const flatFieldMetadataMaps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export const computeSchemaComponents = (
const flatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow<FlatFieldMetadata>({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: item.fieldMetadataIds,
flatEntityIds: item.fieldIds,
});

schemas[capitalize(item.nameSingular)] = computeSchemaComponent({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const mockObjectMetadata: FlatObjectMetadata = {
createdAt: new Date(),
updatedAt: new Date(),
universalIdentifier: 'id',
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
applicationId: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ export class DataloaderService {
});
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
flatEntityMaps: flatFieldMetadataMaps,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const ALL_METADATA_RELATIONS = {
manyToOne: {
object: {
metadataName: 'objectMetadata',
flatEntityForeignKeyAggregator: 'fieldMetadataIds',
flatEntityForeignKeyAggregator: 'fieldIds',
foreignKey: 'objectMetadataId',
},
workspace: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('addFlatEntityToFlatEntityAndRelatedEntityMapsThroughMutationOrThrow',
id: objectMetadataId,
universalIdentifier: 'object-universal-1',
viewIds: [],
fieldMetadataIds: [],
fieldIds: [],
workspaceId,
imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4',
labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('deleteFlatEntityFromFlatEntityAndRelatedEntityMapsThroughMutationOrThr
id: objectMetadataId,
universalIdentifier: 'object-universal-1',
viewIds: [viewId, 'something-else'],
fieldMetadataIds: [],
fieldIds: [],
workspaceId,
imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4',
labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});

return objectFlatFieldMetadatas.filter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export const fromDeleteFieldInputToFlatFieldMetadatasToDelete = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: existingFlatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});

const newIndex = generateFlatIndexMetadataWithNameOrThrow({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const getObjectFieldNamesAndJoinColumnNames = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const initialAccumulator: ObjectFieldNamesAndJoinColumnNames = {
joinColumnNames: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const handleLabelIdentifierChangesDuringFieldUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});

const searchVectorField = findOrThrow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const recomputeIndexOnFlatFieldMetadataNameUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const optimisticObjectFlatFieldMetadatas = objectFlatFieldMetadatas.map(
(flatFieldMetadata) => {
Expand Down
Loading
Loading