From 494c70eb6a210ca19ac12f4b624a7c02edaa41ac Mon Sep 17 00:00:00 2001
From: Collin Beczak <88843144+CollinBeczak@users.noreply.github.com>
Date: Wed, 13 Sep 2023 12:51:24 -0500
Subject: [PATCH] Add error handling for the taskMap widget and fix
 pauseKeywords issue (#2106)

---
 src/components/Widgets/TaskMapWidget/Messages.js  |  5 +++++
 .../Widgets/TaskMapWidget/TaskMapWidget.js        | 15 +++++++++++++++
 .../KeyboardShortcuts/KeyboardShortcuts.js        |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/Widgets/TaskMapWidget/Messages.js b/src/components/Widgets/TaskMapWidget/Messages.js
index f35660431..0d184d8f3 100644
--- a/src/components/Widgets/TaskMapWidget/Messages.js
+++ b/src/components/Widgets/TaskMapWidget/Messages.js
@@ -18,4 +18,9 @@ export default defineMessages({
     id: "Widgets.TaskMapWidget.editMode",
     defaultMessage: "Current Mode:",
   },
+
+  rapidFailed: {
+    id: "Widgets.TaskMapWidget.rapidFailed",
+    defaultMessage: "Widget Failed! Geometries Null!",
+  },
 })
diff --git a/src/components/Widgets/TaskMapWidget/TaskMapWidget.js b/src/components/Widgets/TaskMapWidget/TaskMapWidget.js
index c97b14276..5e2d6df03 100644
--- a/src/components/Widgets/TaskMapWidget/TaskMapWidget.js
+++ b/src/components/Widgets/TaskMapWidget/TaskMapWidget.js
@@ -73,6 +73,21 @@ export default class TaskMapWidget extends Component {
   render() {
     const editMode = this.props.getUserAppSetting ? this.props.getUserAppSetting(this.props.user, 'isEditMode') : false;
 
+    if(!this.props.task.geometries.features){
+      return  (
+        <QuickWidget
+          {...this.props}
+          className="task-map-widget"
+          noMain
+          permanent
+        >
+          <div className="mr-text-lg mr-text-red-light mr-flex">
+            <FormattedMessage {...messages.rapidFailed} />
+          </div>
+        </QuickWidget>
+      )
+    }
+    
     return (
       <QuickWidget
         {...this.props}
diff --git a/src/services/KeyboardShortcuts/KeyboardShortcuts.js b/src/services/KeyboardShortcuts/KeyboardShortcuts.js
index cff40cb9a..bbb4f0bf6 100644
--- a/src/services/KeyboardShortcuts/KeyboardShortcuts.js
+++ b/src/services/KeyboardShortcuts/KeyboardShortcuts.js
@@ -103,7 +103,7 @@ export const currentKeyboardShortcuts = function(state={}, action) {
   }
   else if (action.type === PAUSE_KEYBOARD_SHORTCUTS) {
     // If we're already paused, ignore
-    if (!_isEmpty(state.paused)) {
+    if (state.paused) {
       return state
     }