merge: hotfixes-9.8.0 into master

spraakbanken · Jan 23, 2025 · e8e9ea8 · e8e9ea8
2 parents 2cbcc4e + 3a0a69b
commit e8e9ea8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [9.8.1] - 2025-01-23
+
+### Fixed
+
+- Assignment typo in if condition causes error when aborting statistics request [#425](https://github.com/spraakbanken/korp-frontend/issues/425)
+- Simple search options were not properly synced from URL params
+
 ## [9.8.0] - 2025-01-20
 
 ### Added
@@ -336,6 +343,7 @@
 - Lots of bug fixes for the sidebar
 
 [unreleased]: https://github.com/spraakbanken/korp-frontend/compare/master...dev
+[9.8.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.1
 [9.8.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.0
 [9.7.2]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.7.2
 [9.7.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.7.1

diff --git a/app/markup/about.html b/app/markup/about.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <h2>Korp version 9.8.0</h2>
+    <h2>Korp version 9.8.1</h2>
     <span ng-click="clickX()" class="close-x">×</span>
 
 </div>

diff --git a/app/scripts/components/simple-search.ts b/app/scripts/components/simple-search.ts
@@ -306,17 +306,15 @@ angular.module("korpApp").component("simpleSearch", {
                 }
             })
 
-            // Reach to changes in URL params
-            $scope.$watch(
-                () => $location.search(),
-                (search) => {
-                    ctrl.freeOrder = search.in_order != null
-                    ctrl.prefix = search.prefix != null
-                    ctrl.mid_comp = search.mid_comp != null
-                    ctrl.suffix = search.suffix != null
-                    ctrl.isCaseInsensitive = search.isCaseInsensitive != null
-                }
-            )
+            // React to changes in URL params
+            $scope.$on("$locationChangeSuccess", () => {
+                const search = $location.search()
+                ctrl.freeOrder = search.in_order != null
+                ctrl.prefix = search.prefix != null
+                ctrl.mid_comp = search.mid_comp != null
+                ctrl.suffix = search.suffix != null
+                ctrl.isCaseInsensitive = search.isCaseInsensitive != null
+            })
 
             ctrl.onChange = (value, isPlain) => {
                 ctrl.currentText = isPlain ? value : undefined

diff --git a/app/scripts/controllers/statistics_controller.ts b/app/scripts/controllers/statistics_controller.ts
@@ -124,7 +124,7 @@ angular.module("korpApp").directive("statsResultCtrl", () => ({
                     )
                     .catch((error) => {
                         // AbortError is expected if a new search is made before the previous one is finished
-                        if ((error.name = "AbortError")) return
+                        if (error.name == "AbortError") return
                         console.error(error)
                         // TODO Show error
                         $timeout(() => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "korp-frontend",
-    "version": "9.8.0",
+    "version": "9.8.1",
     "dependencies": {
         "@fontsource/source-sans-pro": "^5.1.0",
         "@fortawesome/fontawesome-free": "6.2.1",