-
Notifications
You must be signed in to change notification settings - Fork 10
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
Experiment/change user group #663
Merged
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
ac309b2
to
66df5a7
Compare
56bff5a
to
9b314cb
Compare
@dorianne-arawa I cannot accept this PR for the moment. I have a little bug renaming a subgroup (look at the screenshot below). |
Okay @dorianne-arawa I fixed it. It's okay, I can accept this Pull Request. |
Perfect @zak39 |
I created the getUserGroup function to get the old user group (SPACE-U-) and the new user group (SPACE-Users-). Back-End side only for the moment. Signed-off-by: Baptiste Fotia <[email protected]>
I changed the user group name (U-<id>) when I create a space. But, the old groupname for the user is preserved if the user end update the workspace app. Signed-off-by: Baptiste Fotia <[email protected]>
The getUserGroup has to return the GID with the space name as suffix for new workspaces. For old workspaces, it's the space id which is returned. Signed-off-by: Baptiste Fotia <[email protected]>
I changed the key 'space_name' for 'space' in the Vue.js, Js and PHP files. Signed-off-by: Baptiste Fotia <[email protected]>
Now, when we create a workspace, the GE-<id> and U-<id> groups are replaced by the "WM-<space_name>" and "U-<space_name>" groups. Signed-off-by: Baptiste Fotia <[email protected]>
I splited the GroupWorkspace class into 2 classes : UserGroup.php and WorkspaceMangerGroup.php. The GroupWorkspace class is an abstract class. I changed the files related to GroupWorkspace class Signed-off-by: Baptiste Fotia <[email protected]>
I don't export ESPACE_MANAGER, ESPACE_USERS and ESPACE_GID. But I replace them with PREFIX_USER and PREFIX_MANAGER. Signed-off-by: Baptiste Fotia <[email protected]>
I cancelled a previous commit because I changed the signature of the getUserGroup function. Signed-off-by: Baptiste Fotia <[email protected]>
I renamed all constants from GroupsWorkspace to be readable for human. Signed-off-by: Baptiste Fotia <[email protected]>
We can define a dynamic prefix for all workspaces. Signed-off-by: Baptiste Fotia <[email protected]>
Now, we can apply the new convetion after an upgrade of the Workspace app. Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
We can create a subgroup with this pattern : - gid: SPACE-G-<groupname>-<spaceId> - displayName: G-<groupname>-<spaceName> It works when we create a subgroup. We have to change for rename and delete, may be. Signed-off-by: Baptiste Fotia <[email protected]>
We initialized the Upgradev300 class from the Register's construct and it doesn't get the prefix values. Signed-off-by: Baptiste Fotia <[email protected]>
Now, all subgroup will be their display name changed when we migrate to v3.0.0. Signed-off-by: Baptiste Fotia <[email protected]>
I splitted the algorithm to upgrade to v3.0.0 or more. I added the license too. Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
I added the license for the GroupFoldersGroupsMapper file. I must have forgotten it. Signed-off-by: Baptiste Fotia <[email protected]>
I moved the new GroupsWorkspace.php, WorkspaceManagerGroup.php, ManagersWorkspace.php and UserGroup.php files in the Service > Group folder. Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
This reverts commit 3fca580.
Following this problem in the CI : https://github.com/arawa/workspace/actions/runs/4788667321/jobs/8515575242?pr=663 . I could not fix the problem with the cs:check command. So, I fixed it manually. Signed-off-by: Baptiste Fotia <[email protected]>
The cs:check command is broken. So, I fixed it manually. Signed-off-by: Baptiste Fotia <[email protected]>
We send the SPACE-GE as GID's prefix when we use the isInGroup() function. Signed-off-by: Baptiste Fotia <[email protected]>
Use the PREFIX_DISPLAYNAME_SUBGROUP_SPACE const instead of the PREFIX_GID_SUBGROUP_SPACE when we want to rename a group. Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
7fb4238
to
77917d8
Compare
Signed-off-by: Baptiste Fotia <[email protected]>
@acdmft can you review my code again please ? 🙏 I rebased my PR to keep up to date |
Signed-off-by: Baptiste Fotia <[email protected]>
Signed-off-by: Baptiste Fotia <[email protected]>
Very good! |
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.
No description provided.