Skip to content

Commit bd4cdc7

Browse files
[UXP-124] provided tab-name for rendering-type models
1 parent 8230199 commit bd4cdc7

40 files changed

Lines changed: 82 additions & 24 deletions

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ describe('AdvancedAttachmentComponent', () => {
152152
{ provide: 'fieldProvider', useValue: mockField },
153153
{ provide: 'itemProvider', useValue: testItem },
154154
{ provide: 'renderingSubTypeProvider', useValue: '' },
155+
{ provide: 'tabNameProvider', useValue: '' },
155156
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
156157
{ provide: AuthorizationDataService, useValue: mockAuthorizedService },
157158
],

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ export class AdvancedAttachmentComponent extends AttachmentComponent implements
4141
@Inject('fieldProvider') public fieldProvider: LayoutField,
4242
@Inject('itemProvider') public itemProvider: Item,
4343
@Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
44+
@Inject('tabNameProvider') public tabNameProvider: string,
4445
protected bitstreamDataService: BitstreamDataService,
4546
protected translateService: TranslateService
4647
) {
47-
super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
48+
super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
4849
}
4950

5051
getBitstreamsByItem(options?: FindListOptions): Observable<PaginatedList<Bitstream>> {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export class AttachmentRenderComponent implements OnInit {
3636
* The bitstream
3737
*/
3838
@Input() renderingType: AttachmentRenderingType | string;
39+
/**
40+
* The tab name
41+
*/
42+
@Input() tabName: string;
3943

4044
/**
4145
* Directive hook used to place the dynamic render component
@@ -77,6 +81,7 @@ export class AttachmentRenderComponent implements OnInit {
7781
attachentComponentRef = this.attachmentValueViewRef.createComponent(factory, 0, this.getComponentInjector());
7882
(attachentComponentRef.instance as any).item = this.item;
7983
(attachentComponentRef.instance as any).bitstream = this.bitstream;
84+
(attachentComponentRef.instance as any).tabName = this.tabName;
8085
}
8186
return attachentComponentRef;
8287
}
@@ -87,7 +92,8 @@ export class AttachmentRenderComponent implements OnInit {
8792
getComponentInjector() {
8893
const providers = [
8994
{provide: 'itemProvider', useValue: this.item, deps: []},
90-
{provide: 'bitstreamProvider', useValue: this.bitstream, deps: []}
95+
{provide: 'bitstreamProvider', useValue: this.bitstream, deps: []},
96+
{provide: 'tabNameProvider', useValue: this.tabName, deps: []}
9197
];
9298

9399
return Injector.create({

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<div class="d-flex flex-column align-items-end gap-3">
1010
<ng-container *ngFor="let renderingType of allAttachmentProviders">
1111
<div class="text-nowrap">
12-
<ds-attachment-render [renderingType]="renderingType" [bitstream]="attachment" [item]="item"></ds-attachment-render>
12+
<ds-attachment-render [renderingType]="renderingType" [bitstream]="attachment" [item]="item" [tabName]="tabName"></ds-attachment-render>
1313
</div>
1414
</ng-container>
1515
<!-- Default download button -->
1616
<div class="text-nowrap">
17-
<ds-attachment-render [renderingType]="AttachmentRenderingType.DOWNLOAD" [bitstream]="attachment" [item]="item"></ds-attachment-render>
17+
<ds-attachment-render [renderingType]="AttachmentRenderingType.DOWNLOAD" [bitstream]="attachment" [item]="item" [tabName]="tabName"></ds-attachment-render>
1818
</div>
1919
</div>
2020
</div>

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ describe('BitstreamAttachmentComponent', () => {
1818
{provide: 'fieldProvider', useValue: {}},
1919
{provide: 'itemProvider', useValue: {}},
2020
{provide: 'renderingSubTypeProvider', useValue: ''},
21+
{provide: 'tabNameProvider', useValue: '' },
2122
{provide: BitstreamDataService, useValue: {}},
2223
{provide: TranslateService, useValue: {}},
2324
],

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,13 @@ export class BitstreamAttachmentComponent extends BitstreamRenderingModelCompone
4141
@Inject('fieldProvider') public fieldProvider: LayoutField,
4242
@Inject('itemProvider') public itemProvider: Item,
4343
@Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
44+
@Inject('tabNameProvider') public tabNameProvider: string,
4445
protected readonly bitstreamDataService: BitstreamDataService,
4546
protected readonly translateService: TranslateService,
4647
protected readonly router: Router,
4748
protected readonly route: ActivatedRoute,
4849
) {
49-
super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
50+
super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
5051
}
5152

5253
ngOnInit() {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ describe('AttachmentComponent', () => {
152152
{ provide: 'fieldProvider', useValue: mockField },
153153
{ provide: 'itemProvider', useValue: testItem },
154154
{ provide: 'renderingSubTypeProvider', useValue: '' },
155+
{ provide: 'tabNameProvider', useValue: '' },
155156
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
156157
{ provide: AuthorizationDataService, useValue: mockAuthorizedService },
157158
],

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ export class AttachmentComponent extends BitstreamAttachmentRenderingModelCompon
4949
@Inject('fieldProvider') public fieldProvider: LayoutField,
5050
@Inject('itemProvider') public itemProvider: Item,
5151
@Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
52+
@Inject('tabNameProvider') public tabNameProvider: string,
5253
protected bitstreamDataService: BitstreamDataService,
5354
protected translateService: TranslateService
5455
) {
55-
super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
56+
super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
5657
}
5758

5859
/**

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/bitstream-attachment-rendering.model.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ export abstract class BitstreamAttachmentRenderingModelComponent extends Bitstre
2626
@Inject('fieldProvider') fieldProvider: LayoutField,
2727
@Inject('itemProvider') itemProvider: Item,
2828
@Inject('renderingSubTypeProvider') renderingSubTypeProvider: string,
29+
@Inject('tabNameProvider') public tabNameProvider: string,
2930
bitstreamDataService: BitstreamDataService,
3031
translateService: TranslateService
3132
) {
32-
super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
33+
super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
3334
}
3435

3536
getBitstreamsByItem(options?: FindListOptions): Observable<PaginatedList<Bitstream>> {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ export abstract class BitstreamRenderingModelComponent extends RenderingTypeStru
3535
@Inject('fieldProvider') public fieldProvider: LayoutField,
3636
@Inject('itemProvider') public itemProvider: Item,
3737
@Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
38+
@Inject('tabNameProvider') public tabNameProvider: string,
3839
protected bitstreamDataService: BitstreamDataService,
3940
protected translateService: TranslateService
4041
) {
41-
super(fieldProvider, itemProvider, renderingSubTypeProvider, translateService);
42+
super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, translateService);
4243
}
4344

4445
/**

0 commit comments

Comments
 (0)