Merge remote-tracking branch 'origin/main' into CST-4633-search-refactoring

This commit is contained in:
Giuseppe Digilio
2021-12-15 15:09:06 +01:00
14 changed files with 30 additions and 14 deletions

View File

@@ -64,7 +64,7 @@ services:
dspacesolr: dspacesolr:
container_name: dspacesolr container_name: dspacesolr
# Uses official Solr image at https://hub.docker.com/_/solr/ # Uses official Solr image at https://hub.docker.com/_/solr/
image: solr:8.8 image: solr:8.11-slim
# Needs main 'dspace' container to start first to guarantee access to solr_configs # Needs main 'dspace' container to start first to guarantee access to solr_configs
depends_on: depends_on:
- dspace - dspace

View File

@@ -62,7 +62,7 @@ services:
dspacesolr: dspacesolr:
container_name: dspacesolr container_name: dspacesolr
# Uses official Solr image at https://hub.docker.com/_/solr/ # Uses official Solr image at https://hub.docker.com/_/solr/
image: solr:8.8 image: solr:8.11-slim
# Needs main 'dspace' container to start first to guarantee access to solr_configs # Needs main 'dspace' container to start first to guarantee access to solr_configs
depends_on: depends_on:
- dspace - dspace

View File

@@ -36,7 +36,7 @@ const ENTRY_COMPONENTS = [
export class AdminSearchModule { export class AdminSearchModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -28,7 +28,7 @@ const ENTRY_COMPONENTS = [
export class AdminWorkflowModuleModule { export class AdminWorkflowModuleModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -34,7 +34,7 @@ const ENTRY_COMPONENTS = [
export class AdminModule { export class AdminModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -203,7 +203,6 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
]} ]}
],{ ],{
onSameUrlNavigation: 'reload', onSameUrlNavigation: 'reload',
relativeLinkResolution: 'legacy'
}) })
], ],
exports: [RouterModule], exports: [RouterModule],

View File

@@ -31,7 +31,7 @@ const ENTRY_COMPONENTS = [
export class BrowseByModule { export class BrowseByModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -54,7 +54,7 @@ const ENTRY_COMPONENTS = [
export class JournalEntitiesModule { export class JournalEntitiesModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -74,7 +74,7 @@ const COMPONENTS = [
export class ResearchEntitiesModule { export class ResearchEntitiesModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -33,7 +33,7 @@ import { NgxGalleryModule } from '@kolkov/ngx-gallery';
import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component'; import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
import { VersionPageComponent } from './version-page/version-page/version-page.component'; import { VersionPageComponent } from './version-page/version-page/version-page.component';
import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component'; import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
import { ThemedFileSectionComponent} from './simple/field-components/file-section/themed-file-section.component'; import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
@@ -91,7 +91,7 @@ const DECLARATIONS = [
export class ItemPageModule { export class ItemPageModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -50,7 +50,7 @@ const ENTRY_COMPONENTS = [
export class MyDspaceSearchModule { export class MyDspaceSearchModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -58,7 +58,7 @@ const ENTRY_COMPONENTS = [
export class NavbarModule { export class NavbarModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -623,7 +623,7 @@ const DIRECTIVES = [
export class SharedModule { export class SharedModule {
/** /**
* NOTE: this method allows to resolve issue with components that using a custom decorator * NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during CSR otherwise * which are not loaded during SSR otherwise
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {

View File

@@ -65,6 +65,13 @@ const DECLARATIONS = [
SubmissionImportExternalCollectionComponent SubmissionImportExternalCollectionComponent
]; ];
const ENTRY_COMPONENTS = [
SubmissionSectionUploadComponent,
SubmissionSectionformComponent,
SubmissionSectionLicenseComponent,
SubmissionSectionCcLicensesComponent
];
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
@@ -88,4 +95,14 @@ const DECLARATIONS = [
* This module handles all components that are necessary for the submission process * This module handles all components that are necessary for the submission process
*/ */
export class SubmissionModule { export class SubmissionModule {
/**
* 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: SubmissionModule,
providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
};
}
} }