Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions attack-search/__tests__/search-service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,24 @@ describe('SearchService', () => {
expect(tableResults).toEqual(data);
});

test('Waits for FlexSearch indexing before backing up the search index', async () => {
let resolveAddBulk;
searchService.attackIndex.addBulk = jest.fn(() => new Promise((resolve) => {
resolveAddBulk = resolve;
}));
searchService.backupSearchIndex = jest.fn(() => Promise.resolve());

const initialization = searchService.initializeAsync(data);
await Promise.resolve();

expect(searchService.backupSearchIndex).not.toHaveBeenCalled();

resolveAddBulk();
await initialization;

expect(searchService.backupSearchIndex).toHaveBeenCalled();
});

test('Backup search index completes when FlexSearch exports fewer than nine persisted chunks', async () => {
const exportedChunks = [
['title.1.map', 'title map data'],
Expand Down
2 changes: 1 addition & 1 deletion attack-search/src/search-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
this.maxSearchResults = searchableDocuments.length;

// Add the data to the in-memory FlexSearch instance
this.attackIndex.addBulk(searchableDocuments);
await this.attackIndex.addBulk(searchableDocuments);

Check failure on line 169 in attack-search/src/search-service.js

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unexpected `await` of a non-Promise (non-"Thenable") value.

See more on https://sonarcloud.io/project/issues?id=mitre-attack_attack-website&issues=AZ71ytSeIpOdh8Ykoegg&open=AZ71ytSeIpOdh8Ykoegg&pullRequest=610

console.debug('Backing up search index...');

Expand Down
2 changes: 1 addition & 1 deletion attack-search/src/settings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const baseURL = ''; // TODO migrate from base_url (generated via Pelican)
const packageJson = require('../package.json');

const searchCacheSchemaVersion = 2;
const searchCacheSchemaVersion = 3;
const flexSearchVersion = packageJson.dependencies.flexsearch.replace(/^[^\d]*/, '');
const searchCacheCompatibilityVersion = `flexsearch-${flexSearchVersion}`;

Expand Down
Loading