Skip to content

Commit 069fd02

Browse files
FrancescoMolinaroFrancescoMolinaro
committed
[DURACOM-307] start migration and type fixing
1 parent b9e164d commit 069fd02

598 files changed

Lines changed: 5671 additions & 6012 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
AsyncPipe,
3-
NgForOf,
4-
NgIf,
5-
} from '@angular/common';
1+
import { AsyncPipe } from '@angular/common';
62
import {
73
Component,
84
Input,
@@ -59,15 +55,13 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
5955
AsyncPipe,
6056
NgbAccordionModule,
6157
TranslateModule,
62-
NgIf,
6358
NgbNavModule,
6459
ThemedSearchComponent,
6560
BrowserOnlyPipe,
66-
NgForOf,
6761
NgxPaginationModule,
6862
SelectableListItemControlComponent,
69-
ListableObjectComponentLoaderComponent,
70-
],
63+
ListableObjectComponentLoaderComponent
64+
],
7165
standalone: true,
7266
})
7367
export class BulkAccessBrowseComponent implements OnInit, OnDestroy {

‎src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NgIf } from '@angular/common';
1+
22
import {
33
Component,
44
ViewChild,
@@ -16,9 +16,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
1616
imports: [
1717
NgbAccordionModule,
1818
TranslateModule,
19-
NgIf,
20-
AccessControlFormContainerComponent,
21-
],
19+
AccessControlFormContainerComponent
20+
],
2221
standalone: true,
2322
})
2423
export class BulkAccessSettingsComponent {

‎src/app/access-control/epeople-registry/epeople-registry.component.ts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
import {
2-
AsyncPipe,
3-
NgClass,
4-
NgForOf,
5-
NgIf,
6-
} from '@angular/common';
1+
import { AsyncPipe, NgClass } from '@angular/common';
72
import {
83
Component,
94
OnDestroy,
@@ -72,14 +67,12 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component';
7267
TranslateModule,
7368
RouterModule,
7469
AsyncPipe,
75-
NgIf,
7670
EPersonFormComponent,
7771
ReactiveFormsModule,
7872
ThemedLoadingComponent,
7973
PaginationComponent,
80-
NgClass,
81-
NgForOf,
82-
],
74+
NgClass
75+
],
8376
standalone: true,
8477
})
8578
/**

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
import {
2-
AsyncPipe,
3-
NgClass,
4-
NgFor,
5-
NgIf,
6-
} from '@angular/common';
1+
import { AsyncPipe, NgClass } from '@angular/common';
72
import {
83
ChangeDetectorRef,
94
Component,
@@ -84,17 +79,15 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
8479
templateUrl: './eperson-form.component.html',
8580
imports: [
8681
FormComponent,
87-
NgIf,
88-
NgFor,
8982
AsyncPipe,
9083
TranslateModule,
9184
NgClass,
9285
ThemedLoadingComponent,
9386
PaginationComponent,
9487
RouterLink,
9588
HasNoValuePipe,
96-
BtnDisabledDirective,
97-
],
89+
BtnDisabledDirective
90+
],
9891
standalone: true,
9992
})
10093
/**

‎src/app/access-control/group-registry/group-form/group-form.component.html‎

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
<div class="group-form row">
33
<div class="col-12">
44

5-
<div *ngIf="activeGroup$ | async; then editHeader; else createHeader"></div>
6-
7-
<ng-template #createHeader>
8-
<h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
9-
</ng-template>
10-
11-
<ng-template #editHeader>
5+
@if (activeGroup$ | async) {
126
<h1 class="border-bottom pb-2">
137
<span
148
*dsContextHelp="{
@@ -17,47 +11,61 @@ <h1 class="border-bottom pb-2">
1711
iconPlacement: 'right',
1812
tooltipPlacement: ['right', 'bottom']
1913
}"
20-
>
14+
>
2115
{{messagePrefix + '.head.edit' | translate}}
2216
</span>
2317
</h1>
24-
</ng-template>
18+
} @else {
19+
<h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
20+
}
21+
22+
2523

26-
<ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
27-
<ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
28-
[content]="messagePrefix + '.alert.permanent'"></ds-alert>
29-
<ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
30-
<ds-alert *ngIf="(canEdit$ | async) !== true" [type]="AlertType.Warning"
31-
[content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
32-
</ds-alert>
33-
</ng-container>
34-
</ng-container>
24+
@if ((activeGroup$ | async); as groupBeingEdited) {
25+
@if (groupBeingEdited?.permanent) {
26+
<ds-alert [type]="AlertType.Warning"
27+
[content]="messagePrefix + '.alert.permanent'"></ds-alert>
28+
}
29+
@if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) {
30+
@if ((canEdit$ | async) !== true) {
31+
<ds-alert [type]="AlertType.Warning"
32+
[content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
33+
</ds-alert>
34+
}
35+
}
36+
}
3537

3638
<ds-form [formId]="formId"
37-
[formModel]="formModel"
38-
[formGroup]="formGroup"
39-
[formLayout]="formLayout"
40-
[displayCancel]="false"
41-
(submitForm)="onSubmit()">
39+
[formModel]="formModel"
40+
[formGroup]="formGroup"
41+
[formLayout]="formLayout"
42+
[displayCancel]="false"
43+
(submitForm)="onSubmit()">
4244
<div before class="btn-group">
4345
<button (click)="onCancel()" type="button"
44-
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
45-
</div>
46-
<div after *ngIf="(canEdit$ | async) && !(activeGroup$ | async)?.permanent" class="btn-group">
47-
<button (click)="delete()" class="btn btn-danger delete-button" type="button">
48-
<i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
49-
</button>
50-
</div>
51-
</ds-form>
46+
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
47+
</div>
48+
@if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
49+
<div after class="btn-group">
50+
<button (click)="delete()" class="btn btn-danger delete-button" type="button">
51+
<i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
52+
</button>
53+
</div>
54+
}
55+
</ds-form>
5256

53-
<ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
54-
<div class="mb-5">
55-
<ds-members-list *ngIf="groupBeingEdited !== undefined"
56-
[messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
57-
</div>
58-
<ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
59-
[messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
60-
</ng-container>
57+
@if ((activeGroup$ | async); as groupBeingEdited) {
58+
<div class="mb-5">
59+
@if (groupBeingEdited !== undefined) {
60+
<ds-members-list
61+
[messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
62+
}
63+
</div>
64+
@if (groupBeingEdited !== undefined) {
65+
<ds-subgroups-list
66+
[messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
67+
}
68+
}
69+
</div>
6170
</div>
6271
</div>
63-
</div>

‎src/app/access-control/group-registry/group-form/group-form.component.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
AsyncPipe,
3-
NgIf,
4-
} from '@angular/common';
1+
import { AsyncPipe } from '@angular/common';
52
import {
63
ChangeDetectorRef,
74
Component,
@@ -92,13 +89,12 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
9289
imports: [
9390
FormComponent,
9491
AlertComponent,
95-
NgIf,
9692
AsyncPipe,
9793
TranslateModule,
9894
ContextHelpDirective,
9995
MembersListComponent,
100-
SubgroupsListComponent,
101-
],
96+
SubgroupsListComponent
97+
],
10298
standalone: true,
10399
})
104100
/**

0 commit comments

Comments
 (0)