Fix tab change & reload page issue

bitbucket-pipelines.yml

@@ -20,7 +20,7 @@ definitions:
 
 pipelines:
   branches:
-    'dspace-cris-2023_02_x':
+    'main-cris':
       - step: *unittest-code-checks
   pull-requests:
     '**':

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/core/submission/submission-response-parsing.service.ts

@@ -51,7 +51,8 @@ export function normalizeSectionData(obj: any, objIndex?: number) {
         (obj.display || obj.value),
         obj.place || objIndex,
         obj.confidence,
-        obj.otherInformation
+        obj.otherInformation,
+        obj.source
       );
     } else if (Array.isArray(obj)) {
       result = [];

src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts

@@ -111,11 +111,24 @@ export abstract class CrisLayoutTabsComponent {
     const itemPageRoute = getItemPageRoute(this.item);
     this.activeTab$.next(tab);
     this.emitSelected(tab);
+
+    let queryParams = {};
+
+    this.route.queryParams.subscribe(params => {
+      queryParams = params;
+    });
+
+    const currentTabName = this.route.snapshot.paramMap.get('tab');
+    const navigationExtras = (currentTabName && currentTabName.includes(tab.shortname)) ? { queryParams: queryParams } : {};
+
+    let newUrl: string;
     if (this.tabs[0].shortname === tab.shortname) {
-      this.location.replaceState(itemPageRoute);
+      newUrl = itemPageRoute;
     } else {
-      this.location.replaceState(itemPageRoute + '/' + tab.shortname);
+      newUrl = itemPageRoute + '/' + tab.shortname;
     }
+
+    this.router.navigate([newUrl], navigationExtras);
   }
 
 }

src/app/footer/footer.component.html

@@ -12,7 +12,7 @@ <h5 class="text-uppercase">Get Involved!</h5>
 
           <ul class="list-unstyled mb-0">
             <li>
-              <a href="https://github.com/4Science/DSpace/tree/dspace-cris-7">
+              <a href="https://github.com/4Science/DSpace/tree/main-cris">
                 <i class="fab fa-github" aria-hidden="true"></i> Source Code</a>
             </li>
             <li>

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

@@ -7,7 +7,13 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item d-flex align-items-center">
+      <div *ngIf="entry.source" class="mr-2">
+        <img onerror="handleImgError(this)" [src]="'assets/images/' + entry.source + '.logo.icon.svg'" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
+      </div>
+      <div class="text-truncate text-primary font-weight-bold">{{entry.value}}</div>
+      <div *ngIf="entry.source" class="ml-2 text-truncate text-secondary">{{ ('form.entry.source.' + entry.source) | translate}}</div>
+    </li>
     <ng-container *ngFor="let item of entry.otherInformation | dsObjNgFor">
       <li *ngIf="!item.key.startsWith('data-')" class="list-item text-truncate text-secondary"  >
         {{ 'form.other-information.' + item.key | translate }} : {{item.value !== '' ? getOtherInfoValue(item.value, item.key) : ('form.other-information.not-available' | translate)}}
@@ -18,7 +24,13 @@
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item d-flex align-items-center">
+      <div *ngIf="entry.source" class="mr-2">
+        <img onerror="handleImgError(this)" [src]="'assets/images/' + entry.source + '.logo.icon.svg'" [attr.alt]="('form.entry.source.' + entry.source) | translate" />
+      </div>
+      <div class="text-truncate text-primary font-weight-bold">{{entry.value}}</div>
+      <div *ngIf="entry.source" class="ml-2 text-truncate text-secondary">{{ ('form.entry.source.' + entry.source) | translate}}</div>
+    </li>
   </ul>
 </ng-template>
 

src/app/shared/form/builder/form-builder.service.ts

@@ -263,6 +263,7 @@ export class FormBuilderService extends DynamicFormService {
                   (controlModel as any).metadataValue.place,
                   (controlModel as any).metadataValue.confidence,
                   (controlModel as any).metadataValue.otherInformation,
+                  (controlModel as any).metadataValue.source,
                   (controlModel as any).metadataValue.metadata);
               }
 
@@ -277,6 +278,7 @@ export class FormBuilderService extends DynamicFormService {
                   (controlModel as any).value.place,
                   (controlModel as any).value.confidence,
                   (controlModel as any).value.otherInformation,
+                  (controlModel as any).value.source,
                   (controlModel as any).value.metadata);
               }
             }

src/app/shared/form/builder/models/form-field-metadata-value.model.ts

@@ -25,6 +25,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   place: number;
   label: string;
   securityLevel: number;
+  source: string;
   otherInformation: OtherInformation;
 
   constructor(value: any = null,
@@ -35,7 +36,9 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
               place: number = 0,
               confidence: number = null,
               otherInformation: any = null,
-              metadata: string = null) {
+              source: string = null,
+              metadata: string = null
+              ) {
     this.value = isNotNull(value) ? ((typeof value === 'string') ? value.trim() : value) : null;
     this.language = language;
     this.authority = authority;
@@ -54,7 +57,7 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     if (isNotEmpty(metadata)) {
       this.metadata = metadata;
     }
-
+    this.source = source;
     this.otherInformation = otherInformation;
   }
 

src/app/shared/metric/metric-altmetric/metric-altmetric.component.spec.ts

@@ -42,6 +42,7 @@ describe('MetricAltmetricComponent', () => {
     component = fixture.componentInstance;
     component.metric = metricMock;
     component.success = true;
+    component.canLoadScript = true;
     component.maxRetry = 0;
     fixture.detectChanges();
   });

src/app/shared/metric/metric-dimensions/metric-dimensions.component.spec.ts

@@ -41,6 +41,7 @@ describe('MetricDimensionsComponent', () => {
     component = fixture.componentInstance;
     component.metric = metricMock;
     component.success = true;
+    component.canLoadScript = true;
     component.maxRetry = 0;
     fixture.detectChanges();
   });

src/assets/i18n/en.json5

@@ -2471,6 +2471,18 @@
 
   "form.other-information.ror_orgunit_acronym": "ROR acronym",
 
+  "form.entry.source.local": "",
+
+  "form.entry.source.orcid": "",
+
+  "form.entry.source.ror": "",
+
+  "form.entry.source.openaire": "",
+
+  "form.entry.source.zdb": "",
+
+  "form.entry.source.sherpa": "- Sherpa Romeo",
+
   "form.remove": "Remove",
 
   "form.save": "Save",