Merge remote-tracking branch 'templates/w2p-89721_Add-themeable-components_contribute-7.2' into w2p-91272_Add-themed-components-to-upstream-branch

src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts

@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin/admin-sidebar/admin-sidebar.component';
+
+/**
+ * Component representing the admin sidebar
+ */
+@Component({
+  selector: 'ds-admin-sidebar',
+  // templateUrl: './admin-sidebar.component.html',
+  templateUrl: '../../../../../app/admin/admin-sidebar/admin-sidebar.component.html',
+  // styleUrls: ['./admin-sidebar.component.scss']
+  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss']
+})
+export class AdminSidebarComponent extends BaseComponent {
+}

src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalIssueComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal-issue',
+  // styleUrls: ['./journal-issue.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss'],
+  // templateUrl: './journal-issue.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal Issue
+ */
+export class JournalIssueComponent extends BaseComponent {
+}

src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalVolumeComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal-volume',
+  // styleUrls: ['./journal-volume.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss'],
+  // templateUrl: './journal-volume.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal Volume
+ */
+export class JournalVolumeComponent extends BaseComponent {
+}

src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal',
+  // styleUrls: ['./journal.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.scss'],
+  // templateUrl: './journal.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal
+ */
+export class JournalComponent extends BaseComponent {
+}

src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts

@@ -0,0 +1,25 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Item } from '../../../../../../../app/core/shared/item.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+import {
+  UntypedItemComponent as BaseComponent
+} from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+
+/**
+ * Component that represents an untyped Item page
+ */
+@listableObjectComponent(Item, ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-untyped-item',
+  // styleUrls: ['./untyped-item.component.scss'],
+  styleUrls: ['../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.scss'],
+  // templateUrl: './untyped-item.component.html',
+  templateUrl: '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class UntypedItemComponent extends BaseComponent {
+}

src/themes/custom/eager-theme.module.ts

@@ -12,13 +12,26 @@ import { NavbarModule } from '../../app/navbar/navbar.module';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
 import { FooterComponent } from './app/footer/footer.component';
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import {
+  JournalIssueComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import {
+  JournalVolumeComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
 const ENTRY_COMPONENTS = [
+  JournalComponent,
+  JournalIssueComponent,
+  JournalVolumeComponent,
   PublicationComponent,
+  UntypedItemComponent,
 ];
 
 const DECLARATIONS = [
@@ -39,6 +52,7 @@ const DECLARATIONS = [
     RootModule,
     NavbarModule,
     ItemPageModule,
+    ItemSharedModule,
   ],
   declarations: DECLARATIONS,
   providers: [

src/themes/custom/lazy-theme.module.ts

@@ -55,8 +55,12 @@ import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component
 import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
 import { ForbiddenComponent } from './app/forbidden/forbidden.component';
 import { PrivacyComponent } from './app/info/privacy/privacy.component';
-import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
+import {
-import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
+  CollectionStatisticsPageComponent
+} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
+import {
+  CommunityStatisticsPageComponent
+} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
 import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
 import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
 import { CommunityPageComponent } from './app/community-page/community-page.component';
@@ -72,10 +76,15 @@ import { ProfilePageComponent } from './app/profile-page/profile-page.component'
 import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
 import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
 import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
-import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
+import {
+  SubmissionImportExternalComponent
+} from './app/submission/import-external/submission-import-external.component';
 import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
-import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import { WorkflowItemDeleteComponent
-import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
+} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import {
+  WorkflowItemSendBackComponent
+} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
@@ -89,7 +98,7 @@ import {
 } from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
 import { LoadingComponent } from './app/shared/loading/loading.component';
 import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
-
+import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -134,6 +143,7 @@ const DECLARATIONS = [
   EditItemTemplatePageComponent,
   LoadingComponent,
   SearchResultsComponent,
+  AdminSidebarComponent,
 ];
 
 @NgModule({