mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
feat(ui): render the CCTV camera picker from the store
The picker's options are data: CctvControls computes the cameras in view and the closing note for those left out, keeps a focused picker's list and prepends a camera activated under it, and publishes the options, disabled state and selection. CctvPicker renders them keyed by camera id and applies the selection once the options are in place; it updates only when the controls publish, as the old picker did on layer notifications. A picker about to be disabled no longer counts as focused. This completes the CCTV panel: everything it shows is rendered from the gev-cctv store.
This commit is contained in:
1 parent
eef3dec759
commit
ce343c1c6d
10 files changed
+257
-196
No files matched your search
+151
-83
@@ -1,123 +1,116 @@
|
||||
// src/ui/cctvPicker.test.mjs — the camera picker lists the cameras in view and
|
||||
// says how many more the view leaves out.
|
||||
import '../testSupport/registerDom.mjs';
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { createPinia } from 'pinia';
|
||||
import { createApp, nextTick } from 'vue';
|
||||
import { CctvControls } from './cctvControls.js';
|
||||
|
||||
/** The slice of a <select> and its document the picker touches. */
|
||||
function pickerDocument() {
|
||||
const select = new EventTarget();
|
||||
const option = () => ({
|
||||
value: '',
|
||||
textContent: '',
|
||||
disabled: false,
|
||||
dataset: {},
|
||||
remove() {
|
||||
select.options = select.options.filter((entry) => entry !== this);
|
||||
},
|
||||
});
|
||||
Object.assign(select, {
|
||||
options: [],
|
||||
disabled: false,
|
||||
selectedIndex: -1,
|
||||
get value() {
|
||||
return this.options[this.selectedIndex]?.value ?? '';
|
||||
},
|
||||
set value(id) {
|
||||
this.selectedIndex = this.options.findIndex((o) => o.value === id);
|
||||
},
|
||||
replaceChildren(fragment) {
|
||||
this.options = [...fragment.children];
|
||||
this.selectedIndex = this.options.length ? 0 : -1;
|
||||
},
|
||||
prepend(child) {
|
||||
this.options.unshift(child);
|
||||
},
|
||||
});
|
||||
const document = {
|
||||
activeElement: null,
|
||||
createElement: option,
|
||||
createDocumentFragment: () => ({
|
||||
children: [],
|
||||
appendChild(child) {
|
||||
this.children.push(child);
|
||||
},
|
||||
}),
|
||||
};
|
||||
return { document, select };
|
||||
}
|
||||
import { useCctvStore } from './stores/cctv.js';
|
||||
import CctvPanel from './views/panels/CctvPanel.vue';
|
||||
|
||||
function fixture(t) {
|
||||
const { document, select } = pickerDocument();
|
||||
const previous = globalThis.document;
|
||||
globalThis.document = document;
|
||||
document.body.replaceChildren();
|
||||
const host = document.body.appendChild(document.createElement('div'));
|
||||
const pinia = createPinia();
|
||||
const app = createApp(CctvPanel).use(pinia);
|
||||
app.mount(host);
|
||||
const select = document.getElementById('cctv-camera-select');
|
||||
const controls = new CctvControls({
|
||||
elements: { _cctvSelect: select },
|
||||
elements: {
|
||||
_cctvPanel: document.getElementById('cctv-panel'),
|
||||
_cctvSelect: select,
|
||||
},
|
||||
cctv: {},
|
||||
actions: { isEnabled: () => true, setPanelCollapsed() {} },
|
||||
actions: {
|
||||
isEnabled: () => true,
|
||||
setPanelCollapsed() {},
|
||||
syncViewport() {},
|
||||
},
|
||||
store: useCctvStore(pinia),
|
||||
});
|
||||
t.after(() => {
|
||||
controls.destroy();
|
||||
globalThis.document = previous;
|
||||
app.unmount();
|
||||
});
|
||||
return { controls, select };
|
||||
const render = async (state) => {
|
||||
controls._renderCctvState(state);
|
||||
await nextTick();
|
||||
};
|
||||
const values = () => [...select.options].map((option) => option.value);
|
||||
return { controls, select, render, values };
|
||||
}
|
||||
|
||||
const camera = (id) => ({ id, city: 'Austin', name: `Cam ${id}` });
|
||||
|
||||
test('the picker closes with the count of cameras outside the view', (t) => {
|
||||
const { controls, select } = fixture(t);
|
||||
controls._renderCctvState({
|
||||
test('the picker closes with the count of cameras outside the view', async (t) => {
|
||||
const { select, render, values } = fixture(t);
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 40,
|
||||
cameraIndex: [camera('a'), camera('b')],
|
||||
});
|
||||
assert.deepEqual(
|
||||
select.options.map((o) => o.value),
|
||||
['a', 'b', ''],
|
||||
);
|
||||
assert.deepEqual(values(), ['a', 'b', '']);
|
||||
assert.equal(select.options[0].textContent, 'Austin · Cam a');
|
||||
const note = select.options[2];
|
||||
assert.equal(note.disabled, true);
|
||||
assert.equal(note.dataset.cctvOutside, '');
|
||||
assert.equal(
|
||||
note.textContent,
|
||||
'38 more cameras outside this view · pan or zoom out',
|
||||
);
|
||||
assert.equal(select.selectedIndex, -1, 'nothing active, nothing picked');
|
||||
|
||||
controls._renderCctvState({
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 2,
|
||||
cameraIndex: [camera('a'), camera('b')],
|
||||
});
|
||||
assert.deepEqual(
|
||||
select.options.map((o) => o.value),
|
||||
values(),
|
||||
['a', 'b'],
|
||||
'a view holding every camera has no note',
|
||||
);
|
||||
});
|
||||
|
||||
test('with no camera in view, the closed picker shows the note', (t) => {
|
||||
const { controls, select } = fixture(t);
|
||||
controls._renderCctvState({ enabled: true, count: 1, cameraIndex: [] });
|
||||
test('with no camera in view, the closed picker shows the note', async (t) => {
|
||||
const { select, render } = fixture(t);
|
||||
await render({ enabled: true, count: 1, cameraIndex: [] });
|
||||
assert.equal(select.options.length, 1);
|
||||
assert.equal(
|
||||
select.options[select.selectedIndex].textContent,
|
||||
'1 more camera outside this view · pan or zoom out',
|
||||
);
|
||||
assert.equal(select.value, '');
|
||||
});
|
||||
|
||||
test('a disabled layer has no note', (t) => {
|
||||
const { controls, select } = fixture(t);
|
||||
controls._renderCctvState({ enabled: false, count: 40, cameraIndex: [] });
|
||||
test('a disabled layer has no note', async (t) => {
|
||||
const { select, render } = fixture(t);
|
||||
await render({ enabled: false, count: 40, cameraIndex: [] });
|
||||
assert.equal(select.options.length, 0);
|
||||
assert.equal(select.selectedIndex, -1);
|
||||
assert.equal(select.disabled, true);
|
||||
});
|
||||
|
||||
test('a camera activated under a focused picker counts against the note', (t) => {
|
||||
const { controls, select } = fixture(t);
|
||||
test('the active camera is the one picked', async (t) => {
|
||||
const { select, render } = fixture(t);
|
||||
const [a, b] = [camera('a'), camera('b')];
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 2,
|
||||
cameraIndex: [a, b],
|
||||
activeCameraId: 'b',
|
||||
activeCamera: b,
|
||||
});
|
||||
assert.equal(select.value, 'b');
|
||||
assert.equal(select.disabled, false);
|
||||
});
|
||||
|
||||
test('a camera activated under a focused picker counts against the note', async (t) => {
|
||||
const { select, render, values } = fixture(t);
|
||||
const a = camera('a');
|
||||
const b = camera('b');
|
||||
controls._renderCctvState({
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 3,
|
||||
cameraIndex: [a],
|
||||
@@ -125,36 +118,111 @@ test('a camera activated under a focused picker counts against the note', (t) =>
|
||||
activeCamera: a,
|
||||
});
|
||||
assert.equal(
|
||||
select.options.at(-1).textContent,
|
||||
select.options[select.options.length - 1].textContent,
|
||||
'2 more cameras outside this view · pan or zoom out',
|
||||
);
|
||||
globalThis.document.activeElement = select;
|
||||
controls._renderCctvState({
|
||||
select.focus();
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 3,
|
||||
cameraIndex: [b, a],
|
||||
activeCameraId: 'b',
|
||||
activeCamera: b,
|
||||
});
|
||||
assert.deepEqual(
|
||||
select.options.map((o) => o.value),
|
||||
['b', 'a', ''],
|
||||
);
|
||||
assert.deepEqual(values(), ['b', 'a', '']);
|
||||
assert.equal(
|
||||
select.options.at(-1).textContent,
|
||||
select.options[select.options.length - 1].textContent,
|
||||
'1 more camera outside this view · pan or zoom out',
|
||||
);
|
||||
assert.equal(select.value, 'b');
|
||||
});
|
||||
|
||||
test('a focused picker does not pick a stale camera when the view empties', (t) => {
|
||||
const { controls, select } = fixture(t);
|
||||
controls._renderCctvState({
|
||||
test('a focused picker that empties is disabled and shows the note', async (t) => {
|
||||
const { select, render, values } = fixture(t);
|
||||
await render({ enabled: true, count: 3, cameraIndex: [camera('a')] });
|
||||
select.focus();
|
||||
await render({ enabled: true, count: 3, cameraIndex: [] });
|
||||
assert.equal(select.disabled, true);
|
||||
assert.deepEqual(values(), ['']);
|
||||
assert.equal(select.selectedIndex, 0, 'no stale camera is picked');
|
||||
});
|
||||
|
||||
test('a focused picker keeps its options until it lets go', async (t) => {
|
||||
const { select, render, values } = fixture(t);
|
||||
await render({ enabled: true, count: 3, cameraIndex: [camera('a')] });
|
||||
select.focus();
|
||||
await render({ enabled: true, count: 3, cameraIndex: [camera('b')] });
|
||||
assert.deepEqual(values(), ['a', '']);
|
||||
select.blur();
|
||||
await nextTick();
|
||||
assert.deepEqual(values(), ['b', '']);
|
||||
});
|
||||
|
||||
test('losing the active camera clears the pick', async (t) => {
|
||||
const { select, render } = fixture(t);
|
||||
const a = camera('a');
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 3,
|
||||
cameraIndex: [camera('a')],
|
||||
count: 1,
|
||||
cameraIndex: [a],
|
||||
activeCameraId: 'a',
|
||||
activeCamera: a,
|
||||
});
|
||||
globalThis.document.activeElement = select;
|
||||
controls._renderCctvState({ enabled: true, count: 3, cameraIndex: [] });
|
||||
assert.equal(select.value, 'a');
|
||||
await render({ enabled: true, count: 1, cameraIndex: [a] });
|
||||
assert.equal(select.selectedIndex, -1);
|
||||
});
|
||||
|
||||
test('the last camera outside the view, added under focus, drops the note', async (t) => {
|
||||
const { select, render, values } = fixture(t);
|
||||
const [a, b] = [camera('a'), camera('b')];
|
||||
await render({ enabled: true, count: 2, cameraIndex: [a] });
|
||||
assert.deepEqual(values(), ['a', '']);
|
||||
select.focus();
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 2,
|
||||
cameraIndex: [b],
|
||||
activeCameraId: 'b',
|
||||
activeCamera: b,
|
||||
});
|
||||
assert.deepEqual(values(), ['b', 'a']);
|
||||
assert.equal(select.value, 'b');
|
||||
});
|
||||
|
||||
test('other panel updates leave the picker alone', async (t) => {
|
||||
const { controls, select, render } = fixture(t);
|
||||
const [a, b] = [camera('a'), camera('b')];
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 2,
|
||||
cameraIndex: [a, b],
|
||||
activeCameraId: 'a',
|
||||
activeCamera: a,
|
||||
});
|
||||
const before = [...select.options];
|
||||
// The user arrows to another camera while its activation is pending.
|
||||
select.value = 'b';
|
||||
controls.store.setSummary('Typing…');
|
||||
controls.store.setSourceBadge({ label: 'LIVE · OK', state: 'ready' });
|
||||
await nextTick();
|
||||
assert.equal(select.value, 'b');
|
||||
assert.ok(
|
||||
[...select.options].every((option, index) => option === before[index]),
|
||||
'the options are the same elements',
|
||||
);
|
||||
});
|
||||
|
||||
test('an active id without its camera record leaves the pick alone', async (t) => {
|
||||
const { select, render } = fixture(t);
|
||||
const [a, b] = [camera('a'), camera('b')];
|
||||
await render({ enabled: true, count: 2, cameraIndex: [a, b] });
|
||||
select.value = 'b';
|
||||
await render({
|
||||
enabled: true,
|
||||
count: 2,
|
||||
cameraIndex: [a, b],
|
||||
activeCameraId: 'a',
|
||||
});
|
||||
assert.equal(select.value, 'b');
|
||||
});
|
||||
Reference in new issue
Block a user