Merge remote-tracking branch 'atmire/issue-1833_entity-title-refactor_themed-ItemPageTitleFieldComponent-7.2'

# Conflicts: # src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html # src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html # src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html # src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html # src/app/entity-groups/research-entities/item-pages/person/person.component.html # src/app/entity-groups/research-entities/item-pages/project/project.component.html # src/app/item-page/full/full-item-page.component.html # src/app/item-page/simple/item-types/publication/publication.component.html # src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html # src/app/shared/shared.module.ts # src/themes/custom/lazy-theme.module.ts
2025-10-07 10:04:11 +00:00 · 2023-03-15 17:15:05 +01:00
parent 06f95da018 d79dcbae73
commit daca70e6cb
15 changed files with 76 additions and 23 deletions
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field class="mr-auto" [item]="object">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field class="mr-auto" [item]="object">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,7 +1,7 @@
 <ds-themed-results-back-button *ngIf="showBackButton | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -6,9 +6,8 @@
      <ds-view-tracker [object]="item"></ds-view-tracker>
      <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
        <div class="d-flex flex-row">
-          <ds-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
-        <ds-dso-edit-menu></ds-dso-edit-menu>
-
+          <ds-themed-item-page-title-field class="mr-auto" [item]="item"></ds-themed-item-page-title-field>
+          <ds-dso-edit-menu></ds-dso-edit-menu>
        </div>
        <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
          <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
--- a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { ThemedComponent } from '../../../../../shared/theme-support/themed.component';
+import { ItemPageTitleFieldComponent } from './item-page-title-field.component';
+import { Item } from '../../../../../core/shared/item.model';
+
+/**
+ * Themed wrapper for {@link ItemPageTitleFieldComponent}
+ */
+@Component({
+  selector: 'ds-themed-item-page-title-field',
+  styleUrls: [],
+  templateUrl: '../../../../../shared/theme-support/themed.component.html',
+})
+export class ThemedItemPageTitleFieldComponent extends ThemedComponent<ItemPageTitleFieldComponent> {
+
+  protected inAndOutputNames: (keyof ItemPageTitleFieldComponent & keyof this)[] = [
+    'item',
+  ];
+
+  @Input() item: Item;
+
+  protected getComponentName(): string {
+    return 'ItemPageTitleFieldComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./item-page-title-field.component');
+  }
+}
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -9,9 +9,9 @@
  </div>
 </div>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-    <ds-dso-edit-menu></ds-dso-edit-menu>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
  <div class="col-xs-12 col-md-4">
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -10,8 +10,8 @@
 </div>

 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -3,8 +3,8 @@
    <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
  </ng-container>
  <div *ngIf="item">
-    <ds-item-page-title-field [item]="item">
-    </ds-item-page-title-field>
+    <ds-themed-item-page-title-field [item]="item">
+    </ds-themed-item-page-title-field>
    <div class="row mb-1">
      <div class="col-xs-12 col-md-4">
        <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -268,6 +268,9 @@ import {
 import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
 import { EpersonSearchBoxComponent } from './eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { GroupSearchBoxComponent } from './eperson-group-list/group-search-box/group-search-box.component';
+import {
+  ThemedItemPageTitleFieldComponent
+} from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';

 const MODULES = [
  CommonModule,
@@ -373,7 +376,8 @@ const COMPONENTS = [
  ContextHelpWrapperComponent,
  EpersonGroupListComponent,
  EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  ThemedItemPageTitleFieldComponent,
 ];

 const ENTRY_COMPONENTS = [
--- a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
--- a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import {
+  ItemPageTitleFieldComponent as BaseComponent
+} from '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+
+@Component({
+  selector: 'ds-item-page-title-field',
+  // templateUrl: './item-page-title-field.component.html',
+  templateUrl: '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html',
+})
+export class ItemPageTitleFieldComponent extends BaseComponent {
+}
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -134,6 +134,9 @@ import { MetadataRepresentationListComponent } from './app/item-page/simple/meta
 import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
 import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
+import {
+  ItemPageTitleFieldComponent
+} from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';

 const DECLARATIONS = [
  FileSectionComponent,
@@ -197,6 +200,8 @@ const DECLARATIONS = [
  MetadataRepresentationListComponent,
  DsDynamicLookupRelationSearchTabComponent,
  DsDynamicLookupRelationExternalSourceTabComponent,
+  FeedbackComponent,
+  ItemPageTitleFieldComponent,
 ];

@NgModule({