feat: multi-workspace followup #4197
Merged
Conversation
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
martmull
reviewed
Feb 27, 2024
packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts
Outdated
Show resolved
Hide resolved
martmull
requested changes
Feb 27, 2024
There was a problem hiding this comment.
Hey @AdityaPimpalkar, thank you for your PR. Great job! It was very interesting to review. I believe we are on the right path. However, I have added some comments. Please feel free to respond if you think I've missed anything. Cheers!
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
...ges/twenty-server/src/database/typeorm/core/migrations/1708535112230-addBillingCoreTables.ts
Outdated
Show resolved
Hide resolved
packages/twenty-front/src/modules/users/graphql/queries/getCurrentUser.ts
Outdated
Show resolved
Hide resolved
|
@AdityaPimpalkar Also, your tests are failing! |
martmull
reviewed
Feb 29, 2024
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
martmull
reviewed
Feb 29, 2024
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
martmull
reviewed
Feb 29, 2024
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
martmull
reviewed
Feb 29, 2024
martmull
reviewed
Feb 29, 2024
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
AdityaPimpalkar
commented
Mar 1, 2024
martmull
requested changes
Mar 1, 2024
packages/twenty-server/src/core/user-workspace/user-workspace.entity.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/core/user-workspace/user-workspace.service.ts
Outdated
Show resolved
Hide resolved
martmull
reviewed
Mar 1, 2024
| onDelete: 'CASCADE', | ||
| }) | ||
| workspaceUsers: UserWorkspace[]; | ||
|
|
There was a problem hiding this comment.
think the OneToMany with userWorkspace entities is missing, but we might not call that field users as it is already taken for the OneToMany with user entities
Let's call it workspaceUsers
martmull
reviewed
Mar 1, 2024
| @@ -34,8 +34,8 @@ export class UserWorkspace { | |||
| @Column() | |||
| userId: string; | |||
|
|
|||
| @Field(() => Workspace) | |||
| @ManyToOne(() => Workspace, (workspace) => workspace.workspaceUsers, { | |||
| @Field(() => Workspace, { nullable: true }) | |||
There was a problem hiding this comment.
think one migration is missing then
martmull
approved these changes
Mar 1, 2024
|
Thank you @AdityaPimpalkar! |
arnavsaxena17
pushed a commit
to arnavsaxena17/twenty
that referenced
this pull request
Oct 6, 2024
* Seed UserWorkspace for existing demo/dev users * add workspaces field to currentUser * new token generation endpoint for switching workspace * lint fix * include dependency * requested fixes * resolver test pass * changing defaultWorkspace and workspaceMember when switching workspaces * tests fix * requested changes * delete user/workspace edge case handled * after merge * requested changes * :wq! * workspace manytoone relation * lint fix / import fix * gql codegen * Fix migrations and generateJWT * migration fix * relations fix --------- Co-authored-by: martmull <martmull@hotmail.fr>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
follow up PR for changes made in #4036
It implements -