Skip to content

Commit

Permalink
rolling back on some changes.....
Browse files Browse the repository at this point in the history
  • Loading branch information
epugh committed Nov 30, 2023
1 parent 96a797c commit dc1c37c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 29 deletions.
5 changes: 2 additions & 3 deletions app/assets/javascripts/services/docCacheSvc.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ angular.module('QuepidApp')
}

var docIds = Object.keys(docsToFetch);
var resolver = docResolverSvc.createResolver(docIds, settings, 15);

// 'vectara' does not support doc lookup by ID.
let supportLookupById = true;
Expand All @@ -71,9 +72,7 @@ angular.module('QuepidApp')
}


if ( supportLookupById && docIds.length > 0 ) {
var resolver = docResolverSvc.createResolver(docIds, settings, 15);

if ( supportLookupById && docIds.length > 0 ) {
return resolver.fetchDocs()
.then(function () {
angular.forEach(resolver.docs, function (doc) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"ngclipboard": "^2.0.0",
"party-js": "^2.2.0",
"popper.js": "^1.16.1",
"splainer-search": "2.30.5",
"splainer-search": "2.30.6",
"tether-shepherd": "latest",
"turbolinks": "^5.2.0",
"vega": "5.26.1"
Expand Down
23 changes: 2 additions & 21 deletions spec/javascripts/angular/services/docCacheSvc_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ describe('Service: docCacheSvc', function () {
var docCacheSvc;
var docResolverSvc;
var ignoredSettings = {
proxyRequests: false
proxyRequests: false,
searchEngine: 'solr'
};

beforeEach(function() {
Expand Down Expand Up @@ -105,26 +106,6 @@ describe('Service: docCacheSvc', function () {
var mockResolver = docResolverSvc.mockResolver;
expect(mockResolver.docs.length).toBe(0);
});

it('resolves even if docId resolver does no work', function() {
checkSetupFromScratch();

docCacheSvc.addIds(['1', '2', '3']);

var called = 0;
docCacheSvc.update(ignoredSettings)
.then(function() {
expect(docCacheSvc.getDoc('1').id).toBe('1');
expect(docCacheSvc.getDoc('2').id).toBe('2');
expect(docCacheSvc.getDoc('3').id).toBe('3');
called++;
});

$rootScope.$apply();
expect(called).toBe(1);
var mockResolver = docResolverSvc.mockResolver;
expect(mockResolver.docs.length).toBe(0);
});
});

describe('invalidation and emptying', function() {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dc1c37c

Please sign in to comment.