-
Notifications
You must be signed in to change notification settings - Fork 22
fix( ENG-9127 ): add option of setting project contributors to preprint/registration #670
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
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
aa700f5
fix( ENG-9127 ): add option of setting project contributors to prepri…
mkovalua 1eb586d
update code
mkovalua 42bdd7e
update code
mkovalua 4b83f03
ENG-9127 add contributors from parent project to component (project) …
mkovalua e2750cc
ENG-9127 get parent node project
mkovalua 71f278f
ENG-9127 show button only for component project with parent
mkovalua 2c6f385
check if there was parent project previuosly
mkovalua 9d731dc
fix CR
mkovalua e4f10ac
add full width button
mkovalua 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 hidden or 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 hidden or 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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -65,6 +65,22 @@ | |||||
| </div> | ||||||
| } | ||||||
|
|
||||||
| @if (allowAddingContributorsFromParentProject() && this.isSearchState()) { | ||||||
| <div class="flex justify-content-center mt-2"> | ||||||
| <p-button | ||||||
| class="w-full" | ||||||
| styleClass="w-full" | ||||||
| severity="secondary" | ||||||
| (click)="addSourceProjectContributors()" | ||||||
|
Collaborator
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.
Suggested change
|
||||||
| [label]=" | ||||||
| 'project.contributors.addDialog.addingContributorsFromParentProject' | ||||||
| | translate: { projectName: resourceName() } | ||||||
| " | ||||||
| > | ||||||
| </p-button> | ||||||
| </div> | ||||||
| } | ||||||
|
|
||||||
| <div class="flex gap-2 mt-6"> | ||||||
| <p-button | ||||||
| class="w-full" | ||||||
|
|
||||||
This file contains hidden or 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 hidden or 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,4 +1,5 @@ | ||
| export enum AddContributorType { | ||
| Registered = 1, | ||
| Unregistered, | ||
| ParentProject, | ||
| } |
This file contains hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -150,6 +150,12 @@ export class ContributorsService { | |||||
| .pipe(map((contributor) => ContributorsMapper.getContributor(contributor.data))); | ||||||
| } | ||||||
|
|
||||||
| addContributorsFromProject(resourceType: ResourceType, resourceId: string): Observable<void> { | ||||||
| const baseUrl = `${this.getBaseUrl(resourceType, resourceId)}/?copy_contributors_from_parent_project=${true}`; | ||||||
|
Collaborator
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.
Suggested change
|
||||||
| let contributorData = { data: { type: AddContributorType.ParentProject } }; | ||||||
| return this.jsonApiService.patch(baseUrl, contributorData); | ||||||
| } | ||||||
|
|
||||||
| deleteContributor(resourceType: ResourceType, resourceId: string, userId: string): Observable<void> { | ||||||
| const baseUrl = `${this.getBaseUrl(resourceType, resourceId)}/${userId}/`; | ||||||
|
|
||||||
|
|
||||||
This file contains hidden or 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 hidden or 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 hidden or 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.
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.
Preprints don't need this option. Remove it.
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.
Fix this comment.