@internetarchive/collection-browser 2.7.14-alpha-webdev7397.3 → 2.7.14-alpha-webdev7397.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/collection-browser.d.ts +1 -1
- package/dist/src/collection-browser.js +4 -11
- package/dist/src/collection-browser.js.map +1 -1
- package/dist/src/data-source/collection-browser-data-source-interface.d.ts +2 -2
- package/dist/src/data-source/collection-browser-data-source-interface.js.map +1 -1
- package/dist/src/data-source/collection-browser-data-source.d.ts +3 -0
- package/dist/src/data-source/collection-browser-data-source.js +3 -0
- package/dist/src/data-source/collection-browser-data-source.js.map +1 -1
- package/dist/test/collection-browser.test.js +18 -0
- package/dist/test/collection-browser.test.js.map +1 -1
- package/dist/test/data-source/collection-browser-data-source.test.js +10 -0
- package/dist/test/data-source/collection-browser-data-source.test.js.map +1 -1
- package/package.json +1 -1
- package/src/collection-browser.ts +6 -13
- package/src/data-source/collection-browser-data-source-interface.ts +2 -2
- package/src/data-source/collection-browser-data-source.ts +3 -0
- package/test/collection-browser.test.ts +24 -0
- package/test/data-source/collection-browser-data-source.test.ts +14 -0
|
@@ -77,6 +77,16 @@ describe('Collection Browser Data Source', () => {
|
|
|
77
77
|
dataSource.handleQueryChange();
|
|
78
78
|
expect(pageFetchSpy.callCount).to.equal(0);
|
|
79
79
|
});
|
|
80
|
+
it('can set its initial page batch size', async () => {
|
|
81
|
+
host.searchService = new MockSearchService();
|
|
82
|
+
const pageFetchSpy = sinon.spy();
|
|
83
|
+
const dataSource = new CollectionBrowserDataSource(host);
|
|
84
|
+
dataSource.setNumInitialPages(10);
|
|
85
|
+
dataSource.fetchPage = pageFetchSpy;
|
|
86
|
+
dataSource.handleQueryChange();
|
|
87
|
+
// Uses specified number of initial pages
|
|
88
|
+
expect(pageFetchSpy.args[0][1]).to.equal(10);
|
|
89
|
+
});
|
|
80
90
|
it('refreshes prefix filter counts', () => {
|
|
81
91
|
const dataSource = new CollectionBrowserDataSource(host);
|
|
82
92
|
dataSource.addPage(1, dataPage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-browser-data-source.test.js","sourceRoot":"","sources":["../../../test/data-source/collection-browser-data-source.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect, fixture } from '@open-wc/testing';\nimport { html } from 'lit';\nimport sinon from 'sinon';\nimport { ItemHit, SearchType } from '@internetarchive/search-service';\nimport { CollectionBrowserDataSource } from '../../src/data-source/collection-browser-data-source';\nimport { TileModel } from '../../src/models';\nimport type { CollectionBrowser } from '../../src/collection-browser';\nimport '../../src/collection-browser';\nimport { MockSearchService } from '../mocks/mock-search-service';\n\nconst dataPage: TileModel[] = [\n new TileModel(\n new ItemHit({\n fields: {\n identifier: 'foo',\n },\n }),\n ),\n new TileModel(\n new ItemHit({\n fields: {\n identifier: 'bar',\n },\n }),\n ),\n];\n\ndescribe('Collection Browser Data Source', () => {\n let host: CollectionBrowser;\n\n beforeEach(async () => {\n host = await fixture<CollectionBrowser>(html`\n <collection-browser></collection-browser>\n `);\n });\n\n it('can add and retrieve data pages', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(1);\n expect(dataSource.getPage(1).length).to.equal(2);\n expect(dataSource.getPage(1)[0].identifier).to.equal('foo');\n expect(dataSource.getPage(1)[1].identifier).to.equal('bar');\n });\n\n it('can add data split across multiple pages', () => {\n const dataSource = new CollectionBrowserDataSource(host, 3);\n const doubledDataPage = [...dataPage, ...dataPage];\n dataSource.addMultiplePages(1, doubledDataPage);\n\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(2);\n expect(dataSource.getPage(1).length).to.equal(3);\n expect(dataSource.getPage(2).length).to.equal(1);\n expect(dataSource.getPage(1)[0].identifier).to.equal('foo');\n expect(dataSource.getPage(1)[1].identifier).to.equal('bar');\n expect(dataSource.getPage(1)[2].identifier).to.equal('foo');\n expect(dataSource.getPage(2)[0].identifier).to.equal('bar');\n });\n\n it('resets data when changing page size', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n dataSource.setPageSize(100);\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(0);\n expect(dataSource.getPageSize()).to.equal(100);\n });\n\n it('can be installed on the host', async () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n host.installDataSourceAndQueryState(dataSource, {\n searchType: SearchType.METADATA,\n sortDirection: null,\n selectedTitleFilter: null,\n selectedCreatorFilter: null,\n baseQuery: 'foobar',\n });\n\n await host.updateComplete;\n\n expect(host.dataSource).to.equal(dataSource);\n expect(host.baseQuery).to.equal('foobar');\n\n host.removeController(dataSource);\n });\n\n it('can suppress further fetches', async () => {\n host.searchService = new MockSearchService();\n\n const pageFetchSpy = sinon.spy();\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.fetchPage = pageFetchSpy;\n\n dataSource.addPage(1, dataPage);\n dataSource.setFetchesSuppressed(true);\n dataSource.handleQueryChange();\n\n expect(pageFetchSpy.callCount).to.equal(0);\n });\n\n it('refreshes prefix filter counts', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n dataSource.prefixFilterCountMap = {\n title: {\n X: 10,\n },\n };\n\n dataSource.refreshLetterCounts();\n expect(dataSource.prefixFilterCountMap).to.deep.equal({});\n });\n});\n"]}
|
|
1
|
+
{"version":3,"file":"collection-browser-data-source.test.js","sourceRoot":"","sources":["../../../test/data-source/collection-browser-data-source.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect, fixture } from '@open-wc/testing';\nimport { html } from 'lit';\nimport sinon from 'sinon';\nimport { ItemHit, SearchType } from '@internetarchive/search-service';\nimport { CollectionBrowserDataSource } from '../../src/data-source/collection-browser-data-source';\nimport { TileModel } from '../../src/models';\nimport type { CollectionBrowser } from '../../src/collection-browser';\nimport '../../src/collection-browser';\nimport { MockSearchService } from '../mocks/mock-search-service';\n\nconst dataPage: TileModel[] = [\n new TileModel(\n new ItemHit({\n fields: {\n identifier: 'foo',\n },\n }),\n ),\n new TileModel(\n new ItemHit({\n fields: {\n identifier: 'bar',\n },\n }),\n ),\n];\n\ndescribe('Collection Browser Data Source', () => {\n let host: CollectionBrowser;\n\n beforeEach(async () => {\n host = await fixture<CollectionBrowser>(html`\n <collection-browser></collection-browser>\n `);\n });\n\n it('can add and retrieve data pages', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(1);\n expect(dataSource.getPage(1).length).to.equal(2);\n expect(dataSource.getPage(1)[0].identifier).to.equal('foo');\n expect(dataSource.getPage(1)[1].identifier).to.equal('bar');\n });\n\n it('can add data split across multiple pages', () => {\n const dataSource = new CollectionBrowserDataSource(host, 3);\n const doubledDataPage = [...dataPage, ...dataPage];\n dataSource.addMultiplePages(1, doubledDataPage);\n\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(2);\n expect(dataSource.getPage(1).length).to.equal(3);\n expect(dataSource.getPage(2).length).to.equal(1);\n expect(dataSource.getPage(1)[0].identifier).to.equal('foo');\n expect(dataSource.getPage(1)[1].identifier).to.equal('bar');\n expect(dataSource.getPage(1)[2].identifier).to.equal('foo');\n expect(dataSource.getPage(2)[0].identifier).to.equal('bar');\n });\n\n it('resets data when changing page size', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n dataSource.setPageSize(100);\n expect(Object.keys(dataSource.getAllPages()).length).to.equal(0);\n expect(dataSource.getPageSize()).to.equal(100);\n });\n\n it('can be installed on the host', async () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n host.installDataSourceAndQueryState(dataSource, {\n searchType: SearchType.METADATA,\n sortDirection: null,\n selectedTitleFilter: null,\n selectedCreatorFilter: null,\n baseQuery: 'foobar',\n });\n\n await host.updateComplete;\n\n expect(host.dataSource).to.equal(dataSource);\n expect(host.baseQuery).to.equal('foobar');\n\n host.removeController(dataSource);\n });\n\n it('can suppress further fetches', async () => {\n host.searchService = new MockSearchService();\n\n const pageFetchSpy = sinon.spy();\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.fetchPage = pageFetchSpy;\n\n dataSource.addPage(1, dataPage);\n dataSource.setFetchesSuppressed(true);\n dataSource.handleQueryChange();\n\n expect(pageFetchSpy.callCount).to.equal(0);\n });\n\n it('can set its initial page batch size', async () => {\n host.searchService = new MockSearchService();\n\n const pageFetchSpy = sinon.spy();\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.setNumInitialPages(10);\n dataSource.fetchPage = pageFetchSpy;\n\n dataSource.handleQueryChange();\n\n // Uses specified number of initial pages\n expect(pageFetchSpy.args[0][1]).to.equal(10);\n });\n\n it('refreshes prefix filter counts', () => {\n const dataSource = new CollectionBrowserDataSource(host);\n dataSource.addPage(1, dataPage);\n\n dataSource.prefixFilterCountMap = {\n title: {\n X: 10,\n },\n };\n\n dataSource.refreshLetterCounts();\n expect(dataSource.prefixFilterCountMap).to.deep.equal({});\n });\n});\n"]}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"description": "The Internet Archive Collection Browser.",
|
|
4
4
|
"license": "AGPL-3.0-only",
|
|
5
5
|
"author": "Internet Archive",
|
|
6
|
-
"version": "2.7.14-alpha-webdev7397.
|
|
6
|
+
"version": "2.7.14-alpha-webdev7397.4",
|
|
7
7
|
"main": "dist/index.js",
|
|
8
8
|
"module": "dist/index.js",
|
|
9
9
|
"scripts": {
|
|
@@ -1314,14 +1314,6 @@ export class CollectionBrowser
|
|
|
1314
1314
|
}
|
|
1315
1315
|
|
|
1316
1316
|
updated(changed: PropertyValues) {
|
|
1317
|
-
try {
|
|
1318
|
-
console.log('c-b updated', '\n' + [...changed.entries()].map(([k,v]) =>
|
|
1319
|
-
`${String(k)}: ${JSON.stringify(v)} -> ${JSON.stringify(this[k as keyof this])}`
|
|
1320
|
-
).join('\n'));
|
|
1321
|
-
} catch (err) {
|
|
1322
|
-
console.error(err);
|
|
1323
|
-
}
|
|
1324
|
-
|
|
1325
1317
|
if (changed.has('placeholderType') && this.placeholderType === null) {
|
|
1326
1318
|
if (!this.leftColIntersectionObserver) {
|
|
1327
1319
|
this.setupLeftColumnScrollListeners();
|
|
@@ -1463,7 +1455,6 @@ export class CollectionBrowser
|
|
|
1463
1455
|
}
|
|
1464
1456
|
|
|
1465
1457
|
if (changed.has('isManageView')) {
|
|
1466
|
-
console.log('isManageView changed', changed.get('isManageView'), this.isManageView);
|
|
1467
1458
|
if (this.isManageView) {
|
|
1468
1459
|
this.displayMode = 'grid';
|
|
1469
1460
|
this.fetchManageableSearchResults();
|
|
@@ -2116,17 +2107,19 @@ export class CollectionBrowser
|
|
|
2116
2107
|
* Fetches search results for privileged users when in manage view.
|
|
2117
2108
|
*
|
|
2118
2109
|
* This method:
|
|
2119
|
-
* 1. Checks if we're in search context
|
|
2110
|
+
* 1. Checks if we're in search context and either haven't loaded results yet, or have already finished loading with > 100 total results
|
|
2120
2111
|
* 2. Resets the datasource pagination state
|
|
2121
2112
|
* 3. Fetches first page with limit based on maxPagesToManage threshold
|
|
2122
2113
|
* 4. Reloads the infinite scroller to display new results
|
|
2123
2114
|
*/
|
|
2124
2115
|
private fetchManageableSearchResults(): void {
|
|
2125
|
-
|
|
2116
|
+
const hasNotLoadedInitialResults = !this.dataSource.totalResults;
|
|
2117
|
+
const hasLoadedWithMoreResultsAvailable =
|
|
2118
|
+
!this.searchResultsLoading && this.dataSource.totalResults > 100;
|
|
2119
|
+
|
|
2126
2120
|
if (
|
|
2127
2121
|
this.pageContext === 'search' &&
|
|
2128
|
-
(
|
|
2129
|
-
!this.dataSource.totalResults)
|
|
2122
|
+
(hasNotLoadedInitialResults || hasLoadedWithMoreResultsAvailable)
|
|
2130
2123
|
) {
|
|
2131
2124
|
this.dataSource.resetPages();
|
|
2132
2125
|
this.dataSource.fetchPage(1, this.maxPagesToManage);
|
|
@@ -256,9 +256,9 @@ export interface CollectionBrowserDataSourceInterface
|
|
|
256
256
|
|
|
257
257
|
/**
|
|
258
258
|
* Sets the total number of pages that should be batched together on each initial fetch.
|
|
259
|
-
* @param pages How many pages to batch
|
|
259
|
+
* @param pages How many initial pages to batch
|
|
260
260
|
*/
|
|
261
|
-
setNumInitialPages(
|
|
261
|
+
setNumInitialPages(numPages: number): void;
|
|
262
262
|
|
|
263
263
|
/**
|
|
264
264
|
* Sets the total result count for this data source to the given value.
|
|
@@ -1830,6 +1830,30 @@ describe('Collection Browser', () => {
|
|
|
1830
1830
|
expect(el.dataSource.uncheckedTileModels.length).to.equal(2);
|
|
1831
1831
|
});
|
|
1832
1832
|
|
|
1833
|
+
it('emits event when manage view state changes', async () => {
|
|
1834
|
+
const spy = sinon.spy();
|
|
1835
|
+
const searchService = new MockSearchService();
|
|
1836
|
+
const el = await fixture<CollectionBrowser>(
|
|
1837
|
+
html`<collection-browser
|
|
1838
|
+
.searchService=${searchService}
|
|
1839
|
+
.baseNavigationUrl=${''}
|
|
1840
|
+
@manageModeChanged=${spy}
|
|
1841
|
+
></collection-browser>`,
|
|
1842
|
+
);
|
|
1843
|
+
|
|
1844
|
+
el.isManageView = true;
|
|
1845
|
+
await el.updateComplete;
|
|
1846
|
+
|
|
1847
|
+
expect(spy.callCount).to.equal(1);
|
|
1848
|
+
expect(spy.args[0][0]?.detail).to.be.true;
|
|
1849
|
+
|
|
1850
|
+
el.isManageView = false;
|
|
1851
|
+
await el.updateComplete;
|
|
1852
|
+
|
|
1853
|
+
expect(spy.callCount).to.equal(2);
|
|
1854
|
+
expect(spy.args[1][0]?.detail).to.be.false;
|
|
1855
|
+
});
|
|
1856
|
+
|
|
1833
1857
|
it('emits event when item removal requested', async () => {
|
|
1834
1858
|
const spy = sinon.spy();
|
|
1835
1859
|
const searchService = new MockSearchService();
|
|
@@ -101,6 +101,20 @@ describe('Collection Browser Data Source', () => {
|
|
|
101
101
|
expect(pageFetchSpy.callCount).to.equal(0);
|
|
102
102
|
});
|
|
103
103
|
|
|
104
|
+
it('can set its initial page batch size', async () => {
|
|
105
|
+
host.searchService = new MockSearchService();
|
|
106
|
+
|
|
107
|
+
const pageFetchSpy = sinon.spy();
|
|
108
|
+
const dataSource = new CollectionBrowserDataSource(host);
|
|
109
|
+
dataSource.setNumInitialPages(10);
|
|
110
|
+
dataSource.fetchPage = pageFetchSpy;
|
|
111
|
+
|
|
112
|
+
dataSource.handleQueryChange();
|
|
113
|
+
|
|
114
|
+
// Uses specified number of initial pages
|
|
115
|
+
expect(pageFetchSpy.args[0][1]).to.equal(10);
|
|
116
|
+
});
|
|
117
|
+
|
|
104
118
|
it('refreshes prefix filter counts', () => {
|
|
105
119
|
const dataSource = new CollectionBrowserDataSource(host);
|
|
106
120
|
dataSource.addPage(1, dataPage);
|