Fix map button disabled, fix #238

spraakbanken · Mar 7, 2024 · f61f7a6 · f61f7a6
1 parent 3a9c371
commit f61f7a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 ### Fixed
 
 - Unnecessarily complex query when combining initial/medial/final part [#235](https://github.com/spraakbanken/korp-frontend/issues/235)
+- Disable "Show map" button if no location data is available [#238](https://github.com/spraakbanken/korp-frontend/issues/238)
 - Drop console error when loading page without `cqp` param
 
 ### Removed

diff --git a/app/scripts/components/statistics.js b/app/scripts/components/statistics.js
@@ -66,7 +66,14 @@ export const statisticsComponent = {
                         auto-close="outsideClick"
                         ng-show="$ctrl.mapEnabled"
                     >
-                        <button class="btn btn-sm btn-default" uib-dropdown-toggle>
+                        <button
+                            class="btn btn-sm btn-default"
+                            uib-dropdown-toggle
+                            ng-disabled="!$ctrl.mapAttributes.length"
+                            uib-tooltip="{{'map_no_data' | loc:$root.lang}}"
+                            tooltip-placement="right"
+                            tooltip-enable="!$ctrl.mapAttributes.length"
+                        >
                             {{'show_map' | loc:$root.lang}}<span class="caret"></span>
                         </button>
                         <div uib-dropdown-menu>
@@ -426,12 +433,12 @@ export const statisticsComponent = {
                     }
                 }
 
-                attrs = _.map(attrs, (val) => val)
-                if (attrs && attrs.length > 0) {
-                    attrs[0].selected = true
-                }
+                $ctrl.mapAttributes = Object.values(attrs)
 
-                $ctrl.mapAttributes = attrs
+                // Select first attribute
+                if ($ctrl.mapAttributes.length) {
+                    $ctrl.mapAttributes[0].selected = true
+                }
             }
 
             $ctrl.mapToggleSelected = function (index, event) {

diff --git a/app/translations/locale-eng.json b/app/translations/locale-eng.json
@@ -100,6 +100,7 @@
     "search_aborted": "The search was aborted",
 
     "show_map": "Show map",
+    "map_no_data": "Selected corpora have no geographical data.",
     "map_relative": "Relative",
     "map_relative_help": "Make map marker sizes relative to location prevalence in the corpus selection.",
     "map_name": "Place",

diff --git a/app/translations/locale-swe.json b/app/translations/locale-swe.json
@@ -89,6 +89,7 @@
     "word_pic_hits": "träffar",
 
     "show_map": "Visa karta",
+    "map_no_data": "Valt material saknar geografisk data.",
     "map_relative": "Relativ",
     "map_relative_help": "Gör varje platsmarkörs storlek relativ till platsens förekomst i korpusurvalet.",
     "map_name": "Plats",