From 77b272c775c813af18f9a90f743a0704f1181d97 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Fri, 6 Aug 2021 11:55:23 -0400 Subject: [PATCH] Investigating snapshot diff updates (#393) * small cleanup after looking at queriesCtrl * small cleans * one more remnant! Co-authored-by: epugh@opensourceconnections.com <> --- .../query_explain/query_explain_controller.js | 12 +++--------- .../javascripts/controllers/queriesCtrl.js | 19 +++++++++++-------- app/assets/javascripts/directives/queries.js | 2 +- app/assets/templates/views/queriesLayout.html | 2 +- app/assets/templates/views/searchResults.html | 1 - 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/components/query_explain/query_explain_controller.js b/app/assets/javascripts/components/query_explain/query_explain_controller.js index f3aeb362a..c3d40ee09 100644 --- a/app/assets/javascripts/components/query_explain/query_explain_controller.js +++ b/app/assets/javascripts/components/query_explain/query_explain_controller.js @@ -6,11 +6,9 @@ angular.module('QuepidApp') .controller('QueryExplainCtrl', [ '$uibModal', '$scope', - '$log', function ( $uibModal, - $scope, - $log + $scope ) { var ctrl = this; ctrl.query = $scope.query; @@ -29,12 +27,8 @@ angular.module('QuepidApp') }); modalInstance.result.then( - function() { - - }, - function() { - $log.info('INFO: Modal dismissed'); - } + function() { }, + function() { } ); } } diff --git a/app/assets/javascripts/controllers/queriesCtrl.js b/app/assets/javascripts/controllers/queriesCtrl.js index 8f456edb8..761e29cd4 100644 --- a/app/assets/javascripts/controllers/queriesCtrl.js +++ b/app/assets/javascripts/controllers/queriesCtrl.js @@ -2,7 +2,7 @@ /*jslint latedef:false*/ angular.module('QuepidApp') - .controller('queriesCtrl', [ + .controller('QueriesCtrl', [ '$scope', '$rootScope', '$q', @@ -206,27 +206,30 @@ angular.module('QuepidApp') }; $scope.queries.selectedDiffName = function() { + var diffName = ''; if (queryViewSvc.diffSetting === null) { - return 'disabled'; + diffName = 'disabled'; } else if (queryViewSvc.diffSetting === 'best') { - return 'target'; + diffName = 'target'; } else { - return 'snapshot'; + diffName = 'snapshot'; } - return 'meow'; + return diffName; }; $scope.queries.fullDiffName = function() { + var fullDiffName = ''; if (queryViewSvc.diffSetting === null) { - return 'disabled'; + fullDiffName = 'disabled'; } else if (queryViewSvc.diffSetting === 'best') { - return 'Highest ratest results for each query'; + fullDiffName = 'Highest ratest results for each query'; } else { var snapshot = querySnapshotSvc.snapshots[queryViewSvc.diffSetting]; - return snapshot.name(); + fullDiffName = snapshot.name(); } + return fullDiffName; }; function saveScoring() { diff --git a/app/assets/javascripts/directives/queries.js b/app/assets/javascripts/directives/queries.js index c3f821700..1925c9dfc 100644 --- a/app/assets/javascripts/directives/queries.js +++ b/app/assets/javascripts/directives/queries.js @@ -6,7 +6,7 @@ angular.module('QuepidApp') return { restrict: 'E', transclude: true, - controller: 'queriesCtrl', + controller: 'QueriesCtrl', templateUrl: 'views/queries.html', replace: true }; diff --git a/app/assets/templates/views/queriesLayout.html b/app/assets/templates/views/queriesLayout.html index bff2fc3ca..ef92cc43f 100644 --- a/app/assets/templates/views/queriesLayout.html +++ b/app/assets/templates/views/queriesLayout.html @@ -3,7 +3,7 @@
-
+