-
Notifications
You must be signed in to change notification settings - Fork 29
[BUG] There is no pop-up window when user is deleted from Project/Notebook level #374 #706
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
Open
IamBigBobby
wants to merge
6
commits into
3.0
Choose a base branch
from
ng-374
base: 3.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
806d093
feat: implement pop-up when user is deleted member form the team list
8276456
fix: remove doubles
ae4b7d2
feat: upd dialog pop-up according requirements
c61c0e6
feat: add ability to remove a member without page refreshing
dd2fc64
fix: fix conformation label for member deleting
077e378
fix: make fixes after reivew
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
16 changes: 16 additions & 0 deletions
16
...common/remove-member-confirmation-dialog/remove-member-confirmation-dialog.component.html
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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <div class="p-6"> | ||
| <h2 class="text-lg font-semibold text-neutral-1000 mb-3">{{ 'Remove team member' }}</h2> | ||
| <p class="text-sm text-neutral-900 mb-4">{{ 'Are you sure you want to remove the member?' }}</p> | ||
|
|
||
| @if (data.showCascadeCheckbox) { | ||
| <label class="flex items-start gap-2 text-sm text-neutral-900 mb-6 cursor-pointer"> | ||
| <input type="checkbox" class="mt-0.5" [(ngModel)]="removeFromChildren" [attr.aria-label]="cascadeCheckboxLabel" /> | ||
| <span>{{ cascadeCheckboxLabel }}</span> | ||
| </label> | ||
| } | ||
|
|
||
| <div class="flex items-center justify-end gap-2"> | ||
| <eln-button variant="grey" (click)="cancel()">{{ 'Cancel' }}</eln-button> | ||
| <eln-button variant="red" (click)="confirm()">{{ 'Remove' }}</eln-button> | ||
| </div> | ||
| </div> | ||
45 changes: 45 additions & 0 deletions
45
...s/common/remove-member-confirmation-dialog/remove-member-confirmation-dialog.component.ts
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { CommonModule } from '@angular/common'; | ||
| import { Component, inject } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
| import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; | ||
| import { ButtonComponent } from '../button/button.component'; | ||
|
|
||
| export interface RemoveMemberConfirmationDialogData { | ||
| showCascadeCheckbox: boolean; | ||
| cascadeCheckboxLabel: string; | ||
| } | ||
|
|
||
| export interface RemoveMemberConfirmationResult { | ||
| confirmed: boolean; | ||
| removeFromChildren: boolean; | ||
| } | ||
|
|
||
| @Component({ | ||
| selector: 'eln-remove-member-confirmation-dialog', | ||
| standalone: true, | ||
| imports: [CommonModule, FormsModule, MatDialogModule, ButtonComponent], | ||
| templateUrl: './remove-member-confirmation-dialog.component.html', | ||
| }) | ||
| export class RemoveMemberConfirmationDialogComponent { | ||
| readonly data = inject<RemoveMemberConfirmationDialogData>(MAT_DIALOG_DATA); | ||
| private dialogRef = inject(MatDialogRef<RemoveMemberConfirmationDialogComponent, RemoveMemberConfirmationResult>); | ||
|
|
||
| readonly cascadeCheckboxLabel = this.data.cascadeCheckboxLabel; | ||
|
|
||
| // Project/Notebook show cascade option (default true), Experiment does not (default false). | ||
| removeFromChildren = this.data.showCascadeCheckbox; | ||
|
|
||
| cancel(): void { | ||
| this.dialogRef.close({ | ||
| confirmed: false, | ||
| removeFromChildren: false, | ||
| }); | ||
| } | ||
|
|
||
| confirm(): void { | ||
| this.dialogRef.close({ | ||
| confirmed: true, | ||
| removeFromChildren: this.removeFromChildren, | ||
| }); | ||
| } | ||
| } |
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 @@ | ||
| // Config interface to adapt component to entity context (project, notebook, etc.) | ||
| export interface TeamComponentConfig { | ||
| buildAccessEndpoint: (entityId: string) => string; // e.g. projects/{id}/access or notebooks/{id}/access | ||
| removeMemberCascadeCheckboxLabel?: string; | ||
| } |
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
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.
Shall we reuse eln-form-dialog? It will give us title and buttons for free