+
+
+
item(s)
Latest location:
- Quantity:
+
+
+
+
@@ -781,6 +816,12 @@ export function renderStockListPage() {
•
+
+
+ •
+
+
+
@@ -876,6 +917,7 @@ export function stockListPageData(store) {
locationMap: {},
locationDescendants: {},
locationLineage: {},
+ categoriesById: {},
editForms: {},
editErrors: {},
levelOptions: LEVEL_OPTIONS,
@@ -918,13 +960,13 @@ export function stockListPageData(store) {
: false;
if (!restoredFromRuntime) {
- const initTasks = [this.loadLocations()];
+ const initTasks = [this.loadLocations(), this.loadCategories()];
if (this.viewMode === 'items') {
initTasks.push(this.loadEntries());
} else {
initTasks.push(
this.loadGroupedEntries({
- expanded: 0,
+ expanded: false,
resetVisible: !restoredContext,
}),
);
@@ -937,6 +979,9 @@ export function stockListPageData(store) {
if (!restoredFromRuntime && this.viewMode === 'grouped') {
this.hydrateGroupedEntriesInBackground().catch(() => {});
}
+ if (restoredFromRuntime) {
+ this.refreshLoadedViewsInBackground().catch(() => {});
+ }
if (restoredFromRuntime && restoredContext?.focusedItemUuid) {
this.refreshFocusedItemInBackground(restoredContext.focusedItemUuid).catch(() => {});
}
@@ -1047,6 +1092,7 @@ export function stockListPageData(store) {
locationMap: this.locationMap,
locationDescendants: this.locationDescendants,
locationLineage: this.locationLineage,
+ categoriesById: this.categoriesById,
changeCursor: this.changeCursor,
}),
};
@@ -1106,6 +1152,9 @@ export function stockListPageData(store) {
this.locationLineage = payload.locationLineage && typeof payload.locationLineage === 'object'
? payload.locationLineage
: {};
+ this.categoriesById = payload.categoriesById && typeof payload.categoriesById === 'object'
+ ? payload.categoriesById
+ : {};
this.changeCursor = payload.changeCursor || this.changeCursor;
if (this.itemsLoaded) {
@@ -1267,7 +1316,7 @@ export function stockListPageData(store) {
},
indexEntry(entry) {
const indexed = { ...entry };
- indexed._searchBlob = searchBlob(indexed, this.locationMap);
+ indexed._searchBlob = searchBlob(indexed, this.locationMap, this.categoriesById);
return indexed;
},
indexGroup(group) {
@@ -1278,7 +1327,7 @@ export function stockListPageData(store) {
...group,
items: indexedItems,
};
- indexed._searchBlob = groupSearchBlob(indexed, this.locationMap);
+ indexed._searchBlob = groupSearchBlob(indexed, this.locationMap, this.categoriesById);
return indexed;
},
reindexSearchData() {
@@ -1309,7 +1358,7 @@ export function stockListPageData(store) {
if (mode === 'grouped') {
if (!this.groupedLoaded) {
- await this.loadGroupedEntries({ expanded: 0, resetVisible: true });
+ await this.loadGroupedEntries({ expanded: false, resetVisible: true });
}
this.hydrateGroupedEntriesInBackground().catch(() => {});
return;
@@ -1325,7 +1374,7 @@ export function stockListPageData(store) {
: this.itemsLoaded);
if (this.viewMode === 'grouped') {
- await this.loadGroupedEntries({ expanded: 0, background: useBackground });
+ await this.loadGroupedEntries({ expanded: false, background: useBackground });
this.hydrateGroupedEntriesInBackground({ force: true }).catch(() => {});
return;
}
@@ -1417,7 +1466,7 @@ export function stockListPageData(store) {
this.invalidateMemo();
this.persistRuntimeCache();
},
- async loadGroupedEntries({ expanded = 1, background = false, resetVisible = false } = {}) {
+ async loadGroupedEntries({ expanded = true, background = false, resetVisible = false } = {}) {
if (!store.isConnected) {
return;
}
@@ -1432,7 +1481,7 @@ export function stockListPageData(store) {
try {
const loadedGroups = await listGroupedStockEntries(store, { expanded });
- if (expanded === 0) {
+ if (!expanded) {
this.applyGroupedSummary(loadedGroups, { resetVisible });
return;
}
@@ -1461,7 +1510,7 @@ export function stockListPageData(store) {
this.groupedHydrating = true;
try {
- await this.loadGroupedEntries({ expanded: 1, background: true });
+ await this.loadGroupedEntries({ expanded: true, background: true });
} finally {
this.groupedHydrating = false;
}
@@ -1473,7 +1522,7 @@ export function stockListPageData(store) {
}
if (this.groupedLoaded) {
tasks.push(
- this.loadGroupedEntries({ expanded: 0, background: true }).then(() =>
+ this.loadGroupedEntries({ expanded: false, background: true }).then(() =>
this.hydrateGroupedEntriesInBackground({ force: true }),
),
);
@@ -1513,6 +1562,25 @@ export function stockListPageData(store) {
this.persistRuntimeCache();
}
},
+ async loadCategories() {
+ if (!store.isConnected) {
+ return;
+ }
+
+ try {
+ const categories = await listCategories(store, { expanded: true });
+ this.categoriesById = Object.fromEntries(
+ categories
+ .filter((category) => category?.id !== undefined && category?.id !== null)
+ .map((category) => [String(category.id), category]),
+ );
+ } catch {
+ this.categoriesById = {};
+ } finally {
+ this.reindexSearchData();
+ this.persistRuntimeCache();
+ }
+ },
resetGroupedVisibleLimit() {
this.groupedVisibleLimit = this.groupedPageSize;
},
@@ -1526,6 +1594,28 @@ export function stockListPageData(store) {
return group.items.filter((item) => !isGroupedChildStub(item));
},
+ mainCategoryLabel(entry) {
+ return resolveMainCategoryLabel(entry, this.categoriesById);
+ },
+ mainCategoryBadgeLabel(entry) {
+ return `Main category: ${this.mainCategoryLabel(entry)}`;
+ },
+ groupSummaryMetricLabel(group) {
+ if (group?.stock_type === 'measured') {
+ return 'Quantity';
+ }
+ if (group?.stock_type === 'descriptive') {
+ return 'Stock level';
+ }
+ if (group?.stock_type === 'binary') {
+ return 'Stock state';
+ }
+ return 'Stock';
+ },
+ groupSummaryMetricValue(group) {
+ // Use backend-provided grouped fields as the single source of truth.
+ return quantityLabel(group);
+ },
hasGroupedChildStubs(group) {
if (!Array.isArray(group?.items)) {
return false;
@@ -2269,7 +2359,7 @@ export function stockListPageData(store) {
? `${item.name} was already out of stock and removed from the group.`
: `${item.name} was ${actionLabel} and removed from the group.`,
});
- this.loadGroupedEntries({ expanded: 0, background: true }).catch(() => {});
+ this.loadGroupedEntries({ expanded: false, background: true }).catch(() => {});
} catch (error) {
this.editErrors[item.id] = error.message || 'Removal failed.';
}
diff --git a/tests/api/categories.test.js b/tests/api/categories.test.js
new file mode 100644
index 0000000..b3f46c5
--- /dev/null
+++ b/tests/api/categories.test.js
@@ -0,0 +1,67 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const apiRequestMock = vi.fn();
+
+vi.mock('../../src/api/client.js', () => ({
+ getPath(key) {
+ const paths = {
+ categories: 'kitchen/categories',
+ };
+ return paths[key];
+ },
+ apiRequest: (...args) => apiRequestMock(...args),
+}));
+
+const { listCategories } = await import('../../src/api/categories.js');
+
+describe('api/categories', () => {
+ beforeEach(() => {
+ apiRequestMock.mockReset();
+ });
+
+ it('forwards explicit pagination and filters', async () => {
+ apiRequestMock.mockResolvedValueOnce([]);
+
+ await listCategories(
+ { config: { database: 'db' } },
+ { searchName: 'dairy', active: true, limit: 10, offset: 20, orderBy: 'name', orderDir: 'asc' },
+ );
+
+ expect(apiRequestMock).toHaveBeenCalledWith(
+ { config: { database: 'db' } },
+ 'kitchen/categories',
+ {
+ query: {
+ search_name: 'dairy',
+ active: true,
+ order_by: 'name',
+ order_dir: 'asc',
+ limit: 10,
+ offset: 20,
+ },
+ },
+ );
+ });
+
+ it('aggregates category pages by default', async () => {
+ apiRequestMock
+ .mockResolvedValueOnce(Array.from({ length: 100 }, (_, id) => ({ id: id + 1 })))
+ .mockResolvedValueOnce([{ id: 101 }]);
+
+ const response = await listCategories({ config: { database: 'db' } }, {});
+
+ expect(response).toHaveLength(101);
+ expect(apiRequestMock).toHaveBeenNthCalledWith(
+ 1,
+ { config: { database: 'db' } },
+ 'kitchen/categories',
+ { query: { limit: 100, offset: 0 } },
+ );
+ expect(apiRequestMock).toHaveBeenNthCalledWith(
+ 2,
+ { config: { database: 'db' } },
+ 'kitchen/categories',
+ { query: { limit: 100, offset: 100 } },
+ );
+ });
+});
diff --git a/tests/api/client.test.js b/tests/api/client.test.js
index 8e85094..171e0b8 100644
--- a/tests/api/client.test.js
+++ b/tests/api/client.test.js
@@ -61,12 +61,12 @@ describe('api/client', () => {
const url = buildKitchenApiUrl(store, 'kitchen/items/grouped', {
search_name: 'Milk + eggs',
- expanded: 1,
+ expanded: true,
ignored: '',
});
expect(url).toBe(
- 'https://api.example.com/my%20db/kitchen/items/grouped?search_name=Milk+%2B+eggs&expanded=1',
+ 'https://api.example.com/my%20db/kitchen/items/grouped?search_name=Milk+%2B+eggs&expanded=true',
);
});
@@ -88,14 +88,14 @@ describe('api/client', () => {
name: 'Rice',
},
query: {
- label: 1,
+ label: true,
},
});
expect(payload).toEqual({ ok: true });
const [url, request] = fetchSpy.mock.calls[0];
- expect(url).toBe('/kitchen-db/kitchen/items?label=1');
+ expect(url).toBe('/kitchen-db/kitchen/items?label=true');
expect(request.method).toBe('POST');
expect(request.body).toBe('{"name":"Rice"}');
expect(request.headers.get('Accept')).toBe('application/json');
diff --git a/tests/api/labels.test.js b/tests/api/labels.test.js
index cf1e8b9..5c78646 100644
--- a/tests/api/labels.test.js
+++ b/tests/api/labels.test.js
@@ -1,6 +1,72 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { formatPrintErrorMessage } from '../../src/api/labels.js';
+const apiRequestMock = vi.fn();
+
+vi.mock('../../src/api/client.js', () => ({
+ getPath(key) {
+ const paths = {
+ items: 'kitchen/items',
+ };
+ return paths[key];
+ },
+ apiRequest: (...args) => apiRequestMock(...args),
+}));
+
+const {
+ formatPrintErrorMessage,
+ getItemLabel,
+ previewLabel,
+} = await import('../../src/api/labels.js');
+
+describe('api/labels', () => {
+ beforeEach(() => {
+ apiRequestMock.mockReset();
+ });
+
+ it('previewLabel uses boolean label/preview query flags', async () => {
+ apiRequestMock.mockResolvedValueOnce({
+ label: 'YWJj',
+ });
+
+ const response = await previewLabel({ config: { database: 'db' } }, { name: 'Rice' });
+
+ expect(apiRequestMock).toHaveBeenCalledWith(
+ { config: { database: 'db' } },
+ 'kitchen/items',
+ {
+ method: 'POST',
+ body: { name: 'Rice' },
+ accept: 'image/svg+xml, image/png, application/json',
+ query: { label: true, preview: true },
+ },
+ );
+ expect(response).toEqual({
+ objectUrl: 'data:image/png;base64,YWJj',
+ contentType: 'image/png',
+ });
+ });
+
+ it('getItemLabel fetches PNG from /label endpoint', async () => {
+ apiRequestMock.mockResolvedValueOnce({
+ label: 'YWJj',
+ });
+
+ const response = await getItemLabel({ config: { database: 'db' } }, 'item-1');
+
+ expect(apiRequestMock).toHaveBeenCalledWith(
+ { config: { database: 'db' } },
+ 'kitchen/items/item-1/label',
+ {
+ method: 'GET',
+ accept: 'image/png, application/json',
+ },
+ );
+ expect(response).toEqual({
+ objectUrl: 'data:image/png;base64,YWJj',
+ contentType: 'image/png',
+ });
+ });
+});
describe('api/labels formatPrintErrorMessage', () => {
it('maps printer_unavailable payload to user-friendly message', () => {
diff --git a/tests/api/stock.test.js b/tests/api/stock.test.js
index 6ce7d28..9c56e0e 100644
--- a/tests/api/stock.test.js
+++ b/tests/api/stock.test.js
@@ -20,6 +20,7 @@ const {
listGroupedStockEntries,
listKitchenChanges,
listStockEntries,
+ markStockGone,
lookupItemByIdentifier,
lookupItemDetails,
patchStockItem,
@@ -84,7 +85,7 @@ describe('api/stock', () => {
await listGroupedStockEntries(
{ config: { database: 'db' } },
- { expanded: 0, searchName: 'Rice', limit: 10, offset: 0 },
+ { expanded: false, searchName: 'Rice', limit: 10, offset: 0 },
);
expect(apiRequestMock).toHaveBeenCalledWith(
@@ -92,7 +93,7 @@ describe('api/stock', () => {
'kitchen/items/grouped',
{
query: {
- expanded: 0,
+ expanded: false,
search_name: 'Rice',
limit: 10,
offset: 0,
@@ -108,7 +109,7 @@ describe('api/stock', () => {
const response = await listGroupedStockEntries(
{ config: { database: 'db' } },
- { expanded: 1, searchName: 'Rice' },
+ { expanded: true, searchName: 'Rice' },
);
expect(response).toHaveLength(101);
@@ -116,13 +117,13 @@ describe('api/stock', () => {
1,
{ config: { database: 'db' } },
'kitchen/items/grouped',
- { query: { expanded: 1, search_name: 'Rice', limit: 100, offset: 0 } },
+ { query: { expanded: true, search_name: 'Rice', limit: 100, offset: 0 } },
);
expect(apiRequestMock).toHaveBeenNthCalledWith(
2,
{ config: { database: 'db' } },
'kitchen/items/grouped',
- { query: { expanded: 1, search_name: 'Rice', limit: 100, offset: 100 } },
+ { query: { expanded: true, search_name: 'Rice', limit: 100, offset: 100 } },
);
});
@@ -151,7 +152,7 @@ describe('api/stock', () => {
expect(apiRequestMock).toHaveBeenCalledWith(
{ config: { database: 'db' } },
'kitchen/items/item-2',
- { query: { allow_inactive: 1 } },
+ { query: { allow_inactive: true } },
);
});
@@ -297,7 +298,7 @@ describe('api/stock', () => {
expect(apiRequestMock).toHaveBeenCalledWith(
{ config: { database: 'db' } },
'kitchen/items/item-1/lookup',
- { method: 'POST', query: { update: 1 } },
+ { method: 'POST', query: { update: true } },
);
expect(response).toEqual({
status: 'ok',
@@ -426,4 +427,30 @@ describe('api/stock', () => {
});
expect(apiRequestMock).toHaveBeenCalledTimes(1);
});
+
+ it('markStockGone uses /use endpoint for consumed reason', async () => {
+ apiRequestMock.mockResolvedValueOnce(null);
+
+ const result = await markStockGone({ config: { database: 'db' } }, 'item-1', 'consumed');
+
+ expect(result).toEqual({ status: 'gone', reason: 'consumed' });
+ expect(apiRequestMock).toHaveBeenCalledWith(
+ { config: { database: 'db' } },
+ 'kitchen/items/item-1/use',
+ { method: 'POST' },
+ );
+ });
+
+ it('markStockGone uses /stock endpoint for non-consumed reasons', async () => {
+ apiRequestMock.mockResolvedValueOnce({ status: 'OK', stock: { id: 3 } });
+
+ const result = await markStockGone({ config: { database: 'db' } }, 'item-1', 'spoiled');
+
+ expect(result).toEqual({ status: 'gone', reason: 'spoiled' });
+ expect(apiRequestMock).toHaveBeenCalledWith(
+ { config: { database: 'db' } },
+ 'kitchen/items/item-1/stock',
+ { method: 'POST', body: { level: 'gone', gone_reason: 'spoiled' } },
+ );
+ });
});
diff --git a/tests/features/stock/mark-gone.test.js b/tests/features/stock/mark-gone.test.js
index 25cf90c..2c289ed 100644
--- a/tests/features/stock/mark-gone.test.js
+++ b/tests/features/stock/mark-gone.test.js
@@ -130,6 +130,6 @@ describe('stock mark-gone behavior', () => {
message: 'Beans was marked used and removed from the group.',
});
expect(listGroupedStockEntriesMock).toHaveBeenCalledTimes(1);
- expect(listGroupedStockEntriesMock).toHaveBeenCalledWith(store, { expanded: 0 });
+ expect(listGroupedStockEntriesMock).toHaveBeenCalledWith(store, { expanded: false });
});
});
diff --git a/tests/features/stock/stock-list-page-grouped.test.js b/tests/features/stock/stock-list-page-grouped.test.js
index 058c26d..cb0fa3e 100644
--- a/tests/features/stock/stock-list-page-grouped.test.js
+++ b/tests/features/stock/stock-list-page-grouped.test.js
@@ -7,6 +7,7 @@ const getStockEntryMock = vi.fn();
const updateStockItemMock = vi.fn();
const useStockItemMock = vi.fn();
const fetchLocationsMock = vi.fn();
+const listCategoriesMock = vi.fn();
vi.mock('../../../src/api/stock.js', () => ({
listStockEntries: (...args) => listStockEntriesMock(...args),
@@ -21,6 +22,10 @@ vi.mock('../../../src/api/locations.js', () => ({
fetchLocations: (...args) => fetchLocationsMock(...args),
}));
+vi.mock('../../../src/api/categories.js', () => ({
+ listCategories: (...args) => listCategoriesMock(...args),
+}));
+
const { stockListPageData } = await import('../../../src/features/stock/stock-list-page.js');
function createGroupedSummary() {
@@ -112,6 +117,8 @@ describe('stock list grouped-first behavior', () => {
updateStockItemMock.mockReset();
useStockItemMock.mockReset();
fetchLocationsMock.mockReset();
+ listCategoriesMock.mockReset();
+ listCategoriesMock.mockResolvedValue([]);
globalThis.window = createWindowMock();
globalThis.requestAnimationFrame = (callback) => callback();
@@ -133,6 +140,7 @@ describe('stock list grouped-first behavior', () => {
listStockEntriesMock.mockResolvedValueOnce([]);
listKitchenChangesMock.mockResolvedValue({ since: null, nextCursor: null, changes: [] });
fetchLocationsMock.mockResolvedValue({ flat: [], tree: [] });
+ listCategoriesMock.mockResolvedValue([]);
const store = { isConnected: true, addAlert: vi.fn() };
const data = stockListPageData(store);
@@ -141,12 +149,12 @@ describe('stock list grouped-first behavior', () => {
await data.init();
expect(data.viewMode).toBe('grouped');
- expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(1, store, { expanded: 0 });
+ expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(1, store, { expanded: false });
expect(listStockEntriesMock).not.toHaveBeenCalled();
await Promise.resolve();
- expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(2, store, { expanded: 1 });
+ expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(2, store, { expanded: true });
await data.switchView('items');
expect(listStockEntriesMock).toHaveBeenCalledTimes(1);
@@ -162,7 +170,7 @@ describe('stock list grouped-first behavior', () => {
.mockResolvedValueOnce(createGroupedExpanded());
const data = stockListPageData({ isConnected: true, addAlert: vi.fn() });
- await data.loadGroupedEntries({ expanded: 0, resetVisible: true });
+ await data.loadGroupedEntries({ expanded: false, resetVisible: true });
expect(data.groupDisplayItems(data.groupedEntries[0])).toEqual([]);
expect(data.hasGroupedChildStubs(data.groupedEntries[0])).toBe(true);
@@ -226,7 +234,7 @@ describe('stock list grouped-first behavior', () => {
data.groupedLoaded = true;
data.groupedEntries = createGroupedSummary().map((group) => data.indexGroup(group));
- const pending = data.loadGroupedEntries({ expanded: 0, background: true });
+ const pending = data.loadGroupedEntries({ expanded: false, background: true });
expect(data.state.isRefreshing).toBe(true);
expect(data.groupedEntries).toHaveLength(1);
@@ -357,8 +365,10 @@ describe('stock list grouped-first behavior', () => {
await Promise.resolve();
await Promise.resolve();
- expect(listGroupedStockEntriesMock).not.toHaveBeenCalled();
- expect(listStockEntriesMock).not.toHaveBeenCalled();
+ expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(1, store, { expanded: false });
+ expect(listGroupedStockEntriesMock).toHaveBeenNthCalledWith(2, store, { expanded: true });
+ expect(listStockEntriesMock).toHaveBeenCalledTimes(1);
+ expect(listStockEntriesMock).toHaveBeenCalledWith(store);
expect(fetchLocationsMock).not.toHaveBeenCalled();
expect(getStockEntryMock).toHaveBeenCalledWith(store, 'item-100');
expect(returnVisit.entries[0].quantity).toBe(2);