From c73d1df30e92742ddef99287d2c33e0213e54971 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Wed, 29 Nov 2023 11:51:55 -0500 Subject: [PATCH 1/4] pass in the proxyUrl if we have specified we want it. --- app/assets/javascripts/services/docCacheSvc.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/services/docCacheSvc.js b/app/assets/javascripts/services/docCacheSvc.js index 7d77bc7e6..14ecac5b4 100644 --- a/app/assets/javascripts/services/docCacheSvc.js +++ b/app/assets/javascripts/services/docCacheSvc.js @@ -5,10 +5,12 @@ angular.module('QuepidApp') '$q', '$log', 'docResolverSvc', + 'caseTryNavSvc', function docCacheSvc( $q, $log, - docResolverSvc + docResolverSvc, + caseTryNavSvc ) { var docCache = {}; @@ -52,6 +54,11 @@ angular.module('QuepidApp') } }); + if (settings.proxyRequests === true){ + // Pass in the Quepid specific proxy url + settings.proxyUrl = caseTryNavSvc.getQuepidProxyUrl(); + } + var docIds = Object.keys(docsToFetch); var resolver = docResolverSvc.createResolver(docIds, settings, 15); From 38afaf2745677f7cc1174c078718523c05cb42a1 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Thu, 30 Nov 2023 08:22:59 -0500 Subject: [PATCH 2/4] respect our proxy settings --- app/assets/javascripts/controllers/detailedDoc.js | 15 ++++++++++++++- app/assets/templates/views/detailedDoc.html | 2 +- app/assets/templates/views/snapshotModal.html | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/controllers/detailedDoc.js b/app/assets/javascripts/controllers/detailedDoc.js index b865d85c4..2dfc05420 100644 --- a/app/assets/javascripts/controllers/detailedDoc.js +++ b/app/assets/javascripts/controllers/detailedDoc.js @@ -3,11 +3,24 @@ angular.module('QuepidApp') .controller('DetailedDocCtrl', [ '$scope', '$uibModalInstance', + 'settingsSvc','caseTryNavSvc', 'doc', - function DetailedDocCtrl($scope, $uibModalInstance, doc) { + function DetailedDocCtrl( + $scope, $uibModalInstance, + settingsSvc, caseTryNavSvc, + doc) { $scope.doc = doc; + $scope.linkToDoc = function() { + let url = $scope.doc._url(); + if (settingsSvc.applicableSettings().proxyRequests === true) { + url = caseTryNavSvc.getQuepidProxyUrl() + url; + } + + return url; + } + $scope.showAllFields = false; $scope.allFields = function() { diff --git a/app/assets/templates/views/detailedDoc.html b/app/assets/templates/views/detailedDoc.html index 405c16010..51854ecde 100644 --- a/app/assets/templates/views/detailedDoc.html +++ b/app/assets/templates/views/detailedDoc.html @@ -55,7 +55,7 @@

{{doc.title}}

- + View Document diff --git a/app/assets/templates/views/snapshotModal.html b/app/assets/templates/views/snapshotModal.html index 018e9a1d4..f02c4c30b 100644 --- a/app/assets/templates/views/snapshotModal.html +++ b/app/assets/templates/views/snapshotModal.html @@ -13,7 +13,7 @@

Take a Snapshot of all your queries?

- To facilitate the human rating interface, you need to record as part of the snapshot all the displayed fields for each document returned. + To facilitate additional analysis, you may need to record as part of the snapshot all the displayed fields for each document returned. This will be the {{ fieldSpec }} fields.

diff --git a/package.json b/package.json index bbb56ffb4..e4040db8c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "ngclipboard": "^2.0.0", "party-js": "^2.2.0", "popper.js": "^1.16.1", - "splainer-search": "2.30.4", + "splainer-search": "2.30.5", "tether-shepherd": "latest", "turbolinks": "^5.2.0", "vega": "5.26.1" diff --git a/yarn.lock b/yarn.lock index 3fbb22388..141dd0400 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1925,10 +1925,10 @@ spark-md5@^3.0.1: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== -splainer-search@2.30.4: - version "2.30.4" - resolved "https://registry.yarnpkg.com/splainer-search/-/splainer-search-2.30.4.tgz#8976665769394a028ed910e011a67d58cd08fa7a" - integrity sha512-X9f0ABBEHEVhZSTDAieCsvFtGksMgOomi2+OAUTj6JUkX7gQhN/v3NxeV4kFLmbeULvDA3jMZfHGtuJrhuJd2A== +splainer-search@2.30.5: + version "2.30.5" + resolved "https://registry.yarnpkg.com/splainer-search/-/splainer-search-2.30.5.tgz#c99c57a8f02d3a73e432c2062eb2b101eed80be7" + integrity sha512-7Y2ZHbkwvVTJS3DrH3TCY2D4NRldchtNCov4M3Ioz/yIzcTAy6/G/QZyh5Yil+5GemrXZAFzk6TaTu78Smg0Mw== dependencies: angular "1.8.3" urijs "^1.19.7" From add1bfa64f926565d2d211da14b35a114a02eeb5 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Thu, 30 Nov 2023 08:30:34 -0500 Subject: [PATCH 3/4] make the test work. --- spec/javascripts/angular/services/docCacheSvc_spec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/javascripts/angular/services/docCacheSvc_spec.js b/spec/javascripts/angular/services/docCacheSvc_spec.js index 4490e5158..42884f5f1 100644 --- a/spec/javascripts/angular/services/docCacheSvc_spec.js +++ b/spec/javascripts/angular/services/docCacheSvc_spec.js @@ -10,7 +10,9 @@ describe('Service: docCacheSvc', function () { var $q; var docCacheSvc; var docResolverSvc; - var ignoredSettings = null; + var ignoredSettings = { + proxyRequests: false + }; beforeEach(function() { inject(function(_$rootScope_, _$q_, _docCacheSvc_, _docResolverSvc_) { From 85d2c0fce3cf83f2e6acef2cadc0f061f4eb498d Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Thu, 30 Nov 2023 08:35:17 -0500 Subject: [PATCH 4/4] lint --- app/assets/javascripts/controllers/detailedDoc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/detailedDoc.js b/app/assets/javascripts/controllers/detailedDoc.js index 2dfc05420..8d2d07d24 100644 --- a/app/assets/javascripts/controllers/detailedDoc.js +++ b/app/assets/javascripts/controllers/detailedDoc.js @@ -19,7 +19,7 @@ angular.module('QuepidApp') } return url; - } + }; $scope.showAllFields = false;