Skip to content

-Fix issue 1059, refactor html view to display in tabs insted of list #6101

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.

Sign up for GitHub

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
abelc-escire wants to merge 1 commit into
base: main
Choose a base branch
from
+69 −30
Open

-Fix issue 1059, refactor html view to display in tabs insted of list #6101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 50 additions & 29 deletions src/app/access-control/group-registry/group-form/group-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,58 @@ <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h
}
}

<ds-form [formId]="formId"
[formModel]="formModel"
[formGroup]="formGroup"
[formLayout]="formLayout"
[displayCancel]="false"
(submitForm)="onSubmit()">
<div before class="btn-group">
<button (click)="onCancel()" type="button"
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
</div>
@if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
<div after class="btn-group">
<button (click)="delete()" class="btn btn-danger delete-button" type="button">
<i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
</button>
<ul ngbNav [destroyOnHide]="true" #tabs="ngbNav" class="nav-tabs" role="tablist">
<li [ngbNavItem]="'editGroupTab'" role="presentation" data-test="editGroupTab">
<a ngbNavLink>{{messagePrefix + '.tabs.edit' | translate}}</a>
<ng-template ngbNavContent>
<div class="mt-2">
<ds-form [formId]="formId"
[formModel]="formModel"
[formGroup]="formGroup"
[formLayout]="formLayout"
[displayCancel]="false"
(submitForm)="onSubmit()">
<div before class="btn-group">
<button (click)="onCancel()" type="button"
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
</div>
@if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
<div after class="btn-group">
<button (click)="delete()" class="btn btn-danger delete-button" type="button">
<i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
</button>
</div>
}
</ds-form>
</div>
}
</ds-form>

</ng-template>
</li>
@if ((activeGroup$ | async); as groupBeingEdited) {
<div class="mb-5">
@if (groupBeingEdited !== undefined) {
<ds-members-list
[messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
}
</div>
@if (groupBeingEdited !== undefined) {
<ds-subgroups-list
[messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
}
<li [ngbNavItem]="'ePeopleTab'" role="presentation" data-test="ePeopleTab">
<a ngbNavLink>{{messagePrefix + '.tabs.ePeople' | translate}}</a>
<ng-template ngbNavContent>
<div class="mt-2">
@if (groupBeingEdited !== undefined) {
<ds-members-list
[messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
}
</div>
</ng-template>
</li>
<li [ngbNavItem]="'groupsTab'" role="presentation" data-test="groupsTab">
<a ngbNavLink>{{messagePrefix + '.tabs.groups' | translate}}</a>
<ng-template ngbNavContent>
<div class="mt-2">
@if (groupBeingEdited !== undefined) {
<ds-subgroups-list
[messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
}
</div>
</ng-template>
</li>
}
</div>
</ul>
<div [ngbNavOutlet]="tabs"></div>
</div>
</div>
</div>
14 changes: 13 additions & 1 deletion src/app/access-control/group-registry/group-form/group-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ import {
hasValueOperator,
isNotEmpty,
} from '@dspace/shared/utils/empty.util';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import {
NgbModal,
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
} from '@ng-bootstrap/ng-bootstrap';
import {
DynamicFormControlModel,
DynamicFormLayout,
Expand Down Expand Up @@ -93,6 +100,11 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
ContextHelpDirective,
FormComponent,
MembersListComponent,
NgbNav,
NgbNavContent,
NgbNavItem,
NgbNavLink,
NgbNavOutlet,
SubgroupsListComponent,
TranslateModule,
],
Expand Down
6 changes: 6 additions & 0 deletions src/assets/i18n/en.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,12 @@

"admin.access-control.groups.form.return": "Back",

"admin.access-control.groups.form.tabs.edit": "Edit Group",

"admin.access-control.groups.form.tabs.ePeople": "EPeople",

"admin.access-control.groups.form.tabs.groups": "Groups",

"admin.quality-assurance.breadcrumbs": "Quality Assurance",

"admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
Expand Down
Loading