diff --git a/angular.json b/angular.json index 240869b2ac2..b5eda9fbbbb 100644 --- a/angular.json +++ b/angular.json @@ -63,7 +63,10 @@ "input": "src/themes/aura/styles/theme.scss", "inject": false, "bundleName": "aura-theme" - } + }, + "leaflet/dist/leaflet.css", + "leaflet.markercluster/dist/MarkerCluster.Default.css", + "leaflet.markercluster/dist/MarkerCluster.css" ], "scripts": [], "baseHref": "/" diff --git a/package.json b/package.json index 3296b28de1b..8e85ef720bb 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,8 @@ "jsonschema": "1.5.0", "jwt-decode": "^3.1.2", "klaro": "^0.7.18", + "leaflet": "^1.9.4", + "leaflet.markercluster": "^1.5.3", "lodash": "^4.18.1", "lru-cache": "^7.14.1", "markdown-it": "^13.0.1", @@ -148,6 +150,7 @@ "@types/grecaptcha": "^3.0.9", "@types/jasmine": "~3.6.0", "@types/js-cookie": "2.2.6", + "@types/leaflet": "^1.9.22", "@types/lodash": "^4.17.24", "@types/node": "^14.14.9", "@typescript-eslint/eslint-plugin": "^7.2.0", diff --git a/src/app/admin/admin-search-page/admin-search.module.ts.bak b/src/app/admin/admin-search-page/admin-search.module.ts.bak new file mode 100644 index 00000000000..fae7d880be0 --- /dev/null +++ b/src/app/admin/admin-search-page/admin-search.module.ts.bak @@ -0,0 +1,52 @@ +import { NgModule } from '@angular/core'; + +import { JournalEntitiesModule } from '../../entity-groups/journal-entities/journal-entities.module'; +import { ResearchEntitiesModule } from '../../entity-groups/research-entities/research-entities.module'; +import { SearchModule } from '../../shared/search/search.module'; +import { SharedModule } from '../../shared/shared.module'; +import { AdminSearchPageComponent } from './admin-search-page.component'; +import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component'; +import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component'; +import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component'; +import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component'; +import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component'; +import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component'; +import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component'; +import { ThemedAdminSearchPageComponent } from './themed-admin-search-page.component'; + +const ENTRY_COMPONENTS = [ + // put only entry components that use custom decorator + ItemAdminSearchResultListElementComponent, + CommunityAdminSearchResultListElementComponent, + CollectionAdminSearchResultListElementComponent, + ItemAdminSearchResultGridElementComponent, + CommunityAdminSearchResultGridElementComponent, + CollectionAdminSearchResultGridElementComponent, + ItemAdminSearchResultActionsComponent, +]; + +@NgModule({ + imports: [ + SearchModule, + SharedModule.withEntryComponents(), + JournalEntitiesModule.withEntryComponents(), + ResearchEntitiesModule.withEntryComponents(), + ], + declarations: [ + ThemedAdminSearchPageComponent, + AdminSearchPageComponent, + ...ENTRY_COMPONENTS, + ], +}) +export class AdminSearchModule { + /** + * NOTE: this method allows to resolve issue with components that using a custom decorator + * which are not loaded during SSR otherwise + */ + static withEntryComponents() { + return { + ngModule: SharedModule, + providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })), + }; + } +} diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts.bak b/src/app/admin/admin-workflow-page/admin-workflow.module.ts.bak new file mode 100644 index 00000000000..ba2520e46ed --- /dev/null +++ b/src/app/admin/admin-workflow-page/admin-workflow.module.ts.bak @@ -0,0 +1,43 @@ +import { NgModule } from '@angular/core'; + +import { SearchModule } from '../../shared/search/search.module'; +import { SharedModule } from '../../shared/shared.module'; +import { AdminWorkflowPageComponent } from './admin-workflow-page.component'; +import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component'; +import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component'; +import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/workflow-item-admin-workflow-actions.component'; +import { ThemedAdminWorkflowPageComponent } from './themed-admin-workflow-page.component'; + +const ENTRY_COMPONENTS = [ + // put only entry components that use custom decorator + WorkflowItemSearchResultAdminWorkflowListElementComponent, + WorkflowItemSearchResultAdminWorkflowGridElementComponent, +]; + +@NgModule({ + imports: [ + SearchModule, + SharedModule.withEntryComponents(), + ], + declarations: [ + ThemedAdminWorkflowPageComponent, + AdminWorkflowPageComponent, + WorkflowItemAdminWorkflowActionsComponent, + ...ENTRY_COMPONENTS, + ], + exports: [ + AdminWorkflowPageComponent, + ], +}) +export class AdminWorkflowModuleModule { + /** + * NOTE: this method allows to resolve issue with components that using a custom decorator + * which are not loaded during SSR otherwise + */ + static withEntryComponents() { + return { + ngModule: SharedModule, + providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })), + }; + } +} diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html index b730d2c83a2..a47332b5be4 100644 --- a/src/app/info/accessibility-settings/accessibility-settings.component.html +++ b/src/app/info/accessibility-settings/accessibility-settings.component.html @@ -1,94 +1,252 @@
-

{{ 'info.accessibility-settings.title' | translate }}

+

Accessibility statement for the Aberdeen University Research Archive (AURA)

+

Website accessibility statement inline with Public Sector Body (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018

+

This accessibility statement applies to: https://aura.abdn.ac.uk/ +

+

This website is run by the Library and University Collections Directorate, Information Services Group at the University of Edinburgh. We want as many people as possible to be able to use this application. For example, that means you should be able to:

+ +

We’ve also made the website text as simple as possible to understand. However, some of our content is technical, and we use technical terms where there is no easier wording we could use without changing what the text means.

-
-
- +

Customising the website

+

AbilityNet has advice on making your device easier to use if you have a disability. This is an external site with suggestions to make your computer more accessible:

+

+ AbilityNet - My computer my way +

+

With a few simple steps you can customise the appearance of our website using your browser settings to make it easier to read and navigate:

+

+ Additional information on how to customise our website appearance +

+

If you are a member of University staff or a student, you can use the free SensusAccess accessible document conversion service:

+

+ SenusAccess Information +

-
- -
+

How accessible this website is

+

We know some parts of this website are not fully accessible:

+
    +
  • It is not possible to keyboard navigate to all content using keyboard only
    • +
  • There is a keyboard trap for users navigating by keyboard only
    • +
  • Keyboard navigation focus indicators can be hard to see
    • +
  • The skip to main content function is not visible
    • +
  • The website is not fully compatible with assistive technologies such as screen readers and voice recognition software
    • +
  • There are pop ups that open without warning
    • +
  • There are pop-ups that obscure or render other content inaccessible
    • +
  • Some pop ups disappear without human interaction
    • +
  • There are some instances where colour contrast does not meet the WCAG 2.2 AA standard
    • +
  • Not all non text content has a text alternative
    • +
  • There are examples of information conveyed by colour only, for example links that are not underlined
    • +
  • There are examples of links without meaningful hypertext
    • +
  • There are time limits that cannot be extended in that data validation message disappear without user interaction
    • +
  • There is some moving content that cannot be stopped or paused by the user
    • +
  • Some content does not magnify correctly from 400%
    • +
  • Some content does not reflow correctly from 400% magnification
    • +
  • Some heading levels are missing throughout the site
    • +
  • Error suggestions are not always given and appear in an inaccessible manner
    • +
  • It is not possible to use the website on mobile in both landscape and portrait orientation without loss of content
    • +
  • There are PDFs that are not fully accessible
    • +
-
-
-
+

Feedback and contact information

+

If you need information on this website in a different format, including accessible PDF, large print, audio recording or braille:

+

Email: library@abdn.ac.uk

+

Telephone: +44 (0)1224 273330

+

British Sign Language (BSL) users can contact us via Contact Scotland BSL, the on-line BSL interpreting service

+

We'll consider your request and get back to you in 5 working days.

-
- +

Reporting accessibility problems with this website

+

We are always looking to improve the accessibility of this website. If you find any problems not listed on this page, or think we’re not meeting accessibility requirements, please contact:

+

Email: library@abdn.ac.uk

+

Telephone: +44 (0)1224 273330

+

British Sign Language (BSL) users can contact us via Contact Scotland BSL, the on-line BSL interpreting service

+

We'll consider your request and get back to you in 5 working days.

-
- -
- {{ 'info.accessibility-settings.notificationTimeOut.invalid' | translate }} -
-
+

Enforcement procedure

+

The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to your complaint please contact the Equality Advisory and Support Service (EASS) directly:

+

+ Contact details for the Equality Advisory and Support Service (EASS) +

+

The government has produced information on how to report accessibility issues:

+

+ Reporting an accessibility problem on a public sector website +

+

Contacting us by Telephone using British Sign Language

+

British Sign Language service

+

Contact Scotland BSL runs a service for British Sign Language users and all of Scotland’s public bodies using video relay. This enables sign language users to contact public bodies and vice versa. The service operates from 8.00am to 12.00am, 7 days a week.

+

+ Contact Scotland BSL service details. +

-
-
-
+

Technical information about this website's accessibility

+

The University of Edinburgh is committed to making its websites and applications accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.

+ +

Compliance Status

+

This website is partially compliant with the Web Content Accessibility Guidelines (WCAG) 2.2 AA standard, due to the non-compliances listed below.

+

The full guidelines are available at:

+

+ Web Content Accessibility Guidelines (WCAG) 2.2 AA standard +

-
- +

Non accessible content

+

The content listed below is non-accessible for the following reasons.

+

Noncompliance with the accessibility regulations.

+

The following items to not comply with the WCAG 2.1 AA success criteria:

+
    +
  1. Not all non-text content has appropriate alternative text. + +
    2. +
  2. Information, structure, and relationships conveyed through presentation can be programmatically determined or are available in text. e.g. certain ARIA roles are not contained by particular parents and some ARIA roles do not contain specific children. + +
    3. +
  3. The website cannot be viewed in both portrait and landscape orientation on mobile without loss of content + +
    4. +
  4. There are examples of information conveyed by colour only. + +
    5. +
  5. There may not be sufficient colour contrast between font and background colours for data validation. + +
    6. +
  6. Items do not magnify properly up to 400% meaning some content overlaps at higher magnification levels. + +
    7. +
  7. Items do not reflow properly above 400% meaning some content is cut off or overlaps. + +
    8. +
  8. Not all content can be reached and interacted with by keyboard alone. + +
    9. +
  9. Keyboard focus encounters a keyboard trap so there is a keyboard trap. + +
    10. +
  10. There are time limits which cannot be extended e.g. there are pop ups which appear for a limited amount of time and then disappear without altering the use. + +
    11. +
  11. There are time limits which cannot be extended by the end user. + +
    12. +
  12. There is movement that the end user cannot pause. + +
    13. +
  13. Although a skip to main content option is present this is only accessible for screen reader users as the visual presentation is blocked by other content on the page. + +
    14. +
  14. There are links on the site without meaningful hypertext. + +
    15. +
  15. There are missing heading levels. + +
    16. +
  16. It is not always clear where you have navigated to using the keyboard. + +
    17. +
  17. Pop ups open without warning the user this will happen. + +
    18. +
  18. There are form elements that do not have labels. + +
    19. +
  19. Error suggestions or corrections are not always displayed. + +
    20. +
  20. The site is not fully compatible with assistive software such as Screen readers or voice recognition software e.g. Form elements do not always have labels, buttons do not always have discernible text, some interactive controls are nested etc + +
    21. +
  21. There are PDFs on the site that are not fully accessible. + +
    22. +
+

We aim to improve our websites accessibility on a regular and continuous basis. See the section below ('What we're doing to improve accessibility') on how we are improving our site accessibility.

+

We are working towards solving these problems and expect significant improvements by October 2026. The site is fully within our control.

-
- -
- {{ 'info.accessibility-settings.liveRegionTimeOut.invalid' | translate }} -
-
+

Disproportionate burden

+

We are not currently claiming that any accessibility problems would be a disproportionate burden to fix.

+

Content that is not within the Scope of the Accessibility Regulations

+

At this time, we do not believe that any content is outside the scope of the accessibility regulations.

-
-
-
+

What we're doing to improve accessibility

+

We will continue to address and make significant improvements to the accessibility issues highlighted. Unless specified otherwise, a complete solution or significant improvement will be in place by October 2026.

+

While we are in the process of resolving these accessibility issues we will ensure reasonable adjustments are in place to make sure no user is disadvantaged. As changes are made, we will continue to review accessibility and retest the accessibility of this website.

-
- - -
+

Preparation of this accessibility statement

+

This statement was prepared on 23rd September 2021. It was last reviewed on 19th December 2025.

+

The website was last tested on 10th October 2025. The testing was carried out by Library and University Collections, Information Services Group at the University of Edinburgh using both automated and manual methods. The site was tested on a PC, primarily using Microsoft Edge alongside Mozilla Firefox and Google Chrome.

+

Recent world-wide usage levels survey for different screen readers and browsers shows that Chrome, Mozilla Firefox and Microsoft Edge are increasing in popularity and Google Chrome is now the favoured browser for screen readers:

+

+ WebAIM: Screen Reader User Survey +

+

The aforementioned three browsers have been used in certain questions for reasons of breadth and variety.

+

We ran automated testing using AXE Devtools and then manual testing that included:

+ -
- -
- {{ 'info.accessibility-settings.cookie-warning' | translate }} -
- -
+

Change Log

+
    +
  1. December 2025 - A ‘skip to main content’ option has been added that is audible to users of assistive software but is not visually apparent as it is blocked by other content so this later aspect needs to be resolved to fully meet the criteria.
    2. +
+ \ No newline at end of file diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html index 881bdf726d9..059487fa689 100644 --- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html +++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html @@ -1,5 +1,18 @@ - - {{ linktext || mdValue.value }} - + +
+ + {{ linktext || mdValue.value }} + + + + {{ linktext || mdValue.value }} + + +
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6ddad41ee20..78c03bc55af 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2151,7 +2151,7 @@ "home.top-level-communities.help": "Select a community to browse its collections.", - "info.accessibility-settings.breadcrumbs": "Accessibility settings", + "info.accessibility-settings.breadcrumbs": "Accessibility Statement", "info.accessibility-settings.cookie-warning": "Saving the accessibility settings is currently not possible. Either log in to save the settings in user data, or accept the 'Accessibility Settings' cookie using the 'Cookie Settings' menu at the bottom of the page. Once the cookie has been accepted, you can reload the page to remove this message.", @@ -2243,14 +2243,6 @@ "info.coar-notify-support.breadcrumbs": "COAR Notify Support", - // custom - "info.accessibility.breadcrumbs": "Accessibility Statement", - - "info.accessibility.head": "Accessibility Statement", - - "info.accessibility.title": "Accessibility Statement", - // custom end - "item.alerts.private": "This item is non-discoverable", "item.alerts.withdrawn": "This item has been withdrawn", @@ -3315,7 +3307,7 @@ "menu.header.admin": "Management", - "menu.header.image.logo": "University of Aberdeen logo", + "menu.header.image.logo": "Repository logo", "menu.header.admin.description": "Management menu", @@ -3987,9 +3979,9 @@ "profile.card.accessibility.content": "Accessibility settings can be configured on the accessibility settings page.", - "profile.card.accessibility.header": "Accessibility", + "profile.card.accessibility.header": "Accessibility Statement", - "profile.card.accessibility.link": "Go to Accessibility Settings Page", + "profile.card.accessibility.link": "Go to Accessibility Statement", "profile.card.identify": "Identify", diff --git a/src/ngx-translate-loaders/translate-browser.loader.ts b/src/ngx-translate-loaders/translate-browser.loader.ts index 56c856e741b..dc15340d6f4 100644 --- a/src/ngx-translate-loaders/translate-browser.loader.ts +++ b/src/ngx-translate-loaders/translate-browser.loader.ts @@ -41,7 +41,8 @@ export class TranslateBrowserLoader implements TranslateLoader { if (hasValue(messages)) { return observableOf(messages); } else { - const translationHash: string = environment.production ? `.${(process.env.languageHashes as any)[lang + '.json5']}` : ''; + //const translationHash: string = environment.production ? `.${(process.env.languageHashes as any)[lang + '.json5']}` : ''; + const translationHash = ''; // If they're not available on the transfer state (e.g. when running in dev mode), retrieve // them using HttpClient return this.http.get(`${this.prefix}${lang}${translationHash}${this.suffix}`, { responseType: 'text' }).pipe( diff --git a/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.html b/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.scss b/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.ts b/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.ts new file mode 100644 index 00000000000..b16a544827b --- /dev/null +++ b/src/themes/aura/app/admin/admin-search-page/admin-search-page.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; + +import { AdminSearchPageComponent as BaseComponent } from '../../../../../app/admin/admin-search-page/admin-search-page.component'; +import { ThemedConfigurationSearchPageComponent } from '../../../../../app/search-page/themed-configuration-search-page.component'; + +@Component({ + selector: 'ds-themed-admin-search-page', + // styleUrls: ['./admin-search-page.component.scss'], + styleUrls: ['../../../../../app/admin/admin-search-page/admin-search-page.component.scss'], + // templateUrl: './admin-search-page.component.html', + templateUrl: '../../../../../app/admin/admin-search-page/admin-search-page.component.html', + imports: [ThemedConfigurationSearchPageComponent], + standalone: true, +}) +export class AdminSearchPageComponent extends BaseComponent { +} diff --git a/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.html b/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.scss b/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.ts new file mode 100644 index 00000000000..c5ee994c5bb --- /dev/null +++ b/src/themes/aura/app/admin/admin-workflow-page/admin-workflow-page.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; + +import { AdminWorkflowPageComponent as BaseComponent } from '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component'; +import { ThemedConfigurationSearchPageComponent } from '../../../../../app/search-page/themed-configuration-search-page.component'; + +@Component({ + selector: 'ds-themed-admin-workflow-page', + // styleUrls: ['./admin-workflow-page.component.scss'], + styleUrls: ['../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.scss'], + // templateUrl: './admin-workflow-page.component.html', + templateUrl: '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.html', + standalone: true, + imports: [ThemedConfigurationSearchPageComponent], +}) +export class AdminWorkflowPageComponent extends BaseComponent { +} diff --git a/src/themes/aura/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/aura/app/browse-by/browse-by-date/browse-by-date.component.ts index d4582dcf25d..ffcb504a7fc 100644 --- a/src/themes/aura/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/themes/aura/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-date', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/aura/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/aura/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index d2894fce3aa..9b29bf93bec 100644 --- a/src/themes/aura/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/themes/aura/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-metadata', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/aura/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/aura/app/browse-by/browse-by-title/browse-by-title.component.ts index 578663c43ca..6a3b612b575 100644 --- a/src/themes/aura/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/themes/aura/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -7,14 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; -import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; -import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component'; -import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; -import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; -import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; -import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; @Component({ selector: 'ds-browse-by-title', @@ -24,15 +17,8 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html', standalone: true, imports: [ - VarDirective, AsyncPipe, - ComcolPageHeaderComponent, - ComcolPageLogoComponent, NgIf, - ThemedComcolPageHandleComponent, - ThemedComcolPageContentComponent, - DsoEditMenuComponent, - ThemedComcolPageBrowseByComponent, TranslateModule, ThemedLoadingComponent, ThemedBrowseByComponent, diff --git a/src/themes/aura/app/collection-page/collection-page.component.ts b/src/themes/aura/app/collection-page/collection-page.component.ts index 4b2f9e3245e..470a5cf62c6 100644 --- a/src/themes/aura/app/collection-page/collection-page.component.ts +++ b/src/themes/aura/app/collection-page/collection-page.component.ts @@ -24,7 +24,6 @@ import { ErrorComponent } from '../../../../app/shared/error/error.component'; import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../app/shared/object-collection/object-collection.component'; import { VarDirective } from '../../../../app/shared/utils/var.directive'; -import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dspace/view-tracker.component'; @Component({ selector: 'ds-themed-collection-page', @@ -44,7 +43,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp NgIf, ThemedLoadingComponent, TranslateModule, - ViewTrackerComponent, VarDirective, AsyncPipe, ComcolPageHeaderComponent, diff --git a/src/themes/aura/app/community-page/community-page.component.ts b/src/themes/aura/app/community-page/community-page.component.ts index 5aa7e855270..d14507e9051 100644 --- a/src/themes/aura/app/community-page/community-page.component.ts +++ b/src/themes/aura/app/community-page/community-page.component.ts @@ -25,7 +25,6 @@ import { DsoEditMenuComponent } from '../../../../app/shared/dso-page/dso-edit-m import { ErrorComponent } from '../../../../app/shared/error/error.component'; import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component'; import { VarDirective } from '../../../../app/shared/utils/var.directive'; -import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dspace/view-tracker.component'; @Component({ selector: 'ds-themed-community-page', @@ -50,7 +49,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp ComcolPageLogoComponent, ComcolPageHeaderComponent, AsyncPipe, - ViewTrackerComponent, VarDirective, RouterOutlet, RouterModule, diff --git a/src/themes/aura/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/aura/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index a7437c04081..f74a73a4b88 100644 --- a/src/themes/aura/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/themes/aura/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -13,6 +13,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component'; import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component'; import { AlertComponent } from '../../../../../app/shared/alert/alert.component'; +import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; @Component({ @@ -22,7 +23,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed // templateUrl: './dso-edit-metadata.component.html', templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html', standalone: true, - imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule], + imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective], }) export class DsoEditMetadataComponent extends BaseComponent { } diff --git a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts index 66803ffd846..aa026ad0ed5 100644 --- a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts +++ b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts @@ -18,7 +18,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object- import { ThemedResultsBackButtonComponent } from '../../../../../../../app/shared/results-back-button/themed-results-back-button.component'; import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/themed-thumbnail.component'; -@listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-journal-issue', // styleUrls: ['./journal-issue.component.scss'], diff --git a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts index c63f68bd708..f45b838b0f9 100644 --- a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts +++ b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts @@ -18,7 +18,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object- import { ThemedResultsBackButtonComponent } from '../../../../../../../app/shared/results-back-button/themed-results-back-button.component'; import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/themed-thumbnail.component'; -@listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-journal-volume', // styleUrls: ['./journal-volume.component.scss'], diff --git a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts index 104f1b40b05..f4d0c276cfb 100644 --- a/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts +++ b/src/themes/aura/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts @@ -19,7 +19,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object- import { ThemedResultsBackButtonComponent } from '../../../../../../../app/shared/results-back-button/themed-results-back-button.component'; import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/themed-thumbnail.component'; -@listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-journal', // styleUrls: ['./journal.component.scss'], diff --git a/src/themes/aura/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/aura/app/entity-groups/research-entities/item-pages/person/person.component.ts index f1a60957eda..f4944e02b90 100644 --- a/src/themes/aura/app/entity-groups/research-entities/item-pages/person/person.component.ts +++ b/src/themes/aura/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -17,9 +17,10 @@ import { ThemedThumbnailComponent } from 'src/app/thumbnail/themed-thumbnail.com import { Context } from '../../../../../../../app/core/shared/context.model'; import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model'; import { PersonComponent as BaseComponent } from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component'; +import { ItemPageOrcidFieldComponent } from '../../../../../../../app/item-page/simple/field-components/specific-field/orcid/item-page-orcid-field.component'; import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; -@listableObjectComponent('Person', ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent('Person', ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-person', // styleUrls: ['./person.component.scss'], @@ -27,7 +28,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object- // templateUrl: './person.component.html', templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html', standalone: true, - imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, ItemPageOrcidFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule], }) export class PersonComponent extends BaseComponent { } diff --git a/src/themes/aura/app/footer/footer.component.ts b/src/themes/aura/app/footer/footer.component.ts index 2e6633266a8..86f81719f20 100644 --- a/src/themes/aura/app/footer/footer.component.ts +++ b/src/themes/aura/app/footer/footer.component.ts @@ -19,8 +19,9 @@ import { FooterComponent as BaseComponent } from '../../../../app/footer/footer. imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule], }) export class FooterComponent extends BaseComponent { - + onEdit(){ document.body.scrollTop = document.documentElement.scrollTop = 0; } + } diff --git a/src/themes/aura/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/aura/app/forgot-password/forgot-password-form/forgot-password-form.component.ts index 9656e7b85ce..37fb3834294 100644 --- a/src/themes/aura/app/forgot-password/forgot-password-form/forgot-password-form.component.ts +++ b/src/themes/aura/app/forgot-password/forgot-password-form/forgot-password-form.component.ts @@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component'; import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component'; +import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive'; import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe'; @Component({ @@ -22,6 +23,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi ProfilePageSecurityFormComponent, AsyncPipe, NgIf, + BtnDisabledDirective, ], }) /** diff --git a/src/themes/aura/app/home-page/home-page.component.ts b/src/themes/aura/app/home-page/home-page.component.ts index 2b45f697544..86c0d272d5a 100644 --- a/src/themes/aura/app/home-page/home-page.component.ts +++ b/src/themes/aura/app/home-page/home-page.component.ts @@ -16,7 +16,6 @@ import { SuggestionsPopupComponent } from '../../../../app/notifications/suggest import { ThemedConfigurationSearchPageComponent } from '../../../../app/search-page/themed-configuration-search-page.component'; import { ThemedSearchFormComponent } from '../../../../app/shared/search-form/themed-search-form.component'; import { PageWithSidebarComponent } from '../../../../app/shared/sidebar/page-with-sidebar.component'; -import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dspace/view-tracker.component'; @Component({ selector: 'ds-themed-home-page', @@ -25,7 +24,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp // templateUrl: './home-page.component.html' templateUrl: '../../../../app/home-page/home-page.component.html', standalone: true, - imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent], + imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent], }) export class HomePageComponent extends BaseComponent { diff --git a/src/themes/aura/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/aura/app/info/end-user-agreement/end-user-agreement.component.ts index 05f22522163..2b78006f650 100644 --- a/src/themes/aura/app/info/end-user-agreement/end-user-agreement.component.ts +++ b/src/themes/aura/app/info/end-user-agreement/end-user-agreement.component.ts @@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component'; import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component'; +import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive'; @Component({ selector: 'ds-themed-end-user-agreement', @@ -12,7 +13,7 @@ import { EndUserAgreementContentComponent } from '../../../../../app/info/end-us // templateUrl: './end-user-agreement.component.html' templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html', standalone: true, - imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule], + imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective], }) /** diff --git a/src/themes/aura/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/aura/app/info/feedback/feedback-form/feedback-form.component.ts index b3cd90e73ed..38356671118 100644 --- a/src/themes/aura/app/info/feedback/feedback-form/feedback-form.component.ts +++ b/src/themes/aura/app/info/feedback/feedback-form/feedback-form.component.ts @@ -7,6 +7,7 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component'; +import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive'; import { ErrorComponent } from '../../../../../../app/shared/error/error.component'; @Component({ @@ -16,7 +17,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone // styleUrls: ['./feedback-form.component.scss'], styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'], standalone: true, - imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule], + imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, BtnDisabledDirective], }) export class FeedbackFormComponent extends BaseComponent { } diff --git a/src/themes/aura/app/info/feedback/feedback.component.ts b/src/themes/aura/app/info/feedback/feedback.component.ts index 9c3d497d6b3..e31cfd46cf9 100644 --- a/src/themes/aura/app/info/feedback/feedback.component.ts +++ b/src/themes/aura/app/info/feedback/feedback.component.ts @@ -5,10 +5,10 @@ import { ThemedFeedbackFormComponent } from '../../../../../app/info/feedback/fe @Component({ selector: 'ds-themed-feedback', - styleUrls: ['./feedback.component.scss'], - // styleUrls: ['../../../../../app/info/feedback/feedback.component.scss'], - templateUrl: './feedback.component.html', - // templateUrl: '../../../../../app/info/feedback/feedback.component.html', + // styleUrls: ['./feedback.component.scss'], + styleUrls: ['../../../../../app/info/feedback/feedback.component.scss'], + // templateUrl: './feedback.component.html' + templateUrl: '../../../../../app/info/feedback/feedback.component.html', standalone: true, imports: [ThemedFeedbackFormComponent], }) diff --git a/src/themes/aura/app/item-page/full/full-item-page.component.ts b/src/themes/aura/app/item-page/full/full-item-page.component.ts index c1bad7ba897..c9b17cd200d 100644 --- a/src/themes/aura/app/item-page/full/full-item-page.component.ts +++ b/src/themes/aura/app/item-page/full/full-item-page.component.ts @@ -23,7 +23,6 @@ import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edi import { ErrorComponent } from '../../../../../app/shared/error/error.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; import { VarDirective } from '../../../../../app/shared/utils/var.directive'; -import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/dspace/view-tracker.component'; /** * This component renders a full item page. @@ -54,7 +53,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/ ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, ItemVersionsNoticeComponent, - ViewTrackerComponent, ThemedItemAlertsComponent, VarDirective, ], diff --git a/src/themes/aura/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/aura/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts index 5c6c7f35072..0efa0130640 100644 --- a/src/themes/aura/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts +++ b/src/themes/aura/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts @@ -7,6 +7,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component'; +import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive'; @Component({ selector: 'ds-themed-media-viewer-video', @@ -20,6 +21,7 @@ import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../ap NgbDropdownModule, TranslateModule, NgIf, + BtnDisabledDirective, ], }) export class MediaViewerVideoComponent extends BaseComponent { diff --git a/src/themes/aura/app/item-page/simple/item-page.component.ts b/src/themes/aura/app/item-page/simple/item-page.component.ts index 90efde101e5..7ffd4b68d14 100644 --- a/src/themes/aura/app/item-page/simple/item-page.component.ts +++ b/src/themes/aura/app/item-page/simple/item-page.component.ts @@ -19,7 +19,6 @@ import { ErrorComponent } from '../../../../../app/shared/error/error.component' import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; import { ListableObjectComponentLoaderComponent } from '../../../../../app/shared/object-collection/shared/listable-object/listable-object-component-loader.component'; import { VarDirective } from '../../../../../app/shared/utils/var.directive'; -import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/dspace/view-tracker.component'; /** * This component renders a simple item page. @@ -28,10 +27,10 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/ */ @Component({ selector: 'ds-themed-item-page', - styleUrls: ['./item-page.component.scss'], - // styleUrls: ['../../../../../app/item-page/simple/item-page.component.scss'], - templateUrl: './item-page.component.html', - // templateUrl: '../../../../../app/item-page/simple/item-page.component.html', + // styleUrls: ['./item-page.component.scss'], + styleUrls: ['../../../../../app/item-page/simple/item-page.component.scss'], + // templateUrl: './item-page.component.html', + templateUrl: '../../../../../app/item-page/simple/item-page.component.html', changeDetection: ChangeDetectionStrategy.OnPush, animations: [fadeInOut], standalone: true, @@ -39,7 +38,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/ VarDirective, ThemedItemAlertsComponent, ItemVersionsNoticeComponent, - ViewTrackerComponent, ListableObjectComponentLoaderComponent, ItemVersionsComponent, ErrorComponent, diff --git a/src/themes/aura/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/aura/app/item-page/simple/item-types/publication/publication.component.ts index ce56724e4ab..afa9e6d6567 100644 --- a/src/themes/aura/app/item-page/simple/item-types/publication/publication.component.ts +++ b/src/themes/aura/app/item-page/simple/item-types/publication/publication.component.ts @@ -33,7 +33,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the * Component that represents a publication Item page */ -@listableObjectComponent('Publication', ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent('Publication', ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-publication', // styleUrls: ['./publication.component.scss'], diff --git a/src/themes/aura/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/aura/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index 36096dfd5ba..ff26f8daf81 100644 --- a/src/themes/aura/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/themes/aura/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -33,7 +33,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the /** * Component that represents an untyped Item page */ -@listableObjectComponent(Item, ViewMode.StandalonePage, Context.Any, 'custom') +@listableObjectComponent(Item, ViewMode.StandalonePage, Context.Any, 'aura') @Component({ selector: 'ds-untyped-item', styleUrls: ['./untyped-item.component.scss'], diff --git a/src/themes/aura/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/aura/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts index f0e2ebd5029..b0b57a75aae 100644 --- a/src/themes/aura/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts +++ b/src/themes/aura/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts @@ -9,11 +9,8 @@ import { RouterLinkActive } from '@angular/router'; import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component'; import { slide } from '../../../../../app/shared/animations/slide'; -import { VarDirective } from '../../../../../app/shared/utils/var.directive'; +import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive'; -/** - * Represents an expandable section in the navbar - */ @Component({ selector: 'ds-themed-expandable-navbar-section', // templateUrl: './expandable-navbar-section.component.html', @@ -22,7 +19,14 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'], animations: [slide], standalone: true, - imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe], + imports: [ + AsyncPipe, + HoverOutsideDirective, + NgComponentOutlet, + NgFor, + NgIf, + RouterLinkActive, + ], }) export class ExpandableNavbarSectionComponent extends BaseComponent { } diff --git a/src/themes/aura/app/profile-page/profile-page.component.ts b/src/themes/aura/app/profile-page/profile-page.component.ts index 74a88fdba63..62646dbfa43 100644 --- a/src/themes/aura/app/profile-page/profile-page.component.ts +++ b/src/themes/aura/app/profile-page/profile-page.component.ts @@ -2,8 +2,10 @@ import { AsyncPipe, NgForOf, NgIf, + NgTemplateOutlet, } from '@angular/common'; import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { SuggestionsNotificationComponent } from '../../../../app/notifications/suggestions-notification/suggestions-notification.component'; @@ -11,6 +13,10 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component'; import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component'; import { ProfilePageSecurityFormComponent } from '../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component'; +import { AlertComponent } from '../../../../app/shared/alert/alert.component'; +import { ErrorComponent } from '../../../../app/shared/error/error.component'; +import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component'; +import { PaginationComponent } from '../../../../app/shared/pagination/pagination.component'; import { VarDirective } from '../../../../app/shared/utils/var.directive'; @Component({ @@ -30,6 +36,12 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive'; NgIf, NgForOf, SuggestionsNotificationComponent, + NgTemplateOutlet, + PaginationComponent, + ThemedLoadingComponent, + ErrorComponent, + RouterModule, + AlertComponent, ], }) /** diff --git a/src/themes/aura/app/register-email-form/register-email-form.component.ts b/src/themes/aura/app/register-email-form/register-email-form.component.ts index 44426c527fd..d1f4a6d3ffe 100644 --- a/src/themes/aura/app/register-email-form/register-email-form.component.ts +++ b/src/themes/aura/app/register-email-form/register-email-form.component.ts @@ -12,13 +12,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component'; import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component'; import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component'; +import { BtnDisabledDirective } from '../../../../app/shared/btn-disabled.directive'; @Component({ selector: 'ds-themed-register-email-form', // templateUrl: './register-email-form.component.html', templateUrl: '../../../../app/register-email-form/register-email-form.component.html', standalone: true, - imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule], + imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective], }) export class RegisterEmailFormComponent extends BaseComponent { } diff --git a/src/themes/aura/app/register-page/create-profile/create-profile.component.ts b/src/themes/aura/app/register-page/create-profile/create-profile.component.ts index ac2491cc4ee..7c1ff908c37 100644 --- a/src/themes/aura/app/register-page/create-profile/create-profile.component.ts +++ b/src/themes/aura/app/register-page/create-profile/create-profile.component.ts @@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component'; import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component'; +import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive'; /** * Component that renders the create profile page to be used by a user registering through a token @@ -27,6 +28,7 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi AsyncPipe, ReactiveFormsModule, NgForOf, + BtnDisabledDirective, ], }) export class CreateProfileComponent extends BaseComponent { diff --git a/src/themes/aura/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/aura/app/request-copy/email-request-copy/email-request-copy.component.ts index 1876b134a26..cf4981d289b 100644 --- a/src/themes/aura/app/request-copy/email-request-copy/email-request-copy.component.ts +++ b/src/themes/aura/app/request-copy/email-request-copy/email-request-copy.component.ts @@ -7,6 +7,8 @@ import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component'; +import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive'; + @Component({ selector: 'ds-themed-email-request-copy', // styleUrls: ['./email-request-copy.component.scss'], @@ -14,7 +16,7 @@ import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy // templateUrl: './email-request-copy.component.html', templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html', standalone: true, - imports: [FormsModule, NgClass, NgIf, TranslateModule], + imports: [FormsModule, NgClass, NgIf, TranslateModule, BtnDisabledDirective], }) export class EmailRequestCopyComponent extends BaseComponent { diff --git a/src/themes/aura/app/root/root.component.ts b/src/themes/aura/app/root/root.component.ts index bac434eeb3b..4894746e52d 100644 --- a/src/themes/aura/app/root/root.component.ts +++ b/src/themes/aura/app/root/root.component.ts @@ -13,6 +13,7 @@ import { ThemedFooterComponent } from '../../../../app/footer/themed-footer.comp import { ThemedHeaderNavbarWrapperComponent } from '../../../../app/header-nav-wrapper/themed-header-navbar-wrapper.component'; import { RootComponent as BaseComponent } from '../../../../app/root/root.component'; import { slideSidebarPadding } from '../../../../app/shared/animations/slide'; +import { LiveRegionComponent } from '../../../../app/shared/live-region/live-region.component'; import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component'; import { NotificationsBoardComponent } from '../../../../app/shared/notifications/notifications-board/notifications-board.component'; import { SystemWideAlertBannerComponent } from '../../../../app/system-wide-alert/alert-banner/system-wide-alert-banner.component'; @@ -38,6 +39,7 @@ import { SystemWideAlertBannerComponent } from '../../../../app/system-wide-aler ThemedFooterComponent, NotificationsBoardComponent, AsyncPipe, + LiveRegionComponent, ], }) export class RootComponent extends BaseComponent { diff --git a/src/themes/aura/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/aura/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts index b3670f16d64..9495ae45d56 100644 --- a/src/themes/aura/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/themes/aura/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -15,10 +15,10 @@ import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../ @Component({ selector: 'ds-themed-comcol-page-browse-by', - styleUrls: ['./comcol-page-browse-by.component.scss'], - // styleUrls: ['../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'], - templateUrl: './comcol-page-browse-by.component.html', - // templateUrl: '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html', + // styleUrls: ['./comcol-page-browse-by.component.scss'], + styleUrls: ['../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'], + // templateUrl: './comcol-page-browse-by.component.html' + templateUrl: '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html', standalone: true, imports: [ FormsModule, diff --git a/src/themes/aura/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/aura/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts index 6c4aa8082c6..182a0a17a22 100644 --- a/src/themes/aura/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts +++ b/src/themes/aura/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts @@ -1,7 +1,11 @@ +import { + AsyncPipe, + NgIf, +} from '@angular/common'; import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; +import { AuthorizedCommunitySelectorComponent } from 'src/app/shared/dso-selector/dso-selector/authorized-community-selector/authorized-community-selector.component'; -import { DSOSelectorComponent } from '../../../../../../../app/shared/dso-selector/dso-selector/dso-selector.component'; import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; @Component({ @@ -11,7 +15,12 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../. // templateUrl: './create-community-parent-selector.component.html', templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html', standalone: true, - imports: [DSOSelectorComponent, TranslateModule], + imports: [ + AsyncPipe, + AuthorizedCommunitySelectorComponent, + NgIf, + TranslateModule, + ], }) export class CreateCommunityParentSelectorComponent extends BaseComponent { } diff --git a/src/themes/aura/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/themes/aura/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 424adb79429..aec7bfd6db2 100644 --- a/src/themes/aura/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/themes/aura/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -5,6 +5,7 @@ import { import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; +import { BtnDisabledDirective } from '../../../../../../../../../../app/shared/btn-disabled.directive'; import { ExternalSourceEntryImportModalComponent as BaseComponent } from '../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component'; @@ -19,6 +20,7 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/ ThemedSearchResultsComponent, NgIf, AsyncPipe, + BtnDisabledDirective, ], }) export class ExternalSourceEntryImportModalComponent extends BaseComponent { diff --git a/src/themes/aura/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/aura/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts index 5391c516243..3e1b64d358e 100644 --- a/src/themes/aura/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts +++ b/src/themes/aura/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts @@ -20,6 +20,6 @@ import { BrowseEntryListElementComponent as BaseComponent } from '../../../../.. standalone: true, imports: [NgIf, RouterLink, AsyncPipe], }) -@listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom') +@listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'aura') export class BrowseEntryListElementComponent extends BaseComponent { } diff --git a/src/themes/aura/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/themes/aura/app/shared/object-list/collection-list-element/collection-list-element.component.ts index d7db69198b7..738b8181451 100644 --- a/src/themes/aura/app/shared/object-list/collection-list-element/collection-list-element.component.ts +++ b/src/themes/aura/app/shared/object-list/collection-list-element/collection-list-element.component.ts @@ -8,7 +8,7 @@ import { ViewMode } from '../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { CollectionListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component'; -@listableObjectComponent(Collection, ViewMode.ListElement, Context.Any, 'custom') +@listableObjectComponent(Collection, ViewMode.ListElement, Context.Any, 'aura') @Component({ selector: 'ds-collection-list-element', diff --git a/src/themes/aura/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/aura/app/shared/object-list/community-list-element/community-list-element.component.ts index 50f24ae91ae..8dc3d742c08 100644 --- a/src/themes/aura/app/shared/object-list/community-list-element/community-list-element.component.ts +++ b/src/themes/aura/app/shared/object-list/community-list-element/community-list-element.component.ts @@ -8,7 +8,7 @@ import { ViewMode } from '../../../../../../app/core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator'; import { CommunityListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component'; -@listableObjectComponent(Community, ViewMode.ListElement, Context.Any, 'custom') +@listableObjectComponent(Community, ViewMode.ListElement, Context.Any, 'aura') @Component({ selector: 'ds-community-list-element', diff --git a/src/themes/aura/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/aura/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 7d2913dc1f2..7bfd71cf999 100644 --- a/src/themes/aura/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/themes/aura/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -17,8 +17,8 @@ import { TruncatableComponent } from '../../../../../../../../../app/shared/trun import { TruncatablePartComponent } from '../../../../../../../../../app/shared/truncatable/truncatable-part/truncatable-part.component'; import { ThemedThumbnailComponent } from '../../../../../../../../../app/thumbnail/themed-thumbnail.component'; -@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.Any, 'custom') -@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Any, 'custom') +@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.Any, 'aura') +@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Any, 'aura') @Component({ selector: 'ds-item-search-result-list-element', // styleUrls: ['./item-search-result-list-element.component.scss'], diff --git a/src/themes/aura/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/themes/aura/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts index dbb4526a9a7..8bda6215a39 100644 --- a/src/themes/aura/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts +++ b/src/themes/aura/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts @@ -13,10 +13,10 @@ import { listableObjectComponent } from '../../../../../../../../app/shared/obje import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component'; import { TruncatablePartComponent } from '../../../../../../../../app/shared/truncatable/truncatable-part/truncatable-part.component'; -@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal, 'custom') -@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom') -@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal, 'custom') -@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom') +@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal, 'aura') +@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'aura') +@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal, 'aura') +@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'aura') @Component({ selector: 'ds-publication-sidebar-search-list-element', // templateUrl: './publication-sidebar-search-list-element.component.html', diff --git a/src/themes/aura/app/shared/search/search-filters/search-filters.component.ts b/src/themes/aura/app/shared/search/search-filters/search-filters.component.ts index 5b10c841453..3e86e16c018 100644 --- a/src/themes/aura/app/shared/search/search-filters/search-filters.component.ts +++ b/src/themes/aura/app/shared/search/search-filters/search-filters.component.ts @@ -5,18 +5,14 @@ * * https://www.atmire.com/software-license/ */ -import { - AsyncPipe, - NgFor, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service'; import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service'; -import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component'; import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component'; import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component'; @@ -34,7 +30,7 @@ import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/s }, ], standalone: true, - imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent], + imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule], }) export class SearchFiltersComponent extends BaseComponent { diff --git a/src/themes/aura/app/shared/search/search-results/search-results.component.ts b/src/themes/aura/app/shared/search/search-results/search-results.component.ts index b72297f32f6..b7c84f0fcce 100644 --- a/src/themes/aura/app/shared/search/search-results/search-results.component.ts +++ b/src/themes/aura/app/shared/search/search-results/search-results.component.ts @@ -1,29 +1,43 @@ -import { NgIf } from '@angular/common'; +import { + AsyncPipe, + NgIf, +} from '@angular/common'; import { Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { fadeIn, fadeInOut, } from '../../../../../../app/shared/animations/fade'; import { ErrorComponent } from '../../../../../../app/shared/error/error.component'; -import { ThemedLoadingComponent } from '../../../../../../app/shared/loading/themed-loading.component'; import { ObjectCollectionComponent } from '../../../../../../app/shared/object-collection/object-collection.component'; import { SearchExportCsvComponent } from '../../../../../../app/shared/search/search-export-csv/search-export-csv.component'; import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component'; +import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component'; @Component({ selector: 'ds-themed-search-results', // templateUrl: './search-results.component.html', templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html', - // styleUrls: ['./search-results.component.scss'], + styleUrls: ['../../../../../../app/shared/search/search-results/search-results.component.scss'], animations: [ fadeIn, fadeInOut, ], standalone: true, - imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule], + imports: [ + AsyncPipe, + ErrorComponent, + NgIf, + NgxSkeletonLoaderModule, + ObjectCollectionComponent, + RouterLink, + SearchExportCsvComponent, + SearchResultsSkeletonComponent, + TranslateModule, + ], }) export class SearchResultsComponent extends BaseComponent { diff --git a/src/themes/aura/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/aura/app/submission/sections/upload/file/section-upload-file.component.ts index 13f5f976503..cea515102ac 100644 --- a/src/themes/aura/app/submission/sections/upload/file/section-upload-file.component.ts +++ b/src/themes/aura/app/submission/sections/upload/file/section-upload-file.component.ts @@ -6,6 +6,7 @@ import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component'; +import { BtnDisabledDirective } from '../../../../../../../app/shared/btn-disabled.directive'; import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component'; import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe'; import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component'; @@ -27,6 +28,7 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a AsyncPipe, ThemedFileDownloadLinkComponent, FileSizePipe, + BtnDisabledDirective, ], }) export class SubmissionSectionUploadFileComponent diff --git a/src/themes/aura/lazy-theme.module.ts b/src/themes/aura/lazy-theme.module.ts index dfb649b0ff4..7367e291b54 100644 --- a/src/themes/aura/lazy-theme.module.ts +++ b/src/themes/aura/lazy-theme.module.ts @@ -12,8 +12,11 @@ import { TranslateModule } from '@ngx-translate/core'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; import { RootModule } from '../../app/root.module'; +import { SearchResultsSkeletonComponent } from '../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component'; import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component'; +import { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component'; import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component'; +import { AdminWorkflowPageComponent } from './app/admin/admin-workflow-page/admin-workflow-page.component'; import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component'; import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component'; import { BrowseByDateComponent } from './app/browse-by/browse-by-date/browse-by-date.component'; @@ -103,9 +106,6 @@ import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workf import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; import { WorkspaceItemsDeletePageComponent } from './app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component'; -// Custom components -import { AccessibilityComponent } from './app/info/accessibility/accessibility.component'; - const DECLARATIONS = [ FileSectionComponent, HomePageComponent, @@ -197,7 +197,9 @@ const DECLARATIONS = [ ProfilePageMetadataFormComponent, SubmissionUploadFilesComponent, ComcolPageContentComponent, - AccessibilityComponent, + SearchResultsSkeletonComponent, + AdminSearchPageComponent, + AdminWorkflowPageComponent, ]; @NgModule({ diff --git a/tsconfig.app.json b/tsconfig.app.json index c89834db4ab..499f386aa89 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -10,7 +10,7 @@ ], "include": [ "src/**/*.d.ts", - "src/themes/**/*.module.ts" + "src/**/*.ts" ], "exclude": [ "src/test.ts", diff --git a/yarn.lock b/yarn.lock index e59c8975f22..07a09d0a969 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,6 +2726,11 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/geojson@*": + version "7946.0.16" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.16.tgz#8ebe53d69efada7044454e3305c19017d97ced2a" + integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg== + "@types/grecaptcha@^3.0.9": version "3.0.9" resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.9.tgz#9f3b07ec06c8fff221aa6fc124fe5b8a0e2c3349" @@ -2771,6 +2776,13 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/leaflet@^1.9.22": + version "1.9.22" + resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.9.22.tgz#d46d501e5bcdf5a99374cf113ab33562cb887783" + integrity sha512-h3lhECYEKDasG7LFHu+GiHqAvsgLuQvlJvVZzJDGONo3sEL+wUOqSFLnwkZlK0qVxnxbuGFW8iBlJNYs5wgndA== + dependencies: + "@types/geojson" "*" + "@types/lodash@^4.17.24": version "4.17.24" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.24.tgz#4ae334fc62c0e915ca8ed8e35dcc6d4eeb29215f" @@ -5515,9 +5527,11 @@ eslint-plugin-deprecation@^1.4.1: "eslint-plugin-dspace-angular-html@link:./lint/dist/src/rules/html": version "0.0.0" + uid "" "eslint-plugin-dspace-angular-ts@link:./lint/dist/src/rules/ts": version "0.0.0" + uid "" eslint-plugin-import-newlines@^1.4.1: version "1.4.1" @@ -7797,6 +7811,16 @@ lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw== +leaflet.markercluster@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz#9cdb52a4eab92671832e1ef9899669e80efc4056" + integrity sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA== + +leaflet@^1.9.4: + version "1.9.4" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d" + integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA== + less-loader@11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.0.tgz#a452384259bdf8e4f6d5fdcc39543609e6313f82" @@ -10914,16 +10938,7 @@ streamroller@^3.1.5: debug "^4.3.4" fs-extra "^8.1.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10997,7 +11012,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11011,13 +11026,6 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -12002,7 +12010,7 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -12020,15 +12028,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"