mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Merge origin/main into claude/hal-676-gev-fire-intensity-742bd1
Main moved the layer rows to Vue, so the fire confidence switch and minimum-FRP slider now render through RowSwitch and RowSlider on the kit's UiSegmented and UiSlider, with the same classes as before. The fire filter strings are translated into Arabic.
This commit is contained in:
commit
02953665de
665 files changed
+44368
-19993
No files matched your search
@@ -0,0 +1,94 @@
|
||||
<script setup>
|
||||
import RailChips from '../rail/RailChips.vue';
|
||||
import RailRowList from '../rail/RailRowList.vue';
|
||||
import RowSlider from './RowSlider.vue';
|
||||
import RowSwitch from './RowSwitch.vue';
|
||||
import RowText from './RowText.vue';
|
||||
import { vClassToggle } from '../rail/classToggle.js';
|
||||
|
||||
// The data layer rows under their group headings. LayerPanel presents every
|
||||
// value; clicks reach it with the layer id, and it re-reads the live
|
||||
// descriptor before acting.
|
||||
defineProps({
|
||||
items: { type: Array, required: true },
|
||||
onToggle: { type: Function, default: () => {} },
|
||||
onChip: { type: Function, default: () => {} },
|
||||
onListItem: { type: Function, default: () => {} },
|
||||
onSlider: { type: Function, default: () => {} },
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<template v-for="item in items" :key="item.key"
|
||||
><h3 v-if="item.heading" class="data-layer-group-heading">{{
|
||||
item.heading
|
||||
}}</h3
|
||||
><div
|
||||
v-else
|
||||
class="data-toggle-row"
|
||||
v-class-toggle="{
|
||||
'data-toggle-row--count-line': item.count?.countLine,
|
||||
}"
|
||||
:data-layer-id="item.id"
|
||||
:data-layer-name="item.englishName"
|
||||
><div class="data-toggle-top"
|
||||
><div class="data-toggle-left"
|
||||
><span class="data-icon" aria-hidden="true">{{ item.icon }}</span
|
||||
><RowText class="data-name" :text="item.name" /></div
|
||||
><div class="data-toggle-right"
|
||||
><RowText
|
||||
v-if="item.count"
|
||||
:class="['data-count', { 'data-count-empty': item.count.empty }]"
|
||||
:text="item.count.text"
|
||||
/><button
|
||||
type="button"
|
||||
:class="['data-toggle-btn', item.toggle.classes]"
|
||||
:data-feed-state="item.toggle.feedState"
|
||||
:aria-disabled="String(item.toggle.ariaDisabled)"
|
||||
:aria-busy="String(item.toggle.ariaBusy)"
|
||||
:title="item.toggle.title"
|
||||
:aria-label="item.toggle.ariaLabel"
|
||||
@click="onToggle(item.id)"
|
||||
>{{ item.toggle.text }}</button
|
||||
></div
|
||||
></div
|
||||
><RowText tag="div" class="data-toggle-meta" :text="item.meta" /><template
|
||||
v-if="item.controls"
|
||||
><div class="data-toggle-controls" :hidden="item.controls.hidden"
|
||||
><RailChips
|
||||
:chips="item.controls.chips"
|
||||
:on-select="(chip) => onChip(item.id, chip.id)"
|
||||
/><RowSwitch
|
||||
v-if="item.controls.segmented"
|
||||
:segmented="item.controls.segmented"
|
||||
:on-select="(optionId) => onChip(item.id, optionId)"
|
||||
/><RowSlider
|
||||
v-if="item.controls.slider"
|
||||
:slider="item.controls.slider"
|
||||
:on-input="
|
||||
(value) => onSlider(item.id, item.controls.slider.id, value)
|
||||
"
|
||||
/><span
|
||||
v-for="(entry, index) in item.controls.legend"
|
||||
:key="index"
|
||||
class="data-toggle-legend-item"
|
||||
:title="entry.blurb || undefined"
|
||||
><span
|
||||
class="data-toggle-legend-swatch"
|
||||
:style="{ background: entry.color }"
|
||||
></span
|
||||
><span>{{ entry.text }}</span></span
|
||||
><div
|
||||
v-if="item.controls.info"
|
||||
class="data-toggle-controls-info"
|
||||
:title="item.controls.info.title"
|
||||
:hidden="!item.controls.info.text"
|
||||
>{{ item.controls.info.text }}</div
|
||||
></div
|
||||
><RailRowList
|
||||
:list="item.controls.list"
|
||||
:on-select="
|
||||
(entry) => onListItem(item.id, entry.id)
|
||||
" /></template></div
|
||||
></template>
|
||||
</template>
|
||||
@@ -0,0 +1,44 @@
|
||||
<script setup>
|
||||
import UiSlider from '../kit/UiSlider.js';
|
||||
|
||||
// A row's quantitative slider (e.g. the Active Fires minimum-FRP filter).
|
||||
// `track` is a CSS background painting the runnable track, so a color ramp
|
||||
// doubles as the legend; each tick sits at `at` (0..1) along it. The input
|
||||
// holds its position while focused, so a refresh from its own tick never
|
||||
// moves the thumb under the pointer.
|
||||
defineProps({
|
||||
slider: { type: Object, required: true },
|
||||
onInput: { type: Function, default: () => {} },
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="data-toggle-slider" :data-slider-id="slider.id"
|
||||
><div class="data-toggle-slider-head"
|
||||
><span class="data-toggle-slider-label">{{ slider.label }}</span
|
||||
><span class="data-toggle-slider-value gev-slider-value">{{
|
||||
slider.valueText
|
||||
}}</span></div
|
||||
><UiSlider
|
||||
class="data-toggle-slider-input"
|
||||
:data-slider-id="slider.id"
|
||||
:min="slider.min"
|
||||
:max="slider.max"
|
||||
:step="slider.step ?? 1"
|
||||
:model-value="slider.value"
|
||||
hold
|
||||
:aria-label="slider.ariaLabel || undefined"
|
||||
:aria-valuetext="slider.valueText || undefined"
|
||||
:style="slider.track ? { '--slider-track': slider.track } : undefined"
|
||||
@update:model-value="onInput"
|
||||
/><div class="data-toggle-slider-ticks"
|
||||
><span
|
||||
v-for="tick in slider.ticks || []"
|
||||
:key="tick.at"
|
||||
class="data-toggle-slider-tick"
|
||||
:style="{ '--at': `${(tick.at * 100).toFixed(2)}%` }"
|
||||
>{{ tick.label }}</span
|
||||
></div
|
||||
></div
|
||||
>
|
||||
</template>
|
||||
@@ -0,0 +1,38 @@
|
||||
<script setup>
|
||||
import UiSegmented from '../kit/UiSegmented.vue';
|
||||
|
||||
// A row's one-of-many switch (e.g. Active Fires confidence). Options carry
|
||||
// the same fields as chips, so the owner resolves a choice the way it
|
||||
// resolves a chip; `label` is an optional caption beside the group.
|
||||
defineProps({
|
||||
segmented: { type: Object, required: true },
|
||||
onSelect: { type: Function, default: () => {} },
|
||||
});
|
||||
|
||||
const options = (segmented) =>
|
||||
(segmented.options || []).map((option) => ({
|
||||
value: option.id,
|
||||
label: option.label,
|
||||
disabled: Boolean(option.disabled),
|
||||
attrs: { 'data-chip-id': option.id, title: option.title || undefined },
|
||||
}));
|
||||
const activeId = (segmented) =>
|
||||
(segmented.options || []).find((option) => option.active)?.id;
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<span
|
||||
v-if="segmented.label"
|
||||
class="data-toggle-segmented-label"
|
||||
:data-segmented-caption-for="segmented.id"
|
||||
>{{ segmented.label }}</span
|
||||
><UiSegmented
|
||||
class="data-toggle-segmented"
|
||||
:data-segmented-id="segmented.id"
|
||||
:model-value="activeId(segmented)"
|
||||
:options="options(segmented)"
|
||||
:label="segmented.ariaLabel || segmented.label || ''"
|
||||
item-class="data-toggle-segment"
|
||||
@update:model-value="onSelect"
|
||||
/>
|
||||
</template>
|
||||
@@ -0,0 +1,25 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { rowTextRuns } from '../layerRowText.js';
|
||||
|
||||
// Row text that wraps well in every language: hyphenated codes and the
|
||||
// space before a " · " separator never break (see rowTextRuns).
|
||||
const props = defineProps({
|
||||
tag: { type: String, default: 'span' },
|
||||
text: { type: String, default: '' },
|
||||
});
|
||||
const runs = computed(() => rowTextRuns(props.text));
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<component :is="tag"
|
||||
><template v-if="runs"
|
||||
><span
|
||||
v-for="(run, index) in runs"
|
||||
:key="index"
|
||||
v-bind="run.keep ? { class: 'data-keep' } : {}"
|
||||
>{{ run.text }}</span
|
||||
></template
|
||||
><template v-else>{{ text }}</template></component
|
||||
>
|
||||
</template>
|
||||
@@ -0,0 +1,161 @@
|
||||
// src/ui/layerPanel/layerRows.test.mjs — a layer row's own classes change
|
||||
// without wiping classes other code adds, such as the voice highlight.
|
||||
import '../../testSupport/registerDom.mjs';
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { h, render } from 'vue';
|
||||
import LayerRows from './LayerRows.vue';
|
||||
|
||||
const row = (countLine) => ({
|
||||
key: 'flights',
|
||||
id: 'flights',
|
||||
englishName: 'Flights',
|
||||
icon: 'flight',
|
||||
name: 'Flights',
|
||||
meta: '',
|
||||
toggle: {
|
||||
classes: [],
|
||||
text: 'OFF',
|
||||
ariaLabel: 'Flights',
|
||||
title: '',
|
||||
ariaBusy: 'false',
|
||||
ariaDisabled: 'false',
|
||||
feedState: '',
|
||||
},
|
||||
count: { countLine, text: '12', empty: false },
|
||||
controls: null,
|
||||
});
|
||||
|
||||
test('the count-line class toggles without dropping the voice highlight', () => {
|
||||
document.body.replaceChildren();
|
||||
const container = document.body.appendChild(document.createElement('div'));
|
||||
render(h(LayerRows, { items: [row(false)] }), container);
|
||||
const element = container.querySelector('[data-layer-id="flights"]');
|
||||
assert.equal(element.className, 'data-toggle-row');
|
||||
element.classList.add('gev-voice-focus');
|
||||
|
||||
render(h(LayerRows, { items: [row(true)] }), container);
|
||||
assert.equal(element.classList.contains('data-toggle-row--count-line'), true);
|
||||
assert.equal(element.classList.contains('gev-voice-focus'), true);
|
||||
|
||||
render(h(LayerRows, { items: [row(false)] }), container);
|
||||
assert.equal(
|
||||
element.classList.contains('data-toggle-row--count-line'),
|
||||
false,
|
||||
);
|
||||
assert.equal(element.classList.contains('gev-voice-focus'), true);
|
||||
assert.equal(element.classList.contains('data-toggle-row'), true);
|
||||
render(null, container);
|
||||
});
|
||||
|
||||
const fireRow = (value, active = 'all') => ({
|
||||
...row(false),
|
||||
key: 'fires',
|
||||
id: 'fires',
|
||||
controls: {
|
||||
hidden: false,
|
||||
chips: [],
|
||||
segmented: {
|
||||
id: 'confidence',
|
||||
label: 'Confidence',
|
||||
ariaLabel: 'Detection confidence',
|
||||
options: ['all', 'high'].map((mode) => ({
|
||||
id: `confidence-${mode}`,
|
||||
label: mode.toUpperCase(),
|
||||
title: `${mode} title`,
|
||||
active: mode === active,
|
||||
})),
|
||||
},
|
||||
slider: {
|
||||
id: 'min-frp',
|
||||
label: 'Fire intensity (FRP)',
|
||||
ariaLabel: 'Minimum fire radiative power, megawatts',
|
||||
valueText: value ? `≥ ${value} MW` : 'All',
|
||||
min: 0,
|
||||
max: 1000,
|
||||
step: 1,
|
||||
value,
|
||||
track: 'linear-gradient(90deg, #4a5bd4, #d1382a)',
|
||||
ticks: [
|
||||
{ at: 0, label: '0' },
|
||||
{ at: 0.5, label: '30' },
|
||||
],
|
||||
},
|
||||
legend: [],
|
||||
info: null,
|
||||
list: null,
|
||||
},
|
||||
});
|
||||
|
||||
test('a row switch and slider render their markup and report choices', () => {
|
||||
document.body.replaceChildren();
|
||||
const container = document.body.appendChild(document.createElement('div'));
|
||||
const chips = [];
|
||||
const moves = [];
|
||||
const props = {
|
||||
onChip: (id, chipId) => chips.push([id, chipId]),
|
||||
onSlider: (id, sliderId, value) => moves.push([id, sliderId, value]),
|
||||
};
|
||||
render(h(LayerRows, { items: [fireRow(0)], ...props }), container);
|
||||
|
||||
const caption = container.querySelector('.data-toggle-segmented-label');
|
||||
assert.equal(caption.textContent, 'Confidence');
|
||||
const group = container.querySelector('.gev-segmented.data-toggle-segmented');
|
||||
assert.equal(group.getAttribute('role'), 'radiogroup');
|
||||
assert.equal(group.getAttribute('aria-label'), 'Detection confidence');
|
||||
const segments = [
|
||||
...group.querySelectorAll('.gev-segment.data-toggle-segment'),
|
||||
];
|
||||
assert.deepEqual(
|
||||
segments.map((button) => button.dataset.chipId),
|
||||
['confidence-all', 'confidence-high'],
|
||||
);
|
||||
assert.equal(segments[0].classList.contains('active'), true);
|
||||
assert.equal(segments[1].title, 'high title');
|
||||
segments[1].click();
|
||||
assert.deepEqual(chips, [['fires', 'confidence-high']]);
|
||||
|
||||
const block = container.querySelector('.data-toggle-slider');
|
||||
assert.equal(block.dataset.sliderId, 'min-frp');
|
||||
assert.equal(
|
||||
block.querySelector('.data-toggle-slider-label').textContent,
|
||||
'Fire intensity (FRP)',
|
||||
);
|
||||
assert.equal(
|
||||
block.querySelector('.data-toggle-slider-value').textContent,
|
||||
'All',
|
||||
);
|
||||
const input = block.querySelector('input.data-toggle-slider-input');
|
||||
assert.equal(input.classList.contains('gev-quantitative-slider'), true);
|
||||
assert.equal(input.type, 'range');
|
||||
assert.equal(input.max, '1000');
|
||||
assert.equal(
|
||||
input.getAttribute('aria-label'),
|
||||
'Minimum fire radiative power, megawatts',
|
||||
);
|
||||
assert.equal(input.getAttribute('aria-valuetext'), 'All');
|
||||
assert.match(
|
||||
input.style.getPropertyValue('--slider-track'),
|
||||
/^linear-gradient/,
|
||||
);
|
||||
const ticks = [...block.querySelectorAll('.data-toggle-slider-tick')];
|
||||
assert.deepEqual(
|
||||
ticks.map((tick) => tick.textContent),
|
||||
['0', '30'],
|
||||
);
|
||||
assert.equal(ticks[1].style.getPropertyValue('--at'), '50.00%');
|
||||
|
||||
input.value = '120';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
assert.deepEqual(moves, [['fires', 'min-frp', 120]]);
|
||||
|
||||
// The refresh that tick triggers keeps the same nodes and updates the text.
|
||||
render(h(LayerRows, { items: [fireRow(120, 'high')], ...props }), container);
|
||||
assert.equal(
|
||||
container.querySelector('input.data-toggle-slider-input'),
|
||||
input,
|
||||
);
|
||||
assert.equal(input.getAttribute('aria-valuetext'), '≥ 120 MW');
|
||||
assert.equal(segments[1].classList.contains('active'), true);
|
||||
render(null, container);
|
||||
});
|
||||
Reference in new issue
Block a user