fix pagination on external sources

package.json

@@ -1,6 +1,6 @@
 {
  "name": "dspace-angular",
- "version": "2023.02.00",
+ "version": "2023.02.01-SNAPSHOT",
  "scripts": {
  "ng": "ng",
  "config:watch": "nodemon",

src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts

@@ -10,7 +10,7 @@ export class TruncateBreadcrumbItemCharactersPipe implements PipeTransform {
  * The maximum number of characters to display in a breadcrumb item
  * @type {number}
  */
- readonly charLimit: number = environment.breadcrumbCharLimit;
+ readonly charLimit: number = environment.layout.breadcrumbs.charLimit;
 
  /**
  * Truncates the text based on the configured char number allowed per breadcrumb element.

src/app/shared/form/form.component.html

@@ -20,7 +20,7 @@
  title="{{'form.remove' | translate}}"
  attr.aria-label="{{'form.remove' | translate}}"
  (click)="clearScrollableDropdown($event, model)"
- [disabled]="!model.value">
+ [disabled]="!model.value || model.readOnly">
  <span><i class="fas fa-trash" aria-hidden="false"></i></span>
  </button>
  </div>

src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html

@@ -19,7 +19,9 @@ <h3 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMet
  <span *ngIf="item.hasMetadata(authorMetadata);" class="item-list-authors">
  <span *ngIf="item.allMetadataValues(authorMetadata).length === 0">{{'mydspace.results.no-authors' | translate}}</span>
  <span *ngFor="let author of item.allMetadata(authorMetadata); let i=index; let last=last;">
- <ds-metadata-link-view *ngIf="!!item && !!author" [item]="item" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view>
+ <ds-metadata-link-view *ngIf="!!item && !!author" [item]="item" [metadataName]="authorMetadata"
+ [metadata]="author"></ds-metadata-link-view><span
+ *ngIf="!last">; </span>
  </span>
  </span>
  </ds-truncatable-part>

src/app/shared/object-list/relationships-list/relationships-items-list-preview/relationships-items-list-preview.component.html

@@ -24,7 +24,9 @@ <h3 [innerHTML]="item.firstMetadataValue('dc.title') || ('mydspace.results.no-ti
  <span *ngIf="item.allMetadata(authorMetadata).length === 0">{{'mydspace.results.no-authors' | translate}}</span>
  <span class="d-flex position-absolute w-100">
  <span class="metadata-content" *ngFor="let author of item.allMetadata(authorMetadata); let i=index; let last=last;">
- <ds-metadata-link-view [item]="item" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view>
+ <ds-metadata-link-view [item]="item" [metadataName]="authorMetadata"
+ [metadata]="author"></ds-metadata-link-view><span
+ *ngIf="!last">; </span>
  </span>
 
  </span>

src/app/submission/import-external/submission-import-external.component.ts

@@ -117,6 +117,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
  ngOnInit(): void {
  this.listId = 'list-submission-external-sources';
  this.context = Context.EntitySearchModalWithNameVariants;
+ this.searchConfigService.setPaginationId(this.initialPagination.id);
  this.repeatable = false;
  this.routeData = {entity: '', sourceId: '', query: ''};
  this.importConfig = {

src/config/default-app-config.ts

@@ -511,23 +511,23 @@ export class DefaultAppConfig implements AppConfig {
  urn: [
  {
  name: 'doi',
- baseUrl: 'https://doi.org/'
+ baseUrl: 'https://doi.org/',
  },
  {
  name: 'hdl',
- baseUrl: 'https://hdl.handle.net/'
+ baseUrl: 'https://hdl.handle.net/',
  },
  {
  name: 'scopus',
- baseUrl: 'https://www.scopus.com/authid/detail.uri?authorId='
+ baseUrl: 'https://www.scopus.com/authid/detail.uri?authorId=',
  },
  {
  name: 'researcherid',
- baseUrl: 'http://www.researcherid.com/rid/'
+ baseUrl: 'http://www.researcherid.com/rid/',
  },
  {
  name: 'mailto',
- baseUrl: 'mailto:'
+ baseUrl: 'mailto:',
  }
  ],
  crisRef: [
@@ -536,7 +536,7 @@ export class DefaultAppConfig implements AppConfig {
  entityStyle: {
  default: {
  icon: 'fa fa-info',
- style: 'text-info'
+ style: 'text-info',
  }
  }
  },
@@ -545,7 +545,7 @@ export class DefaultAppConfig implements AppConfig {
  entityStyle: {
  default: {
  icon: 'fa fa-user',
- style: 'text-info'
+ style: 'text-info',
  }
  }
  },
@@ -554,7 +554,7 @@ export class DefaultAppConfig implements AppConfig {
  entityStyle: {
  default: {
  icon: 'fa fa-university',
- style: 'text-info'
+ style: 'text-info',
  }
  }
  },
@@ -563,7 +563,7 @@ export class DefaultAppConfig implements AppConfig {
  entityStyle: {
  default: {
  icon: 'fas fa-project-diagram',
- style: 'text-info'
+ style: 'text-info',
  }
  }
  }
@@ -573,18 +573,18 @@ export class DefaultAppConfig implements AppConfig {
  },
  itemPage: {
  OrgUnit: {
- orientation: 'vertical'
+ orientation: 'vertical',
  },
  Project: {
- orientation: 'vertical'
+ orientation: 'vertical',
  },
  default: {
- orientation: 'horizontal'
+ orientation: 'horizontal',
  },
  },
  metadataBox: {
  defaultMetadataLabelColStyle: 'col-3',
- defaultMetadataValueColStyle: 'col-9'
+ defaultMetadataValueColStyle: 'col-9',
  },
  collectionsBox: {
  defaultCollectionsLabelColStyle: 'col-3 font-weight-bold',
@@ -597,6 +597,9 @@ export class DefaultAppConfig implements AppConfig {
  navbar: {
  // If true, show the "Community and Collections" link in the navbar; otherwise, show it in the admin sidebar
  showCommunityCollection: true,
+ },
+ breadcrumbs: {
+ charLimit: 10,
  }
  };
 
@@ -605,17 +608,17 @@ export class DefaultAppConfig implements AppConfig {
  {
  value: 0,
  icon: 'fa fa-globe',
- color: 'green'
+ color: 'green',
  },
  {
  value: 1,
  icon: 'fa fa-key',
- color: 'orange'
+ color: 'orange',
  },
  {
  value: 2,
  icon: 'fa fa-lock',
- color: 'red'
+ color: 'red',
  }
  ]
  };
@@ -730,11 +733,12 @@ export class DefaultAppConfig implements AppConfig {
  name: 'checksum',
  type: AdvancedAttachmentElementType.Attribute,
  }
- ]
+ ],
  };
 
  searchResult: SearchResultConfig = {
  additionalMetadataFields: [],
  authorMetadata: ['dc.contributor.author', 'dc.creator', 'dc.contributor.*'],
  };
+
 }

src/config/layout-config.interfaces.ts

@@ -38,6 +38,10 @@ export interface NavbarConfig extends Config {
  showCommunityCollection: boolean;
 }
 
+export interface BreadcrumbsConfig extends Config {
+ charLimit: number;
+}
+
 export interface CrisItemPageConfig extends Config {
  [entity: string]: CrisLayoutTypeConfig;
  default: CrisLayoutTypeConfig;
@@ -59,6 +63,7 @@ export interface CrisLayoutConfig extends Config {
 
 export interface LayoutConfig extends Config {
  navbar: NavbarConfig;
+ breadcrumbs: BreadcrumbsConfig;
 }
 
 export interface SuggestionConfig extends Config {

src/environments/environment.test.ts

@@ -421,7 +421,10 @@ export const environment: BuildConfig = {
  navbar: {
  // If true, show the "Community and Collections" link in the navbar; otherwise, show it in the admin sidebar
  showCommunityCollection: true,
- }
+ },
+ breadcrumbs: {
+ charLimit: 10,
+ },
  },
  security: {
  levels: [
@@ -553,4 +556,5 @@ export const environment: BuildConfig = {
  ],
  authorMetadata: ['dc.contributor.author', 'dc.contributor.editor', 'dc.contributor.contributor', 'dc.creator'],
  },
+
 };