diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html index e3a8e2c590..8fff24e3b4 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.html +++ b/src/app/access-control/epeople-registry/epeople-registry.component.html @@ -47,7 +47,7 @@ {{messagePrefix + '.return' | translate}}
-
-
- @@ -42,13 +42,13 @@
{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}
- + @@ -63,7 +63,7 @@ - + {{group.id}} - diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html index 4d7b3e657e..7bb4ce22ad 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html @@ -18,7 +18,7 @@ {{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}
- - - diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html index f99070b738..5312ef1e19 100644 --- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html index 8083389e1b..9a93c22a22 100644 --- a/src/app/health-page/health-page.component.html +++ b/src/app/health-page/health-page.component.html @@ -21,7 +21,7 @@
- + diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html index c370fe4f20..5ec2e992d9 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.html +++ b/src/app/item-page/edit-item-page/edit-item-page.component.html @@ -12,7 +12,7 @@ {{'item.edit.tabs.' + page.page + '.head' | translate}} - diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html index 4cb9577fcb..d2de98fdd4 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html @@ -10,13 +10,13 @@ class="fas fa-undo-alt">  {{"item.edit.bitstreams.reinstate-button" | translate}} - - - - - +
- - -
{{ 'person.page.orcid.missing-authorizations'| translate }}
- + {{'person.page.orcid.no-missing-authorizations-message' | translate}} @@ -41,7 +41,7 @@
- {{ 'person.page.orcid.remove-orcid-message' | translate}} @@ -49,7 +49,7 @@
@@ -7,7 +7,7 @@ ngbDropdown *ngIf="(moreThanOne$ | async)"> @@ -30,7 +30,7 @@ {{'researcher.profile.action.processing' | translate}} - +  {{'researcher.profile.delete' | translate}} diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html index ed79b1d2d1..e87724df03 100644 --- a/src/app/register-email-form/register-email-form.component.html +++ b/src/app/register-email-form/register-email-form.component.html @@ -47,7 +47,7 @@ (showNotification)="showNotification($event)"> - + diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html index bf49e507c0..ae05220df2 100644 --- a/src/app/root/root.component.html +++ b/src/app/root/root.component.html @@ -1,5 +1,5 @@
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index 05f502afa1..22720133a4 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -1,5 +1,5 @@
    -
    • -
  • +
  • {{ 'nav.login' | translate }}(current)
    • -
  • +
  • diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html index 85b9d8aece..00020a7d52 100644 --- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html +++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html @@ -1,5 +1,5 @@ -
    +
    {{dsoNameService.getName(user$ | async)}}
    {{(user$ | async)?.email}} diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html index 470291373f..39d6e76b2c 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.html +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html @@ -18,7 +18,7 @@ [scrollWindow]="false" (scrolled)="onScrollDown()"> -
  • +
  • {{'submission.sections.general.no-collection' | translate}}
    • diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html index 1e1f3d8209..fdefcd5f7d 100644 --- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html +++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html @@ -13,7 +13,7 @@
    - +
    {{'comcol-role.edit.no-group' | translate}}
    diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html index a4d539625f..48859c36ce 100644 --- a/src/app/shared/entity-dropdown/entity-dropdown.component.html +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html @@ -9,7 +9,7 @@ [fromRoot]="true" [scrollWindow]="false" (scrolled)="onScrollDown()"> -
-
+
@@ -16,7 +16,7 @@
-
+
-
+
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html index fb7d162008..6a4da99fd0 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html @@ -16,7 +16,7 @@
-

+

{{'vocabulary-treeview.search.no-result' | translate}}

diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 6b1fdb9ff6..1aaba13e7d 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -1,5 +1,5 @@ - diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts index 7ff9a2ef3d..8e9dffbd09 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts @@ -1,6 +1,6 @@ import { Component, Inject } from '@angular/core'; -import { Observable } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { Item } from '../../../../core/shared/item.model'; @@ -13,7 +13,6 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; -import { map } from 'rxjs/operators'; import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type'; import { followLink } from '../../../utils/follow-link-config.model'; @@ -37,7 +36,7 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResult /** * The item search result derived from the WorkspaceItemSearchResult */ - derivedSearchResult$: Observable; + derivedSearchResult$: BehaviorSubject = new BehaviorSubject(undefined); /** * Represents the badge context @@ -69,13 +68,14 @@ export class WorkspaceItemSearchResultListElementComponent extends SearchResult private deriveSearchResult() { this.linkService.resolveLink(this.object.indexableObject, followLink('item')); - this.derivedSearchResult$ = this.object.indexableObject.item.pipe( + this.object.indexableObject.item.pipe( getFirstSucceededRemoteDataPayload(), - map((item: Item) => { + ).subscribe((item: Item) => { const result = new ItemSearchResult(); - result.indexableObject = item; - result.hitHighlights = this.object.hitHighlights; - return result; - })); + this.derivedSearchResult$.next(Object.assign(new ItemSearchResult(), { + indexableObject: item, + hitHighlights: this.object.hitHighlights, + })); + }); } } diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html index 7f8ff943a3..97bddc2969 100644 --- a/src/app/shared/object-select/item-select/item-select.component.html +++ b/src/app/shared/object-select/item-select/item-select.component.html @@ -19,7 +19,7 @@ - + diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html index 66c1fc400e..c17987306e 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.component.html +++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html @@ -35,12 +35,12 @@ (click)="onReset()">{{'form.cancel' | translate}} diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html index 277f6e4998..83897900f4 100644 --- a/src/app/shared/resource-policies/resource-policies.component.html +++ b/src/app/shared/resource-policies/resource-policies.component.html @@ -13,13 +13,13 @@
- {{"search.filters.filter.show-more" | translate}} diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html index 7d0ad89914..147a0260f1 100644 --- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html @@ -7,7 +7,7 @@
- {{"search.filters.filter.show-more" | translate}} diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html index eb49235641..9bfab9bd06 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html @@ -7,7 +7,7 @@
- {{"search.filters.filter.show-more" | translate}} diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html index fdf154bc04..28cf3cb514 100644 --- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html @@ -7,7 +7,7 @@
- {{"search.filters.filter.show-more" | translate}} diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html index d43f506866..9cfe854553 100644 --- a/src/app/shared/search/search.component.html +++ b/src/app/shared/search/search.component.html @@ -16,7 +16,7 @@
-
+
@@ -47,7 +47,7 @@ - {{'subscriptions.modal.new-subscription-form.processing' | translate}} - + {{'subscriptions.modal.new-subscription-form.submit' | translate}} diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html index c6938c7582..481aa5280e 100644 --- a/src/app/statistics-page/statistics-page/statistics-page.component.html +++ b/src/app/statistics-page/statistics-page/statistics-page.component.html @@ -19,7 +19,7 @@ [report]="report" class="m-2 {{ report.id }}"> -
+
{{ 'statistics.page.no-data' | translate }}
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html index a78d737640..79be0a8585 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.html +++ b/src/app/submission/form/collection/submission-form-collection.component.html @@ -1,6 +1,6 @@
{{ 'submission.sections.general.collection' | translate }} @@ -28,7 +28,7 @@ [disabled]="(processingChange$ | async) || collectionModifiable == false || isReadonly" ngbDropdownToggle> - {{ selectedCollectionName$ | async }} + {{ selectedCollectionName$ | async }}
- + {{'submission.general.info.saved' | translate}} - + {{'submission.general.info.pending-changes' | translate}}
@@ -28,12 +28,12 @@ class="btn btn-secondary" id="save" [attr.data-test]="'save' | dsBrowserOnly" - [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)" + [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) === false" (click)="save($event)"> {{'submission.general.save' | translate}}

{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}

- -
+
{{ 'search.results.empty' | translate }}
-
+
{{ 'search.results.response.500' | translate }}
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html index e6ae9d1b9c..3173a656ca 100644 --- a/src/app/submission/sections/container/section-container.component.html +++ b/src/app/submission/sections/container/section-container.component.html @@ -9,7 +9,7 @@ 'submission.sections.'+sectionData.header | translate }}
- @@ -48,4 +48,4 @@ -
\ No newline at end of file +
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html index 8999853d72..42ca8d35d7 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.html +++ b/src/app/submission/sections/upload/file/section-upload-file.component.html @@ -25,7 +25,7 @@ [disabled]="(processingDelete$ | async)" (click)="$event.preventDefault();confirmDelete(content);"> - +
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index ed31e16759..4d425f927e 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -7,7 +7,7 @@ - - + {{ 'subscriptions.table.empty.message' | translate }} diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html index 091d152258..0fefd40a2a 100644 --- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html +++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -1,3 +1,3 @@ -
+
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html index 05afac7d7e..a2b8d4d957 100644 --- a/src/themes/dspace/app/navbar/navbar.component.html +++ b/src/themes/dspace/app/navbar/navbar.component.html @@ -1,6 +1,6 @@ -