diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml index c99e469941..370ccbbdf1 100644 --- a/docker/docker-compose-rest.yml +++ b/docker/docker-compose-rest.yml @@ -81,15 +81,22 @@ services: # Keep Solr data directory between reboots - solr_data:/var/solr/data # Initialize all DSpace Solr cores using the mounted local configsets (see above), then start Solr + # * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op + # * Second, copy updated configs from mounted configsets to this core. If it already existed, this updates core + # to the latest configs. If it's a newly created core, this is a no-op. entrypoint: - /bin/bash - '-c' - | init-var-solr precreate-core authority /opt/solr/server/solr/configsets/dspace/authority + cp -r -u /opt/solr/server/solr/configsets/dspace/authority/* authority precreate-core oai /opt/solr/server/solr/configsets/dspace/oai + cp -r -u /opt/solr/server/solr/configsets/dspace/oai/* oai precreate-core search /opt/solr/server/solr/configsets/dspace/search + cp -r -u /opt/solr/server/solr/configsets/dspace/search/* search precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics + cp -r -u /opt/solr/server/solr/configsets/dspace/statistics/* statistics exec solr -f volumes: assetstore: diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 2c6631dd1a..7d7912bb42 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -15,6 +15,7 @@ import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; +import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; @NgModule({ imports: [ @@ -47,7 +48,7 @@ import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request- canActivate: [AuthenticatedGuard] }, { - path: ':request-a-copy', + path: REQUEST_COPY_MODULE_PATH, component: BitstreamRequestACopyPageComponent, } ], diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6eca2c1f5d..ebdb2ef4bc 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2435,7 +2435,7 @@ "menu.section.icon.control_panel": "Control Panel menu section", - "menu.section.icon.curation_task": "Curation Task menu section", + "menu.section.icon.curation_tasks": "Curation Task menu section", "menu.section.icon.edit": "Edit menu section", @@ -2455,6 +2455,8 @@ "menu.section.icon.statistics_task": "Statistics Task menu section", + "menu.section.icon.workflow": "Administer workflow menu section", + "menu.section.icon.unpin": "Unpin sidebar",