ui: gate Read decoded on client-side decoder availability (v2.7.10)

Files without a client-side decoder used to fall back to a raw view when
the Decoded pill was pressed.  The decoder is resolved by name/FID
(efFindDecoder) before any read, so the pill can be disabled instead.

- pysimFsHasDecoder() mirrors the decoded view's resolution (tree node
  name, FID fallback).
- pysimApplyAvailability() honours a new data-needs-decoder marker:
  disabled with the existing 'No decoder for this file' tooltip; the
  card hint still wins when no card is equipped.
- pysimFsClickFile() re-runs the availability pass after selecting a
  file; pysimFsSetMode('dec') ignores the call without a decoder.
- tests: indicator (enable/disable/tooltip precedence), fs_edit
  (decoded guard, name/FID resolution); help EN/RU.
This commit is contained in:
2026-09-20 23:21:06 +03:00
parent cad14e2b5a
commit e9f0a50ea5
8 changed files with 89 additions and 10 deletions
+35 -2
View File
@@ -24,9 +24,10 @@ function extractFunc(src, name) {
let code = 'var pysimFsDecodedMode = false;\n'
+ 'var pysimFsEditMode = false;\n'
+ 'var pysimFsEditData = null;\n'
+ 'var pysimFsSelected = null;\n';
+ 'var pysimFsSelected = null;\n'
+ 'var pysimFsTreeRoot = null;\n';
for (const fn of ['pysimFsSetMode', 'pysimFsPillsEnabled', 'pysimFsEdit',
'pysimFsCancel', 'pysimFsResetEdit']) {
'pysimFsCancel', 'pysimFsResetEdit', 'pysimFsFindNode', 'pysimFsHasDecoder']) {
code += extractFunc(html, fn) + '\n';
}
eval(code);
@@ -80,6 +81,12 @@ function setup(opts) {
pysimFsEditMode = false;
pysimFsEditData = null;
pysimFsSelected = 'EF.IMSI';
pysimFsTreeRoot = { name: 'MF', fid: '3f00', children: [{ name: 'EF.IMSI', fid: '6f07' }] };
globalThis.efFindDecoder = (name, fid) => {
const n = (name || '').toUpperCase();
const f = (fid || '').toLowerCase();
return (n === 'EF.IMSI' || f === '6f07') ? { name: 'EF.IMSI', fid: '6f07' } : null;
};
globalThis.document = {
getElementById: id => id === 'pysim-fs-content' ? content : (buttons[id] || null),
@@ -179,10 +186,36 @@ test('Reset edit re-enables the pills', () => {
assert.ok(!h.pill('dec').classList.contains('opacity-50'));
});
test('Read decoded is ignored when the file has no decoder', () => {
const h = setup();
globalThis.efFindDecoder = () => null;
pysimFsSetMode('dec');
assert.strictEqual(pysimFsDecodedMode, false);
assert.strictEqual(h.reads(), 0);
assert.ok(!h.pill('dec').classList.contains('bg-blue-600'));
});
test('pysimFsHasDecoder resolves the selected file by name or FID', () => {
setup();
assert.strictEqual(pysimFsHasDecoder(), true, 'EF.IMSI is in the tree');
// alias name: the decoder is matched by the FID fallback
pysimFsTreeRoot = { name: 'MF', children: [{ name: 'EF.ALIAS', fid: '6f07' }] };
pysimFsSelected = 'EF.ALIAS';
assert.strictEqual(pysimFsHasDecoder(), true);
// unknown file -> no decoder
globalThis.efFindDecoder = () => null;
assert.strictEqual(pysimFsHasDecoder(), false);
// nothing selected -> no decoder
pysimFsSelected = null;
assert.strictEqual(pysimFsHasDecoder(), false);
});
test('the file manager row exposes the read pills and Edit raw', () => {
assert.ok(!html.includes('id="pysim-fs-read-btn"'), 'the redundant Read button is gone');
assert.ok(html.includes('data-l10n="Read raw">Read raw<'));
assert.ok(html.includes('data-l10n="Read decoded">Read decoded<'));
assert.ok(html.includes('data-l10n="Edit raw">Edit raw<'));
assert.ok(html.includes('id="pysim-fs-read-raw-btn"') && html.includes('data-needs="card"'));
const dec = /<button[^>]*id="pysim-fs-read-dec-btn"[^>]*>/.exec(html);
assert.ok(dec && dec[0].includes('data-needs-decoder'), 'the decoded pill is decoder-gated');
});
+27
View File
@@ -49,6 +49,7 @@ function fakeEl() {
},
setAttribute(k, v) { this.attrs[k] = v; },
getAttribute(k) { return this.attrs[k]; },
hasAttribute(k) { return k in this.attrs; },
removeAttribute(k) { delete this.attrs[k]; },
};
}
@@ -225,6 +226,32 @@ test('card-iccid controls need an equipped card with a readable ICCID', () => {
assert.strictEqual(el.disabled, true);
});
test('Read decoded needs a client-side decoder for the selected file', () => {
const run = (hasDecoder, cardEquipped) => {
const el = fakeEl();
el.setAttribute('data-needs', 'card');
el.setAttribute('data-needs-decoder', '');
globalThis.document = { querySelectorAll: () => [el], getElementById: () => null };
_pysimServerAvailable = true;
_pysimCardEquipped = cardEquipped;
globalThis.pysimFsHasDecoder = () => hasDecoder;
pysimApplyAvailability();
return el;
};
// decoder present, card equipped -> enabled, no tooltip
let el = run(true, true);
assert.strictEqual(el.disabled, false);
assert.strictEqual(el.attrs.title, undefined);
// no decoder -> disabled with its own hint
el = run(false, true);
assert.strictEqual(el.disabled, true);
assert.strictEqual(el.attrs.title, 'No decoder for this file');
// card missing and no decoder -> the card hint wins
el = run(false, false);
assert.strictEqual(el.disabled, true);
assert.strictEqual(el.attrs.title, 'Insert and equip a card');
});
test('indicator image stays within the 32px header row budget', () => {
const m = /id="state-indicator-img"[^>]*style="width:(\d+)px;height:(\d+)px"/.exec(html);
assert.ok(m, 'inline image size not found');