fix: handle missing dojo config correctly

agrc · Apr 5, 2023 · 11a81c2 · 11a81c2
1 parent 1ea0467
commit 11a81c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/_src/app/config.js b/_src/app/config.js
@@ -24,7 +24,7 @@ define([
     let dataEntryApp = 'https://electrofishing.ugrc.utah.gov';
     let baseUrl;
 
-    const projectId = window?.dojoConfig.isJasmineTestRunner ? 'test' :
+    const projectId = window.dojoConfig?.isJasmineTestRunner ? 'test' :
         JSON.parse(process.env.FIREBASE_CONFIG).projectId;
     if (has('agrc-build') === 'prod') {
         // *.ugrc.utah.gov

diff --git a/_src/app/run.js b/_src/app/run.js
@@ -6,16 +6,15 @@
     var config = {
         baseUrl: (
             typeof window !== 'undefined' &&
-            window.dojoConfig &&
-            window.dojoConfig.isJasmineTestRunner
+            window.dojoConfig?.isJasmineTestRunner
         ) ? '/src' : './'
     };
     require(config, ['dojo/has', 'dojo/parser', 'jquery', 'dojo/domReady!'], function (has, parser) {
         has.add('web-workers', function () {
             return window.Worker;
         });
 
-        if (!window?.dojoConfig.isJasmineTestRunner) {
+        if (!window.dojoConfig?.isJasmineTestRunner) {
             window.firebase.initializeApp(JSON.parse(process.env.FIREBASE_CONFIG));
             console.log('firebase app initialized');
         }