-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: created by email calendar #6536
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
48daf11
feat: wip created by email calendar
magrinj faeae1f
fix: created by renamed to actor
magrinj 95c4861
feat: created by for calendar and email
magrinj 6ae6015
fix: person issues
magrinj 1684ddc
fix: wrong source
magrinj 99c5431
Merge remote-tracking branch 'origin/main' into feat/created-by-messa…
magrinj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/node_modules/typeorm/common/PickKeysByType.d.ts b/node_modules/typeorm/common/PickKeysByType.d.ts | ||
index 55ad347..1a8a184 100644 | ||
--- a/common/PickKeysByType.d.ts | ||
+++ b/common/PickKeysByType.d.ts | ||
@@ -1,6 +1,6 @@ | ||
/** | ||
* Pick only the keys that match the Type `U` | ||
*/ | ||
-export type PickKeysByType<T, U> = string & keyof { | ||
- [P in keyof T as T[P] extends U ? P : never]: T[P]; | ||
-}; | ||
+export type PickKeysByType<T, U> = string & { | ||
+ [P in keyof T]: Exclude<T[P], null> extends U ? P : never; | ||
+}[keyof T]; |
4 changes: 0 additions & 4 deletions
4
...ges/twenty-server/src/engine/object-metadata-repository/metadata-to-repository.mapping.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,24 @@ | ||
import { BlocklistRepository } from 'src/modules/blocklist/repositories/blocklist.repository'; | ||
import { CompanyRepository } from 'src/modules/company/repositories/company.repository'; | ||
import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository'; | ||
import { MessageChannelMessageAssociationRepository } from 'src/modules/messaging/common/repositories/message-channel-message-association.repository'; | ||
import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository'; | ||
import { MessageParticipantRepository } from 'src/modules/messaging/common/repositories/message-participant.repository'; | ||
import { MessageThreadRepository } from 'src/modules/messaging/common/repositories/message-thread.repository'; | ||
import { MessageRepository } from 'src/modules/messaging/common/repositories/message.repository'; | ||
import { PersonRepository } from 'src/modules/person/repositories/person.repository'; | ||
import { AuditLogRepository } from 'src/modules/timeline/repositiories/audit-log.repository'; | ||
import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository'; | ||
import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository'; | ||
|
||
export const metadataToRepositoryMapping = { | ||
AuditLogWorkspaceEntity: AuditLogRepository, | ||
BlocklistWorkspaceEntity: BlocklistRepository, | ||
CompanyWorkspaceEntity: CompanyRepository, | ||
ConnectedAccountWorkspaceEntity: ConnectedAccountRepository, | ||
MessageChannelMessageAssociationWorkspaceEntity: | ||
MessageChannelMessageAssociationRepository, | ||
MessageChannelWorkspaceEntity: MessageChannelRepository, | ||
MessageWorkspaceEntity: MessageRepository, | ||
MessageParticipantWorkspaceEntity: MessageParticipantRepository, | ||
MessageThreadWorkspaceEntity: MessageThreadRepository, | ||
PersonWorkspaceEntity: PersonRepository, | ||
TimelineActivityWorkspaceEntity: TimelineActivityRepository, | ||
WorkspaceMemberWorkspaceEntity: WorkspaceMemberRepository, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 0 additions & 85 deletions
85
packages/twenty-server/src/modules/company/repositories/company.repository.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
import { Address } from 'nodemailer/lib/mailer'; | ||
|
||
import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface'; | ||
|
||
import { | ||
|
@@ -32,6 +30,7 @@ import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/perso | |
import { TaskTargetWorkspaceEntity } from 'src/modules/task/standard-objects/task-target.workspace-entity'; | ||
import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity'; | ||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity'; | ||
import { AddressMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/address.composite-type'; | ||
|
||
@WorkspaceEntity({ | ||
standardId: STANDARD_OBJECT_IDS.company, | ||
|
@@ -60,7 +59,7 @@ export class CompanyWorkspaceEntity extends BaseWorkspaceEntity { | |
'The company website URL. We use this url to fetch the company icon', | ||
icon: 'IconLink', | ||
}) | ||
domainName?: string; | ||
domainName?: LinksMetadata; | ||
|
||
@WorkspaceField({ | ||
standardId: COMPANY_STANDARD_FIELD_IDS.employees, | ||
|
@@ -111,7 +110,7 @@ export class CompanyWorkspaceEntity extends BaseWorkspaceEntity { | |
icon: 'IconMap', | ||
}) | ||
@WorkspaceIsNullable() | ||
address: Address; | ||
address: AddressMetadata; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing and incorrect metadata types |
||
@WorkspaceField({ | ||
standardId: COMPANY_STANDARD_FIELD_IDS.idealCustomerProfile, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TypeORM doesn't handle column type that can be nullable...