Merge branch 'main' into DURACOM-152

Author: atarix83

.gitignore

@@ -39,3 +39,5 @@ package-lock.json
 /nbproject/
 
 junit.xml
+
+/src/mirador-viewer/config.local.js

src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html

@@ -6,5 +6,9 @@
                             (deselect)="onDeselect($event)">
     </ds-vocabulary-treeview>
   </div>
-  <a class="btn btn-primary" [routerLink]="['/search']" [queryParams]="queryParams">{{ 'browse.taxonomy.button' | translate }}</a>
+  <a class="btn btn-primary"
+     [routerLink]="['/search']"
+     [queryParams]="queryParams"
+     [queryParamsHandling]="'merge'">
+    {{ 'browse.taxonomy.button' | translate }}</a>
 </div>

src/assets/i18n/en.json5

@@ -775,6 +775,8 @@
 
   "browse.comcol.by.subject": "By Subject",
 
+  "browse.comcol.by.srsc": "By Subject Category",
+
   "browse.comcol.by.title": "By Title",
 
   "browse.comcol.head": "Browse",

src/mirador-viewer/index.js src/mirador-viewer/config.default.jssrc/mirador-viewer/index.js renamed to src/mirador-viewer/config.default.js

@@ -1,4 +1,17 @@
 import Mirador from 'mirador/dist/es/src/index';
+
+// You can modify this default Mirador configuration file. However,
+// you should consider creating a copy of this file named
+// 'config.local.js'. If that file exists it will be used to build
+// your local Mirador instance. This allows you to keep local
+// Mirador configuration separate from this default distribution
+// copy.
+
+// For an example of all Mirador configuration options, see
+// https://github.com/ProjectMirador/mirador/blob/master/src/config/settings.js
+
+// You can add or remove plugins. When adding new plugins be sure to also
+// import them into the project via your package.json dependencies.
 import miradorShareDialogPlugin from 'mirador-share-plugin/es/MiradorShareDialog';
 import miradorSharePlugin from 'mirador-share-plugin/es/miradorSharePlugin';
 import miradorDownloadPlugin from 'mirador-dl-plugin/es/miradorDownloadPlugin';

webpack/webpack.mirador.config.ts

@@ -1,10 +1,13 @@
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
+// @ts-ignore
+const fs = require('fs');
 
 module.exports = {
   mode: 'production',
   entry: {
-    mirador: './src/mirador-viewer/index.js'
+    mirador: fs.existsSync('./src/mirador-viewer/config.local.js')? './src/mirador-viewer/config.local.js' :
+      './src/mirador-viewer/config.default.js'
   },
   output: {
     path: path.resolve(__dirname, '..' , 'dist/iiif/mirador'),