From 336ab8a6205f9341097f9659f950ef011459c4ee Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 17 Dec 2024 10:29:21 +0100 Subject: [PATCH] TEMP: more template var removals --- .../metadata-field-form.component.html | 2 +- .../metadata-field-form.component.ts | 127 +++++++++--------- .../community-list.component.html | 4 +- .../item-authorizations.component.html | 10 +- .../item-authorizations.component.spec.ts | 8 -- .../item-authorizations.component.ts | 37 ++--- .../virtual-metadata.component.html | 10 +- .../virtual-metadata.component.spec.ts | 6 +- .../virtual-metadata.component.ts | 41 +++--- .../orcid-auth/orcid-auth.component.html | 22 +-- .../orcid-auth/orcid-auth.component.ts | 61 +++------ .../orcid-queue/orcid-queue.component.html | 8 +- .../orcid-queue/orcid-queue.component.ts | 12 +- src/app/navbar/navbar.component.html | 2 +- .../overview/process-overview.component.html | 8 +- .../overview/process-overview.component.ts | 4 +- ...rofile-page-researcher-form.component.html | 10 +- .../profile-page-researcher-form.component.ts | 20 +-- .../profile-page/profile-page.component.html | 2 +- .../profile-page.component.spec.ts | 51 ------- .../profile-page/profile-page.component.ts | 7 - src/app/shared/host-window.service.ts | 4 +- .../pagination/pagination.component.html | 2 +- .../shared/pagination/pagination.component.ts | 8 +- ...submission-form-section-add.component.html | 6 +- .../submission-form-section-add.component.ts | 6 + .../form/submission-form.component.html | 6 +- .../form/submission-form.component.spec.ts | 2 +- .../form/submission-form.component.ts | 11 +- ...mission-section-cc-licenses.component.html | 38 +++--- ...ubmission-section-cc-licenses.component.ts | 14 +- .../section-identifiers.component.html | 25 ++-- .../section-identifiers.component.ts | 10 +- .../dspace/app/navbar/navbar.component.html | 2 +- 34 files changed, 240 insertions(+), 346 deletions(-) diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html index 4e29fbb6e81..e03c8adf912 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html @@ -1,4 +1,4 @@ -
+

{{messagePrefix + '.create' | translate}}

diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts index 773e0600fbf..77c5d563789 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts @@ -10,7 +10,7 @@ import { RegistryService } from '../../../../core/registry/registry.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { take } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; -import { combineLatest } from 'rxjs'; +import { Observable } from 'rxjs'; import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; import { MetadataField } from '../../../../core/metadata/metadata-field.model'; @@ -89,6 +89,8 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy { */ @Output() submitForm: EventEmitter = new EventEmitter(); + activeMetadataField$: Observable; + constructor(public registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) { @@ -97,70 +99,65 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy { /** * Initialize the component, setting up the necessary Models for the dynamic form */ - ngOnInit() { - combineLatest([ - this.translateService.get(`${this.messagePrefix}.element`), - this.translateService.get(`${this.messagePrefix}.qualifier`), - this.translateService.get(`${this.messagePrefix}.scopenote`) - ]).subscribe(([element, qualifier, scopenote]) => { - this.element = new DynamicInputModel({ - id: 'element', - label: element, - name: 'element', - validators: { - required: null, - pattern: '^[^. ,]*$', - maxLength: 64, - }, - required: true, - errorMessages: { - pattern: 'error.validation.metadata.element.invalid-pattern', - maxLength: 'error.validation.metadata.element.max-length', - }, - }); - this.qualifier = new DynamicInputModel({ - id: 'qualifier', - label: qualifier, - name: 'qualifier', - validators: { - pattern: '^[^. ,]*$', - maxLength: 64, - }, - required: false, - errorMessages: { - pattern: 'error.validation.metadata.qualifier.invalid-pattern', - maxLength: 'error.validation.metadata.qualifier.max-length', - }, - }); - this.scopeNote = new DynamicInputModel({ - id: 'scopeNote', - label: scopenote, - name: 'scopeNote', - required: false, - }); - this.formModel = [ - new DynamicFormGroupModel( - { - id: 'metadatadatafieldgroup', - group:[this.element, this.qualifier, this.scopeNote] - }) - ]; - this.formGroup = this.formBuilderService.createFormGroup(this.formModel); - this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => { - if (field == null) { - this.clearFields(); - } else { - this.formGroup.patchValue({ - metadatadatafieldgroup: { - element: field.element, - qualifier: field.qualifier, - scopeNote: field.scopeNote, - }, - }); - this.element.disabled = true; - this.qualifier.disabled = true; - } - }); + ngOnInit(): void { + this.activeMetadataField$ = this.registryService.getActiveMetadataField(); + this.element = new DynamicInputModel({ + id: 'element', + label: this.translateService.instant(`${this.messagePrefix}.element`), + name: 'element', + validators: { + required: null, + pattern: '^[^. ,]*$', + maxLength: 64, + }, + required: true, + errorMessages: { + pattern: 'error.validation.metadata.element.invalid-pattern', + maxLength: 'error.validation.metadata.element.max-length', + }, + }); + this.qualifier = new DynamicInputModel({ + id: 'qualifier', + label: this.translateService.instant(`${this.messagePrefix}.qualifier`), + name: 'qualifier', + validators: { + pattern: '^[^. ,]*$', + maxLength: 64, + }, + required: false, + errorMessages: { + pattern: 'error.validation.metadata.qualifier.invalid-pattern', + maxLength: 'error.validation.metadata.qualifier.max-length', + }, + }); + this.scopeNote = new DynamicInputModel({ + id: 'scopeNote', + label: this.translateService.instant(`${this.messagePrefix}.scopenote`), + name: 'scopeNote', + required: false, + }); + this.formModel = [ + new DynamicFormGroupModel( + { + id: 'metadatadatafieldgroup', + group:[this.element, this.qualifier, this.scopeNote] + }) + ]; + this.formGroup = this.formBuilderService.createFormGroup(this.formModel); + this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => { + if (field == null) { + this.clearFields(); + } else { + this.formGroup.patchValue({ + metadatadatafieldgroup: { + element: field.element, + qualifier: field.qualifier, + scopeNote: field.scopeNote, + }, + }); + this.element.disabled = true; + this.qualifier.disabled = true; + } }); } diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html index d6fd77e79bb..27a9499c91a 100644 --- a/src/app/community-list-page/community-list/community-list.component.html +++ b/src/app/community-list-page/community-list/community-list.component.html @@ -28,8 +28,8 @@ [title]="'toggle ' + dsoNameService.getName(node.payload)" [attr.aria-label]="'toggle ' + dsoNameService.getName(node.payload)" (click)="toggleExpanded(node)" - [ngClass]="(hasChild(null, node)| async) ? 'visible' : 'invisible'" - [attr.data-test]="(hasChild(null, node)| async) ? 'expand-button' : ''"> + [ngClass]="(node.isExpandable$ | async) === true ? 'visible' : 'invisible'" + [attr.data-test]="(node.isExpandable$ | async) === true ? 'expand-button' : ''"> diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html index 7f121081f2c..7569ebd6e33 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html @@ -1,9 +1,9 @@
- - + + - + @@ -16,7 +16,7 @@
+ *ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async)"> diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts index 5d2afbaf4ce..ee4ddb1fabf 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts @@ -147,14 +147,6 @@ describe('ItemAuthorizationsComponent test suite', () => { })); }); - it('should get the item UUID', () => { - - expect(comp.getItemUUID()).toBeObservable(cold('(a|)', { - a: item.id - })); - - }); - it('should get the item\'s bundle', () => { expect(comp.getItemBundles()).toBeObservable(cold('a', { diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts index 635cf455b55..5a5c3213847 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts @@ -4,7 +4,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs'; -import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators'; +import { catchError, filter, map, mergeMap, take } from 'rxjs/operators'; import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model'; import { @@ -17,6 +17,7 @@ import { LinkService } from '../../../core/cache/builders/link.service'; import { Bundle } from '../../../core/shared/bundle.model'; import { hasValue, isNotEmpty } from '../../../shared/empty.util'; import { Bitstream } from '../../../core/shared/bitstream.model'; +import { AlertType } from '../../../shared/alert/aletr-type'; /** * Interface for a bundle's bitstream map entry @@ -52,7 +53,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy { * The target editing item * @type {Observable} */ - private item$: Observable; + item$: Observable; /** * Array to track all subscriptions and unsubscribe them onDestroy @@ -91,16 +92,13 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy { */ private bitstreamPageSize = 4; - /** - * Initialize instance variables - * - * @param {LinkService} linkService - * @param {ActivatedRoute} route - * @param nameService - */ + itemName$: Observable; + + readonly AlertType = AlertType; + constructor( - private linkService: LinkService, - private route: ActivatedRoute, + protected linkService: LinkService, + protected route: ActivatedRoute, public nameService: DSONameService ) { } @@ -109,23 +107,14 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy { * Initialize the component, setting up the bundle and bitstream within the item */ ngOnInit(): void { - this.getBundlesPerItem(); + this.getBundlesPerItem(); + this.itemName$ = this.getItemName(); } /** - * Return the item's UUID + * Return the item's name */ - getItemUUID(): Observable { - return this.item$.pipe( - map((item: Item) => item.id), - first((UUID: string) => isNotEmpty(UUID)) - ); - } - - /** - * Return the item's name - */ - getItemName(): Observable { + private getItemName(): Observable { return this.item$.pipe( map((item: Item) => this.nameService.getName(item)) ); diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html index b83b93d8f10..35d89d648fb 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html @@ -5,9 +5,9 @@
- -
+
- + -
+
{{metadata.metadataField}}
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts index 9391df4755c..761dfa7fa2b 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of as observableOf } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; -import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; import { VirtualMetadataComponent } from './virtual-metadata.component'; import { Item } from '../../../core/shared/item.model'; @@ -62,6 +62,10 @@ describe('VirtualMetadataComponent', () => { comp.leftItem = item; comp.rightItem = relatedItem; comp.relationshipId = relationshipId; + comp.ngOnChanges({ + leftItem: new SimpleChange(undefined, comp.leftItem, true), + rightItem: new SimpleChange(undefined, comp.rightItem, true), + }); fixture.detectChanges(); }); diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts index 6f8991dc732..0c2cc5f63e0 100644 --- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts +++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts @@ -1,9 +1,15 @@ -import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Inject, Input, OnInit, Output, OnChanges, SimpleChanges } from '@angular/core'; import {Observable} from 'rxjs'; import {Item} from '../../../core/shared/item.model'; import {MetadataValue} from '../../../core/shared/metadata.models'; import {ObjectUpdatesService} from '../../../core/data/object-updates/object-updates.service'; import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; +import { hasValue } from '../../../shared/empty.util'; + +interface ItemDTO { + item: Item; + isSelectedVirtualMetadata$: Observable; +} @Component({ selector: 'ds-virtual-metadata', @@ -14,7 +20,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface'; * The component is shown when a relationship is marked to be deleted. * Each item has a checkbox to indicate whether its virtual metadata should be saved as real metadata. */ -export class VirtualMetadataComponent implements OnInit { +export class VirtualMetadataComponent implements OnInit, OnChanges { /** * The current url of this page @@ -53,11 +59,9 @@ export class VirtualMetadataComponent implements OnInit { showThumbnails: boolean; /** - * Get an array of the left and the right item of the relationship to be deleted. + * Array of the left and the right item of the relationship to be deleted. */ - get items() { - return [this.leftItem, this.rightItem]; - } + itemDTOs: [ItemDTO, ItemDTO] = [undefined, undefined]; public virtualMetadata: Map = new Map(); @@ -106,17 +110,24 @@ export class VirtualMetadataComponent implements OnInit { return this.objectUpdatesService.isSelectedVirtualMetadata(this.url, this.relationshipId, item.uuid); } - /** - * Prevent unnecessary rerendering so fields don't lose focus - */ - trackItem(index, item: Item) { - return item && item.uuid; + ngOnInit(): void { + this.virtualMetadata.set(this.leftItem.uuid, this.getVirtualMetadata(this.leftItem)); + this.virtualMetadata.set(this.rightItem.uuid, this.getVirtualMetadata(this.rightItem)); } - ngOnInit(): void { - this.items.forEach((item) => { - this.virtualMetadata.set(item.uuid, this.getVirtualMetadata(item)); - }); + ngOnChanges(changes: SimpleChanges): void { + if ((hasValue(changes.leftItem) || hasValue(changes.rightItem)) && hasValue(this.leftItem) && hasValue(this.rightItem)) { + this.itemDTOs = [ + { + item: this.leftItem, + isSelectedVirtualMetadata$: this.isSelectedVirtualMetadataItem(this.leftItem), + }, + { + item: this.rightItem, + isSelectedVirtualMetadata$: this.isSelectedVirtualMetadataItem(this.rightItem), + }, + ]; + } } } diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html index e57ce330089..6bbec3f47a1 100644 --- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html +++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html @@ -1,18 +1,18 @@

{{'person.orcid.registry.auth' | translate}}

- +
-
+
{{ 'person.page.orcid.granted-authorizations'| translate }}
    -
  • +
  • {{getAuthorizationDescription(auth) | translate}}
@@ -25,13 +25,13 @@

{{'person.orcid.registry.auth' | translate}}

{{ 'person.page.orcid.missing-authorizations'| translate }}
- + {{'person.page.orcid.no-missing-authorizations-message' | translate}} - + {{'person.page.orcid.missing-authorizations-message' | translate}}
    -
  • +
  • {{getAuthorizationDescription(auth) | translate }}
@@ -41,11 +41,11 @@

{{'person.orcid.registry.auth' | translate}}

- + {{ 'person.page.orcid.remove-orcid-message' | translate}} -
+
- @@ -68,7 +68,7 @@

{{'person.orcid.registry.auth' | translate}}

orcid-logo
- {{ getOrcidNotLinkedMessage() | async }} + {{ getOrcidNotLinkedMessage() }}
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts index ea970e7d315..4fd77f99518 100644 --- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts +++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts @@ -10,6 +10,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; +import { AlertType } from '../../../shared/alert/aletr-type'; @Component({ selector: 'ds-orcid-auth', @@ -26,43 +27,49 @@ export class OrcidAuthComponent implements OnInit, OnChanges { /** * The list of exposed orcid authorization scopes for the orcid profile */ - profileAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + profileAuthorizationScopes$: BehaviorSubject = new BehaviorSubject([]); + + hasOrcidAuthorizations$: Observable; /** * The list of all orcid authorization scopes missing in the orcid profile */ - missingAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + missingAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + + hasMissingOrcidAuthorizations$: Observable; /** * The list of all orcid authorization scopes available */ - orcidAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); + orcidAuthorizationScopes: BehaviorSubject = new BehaviorSubject([]); /** * A boolean representing if unlink operation is processing */ - unlinkProcessing: BehaviorSubject = new BehaviorSubject(false); + unlinkProcessing: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if orcid profile is linked */ - private isOrcidLinked$: BehaviorSubject = new BehaviorSubject(false); + isOrcidLinked$: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if only admin can disconnect orcid profile */ - private onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); + onlyAdminCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); /** * A boolean representing if owner can disconnect orcid profile */ - private ownerCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); + ownerCanDisconnectProfileFromOrcid$: BehaviorSubject = new BehaviorSubject(false); /** * An event emitted when orcid profile is unliked successfully */ @Output() unlink: EventEmitter = new EventEmitter(); + readonly AlertType = AlertType; + constructor( private orcidAuthService: OrcidAuthService, private translateService: TranslateService, @@ -76,6 +83,8 @@ export class OrcidAuthComponent implements OnInit, OnChanges { this.orcidAuthorizationScopes.next(scopes); this.initOrcidAuthSettings(); }); + this.hasOrcidAuthorizations$ = this.hasOrcidAuthorizations(); + this.hasMissingOrcidAuthorizations$ = this.hasMissingOrcidAuthorizations(); } ngOnChanges(changes: SimpleChanges): void { @@ -88,18 +97,11 @@ export class OrcidAuthComponent implements OnInit, OnChanges { * Check if the list of exposed orcid authorization scopes for the orcid profile has values */ hasOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable().pipe( + return this.profileAuthorizationScopes$.pipe( map((scopes: string[]) => scopes.length > 0) ); } - /** - * Return the list of exposed orcid authorization scopes for the orcid profile - */ - getOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable(); - } - /** * Check if the list of exposed orcid authorization scopes for the orcid profile has values */ @@ -109,26 +111,12 @@ export class OrcidAuthComponent implements OnInit, OnChanges { ); } - /** - * Return the list of exposed orcid authorization scopes for the orcid profile - */ - getMissingOrcidAuthorizations(): Observable { - return this.profileAuthorizationScopes.asObservable(); - } - - /** - * Return a boolean representing if orcid profile is linked - */ - isLinkedToOrcid(): Observable { - return this.isOrcidLinked$.asObservable(); - } - - getOrcidNotLinkedMessage(): Observable { + getOrcidNotLinkedMessage(): string { const orcid = this.item.firstMetadataValue('person.identifier.orcid'); if (orcid) { - return this.translateService.get('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid }); + return this.translateService.instant('person.page.orcid.orcid-not-linked-message', { 'orcid': orcid }); } else { - return this.translateService.get('person.page.orcid.no-orcid-message'); + return this.translateService.instant('person.page.orcid.no-orcid-message'); } } @@ -141,13 +129,6 @@ export class OrcidAuthComponent implements OnInit, OnChanges { return 'person.page.orcid.scope.' + scope.substring(1).replace('/', '-'); } - /** - * Return a boolean representing if only admin can disconnect orcid profile - */ - onlyAdminCanDisconnectProfileFromOrcid(): Observable { - return this.onlyAdminCanDisconnectProfileFromOrcid$.asObservable(); - } - /** * Return a boolean representing if owner can disconnect orcid profile */ @@ -212,7 +193,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges { } private setOrcidAuthorizationsFromItem(): void { - this.profileAuthorizationScopes.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item)); + this.profileAuthorizationScopes$.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item)); } } diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html index 6ba318f7fd5..9b3e470fc1d 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html @@ -3,13 +3,13 @@

{{ 'person.orcid.registry.queue' | translate }}

- {{ 'person.page.orcid.sync-queue.empty-message' | translate}} -
@@ -22,7 +22,7 @@

{{ 'person.orcid.registry.queue' | translate }}

- + diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts index 6079287f711..098bac3fade 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts @@ -47,13 +47,12 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { /** * A list of orcid queue records */ - private list$: BehaviorSubject>> = new BehaviorSubject>>({} as any); + list$: BehaviorSubject>> = new BehaviorSubject>>({} as any); /** * The AlertType enumeration - * @type {AlertType} */ - AlertTypeEnum = AlertType; + readonly AlertTypeEnum = AlertType; /** * Array to track all subscriptions and unsubscribe them onDestroy @@ -99,13 +98,6 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { ); } - /** - * Return the list of orcid queue records - */ - getList(): Observable>> { - return this.list$.asObservable(); - } - /** * Return the icon class for the queue object type * diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index bc1e04f5130..9b043a5865c 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -1,4 +1,4 @@ -