From 77c19d9fb1b31b2a1f34c377116e7cdd30f90c47 Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 8 May 2023 11:54:40 -0700
Subject: [PATCH 1/3] Updated mirador webpack configuration.

---
 .gitignore                                         |  2 ++
 src/mirador-viewer/{index.js => config.default.js} | 13 +++++++++++++
 webpack/webpack.mirador.config.ts                  |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 rename src/mirador-viewer/{index.js => config.default.js} (88%)

diff --git a/.gitignore b/.gitignore
index bdd0d4e589..7d065aca06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@ package-lock.json
 /nbproject/
 
 junit.xml
+
+/src/mirador-viewer/config.local.js
diff --git a/src/mirador-viewer/index.js b/src/mirador-viewer/config.default.js
similarity index 88%
rename from src/mirador-viewer/index.js
rename to src/mirador-viewer/config.default.js
index 6cc4303f1f..0f625093a5 100644
--- a/src/mirador-viewer/index.js
+++ b/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
+// 'index.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';
diff --git a/webpack/webpack.mirador.config.ts b/webpack/webpack.mirador.config.ts
index c0083ded6e..7699cf1bdc 100644
--- a/webpack/webpack.mirador.config.ts
+++ b/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'),

From 508fa76e45d29dd04112324cd6b877d975a312ee Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Mon, 8 May 2023 12:20:55 -0700
Subject: [PATCH 2/3] Updated comment.

---
 src/mirador-viewer/config.default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mirador-viewer/config.default.js b/src/mirador-viewer/config.default.js
index 0f625093a5..71df8adcc3 100644
--- a/src/mirador-viewer/config.default.js
+++ b/src/mirador-viewer/config.default.js
@@ -2,7 +2,7 @@ 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
-// 'index.local.js'. If that file exists it will be used to build
+// '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.

From 77a8fde646d22e060d7a44b48e1fa2c0c1875fb9 Mon Sep 17 00:00:00 2001
From: Nona Luypaert <nona.luypaert@atmire.com>
Date: Wed, 7 Jun 2023 09:36:01 +0200
Subject: [PATCH 3/3] 101623: Fix Browse By Vocabulary on comcol page

---
 .../browse-by-taxonomy-page.component.html                  | 6 +++++-
 src/assets/i18n/en.json5                                    | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html b/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
index 87c7937b1b..0ae3da6847 100644
--- a/src/app/browse-by/browse-by-taxonomy-page/browse-by-taxonomy-page.component.html
+++ b/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>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0958fc5d29..33752cbb8a 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -701,6 +701,8 @@
 
   "browse.comcol.by.subject": "By Subject",
 
+  "browse.comcol.by.srsc": "By Subject Category",
+
   "browse.comcol.by.title": "By Title",
 
   "browse.comcol.head": "Browse",