Merge pull request #33445 from dimagi/bmb/b5-bug-report-prelogin

[B5] fix issue on prelogin pages with bug report modal throwing error
dimagi · Sep 7, 2023 · 1097061 · 1097061
2 parents 90ba51b + 484848d
commit 1097061
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq-bug-report.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq-bug-report.js
@@ -9,6 +9,11 @@ hqDefine('hqwebapp/js/bootstrap5/hq-bug-report', [
         let self = {};
 
         self.$bugReportModalElement = $('#modalReportIssue');
+        if (self.$bugReportModalElement.length === 0) {
+            // If the modal element is not present on the page, don't continue
+            return;
+        }
+
         self.bugReportModal = new bootstrap.Modal(self.$bugReportModalElement);
         self.$hqwebappBugReportForm = $('#hqwebapp-bugReportForm');
         self.$hqwebappBugReportSubmit = $('#bug-report-submit');

diff --git a/...q/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/hq-bug-report.js.diff.txt b/...q/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/hq-bug-report.js.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,49 +1,58 @@
+@@ -1,49 +1,63 @@
 -hqDefine('hqwebapp/js/bootstrap3/hq-bug-report', [
 -    "jquery", "jquery-form/dist/jquery.form.min", "hqwebapp/js/bootstrap3/hq.helpers",
 -], function ($) {
@@ -32,6 +32,11 @@
 -            $emailFormGroup.removeClass('has-error has-feedback');
 -            $emailFormGroup.find(".label-danger").addClass('hide');
 +        self.$bugReportModalElement = $('#modalReportIssue');
++        if (self.$bugReportModalElement.length === 0) {
++            // If the modal element is not present on the page, don't continue
++            return;
++        }
++
 +        self.bugReportModal = new bootstrap.Modal(self.$bugReportModalElement);
 +        self.$hqwebappBugReportForm = $('#hqwebapp-bugReportForm');
 +        self.$hqwebappBugReportSubmit = $('#bug-report-submit');
@@ -91,7 +96,7 @@
                      return false;
                  }
              }
-@@ -51,57 +60,61 @@
+@@ -51,57 +65,61 @@
                  return false;
              }