Merge remote-tracking branch 'upstream/main' into use-applied-filter-to-display-label-on-search_contribute-main

# Conflicts:
#	src/app/shared/search/search-labels/search-label/search-label.component.html
#	src/app/shared/search/search.component.html
This commit is contained in:
Alexandre Vryghem
2024-04-30 11:35:50 +02:00
33 changed files with 133 additions and 83 deletions

View File

@@ -0,0 +1,15 @@
const ADD_TEMPLATE_ITEM_PAGE = '/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')).concat('/itemtemplate');
describe('Item Template', () => {
beforeEach(() => {
cy.visit(ADD_TEMPLATE_ITEM_PAGE);
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});
it('should load properly', () => {
cy.contains('.ds-header-row .lbl-cell', 'Field', { timeout: 10000 }).should('exist').should('be.visible');
cy.contains('.ds-header-row b', 'Value', { timeout: 10000 }).should('exist').should('be.visible');
cy.contains('.ds-header-row b', 'Lang', { timeout: 10000 }).should('exist').should('be.visible');
cy.contains('.ds-header-row b', 'Edit', { timeout: 10000 }).should('exist').should('be.visible');
});
});

View File

@@ -24,8 +24,8 @@ import {
import { import {
BehaviorSubject, BehaviorSubject,
combineLatest as observableCombineLatest, combineLatest as observableCombineLatest,
EMPTY,
Observable, Observable,
of,
Subscription, Subscription,
} from 'rxjs'; } from 'rxjs';
import { import {
@@ -188,7 +188,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy {
const lazyProvider$: Observable<UpdateDataService<DSpaceObject>> = lazyDataService(this.dataServiceMap, this.dsoType, this.parentInjector); const lazyProvider$: Observable<UpdateDataService<DSpaceObject>> = lazyDataService(this.dataServiceMap, this.dsoType, this.parentInjector);
return lazyProvider$; return lazyProvider$;
} else { } else {
return EMPTY; return of(this.updateDataService);
} }
} }

View File

@@ -1,14 +1,20 @@
<a *ngIf="min !== '*'" <a *ngIf="min !== '*'"
[attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate, value: min }"
[routerLink]="searchLink" [routerLink]="searchLink"
[queryParams]="(removeParametersMin$ | async)" [queryParams]="(removeParametersMin$ | async)"
class="badge badge-primary mr-1 mb-1 text-capitalize"> class="badge badge-primary">
{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }} <span class="d-flex">
<span> ×</span> <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
<span class="pl-1" aria-hidden="true">×</span>
</span>
</a> </a>
<a *ngIf="max !== '*'" <a *ngIf="max !== '*'"
[attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate, value: max }"
[routerLink]="searchLink" [routerLink]="searchLink"
[queryParams]="(removeParametersMax$ | async)" [queryParams]="(removeParametersMax$ | async)"
class="badge badge-primary mr-1 mb-1 text-capitalize"> class="badge badge-primary">
{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }} <span class="d-flex">
<span> ×</span> <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
<span class="pl-1" aria-hidden="true">×</span>
</span>
</a> </a>

View File

@@ -0,0 +1,9 @@
:host {
display: flex;
flex-wrap: wrap;
gap: calc(var(--bs-spacer) / 4);
}
.badge {
white-space: inherit;
}

View File

@@ -29,6 +29,7 @@ import { renderSearchLabelFor } from '../search-label-loader/search-label-loader
@Component({ @Component({
selector: 'ds-search-label-range', selector: 'ds-search-label-range',
templateUrl: './search-label-range.component.html', templateUrl: './search-label-range.component.html',
styleUrls: ['./search-label-range.component.scss'],
standalone: true, standalone: true,
imports: [ imports: [
AsyncPipe, AsyncPipe,

View File

@@ -1,7 +1,9 @@
<a class="badge badge-primary mr-1 mb-1" <a class="badge badge-primary"
[attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.' + appliedFilter.filter) | translate, value: appliedFilter.label }" [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter) | translate, value: appliedFilter.label }"
[routerLink]="searchLink" [routerLink]="searchLink"
[queryParams]="(removeParameters$ | async)"> [queryParams]="(removeParameters$ | async)">
{{('search.filters.applied.f.' + appliedFilter.filter) | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: {default: appliedFilter.label} }} <span class="d-flex">
<span aria-hidden="true"> ×</span> <span class="flex-grow-1 text-left">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
<span class="pl-1" aria-hidden="true">×</span>
</span>
</a> </a>

View File

@@ -0,0 +1,3 @@
.badge {
white-space: inherit;
}

View File

@@ -26,6 +26,7 @@ import { renderSearchLabelFor } from '../search-label-loader/search-label-loader
@Component({ @Component({
selector: 'ds-search-label', selector: 'ds-search-label',
templateUrl: './search-label.component.html', templateUrl: './search-label.component.html',
styleUrls: ['./search-label.component.scss'],
standalone: true, standalone: true,
imports: [RouterLink, AsyncPipe, TranslateModule], imports: [RouterLink, AsyncPipe, TranslateModule],
}) })

View File

@@ -1,3 +1,9 @@
:host { :host {
line-height: 1; line-height: 1;
}
.labels {
display: flex;
flex-wrap: wrap;
gap: calc(var(--bs-spacer) / 4);
}
}

View File

@@ -99,8 +99,8 @@
[searchPlaceholder]="searchFormPlaceholder | translate"> [searchPlaceholder]="searchFormPlaceholder | translate">
</ds-themed-search-form> </ds-themed-search-form>
<div class="row mb-3 mb-md-1"> <div class="row mb-3 mb-md-1">
<div class="labels col-sm-9"> <div class="labels col-12">
<ds-search-labels *ngIf="searchEnabled" [appliedFilters]="appliedFilters" [inPlaceSearch]="inPlaceSearch"> <ds-search-labels [appliedFilters]="appliedFilters" [inPlaceSearch]="inPlaceSearch">
</ds-search-labels> </ds-search-labels>
</div> </div>
</div> </div>

View File

@@ -16,6 +16,8 @@ Disallow: /submit
Disallow: /workspaceitems Disallow: /workspaceitems
Disallow: /profile Disallow: /profile
Disallow: /workflowitems Disallow: /workflowitems
# Crawlers should be able to access entity pages, but not the facet search links present on entity pages
Disallow: /entities/*?f
# Optionally uncomment the following line ONLY if sitemaps are working # Optionally uncomment the following line ONLY if sitemaps are working
# and you have verified that your site is being indexed correctly. # and you have verified that your site is being indexed correctly.

View File

@@ -3,7 +3,7 @@ import {
NgIf, NgIf,
} from '@angular/common'; } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterLink } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component'; import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
@@ -32,16 +32,16 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
ComcolPageHeaderComponent, ComcolPageHeaderComponent,
ComcolPageLogoComponent, ComcolPageLogoComponent,
NgIf, NgIf,
RouterModule,
ThemedComcolPageHandleComponent, ThemedComcolPageHandleComponent,
ComcolPageContentComponent, ComcolPageContentComponent,
DsoEditMenuComponent, DsoEditMenuComponent,
ThemedComcolPageBrowseByComponent, ThemedComcolPageBrowseByComponent,
VocabularyTreeviewComponent,
BrowseByComponent, BrowseByComponent,
TranslateModule, TranslateModule,
ThemedLoadingComponent, ThemedLoadingComponent,
ThemedBrowseByComponent, ThemedBrowseByComponent,
VocabularyTreeviewComponent,
RouterLink,
], ],
}) })
export class BrowseByTaxonomyComponent extends BaseComponent { export class BrowseByTaxonomyComponent extends BaseComponent {

View File

@@ -43,7 +43,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
ComcolPageContentComponent, ComcolPageContentComponent,
ErrorComponent, ErrorComponent,
NgIf, NgIf,
RouterOutlet,
ThemedLoadingComponent, ThemedLoadingComponent,
TranslateModule, TranslateModule,
ViewTrackerComponent, ViewTrackerComponent,
@@ -55,6 +54,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
DsoEditMenuComponent, DsoEditMenuComponent,
ThemedComcolPageBrowseByComponent, ThemedComcolPageBrowseByComponent,
ObjectCollectionComponent, ObjectCollectionComponent,
RouterOutlet,
], ],
}) })
/** /**

View File

@@ -11,6 +11,7 @@ import { ThemedDsoEditMetadataComponent } from '../../../../../app/dso-shared/ds
import { AlertComponent } from '../../../../../app/shared/alert/alert.component'; import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
import { VarDirective } from '../../../../../app/shared/utils/var.directive'; import { VarDirective } from '../../../../../app/shared/utils/var.directive';
import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component';
@Component({ @Component({
selector: 'ds-edit-item-template-page', selector: 'ds-edit-item-template-page',
@@ -20,6 +21,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
standalone: true, standalone: true,
imports: [ imports: [
ThemedDsoEditMetadataComponent, ThemedDsoEditMetadataComponent,
DsoEditMetadataComponent,
RouterLink, RouterLink,
AsyncPipe, AsyncPipe,
VarDirective, VarDirective,

View File

@@ -6,7 +6,10 @@ import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
} from '@angular/core'; } from '@angular/core';
import { RouterModule } from '@angular/router'; import {
RouterModule,
RouterOutlet,
} from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { CommunityPageComponent as BaseComponent } from '../../../../app/community-page/community-page.component'; import { CommunityPageComponent as BaseComponent } from '../../../../app/community-page/community-page.component';
@@ -50,6 +53,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
AsyncPipe, AsyncPipe,
ViewTrackerComponent, ViewTrackerComponent,
VarDirective, VarDirective,
RouterOutlet,
RouterModule, RouterModule,
], ],
}) })

View File

@@ -1,6 +1,15 @@
import {
AsyncPipe,
NgIf,
} from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core';
import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component'; import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
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';
@Component({ @Component({
selector: 'ds-community-page-sub-collection-list', selector: 'ds-community-page-sub-collection-list',
@@ -8,6 +17,15 @@ import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../
styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'], styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'],
// templateUrl: './community-page-sub-collection-list.component.html', // templateUrl: './community-page-sub-collection-list.component.html',
templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html', templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html',
imports: [
ObjectCollectionComponent,
ErrorComponent,
ThemedLoadingComponent,
NgIf,
TranslateModule,
AsyncPipe,
VarDirective,
],
standalone: true, standalone: true,
}) })
export class CommunityPageSubCollectionListComponent extends BaseComponent { export class CommunityPageSubCollectionListComponent extends BaseComponent {

View File

@@ -12,8 +12,7 @@ import { RegisterEmailFormComponent } from '../../../../../app/register-email-fo
templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html', templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html',
standalone: true, standalone: true,
imports: [ imports: [
RegisterEmailFormComponent, RegisterEmailFormComponent, ThemedRegisterEmailFormComponent,
ThemedRegisterEmailFormComponent,
], ],
}) })
/** /**

View File

@@ -18,8 +18,8 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
standalone: true, standalone: true,
imports: [ imports: [
TranslateModule, TranslateModule,
ProfilePageSecurityFormComponent,
BrowserOnlyPipe, BrowserOnlyPipe,
ProfilePageSecurityFormComponent,
AsyncPipe, AsyncPipe,
NgIf, NgIf,
], ],

View File

@@ -1,3 +1,7 @@
import {
AsyncPipe,
NgIf,
} from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterLink } from '@angular/router'; import { RouterLink } from '@angular/router';
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -21,7 +25,7 @@ import { LangSwitchComponent } from '../../../../app/shared/lang-switch/lang-swi
// templateUrl: 'header.component.html', // templateUrl: 'header.component.html',
templateUrl: '../../../../app/header/header.component.html', templateUrl: '../../../../app/header/header.component.html',
standalone: true, standalone: true,
imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule], imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
}) })
export class HeaderComponent extends BaseComponent { export class HeaderComponent extends BaseComponent {
} }

View File

@@ -2,6 +2,7 @@ import {
AsyncPipe, AsyncPipe,
NgClass, NgClass,
NgIf, NgIf,
NgTemplateOutlet,
} from '@angular/common'; } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
@@ -25,7 +26,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
// templateUrl: './home-page.component.html' // templateUrl: './home-page.component.html'
templateUrl: '../../../../app/home-page/home-page.component.html', templateUrl: '../../../../app/home-page/home-page.component.html',
standalone: true, standalone: true,
imports: [ThemedHomeNewsComponent, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, ConfigurationSearchPageComponent, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent], imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, ConfigurationSearchPageComponent, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
}) })
export class HomePageComponent extends BaseComponent { export class HomePageComponent extends BaseComponent {

View File

@@ -44,11 +44,11 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
ItemVersionsComponent, ItemVersionsComponent,
ErrorComponent, ErrorComponent,
ThemedLoadingComponent, ThemedLoadingComponent,
NotifyRequestsStatusComponent,
QaEventNotificationComponent,
TranslateModule, TranslateModule,
AsyncPipe, AsyncPipe,
NgIf, NgIf,
NotifyRequestsStatusComponent,
QaEventNotificationComponent,
], ],
}) })
export class ItemPageComponent extends BaseComponent { export class ItemPageComponent extends BaseComponent {

View File

@@ -1,4 +1,7 @@
import { CommonModule } from '@angular/common'; import {
AsyncPipe,
NgIf,
} from '@angular/common';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
@@ -39,26 +42,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html', templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true, standalone: true,
imports: [ imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
CommonModule,
ThemedResultsBackButtonComponent,
MiradorViewerComponent,
ThemedItemPageTitleFieldComponent,
DsoEditMenuComponent,
MetadataFieldWrapperComponent,
ThemedThumbnailComponent,
ThemedMediaViewerComponent,
ThemedFileSectionComponent,
ItemPageDateFieldComponent,
ThemedMetadataRepresentationListComponent,
GenericItemPageFieldComponent,
RelatedItemsComponent,
ItemPageAbstractFieldComponent,
TranslateModule,
ItemPageUriFieldComponent,
CollectionsComponent,
RouterLink,
],
}) })
export class PublicationComponent extends BaseComponent { export class PublicationComponent extends BaseComponent {

View File

@@ -1,4 +1,7 @@
import { CommonModule } from '@angular/common'; import {
AsyncPipe,
NgIf,
} from '@angular/common';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
Component, Component,
@@ -38,25 +41,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
templateUrl: '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.html', templateUrl: '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.html',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true, standalone: true,
imports: [ imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
CommonModule,
ThemedItemPageTitleFieldComponent,
DsoEditMenuComponent,
MetadataFieldWrapperComponent,
ThemedThumbnailComponent,
ThemedMediaViewerComponent,
ThemedFileSectionComponent,
ItemPageDateFieldComponent,
ThemedMetadataRepresentationListComponent,
GenericItemPageFieldComponent,
TranslateModule,
MiradorViewerComponent,
ThemedResultsBackButtonComponent,
CollectionsComponent,
RouterLink,
ItemPageUriFieldComponent,
ItemPageAbstractFieldComponent,
],
}) })
export class UntypedItemComponent extends BaseComponent { export class UntypedItemComponent extends BaseComponent {
} }

View File

@@ -15,7 +15,7 @@ import { LogInComponent } from '../../../../app/shared/log-in/log-in.component';
// templateUrl: './login-page.component.html' // templateUrl: './login-page.component.html'
templateUrl: '../../../../app/login-page/login-page.component.html', templateUrl: '../../../../app/login-page/login-page.component.html',
standalone: true, standalone: true,
imports: [LogInComponent, ThemedLogInComponent ,TranslateModule], imports: [LogInComponent, ThemedLogInComponent, TranslateModule],
}) })
export class LoginPageComponent extends BaseComponent { export class LoginPageComponent extends BaseComponent {
} }

View File

@@ -40,11 +40,11 @@ import { ThemedSearchComponent } from '../../../../app/shared/search/themed-sear
imports: [ imports: [
ThemedSearchComponent, ThemedSearchComponent,
MyDSpaceNewSubmissionComponent, MyDSpaceNewSubmissionComponent,
MyDspaceQaEventsNotificationsComponent,
SuggestionsNotificationComponent,
AsyncPipe, AsyncPipe,
RoleDirective, RoleDirective,
NgIf, NgIf,
SuggestionsNotificationComponent,
MyDspaceQaEventsNotificationsComponent,
], ],
}) })
export class MyDSpacePageComponent extends BaseComponent { export class MyDSpacePageComponent extends BaseComponent {

View File

@@ -1,7 +1,15 @@
import {
AsyncPipe,
NgComponentOutlet,
NgFor,
NgIf,
} from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { RouterLinkActive } from '@angular/router';
import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component'; import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
import { slide } from '../../../../../app/shared/animations/slide'; import { slide } from '../../../../../app/shared/animations/slide';
import { VarDirective } from '../../../../../app/shared/utils/var.directive';
/** /**
* Represents an expandable section in the navbar * Represents an expandable section in the navbar
@@ -14,6 +22,7 @@ import { slide } from '../../../../../app/shared/animations/slide';
styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'], styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
animations: [slide], animations: [slide],
standalone: true, standalone: true,
imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
}) })
export class ExpandableNavbarSectionComponent extends BaseComponent { export class ExpandableNavbarSectionComponent extends BaseComponent {
} }

View File

@@ -23,13 +23,13 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
imports: [ imports: [
ProfilePageMetadataFormComponent, ProfilePageMetadataFormComponent,
ProfilePageSecurityFormComponent, ProfilePageSecurityFormComponent,
SuggestionsNotificationComponent,
AsyncPipe, AsyncPipe,
TranslateModule, TranslateModule,
ProfilePageResearcherFormComponent, ProfilePageResearcherFormComponent,
VarDirective, VarDirective,
NgIf, NgIf,
NgForOf, NgForOf,
SuggestionsNotificationComponent,
], ],
}) })
/** /**

View File

@@ -12,8 +12,7 @@ import { RegisterEmailComponent as BaseComponent } from '../../../../../app/regi
templateUrl: '../../../../../app/register-page/register-email/register-email.component.html', templateUrl: '../../../../../app/register-page/register-email/register-email.component.html',
standalone: true, standalone: true,
imports: [ imports: [
RegisterEmailFormComponent, RegisterEmailFormComponent, ThemedRegisterEmailFormComponent,
ThemedRegisterEmailFormComponent,
], ],
}) })
/** /**

View File

@@ -30,8 +30,7 @@ import { StartsWithLoaderComponent } from '../../../../../app/shared/starts-with
fadeInOut, fadeInOut,
], ],
standalone: true, standalone: true,
imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
}) })
export class BrowseByComponent extends BaseComponent { export class BrowseByComponent extends BaseComponent {
} }

View File

@@ -1,6 +1,7 @@
import { import {
AsyncPipe, AsyncPipe,
NgForOf, NgForOf,
NgIf,
} from '@angular/common'; } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
@@ -30,6 +31,7 @@ import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../app
RouterLinkActive, RouterLinkActive,
TranslateModule, TranslateModule,
AsyncPipe, AsyncPipe,
NgIf,
], ],
}) })
export class ComcolPageBrowseByComponent extends BaseComponent {} export class ComcolPageBrowseByComponent extends BaseComponent {}

View File

@@ -1,5 +1,5 @@
import { import {
NgForOf, NgFor,
NgIf, NgIf,
} from '@angular/common'; } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
@@ -15,7 +15,7 @@ import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/
// templateUrl: './lang-switch.component.html', // templateUrl: './lang-switch.component.html',
templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html', templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
standalone: true, standalone: true,
imports: [NgIf, NgbDropdownModule, NgForOf, TranslateModule], imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
}) })
export class LangSwitchComponent extends BaseComponent { export class LangSwitchComponent extends BaseComponent {
} }

View File

@@ -1,3 +1,4 @@
import { NgIf } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component'; import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
@@ -9,6 +10,7 @@ import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loa
templateUrl: '../../../../../app/shared/loading/loading.component.html', templateUrl: '../../../../../app/shared/loading/loading.component.html',
// templateUrl: './loading.component.html' // templateUrl: './loading.component.html'
standalone: true, standalone: true,
imports: [NgIf],
}) })
export class LoadingComponent extends BaseComponent { export class LoadingComponent extends BaseComponent {

View File

@@ -22,10 +22,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'], styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
// templateUrl: './object-list.component.html' // templateUrl: './object-list.component.html'
templateUrl: '../../../../../app/shared/object-list/object-list.component.html', templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
imports: [ imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent,
ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe,
],
standalone: true, standalone: true,
}) })