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

Fix variable dropdown (#8521)

Browse Source 
- fixed dropdown width
- add icons
- handle composite fields
## After

![image](https://github.com/user-attachments/assets/b9ac585e-2a39-4ab2-8620-739f83272b9b)

![image](https://github.com/user-attachments/assets/d9f7eabb-5693-4c1c-b81c-45a901479042)

![image](https://github.com/user-attachments/assets/9edced28-8a04-4951-913d-3e5561d4fcbe)
This commit is contained in:
martmull
2024-11-15 19:08:03 +01:00
committed by GitHub
parent 54b28ff7ed
commit 9b2853bb01
15 changed files with 189 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
+49 -37
View File
@@ -1,76 +1,88 @@
import { v4 } from 'uuid';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
import { ObjectRecordDestroyEvent } from 'src/engine/core-modules/event-emitter/types/object-record-destroy.event';
import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { generateFakeObjectRecord } from 'src/modules/workflow/workflow-builder/utils/generate-fake-object-record';
import { OutputSchema } from 'src/modules/workflow/workflow-builder/types/output-schema.type';
export const generateFakeObjectRecordEvent = <Entity>(
export const generateFakeObjectRecordEvent = (
objectMetadataEntity: ObjectMetadataEntity,
action: DatabaseEventAction,
):
| ObjectRecordCreateEvent<Entity>
| ObjectRecordUpdateEvent<Entity>
| ObjectRecordDeleteEvent<Entity>
| ObjectRecordDestroyEvent<Entity> => {
): OutputSchema => {
const recordId = v4();
const userId = v4();
const workspaceMemberId = v4();
const after = generateFakeObjectRecord<Entity>(objectMetadataEntity);
const after = generateFakeObjectRecord(objectMetadataEntity);
const formattedObjectMetadataEntity = Object.entries(
objectMetadataEntity,
).reduce((acc: OutputSchema, [key, value]) => {
acc[key] = { isLeaf: true, value };
return acc;
}, {});
const baseResult: OutputSchema = {
recordId: { isLeaf: true, type: 'string', value: recordId },
userId: { isLeaf: true, type: 'string', value: userId },
workspaceMemberId: {
isLeaf: true,
type: 'string',
value: workspaceMemberId,
},
objectMetadata: {
isLeaf: false,
value: formattedObjectMetadataEntity,
},
};
if (action === DatabaseEventAction.CREATED) {
return {
recordId,
userId,
workspaceMemberId,
objectMetadata: objectMetadataEntity,
...baseResult,
properties: {
after,
isLeaf: false,
value: { after: { isLeaf: false, value: after } },
},
} satisfies ObjectRecordCreateEvent<Entity>;
};
}
const before = generateFakeObjectRecord<Entity>(objectMetadataEntity);
const before = generateFakeObjectRecord(objectMetadataEntity);
if (action === DatabaseEventAction.UPDATED) {
return {
recordId,
userId,
workspaceMemberId,
objectMetadata: objectMetadataEntity,
...baseResult,
properties: {
before,
after,
isLeaf: false,
value: {
before: { isLeaf: false, value: before },
after: { isLeaf: false, value: after },
},
},
} satisfies ObjectRecordUpdateEvent<Entity>;
};
}
if (action === DatabaseEventAction.DELETED) {
return {
recordId,
userId,
workspaceMemberId,
objectMetadata: objectMetadataEntity,
...baseResult,
properties: {
before,
isLeaf: false,
value: {
before: { isLeaf: false, value: before },
},
},
} satisfies ObjectRecordDeleteEvent<Entity>;
};
}
if (action === DatabaseEventAction.DESTROYED) {
return {
recordId,
userId,
workspaceMemberId,
objectMetadata: objectMetadataEntity,
...baseResult,
properties: {
before,
isLeaf: false,
value: {
before: { isLeaf: false, value: before },
},
},
} satisfies ObjectRecordDestroyEvent<Entity>;
};
}
throw new Error(`Unknown action '${action}'`);
packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
+29 -5
View File
@@ -1,16 +1,40 @@
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
import { generateFakeValue } from 'src/engine/utils/generate-fake-value';
import { shouldGenerateFieldFakeValue } from 'src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value';
import { OutputSchema } from 'src/modules/workflow/workflow-builder/types/output-schema.type';
import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
export const generateFakeObjectRecord = <Entity>(
export const generateFakeObjectRecord = (
objectMetadataEntity: ObjectMetadataEntity,
): Entity =>
objectMetadataEntity.fields.reduce((acc, field) => {
): OutputSchema =>
objectMetadataEntity.fields.reduce((acc: OutputSchema, field) => {
if (!shouldGenerateFieldFakeValue(field)) {
return acc;
}
const compositeType = compositeTypeDefinitions.get(field.type);
acc[field.name] = generateFakeValue(field.type);
if (!compositeType) {
acc[field.name] = {
isLeaf: true,
type: field.type,
icon: field.icon,
value: generateFakeValue(field.type),
};
} else {
acc[field.name] = {
isLeaf: false,
icon: field.icon,
value: compositeType.properties.reduce((acc, property) => {
acc[property.name] = {
isLeaf: true,
type: property.type,
value: generateFakeValue(property.type),
};
return acc;
}, {}),
};
}
return acc;
}, {} as Entity);
}, {});