fix: Always fetch media for "most recent media" views (#1791)
This commit is contained in:
@@ -103,21 +103,14 @@ export class ViewQueryExecutor {
|
|||||||
viewModifiers.push(...(await executeMediaQuery('clips')));
|
viewModifiers.push(...(await executeMediaQuery('clips')));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Gallery views:
|
case 'clip':
|
||||||
case 'clips':
|
case 'clips':
|
||||||
|
case 'snapshot':
|
||||||
case 'snapshots':
|
case 'snapshots':
|
||||||
|
case 'recording':
|
||||||
case 'recordings':
|
case 'recordings':
|
||||||
viewModifiers.push(...(await executeMediaQuery(mediaType)));
|
viewModifiers.push(...(await executeMediaQuery(mediaType)));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Viewer views:
|
|
||||||
case 'clip':
|
|
||||||
case 'snapshot':
|
|
||||||
case 'recording':
|
|
||||||
if (config.media_viewer.controls.thumbnails.mode !== 'none') {
|
|
||||||
viewModifiers.push(...(await executeMediaQuery(mediaType)));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
viewModifiers.push(...this._getTimelineWindowViewModifier(view));
|
viewModifiers.push(...this._getTimelineWindowViewModifier(view));
|
||||||
|
|||||||
@@ -345,37 +345,6 @@ describe('ViewQueryExecutor', () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('with an media viewer view', () => {
|
|
||||||
it('should not fetch anything if configured for no thumbnails', async () => {
|
|
||||||
const executor = mock<QueryExecutor>();
|
|
||||||
|
|
||||||
const viewQueryExecutor = new ViewQueryExecutor(
|
|
||||||
createPopulatedAPI({
|
|
||||||
media_viewer: {
|
|
||||||
controls: {
|
|
||||||
thumbnails: {
|
|
||||||
mode: 'none' as const,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
executor,
|
|
||||||
);
|
|
||||||
const view = new View({
|
|
||||||
view: 'clip',
|
|
||||||
camera: 'camera.office',
|
|
||||||
});
|
|
||||||
|
|
||||||
const modifiers = await viewQueryExecutor.getNewQueryModifiers(view);
|
|
||||||
applyViewModifiers(view, modifiers);
|
|
||||||
|
|
||||||
expect(view?.query).toBeNull();
|
|
||||||
expect(view?.queryResults).toBeNull();
|
|
||||||
expect(executor.executeDefaultEventQuery).not.toHaveBeenCalled();
|
|
||||||
expect(executor.executeDefaultRecordingQuery).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('when setting or removing seek time', () => {
|
describe('when setting or removing seek time', () => {
|
||||||
it('should set seek time when results are selected based on time', async () => {
|
it('should set seek time when results are selected based on time', async () => {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
|||||||
Reference in New Issue
Block a user