Merge branch 'w2p-98661_themed-FullFileSectionComponent-contribute-7.2' into atmire-contributions-alex-7.5

# Conflicts:
#	src/app/item-page/full/full-item-page.component.html
#	src/app/item-page/item-page.module.ts
#	src/themes/custom/lazy-theme.module.ts
This commit is contained in:
Alexandre Vryghem
2023-02-22 13:29:44 +01:00
7 changed files with 55 additions and 1 deletions

View File

@@ -0,0 +1,32 @@
import { Component, Input } from '@angular/core';
import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
import { FullFileSectionComponent } from './full-file-section.component';
import { Item } from '../../../../core/shared/item.model';
/**
* Themed wrapper for {@link FullFileSectionComponent}
*/
@Component({
selector: 'ds-themed-item-page-full-file-section',
styleUrls: [],
templateUrl: './../../../../shared/theme-support/themed.component.html',
})
export class ThemedFullFileSectionComponent extends ThemedComponent<FullFileSectionComponent> {
@Input() item: Item;
protected inAndOutputNames: (keyof FullFileSectionComponent & keyof this)[] = ['item'];
protected getComponentName(): string {
return 'FullFileSectionComponent';
}
protected importThemedComponent(themeName: string): Promise<any> {
return import(`../../../../../themes/${themeName}/app/item-page/full/field-components/file-section/full-file-section.component`);
}
protected importUnthemedComponent(): Promise<any> {
return import('./full-file-section.component');
}
}

View File

@@ -28,7 +28,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section> <ds-themed-item-page-full-file-section [item]="item"></ds-themed-item-page-full-file-section>
<ds-item-page-collections [item]="item"></ds-item-page-collections> <ds-item-page-collections [item]="item"></ds-item-page-collections>
<ds-item-versions class="mt-2" [item]="item"></ds-item-versions> <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
<div class="button-row bottom" *ngIf="fromSubmissionObject"> <div class="button-row bottom" *ngIf="fromSubmissionObject">

View File

@@ -54,6 +54,9 @@ import { FileSectionComponent } from './simple/field-components/file-section/fil
import { ItemSharedModule } from './item-shared.module'; import { ItemSharedModule } from './item-shared.module';
import { DsoPageModule } from '../shared/dso-page/dso-page.module'; import { DsoPageModule } from '../shared/dso-page/dso-page.module';
import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component'; import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
import {
ThemedFullFileSectionComponent
} from './full/field-components/file-section/themed-full-file-section.component';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
@@ -77,6 +80,7 @@ const DECLARATIONS = [
ItemPageFieldComponent, ItemPageFieldComponent,
CollectionsComponent, CollectionsComponent,
FullFileSectionComponent, FullFileSectionComponent,
ThemedFullFileSectionComponent,
PublicationComponent, PublicationComponent,
UntypedItemComponent, UntypedItemComponent,
ItemComponent, ItemComponent,

View File

@@ -0,0 +1,14 @@
import { Component } from '@angular/core';
import {
FullFileSectionComponent as BaseComponent
} from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
@Component({
selector: 'ds-item-page-full-file-section',
// styleUrls: ['./full-file-section.component.scss'],
styleUrls: ['../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component.scss'],
// templateUrl: './full-file-section.component.html',
templateUrl: '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component.html',
})
export class FullFileSectionComponent extends BaseComponent {
}

View File

@@ -127,6 +127,9 @@ import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module'; import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module'; import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component'; import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
import {
FullFileSectionComponent
} from './app/item-page/full/field-components/file-section/full-file-section.component';
const DECLARATIONS = [ const DECLARATIONS = [
FileSectionComponent, FileSectionComponent,
@@ -185,6 +188,7 @@ const DECLARATIONS = [
ResultsBackButtonComponent, ResultsBackButtonComponent,
DsoEditMetadataComponent, DsoEditMetadataComponent,
ItemAlertsComponent, ItemAlertsComponent,
FullFileSectionComponent,
]; ];
@NgModule({ @NgModule({