Merge remote-tracking branch 'templates/w2p-97729_themed-ItemAlertsComponent_contribute-7.4' into atmire-contributions-alex-7.5

# Conflicts:
#	src/app/item-page/alerts/themed-item-alerts.component.ts
#	src/app/shared/shared.module.ts
#	src/themes/custom/lazy-theme.module.ts
This commit is contained in:
Alexandre Vryghem
2023-02-08 22:45:47 +01:00
9 changed files with 48 additions and 4 deletions

View File

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

View File

@@ -1,7 +1,7 @@
<div class="container" *ngVar="(itemRD$ | async) as itemRD">
<div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
<div *ngIf="itemRD?.payload as item">
<ds-item-alerts [item]="item"></ds-item-alerts>
<ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
<ds-item-versions-notice [item]="item"></ds-item-versions-notice>
<ds-view-tracker [object]="item"></ds-view-tracker>
<div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">

View File

@@ -53,6 +53,7 @@ import { ItemVersionsModule } from './versions/item-versions.module';
import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
import { ItemSharedModule } from './item-shared.module';
import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
const ENTRY_COMPONENTS = [
@@ -91,6 +92,7 @@ const DECLARATIONS = [
OrcidSyncSettingsComponent,
OrcidQueueComponent,
ItemAlertsComponent,
ThemedItemAlertsComponent,
VersionedItemComponent,
BitstreamRequestACopyPageComponent,
];

View File

@@ -1,7 +1,7 @@
<div class="container" *ngVar="(itemRD$ | async) as itemRD">
<div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
<div *ngIf="itemRD?.payload as item">
<ds-item-alerts [item]="item"></ds-item-alerts>
<ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
<ds-item-versions-notice [item]="item"></ds-item-versions-notice>
<ds-view-tracker [object]="item"></ds-view-tracker>
<ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>

View File

@@ -248,8 +248,6 @@ import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-
import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
const MODULES = [
CommonModule,
FormsModule,

View File

@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import { ItemAlertsComponent as BaseComponent } from '../../../../../app/item-page/alerts/item-alerts.component';
@Component({
selector: 'ds-item-alerts',
// templateUrl: './item-alerts.component.html',
templateUrl: '../../../../../app/item-page/alerts/item-alerts.component.html',
// styleUrls: ['./item-alerts.component.scss'],
styleUrls: ['../../../../../app/item-page/alerts/item-alerts.component.scss'],
})
export class ItemAlertsComponent extends BaseComponent {
}

View File

@@ -123,6 +123,7 @@ import { ItemSharedModule } from '../../app/item-page/item-shared.module';
import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
const DECLARATIONS = [
FileSectionComponent,
@@ -179,6 +180,7 @@ const DECLARATIONS = [
ExternalSourceEntryImportModalComponent,
ResultsBackButtonComponent,
DsoEditMetadataComponent,
ItemAlertsComponent,
];
@NgModule({