merge hotfix-9.8.4 into master

spraakbanken · Feb 20, 2025 · 7bf5198 · 7bf5198
2 parents 954f940 + 0203310
commit 7bf5198
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 ## [Unreleased]
 
-## [9.8.3] - 2024-02-17
+## [9.8.4] - 2025-02-20
+
+### Fixed
+
+- Error when opening corpus chooser in mode with no corpus time data [#434](https://github.com/spraakbanken/korp-frontend/issues/434)
+
+## [9.8.3] - 2025-02-17
 
 ### Fixed
 
@@ -367,6 +373,7 @@
 - Lots of bug fixes for the sidebar
 
 [unreleased]: https://github.com/spraakbanken/korp-frontend/compare/master...dev
+[9.8.4]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.4
 [9.8.3]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.3
 [9.8.2]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.2
 [9.8.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.8.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.3</h2>
+    <h2>Korp version 9.8.4</h2>
     <span ng-click="clickX()" class="close-x">×</span>
 
 </div>

diff --git a/app/scripts/components/corpus-chooser/corpus-time-graph.ts b/app/scripts/components/corpus-chooser/corpus-time-graph.ts
@@ -1,5 +1,5 @@
 /** @format */
-import angular from "angular"
+import angular, { IScope } from "angular"
 import range from "lodash/range"
 import { Chart } from "chart.js/auto"
 import { loc } from "@/i18n"
@@ -14,12 +14,22 @@ import {
 import { html } from "@/util"
 import { RootScope } from "@/root-scope.types"
 
+type CorpusTimeGraphScope = IScope & {
+    isEmpty: boolean
+}
+
 angular.module("korpApp").component("corpusTimeGraph", {
-    template: html`<canvas id="time-graph-chart" height="80"></canvas>`,
+    template: html`<canvas ng-show="!isEmpty" id="time-graph-chart" height="80"></canvas>`,
     controller: [
+        "$scope",
         "$rootScope",
-        function ($rootScope: RootScope) {
-            const { min, max } = getSpan()
+        function ($scope: CorpusTimeGraphScope, $rootScope: RootScope) {
+            // Abort and render empty if there is no time data in the current mode's corpora.
+            const span = getSpan()
+            if (!span) return
+            $scope.isEmpty = false
+
+            const { min, max } = span
 
             const datasetsDated = [
                 {

diff --git a/app/scripts/timeseries.ts b/app/scripts/timeseries.ts
@@ -43,8 +43,9 @@ export function getCountUndatedSelected() {
 }
 
 /** Get first and last year in all available corpora. */
-export function getSpan() {
+export function getSpan(): { min: number; max: number } | undefined {
     const timeData = getTimeDataPairs()
+    if (!timeData.length) return undefined
     return { min: timeData[0][0], max: timeData[timeData.length - 1][0] }
 }
 

diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -336,7 +336,7 @@ time-interval {
 
 .corpus-chooser {
   max-height: 80vh;
-  z-index: 9999;
+  z-index: 900;
   border: solid thin #CCCCCC;
   overflow-y: auto;
   overflow-x: hidden;

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