+
+
+
+ Load Recipe From Server
+ Select a country to load material data from server.
+
+
+
+ {#each serverCountries as country}
+
+ {/each}
+
+
+
+
+
+
+
+
+
+
+
+ Machine Not Connected
+
+ Connect to the machine with ADB/WebUSB before loading recipe data from Machine.
+
+
+
+
+
+
+
+
+
@@ -501,31 +1053,60 @@
- {existingMaterial ? 'Edit Material' : 'Add Material'}
+ {isEditingMaterial ? 'Edit Material' : 'Add Material'}
- Create or update one MaterialSetting entry. The JSON preview shows the payload
- before saving to Android.
+ Create or update one MaterialSetting entry. Server-loaded data is read-only until
+ ADB is connected.
+ Material ID {form.id} already exists. Choose another ID before saving.
+
+ {:else if isEditingMaterial}
- Material ID {form.id} already exists. Saving will update this MaterialSetting.
+ Editing Material ID {editingMaterialId}.
{/if}
+
+
+
+
+
-
+
+
+ Generated from the highest existing ID in this type + 1.
+
@@ -548,11 +1129,11 @@
-
+
@@ -584,23 +1165,7 @@
-
-
-
-
-
+
@@ -620,21 +1185,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -688,12 +1238,18 @@
- Cancel
-
@@ -715,14 +1271,46 @@
+
+
+
+ Select Material Type
+
+ Choose the type for the new material. Material ID will be generated from existing IDs in
+ that type + 1.
+
+
+
+
+ {#each selectableMaterialTypeOptions as option}
+
+ {/each}
+
+
+
+
+
+
+
+
Existing Materials
-
- Use Edit to update a material, or Delete to remove it after confirmation.
-
+
- Loading materials from Android...
+ Loading materials...
{:else if !devRecipe}
-
Connect and load recipe first.
+
Load recipe first.
{:else if filteredMaterials.length === 0}
No materials found.
{:else}
ID
- Thai Name
+ Name ({primaryLanguageLabel})English NamePathUse
@@ -764,7 +1352,7 @@
+ {/if}
+
+
+
+
+
+
+
{existingListItem ? 'Edit Topping' : 'Add Topping'}
- Manage one item inside ToppingList.
+
+ Manage one item inside ToppingList. Server-loaded data is read-only until ADB
+ is connected.
+
@@ -758,7 +1137,7 @@
-
+
@@ -929,7 +1308,7 @@
-
@@ -957,7 +1336,10 @@
{existingGroup ? 'Edit Topping Group' : 'Add Topping Group'}
- Manage one group inside ToppingGroup.
+
+ Manage one group inside ToppingGroup. Server-loaded data is read-only until
+ ADB is connected.
+
@@ -980,7 +1362,7 @@
-
+
@@ -1004,7 +1386,7 @@
-
@@ -1032,9 +1414,9 @@
Delete Topping?
- This will remove the selected entry from Android recipe JSON.
+
+ This will remove the selected entry from Android recipe JSON. ADB is required.
+
{#if pendingDelete}
@@ -1064,7 +1446,11 @@
>
Cancel
-
diff --git a/src/routes/(authed)/sheet/add/[country]/[catalog]/+page.svelte b/src/routes/(authed)/sheet/add/[country]/[catalog]/+page.svelte
index 9a9043b..4cf1cfc 100644
--- a/src/routes/(authed)/sheet/add/[country]/[catalog]/+page.svelte
+++ b/src/routes/(authed)/sheet/add/[country]/[catalog]/+page.svelte
@@ -460,7 +460,7 @@
logger.warn('Failed to get boxid from machine:', e);
}
}
- requestListMenu(country, boxid);
+ await requestListMenu(country, boxid);
// Load available product codes from all sources
await loadAvailableProductCodes();
diff --git a/src/routes/(authed)/sheet/edit/[country]/[catalog]/+page.svelte b/src/routes/(authed)/sheet/edit/[country]/[catalog]/+page.svelte
index 20e1fb7..2959b39 100644
--- a/src/routes/(authed)/sheet/edit/[country]/[catalog]/+page.svelte
+++ b/src/routes/(authed)/sheet/edit/[country]/[catalog]/+page.svelte
@@ -49,7 +49,9 @@
Eye,
Cog,
Upload,
- RotateCcw
+ RotateCcw,
+ Usb,
+ MonitorSmartphone
} from '@lucide/svelte/icons';
import * as adb from '$lib/core/adb/adb';
@@ -345,9 +347,84 @@
}
editingItem = JSON.parse(JSON.stringify(item)); // Deep copy
+ // Translations (name-desc-v2) must show EVERY language configured for the
+ // country, even ones with no value yet (e.g. tha = English/Thai/China/Myanmar)
+ // — otherwise empty languages would be filtered out and disappear.
+ ensureNameDescLanguageCells(editingItem);
+ // Snapshot which fields are shown at edit-start so they stay editable even
+ // after the user clears them (otherwise live-filtering by isMeaningfulValue
+ // would drop a field the moment its text is emptied).
+ captureEditFieldKeys(editingItem);
isEditMode = true;
}
+ // name-desc-v2 language columns (sorted), for the Translations card.
+ function nameDescColumns(): number[] {
+ return Object.values(nameDescLanguageMap).sort((a, b) => a - b);
+ }
+
+ // Make sure every name/desc section has a cell for each configured language
+ // column, creating empty ones where missing so all languages are editable.
+ function ensureNameDescLanguageCells(item: any) {
+ const cols = nameDescColumns();
+ for (const section of item?.name_desc_v2 ?? []) {
+ if (!section?.key?.endsWith('.name') && !section?.key?.endsWith('.desc')) continue;
+ if (!Array.isArray(section.cells)) section.cells = [];
+ const row = section.cells[0]?.coord?.row ?? section.row_index;
+ for (const col of cols) {
+ if (!section.cells.some((c: SheetCell) => c.coord.col === col)) {
+ section.cells.push({ value: '', coord: { row, col } });
+ }
+ }
+ }
+ }
+
+ // Translations card: show every language column (existing or just-created).
+ function getNameDescEditSections(sections: SheetSection[] | undefined): SheetSection[] {
+ return (
+ sections?.filter(
+ (s) => s.key?.endsWith('.name') || s.key?.endsWith('.desc')
+ ) ?? []
+ );
+ }
+
+ function getNameDescEditCells(section: SheetSection): SheetCell[] {
+ const cols = nameDescColumns();
+ return (
+ section.cells
+ ?.filter((cell) => cols.includes(cell.coord.col))
+ .sort((a, b) => a.coord.col - b.coord.col) ?? []
+ );
+ }
+
+ let editFieldKeys = $state>(new Set());
+
+ function editFieldKey(section: SheetSection, cell: SheetCell): string {
+ return `${section.row_index}|${section.key ?? ''}|${cell.coord.col}`;
+ }
+
+ function captureEditFieldKeys(item: any) {
+ const keys = new Set();
+ for (const list of [item?.new_layout_v2, item?.name_desc_v2]) {
+ for (const section of getVisibleSections(list)) {
+ for (const cell of getVisibleCells(section)) {
+ keys.add(editFieldKey(section, cell));
+ }
+ }
+ }
+ editFieldKeys = keys;
+ }
+
+ // Edit-mode variants: show the fields captured at edit-start (not live-filtered),
+ // so emptying a field doesn't make its input disappear.
+ function getEditCells(section: SheetSection): SheetCell[] {
+ return section.cells?.filter((cell) => editFieldKeys.has(editFieldKey(section, cell))) ?? [];
+ }
+
+ function getEditSections(sections: SheetSection[] | undefined): SheetSection[] {
+ return sections?.filter((section) => getEditCells(section).length > 0) ?? [];
+ }
+
function cancelEdit() {
editingItem = null;
isEditMode = false;
@@ -526,11 +603,14 @@
en: 'English',
th: 'Thai',
zh: 'Chinese',
+ zh_hans: 'Mandarin (Simplified)',
+ zh_hant: 'Mandarin (Traditional)',
ja: 'Japanese',
ms: 'Malay',
my: 'Myanmar',
lt: 'Lithuanian',
- ro: 'Romanian'
+ ro: 'Romanian',
+ ar: 'Arabic'
};
const languageLabelsByColumn = Object.fromEntries(
Object.entries(languageColumnMap).map(([key, column]) => [
@@ -539,6 +619,16 @@
])
) as Record;
+ // name-desc-v2 is a different sheet namespace whose column→language mapping can
+ // differ from new-layout-v2 → use a separate label map for the Translations card.
+ const nameDescLanguageMap = columnConfig.nameDescLanguage ?? languageColumnMap;
+ const nameDescLabelsByColumn = Object.fromEntries(
+ Object.entries(nameDescLanguageMap).map(([key, column]) => [
+ column,
+ languageLabelsByKey[key] ?? key.toUpperCase()
+ ])
+ ) as Record;
+
const nameColumnLabels: Record = {
9: 'Hot product codes',
10: 'Cold product codes',
@@ -597,13 +687,13 @@
}
if (type === 'img') return imageColumnLabels[cell.coord.col] ?? `Column ${cell.coord.col}`;
if (section.key?.endsWith('.name')) {
- return languageLabelsByColumn[cell.coord.col]
- ? `${languageLabelsByColumn[cell.coord.col]} name`
+ return nameDescLabelsByColumn[cell.coord.col]
+ ? `${nameDescLabelsByColumn[cell.coord.col]} name`
: `Column ${cell.coord.col}`;
}
if (section.key?.endsWith('.desc')) {
- return languageLabelsByColumn[cell.coord.col]
- ? `${languageLabelsByColumn[cell.coord.col]} description`
+ return nameDescLabelsByColumn[cell.coord.col]
+ ? `${nameDescLabelsByColumn[cell.coord.col]} description`
: `Column ${cell.coord.col}`;
}
return `Column ${cell.coord.col}`;
@@ -628,10 +718,33 @@
: 'grid gap-4 md:grid-cols-2 xl:grid-cols-3';
}
+ // ── Machine (ADB) connect for Preview ────────────────────────────────────
+ let connectDialogOpen = $state(false);
+ let adbConnecting = $state(false);
+
+ async function connectMachineForPreview() {
+ adbConnecting = true;
+ try {
+ // no Android server socket needed for preview — only file reads
+ await adb.connnectViaWebUSB(false);
+ if (AdbInstance.instance) {
+ addNotification('Machine connected');
+ connectDialogOpen = false;
+ // Continue straight into the preview the user originally asked for.
+ await loadPreviewMenus();
+ }
+ } catch (e) {
+ addNotification('ERR:' + (e instanceof Error ? e.message : 'Connect failed'));
+ } finally {
+ adbConnecting = false;
+ }
+ }
+
// Preview functions
async function loadPreviewMenus() {
if (!AdbInstance.instance) {
- addNotification('ERR:Machine not connected');
+ // Prompt the user to connect first (same UX as other pages).
+ connectDialogOpen = true;
return;
}
@@ -1170,6 +1283,20 @@
}
}
+ // Map a gen-service file path to the machine path, PRESERVING the structure
+ // under taobin_project. The old code flattened to `${v3}/${basename}`, which sent
+ // nested files (banners in event_v3//, generated .ev in event/, even
+ // active_promotions.lxml) to the wrong place on the machine.
+ function genFileToMachinePath(genFilePath: string, countryCode: string): string {
+ const marker = '/taobin_project/';
+ const idx = genFilePath.indexOf(marker);
+ if (idx >= 0) {
+ return `${sourceDir}/taobin_project/${genFilePath.slice(idx + marker.length)}`;
+ }
+ const filename = genFilePath.split('/').pop() || '';
+ return `${sourceDir}/taobin_project/inter/${countryCode}/xml/multi/v3/${filename}`;
+ }
+
async function pushLayoutFilesToAndroid() {
if (!AdbInstance.instance) {
addNotification('ERR:Machine not connected');
@@ -1201,9 +1328,9 @@
try {
for (let i = 0; i < filesToPush.length; i++) {
const file = filesToPush[i];
- const filename = file.file.split('/').pop() || '';
- const androidPath = `${sourceDir}/taobin_project/inter/${country}/xml/multi/v3/${filename}`;
-
+ const androidPath = genFileToMachinePath(file.file, country);
+ const parentDir = androidPath.slice(0, androidPath.lastIndexOf('/'));
+ await adb.executeCmd(`mkdir -p "${parentDir}"`);
await adb.push(androidPath, file.content);
pushProgress = { current: i + 1, total: filesToPush.length };
@@ -1237,9 +1364,9 @@
try {
for (let i = 0; i < files.length; i++) {
const file = files[i];
- const filename = file.file.split('/').pop() || '';
- const androidPath = `${sourceDir}/taobin_project/inter/${country}/xml/multi/v3/${filename}`;
-
+ const androidPath = genFileToMachinePath(file.file, country);
+ const parentDir = androidPath.slice(0, androidPath.lastIndexOf('/'));
+ await adb.executeCmd(`mkdir -p "${parentDir}"`);
await adb.push(androidPath, file.content);
pushProgress = { current: i + 1, total: files.length };
@@ -1471,7 +1598,7 @@
await new Promise((resolve) => setTimeout(resolve, 300));
// Step 1: Enter room via WebSocket (acquire lock)
- const entered = enterRoom(country, catalog);
+ const entered = await enterRoom(country, catalog);
if (!entered) {
addNotification('ERR:WebSocket not connected');
sheetLoading.set(false);
@@ -2078,13 +2205,13 @@
- {#if getVisibleSections(editingItem.new_layout_v2).length > 0}
+ {#if getEditSections(editingItem.new_layout_v2).length > 0}
Menu Data
- {#each getVisibleSections(editingItem.new_layout_v2) as section}
+ {#each getEditSections(editingItem.new_layout_v2) as section}
{getSectionTitle(section)}
@@ -2093,7 +2220,7 @@
>
- {#each getVisibleCells(section) as cell}
+ {#each getEditCells(section) as cell}