Now distingushing between a "reload TLS" issue and a "You don't have …

…access to case" issue.
o19s · Aug 24, 2023 · 4f97873 · 4f97873
1 parent 1b57ce7
commit 4f97873
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/app/assets/javascripts/controllers/mainCtrl.js b/app/assets/javascripts/controllers/mainCtrl.js
@@ -56,6 +56,9 @@ angular.module('QuepidApp')
       var bootstrapCase = function() {
         return caseSvc.get(caseNo)
           .then(function(acase) {
+            if (angular.isUndefined(acase)){
+              throw new Error('Could not retrieve case ' + caseNo + '.   Confirm that the case has been shared with you via a team you are a member of!');
+            }
 
             caseSvc.selectTheCase(acase);
             settingsSvc.setCaseTries(acase.tries);
@@ -142,15 +145,25 @@ angular.module('QuepidApp')
             loadSnapshots();
             updateCaseMetadata();
             paneSvc.refreshElements();
-          }).catch(function() {
-            var resultsTuple = caseTryNavSvc.swapQuepidUrlTLS();
+          }).catch(function(error) {            
+            // brittle logic, but check if we throw the TLS error or if it's from something else.'
+            var message = error.message;
+            if (message === 'Need to change to different TLS'){
+              var resultsTuple = caseTryNavSvc.swapQuepidUrlTLS();
 
-            var quepidUrlToSwitchTo = resultsTuple[0];
-            var protocolToSwitchTo = resultsTuple[1];
+              var quepidUrlToSwitchTo = resultsTuple[0];
+              var protocolToSwitchTo = resultsTuple[1];
 
-            flash.to('search-error').error = '<a href="' + quepidUrlToSwitchTo + '" class="btn btn-primary form-control">Click Here to <span class="glyphicon glyphicon-refresh"></span> Reload Quepid in <code>' + protocolToSwitchTo + '</code> Protocol!';
-            loadSnapshots();
-            updateCaseMetadata();
+              flash.to('search-error').error = '<a href="' + quepidUrlToSwitchTo + '" class="btn btn-primary form-control">Click Here to <span class="glyphicon glyphicon-refresh"></span> Reload Quepid in <code>' + protocolToSwitchTo + '</code> Protocol!';
+            }
+            else if (message.startsWith('Could not retrieve case')){
+              flash.to('search-error').error = message;
+            }
+            else {
+              flash.to('search-error').error = 'Could not load the case ' + caseNo + ' due to: ' + message;
+            }
+            //loadSnapshots();
+            //updateCaseMetadata();
             paneSvc.refreshElements();
           });
 

diff --git a/app/assets/javascripts/controllers/queriesCtrl.js b/app/assets/javascripts/controllers/queriesCtrl.js
@@ -241,18 +241,23 @@ angular.module('QuepidApp')
         if ( isNaN(tryNo) ) {  // If we didn't specify a try, then we need to get the latest
           caseSvc.get(caseNo)
             .then(function(acase) {
-
-              tryNo = acase.lastTry;
-              console.log('We do not have a tryNo, so we grabbed the lastTry from the case, and using it as the id:' + tryNo);
-              lastScoreTracker = {
-                'score':      $scope.queries.avgQuery.currentScore.score,
-                'all_rated':  $scope.queries.avgQuery.currentScore.allRated,
-                'try_number': tryNo,
-                'queries':    $scope.queries.avgQuery.currentScore.queries,
-              };
-
-              $log.info('sending score information to mothership');
-              caseSvc.trackLastScore(caseNo, lastScoreTracker);
+              if (angular.isUndefined(acase)){
+                $log.info('Did not find a case for ' + caseNo + ' and therefore not scoring');
+              }
+              else {
+                tryNo = acase.lastTry;
+
+                $log.info('We do not have a tryNo, so we grabbed the lastTry from the case, and using it as the id:' + tryNo);
+                lastScoreTracker = {
+                  'score':      $scope.queries.avgQuery.currentScore.score,
+                  'all_rated':  $scope.queries.avgQuery.currentScore.allRated,
+                  'try_number': tryNo,
+                  'queries':    $scope.queries.avgQuery.currentScore.queries,
+                };
+
+                $log.info('sending score information to mothership');
+                caseSvc.trackLastScore(caseNo, lastScoreTracker);
+              }
             });
         }
         else {

diff --git a/app/assets/javascripts/services/caseSvc.js b/app/assets/javascripts/services/caseSvc.js
@@ -3,12 +3,12 @@
 angular.module('QuepidApp')
   .service('caseSvc', [
     '$http', '$filter', '$q', '$rootScope',
-    'flash',
+    '$log',
     'caseTryNavSvc', 'queriesSvc', 'settingsSvc',
     'broadcastSvc',
     function caseSvc(
       $http, $filter, $q, $rootScope,
-      flash,
+      $log,
       caseTryNavSvc, queriesSvc, settingsSvc,
       broadcastSvc
     ) {
@@ -478,9 +478,8 @@ angular.module('QuepidApp')
 
               svc.allCases[index] = acase;
               return acase;
-            }, function(response) {
-              flash.to('search-error').error = 'Either the case does not exist or you do not have permissions to access it!';
-              return response;
+            }, function() {
+              $log.info('Did not find the case ' + id);              
           });
         }
       }

diff --git a/lib/jshint/lint.rb b/lib/jshint/lint.rb
@@ -73,6 +73,10 @@ def javascript_files
       # I am skipping them via this terrible way because I can't get JSHint exclude_paths to work.
       # They should be fixed to pass jshint!
       files_to_skip = [ 'user_pulse.js', 'tour.js' ]
+
+      # This file is a copied from node_modules/ace-builds to make Ace happy, so ignore
+      files_to_skip << 'mode-json.js'
+
       js_asset_files = []
       file_paths.each do |path|
         Dir.glob(path) do |file|