From df015da8fcc04ab0ad607bd19c5658a7e81cd3d1 Mon Sep 17 00:00:00 2001 From: seb Date: Sat, 31 Oct 2026 21:53:21 +0100 Subject: [PATCH] u --- .agents/skills/backend/SKILL.md | 258 ++++++++++-------- src/components/AppShell.jsx | 14 +- src/components/OnlinePrinterIcons.jsx | 290 +++++++++++++++++++++ src/components/UserMenu.jsx | 21 +- src/components/settings/SettingsDialog.jsx | 3 + 5 files changed, 466 insertions(+), 120 deletions(-) create mode 100644 src/components/OnlinePrinterIcons.jsx diff --git a/.agents/skills/backend/SKILL.md b/.agents/skills/backend/SKILL.md index ca17f05..a177aa2 100644 --- a/.agents/skills/backend/SKILL.md +++ b/.agents/skills/backend/SKILL.md @@ -131,7 +131,7 @@ Strip supplierName?: str from T11 (resolve via entityId in cached supplier list) # Dash API Routes Overview (All) -Overview of all 299 API endpoints across all modules. +Overview of all 305 API endpoints across all modules. ### Notation @@ -140,46 +140,47 @@ Params: path values first, then `query:` and `body:` (`body?` = optional body). ### Reusable types -- `T1` = `{ id: int, number: str, type: str, entityId: int, date: str, lines: T19[], externalNumber?: str|null, createdAt?: str, shipping?: T21|null, shippings?: T21[], payment?: T31|null, payments?: T31[], paid?: bool, shipped?: bool, delivered?: bool, orderTotal?: num, paidTotal?: num, orderedQuantity?: num, shippedQuantity?: num, shipments?: T2[], files?: T10[] }` -- `T2` = `{ id: int, number: str, type: str, date: str, lines: T19[], shippings: T21[], entityId?: int|null, externalNumber?: str|null, createdAt?: str|null, lineCount?: int, packageCount?: int, files?: T10[], state?: str }` -- `T3` = `{ id: int, number: str, type: str, date: str, lines: T19[], entityId?: int|null, externalNumber?: str|null, createdAt?: str, positions?: int, grossTotal?: num, totalQuantity?: num, customerName?: str|null, files?: T10[] }` -- `T4` = `{ id: int, number: str, type: str, supplierId: int, date: str, lines: T22[], files: T10[], externalNumber?: str|null, createdAt?: str, ledger?: T38 }` +- `T1` = `{ id: int, number: str, type: str, entityId: int, date: str, lines: T20[], externalNumber?: str|null, createdAt?: str, shipping?: T23|null, shippings?: T23[], payment?: T32|null, payments?: T32[], paid?: bool, shipped?: bool, delivered?: bool, orderTotal?: num, paidTotal?: num, orderedQuantity?: num, shippedQuantity?: num, shipments?: T2[], files?: T10[] }` +- `T2` = `{ id: int, number: str, type: str, date: str, lines: T20[], shippings: T23[], entityId?: int|null, externalNumber?: str|null, createdAt?: str|null, lineCount?: int, packageCount?: int, files?: T10[], state?: str }` +- `T3` = `{ id: int, number: str, type: str, date: str, lines: T20[], entityId?: int|null, externalNumber?: str|null, createdAt?: str, positions?: int, grossTotal?: num, totalQuantity?: num, customerName?: str|null, files?: T10[] }` +- `T4` = `{ id: int, number: str, type: str, supplierId: int, date: str, lines: T24[], files: T10[], externalNumber?: str|null, createdAt?: str, ledger?: T39 }` - `T5` = `{ name: str, path: str, totalSizeBytes: int, timestamp: str|null, manifest?: T6|null }` - `T6` = `{ id: str, timestamp: str, dateKey: str, monthKey: str, dbProvider: str, files: T11, totalSizeBytes: int, durationMs: int }` - `T7` = `{ id: int, name: str, pairingpin?: str|null, token?: str|null, pairedAt?: str|null, clientserial?: str|null, rootCategoryId?: int|null, syncRootArticles?: bool, sort?: int, enabled?: bool, clientversion?: str|null, lastseenAt?: str|null, updatedAt?: str|null, categoryIds?: int[] }` -- `T8` = `{ id: int, articleId: int, entityId: int, pu: num, sort: int, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T40|null, incoming?: { date: str, amount: num }[] }` -- `T9` = `{ id: int, name: str, width: num, height: num, dpi: int, type: str, content: { objects: T23[] }, thumb?: str|null }` +- `T8` = `{ id: int, articleId: int, entityId: int, pu: num, sort: int, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T41|null, incoming?: { date: str, amount: num }[] }` +- `T9` = `{ id: int, name: str, width: num, height: num, dpi: int, type: str, content: { objects: T25[] }, thumb?: str|null }` - `T10` = `{ id: int, manifestId: int, fileId: int, sort: int, hash: str, mimetype: str, name: str, size: int, created?: str, modified?: str, skeledash?: str|null, thumbx?: int|null, thumby?: int|null, meta?: { [k]: str }|null }` -- `T11` = `{ vfs: T39, storage: T39, database: T33 }` +- `T11` = `{ vfs: T40, storage: T40, database: T34 }` - `T12` = `{ id: int, name: str, companyId?: int, token?: str|null, pairingpin?: str|null, pairedAt?: str|null, agentversion?: str|null, lastseenAt?: str|null, updatedAt?: str, sort?: int, enabled?: bool }` -- `T13` = `{ id: int, entityId: int, addressType: str, firstName?: str|null, name?: str|null, street?: str|null, streetNumber?: str|null, zip?: str|null, city?: str|null, county?: str|null }` -- `T14` = `{ id: int, company_id: int, prompt: str, max_itr: int, cron: str, created_at: str, desc?: str|null, skills?: str|null, lastagentnote?: str|null, lastrun_at?: str|null }` -- `T15` = `{ id: int, manifestarticle_id: int, transaction_type: str, amount: num, transaction_text: str, hash_version: int, prev_hash?: str, sku?: str|null, created_at?: str }` -- `T16` = `{ id: int, name: str, sort: int, exclusive: bool, values: T29[], articleCount?: int }` -- `T17` = `{ id: int, companyuser_id: int, provider: str, model: str, created_at: str, updated_at: str, state: str, started_by?: int|null, first_message?: str|null }` -- `T18` = `{ id: int, name: str, rootCategoryId: int|null, languageId: int|null, iso639: str|null, taxrate: num, reducedtaxrate: num, taxfreerate: num }` -- `T19` = `{ id: int, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null, shippable: bool }` -- `T20` = `{ amount: num, net: num, taxrate: num, sku?: str|null, name?: str|null, pu?: num, rebate?: num, comment?: str|null, shippable?: bool }` -- `T21` = `{ id: int, manifestId: int, number: str, carrierId: int, type: str, state: str, trackingCode?: str|null, carrier?: str|null }` -- `T22` = `{ id: int, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null }` -- `T23` = `{ id: str, type: str, x: num, y: num, w?: num, h?: num, text?: str, font?: str, fontSize?: num, barcodeFormat?: str }` -- `T24` = `{ id: int, company_id: int, address: str, type: str, sort: int, model?: str|null, serial?: str|null, desc?: str|null }` -- `T25` = `{ id: int, customergroupId: int, firstName: str|null, name: str, number: str|null, createdAt: str, updatedAt: str }` -- `T26` = `{ id: int, printeragentId: int, type: str, enabled: bool, sort: int, model?: str|null, serial?: str|null }` -- `T27` = `{ name: str, id?: int|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null }` -- `T28` = `{ si: str, basesi: str, basesifactor: num, symbol?: str|null, name?: str|null }` -- `T29` = `{ id: int, attributeId: int, value: str, sort: int, articleCount?: int }` -- `T30` = `{ id: int, name: str, sort: int, exclusive: bool, articleCount?: int }` -- `T31` = `{ id: int, accountId: int, manifestId: int, type: str, amount: num }` -- `T32` = `{ id: int, name: str, sort: int, hasPackages: bool, isReverse: bool }` -- `T33` = `{ name: str|null, sizeBytes: int, backedUp: bool, reason?: str|null }` -- `T34` = `{ id: int, email: str, selectedCompanyId: int|null, picture?: str }` -- `T35` = `{ fullHash: str, thumbW: int, thumbH: int, thumbHash: str }` -- `T36` = `{ id: int, entityId: int, contactType: str, contact: str }` -- `T37` = `{ id: int, name: str, createdAt: str, updatedAt: str }` -- `T38` = `{ totalPositions: int, completelyOnLedgerPositions: int }` -- `T39` = `{ name: str, sizeBytes: int, sourceExists: bool }` -- `T40` = `{ net: num, taxId: int, taxRate?: num|null }` +- `T13` = `{ id: int, printeragentId: int, type: str, enabled: bool, sort: int, model?: str|null, serial?: str|null, open?: bool, pause?: bool, error?: bool, online?: bool, labelLength?: int|null }` +- `T14` = `{ id: int, entityId: int, addressType: str, firstName?: str|null, name?: str|null, street?: str|null, streetNumber?: str|null, zip?: str|null, city?: str|null, county?: str|null }` +- `T15` = `{ id: int, company_id: int, prompt: str, max_itr: int, cron: str, created_at: str, desc?: str|null, skills?: str|null, lastagentnote?: str|null, lastrun_at?: str|null }` +- `T16` = `{ id: int, manifestarticle_id: int, transaction_type: str, amount: num, transaction_text: str, hash_version: int, prev_hash?: str, sku?: str|null, created_at?: str }` +- `T17` = `{ id: int, name: str, sort: int, exclusive: bool, values: T30[], articleCount?: int }` +- `T18` = `{ id: int, companyuser_id: int, provider: str, model: str, created_at: str, updated_at: str, state: str, started_by?: int|null, first_message?: str|null }` +- `T19` = `{ id: int, name: str, rootCategoryId: int|null, languageId: int|null, iso639: str|null, taxrate: num, reducedtaxrate: num, taxfreerate: num }` +- `T20` = `{ id: int, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null, shippable: bool }` +- `T21` = `{ amount: num, net: num, taxrate: num, sku?: str|null, name?: str|null, pu?: num, rebate?: num, comment?: str|null, shippable?: bool }` +- `T22` = `{ id: int, agentprinterId: int, type: str, state: str, data: str, createdAt: str, printeragentId?: int|null, completedAt?: str|null }` +- `T23` = `{ id: int, manifestId: int, number: str, carrierId: int, type: str, state: str, trackingCode?: str|null, carrier?: str|null }` +- `T24` = `{ id: int, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null }` +- `T25` = `{ id: str, type: str, x: num, y: num, w?: num, h?: num, text?: str, font?: str, fontSize?: num, barcodeFormat?: str }` +- `T26` = `{ id: int, company_id: int, address: str, type: str, sort: int, model?: str|null, serial?: str|null, desc?: str|null }` +- `T27` = `{ id: int, customergroupId: int, firstName: str|null, name: str, number: str|null, createdAt: str, updatedAt: str }` +- `T28` = `{ name: str, id?: int|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null }` +- `T29` = `{ si: str, basesi: str, basesifactor: num, symbol?: str|null, name?: str|null }` +- `T30` = `{ id: int, attributeId: int, value: str, sort: int, articleCount?: int }` +- `T31` = `{ id: int, name: str, sort: int, exclusive: bool, articleCount?: int }` +- `T32` = `{ id: int, accountId: int, manifestId: int, type: str, amount: num }` +- `T33` = `{ id: int, name: str, sort: int, hasPackages: bool, isReverse: bool }` +- `T34` = `{ name: str|null, sizeBytes: int, backedUp: bool, reason?: str|null }` +- `T35` = `{ id: int, email: str, selectedCompanyId: int|null, picture?: str }` +- `T36` = `{ fullHash: str, thumbW: int, thumbH: int, thumbHash: str }` +- `T37` = `{ id: int, entityId: int, contactType: str, contact: str }` +- `T38` = `{ id: int, name: str, createdAt: str, updatedAt: str }` +- `T39` = `{ totalPositions: int, completelyOnLedgerPositions: int }` +- `T40` = `{ name: str, sizeBytes: int, sourceExists: bool }` +- `T41` = `{ net: num, taxId: int, taxRate?: num|null }` ### Routes @@ -224,7 +225,7 @@ _none_ #### List agent printers — `GET /agentprinter` - Params: `query: printeragentId?: int` -- Returns: `200 { agentprinters: T26[] }` +- Returns: `200 { agentprinters: T13[] }` #### Reorder agent printers — `PUT /agentprinter/order` - Params: `body: { printeragentId: int, agentprinterIds: int[] }` - Returns: `200 { agentprinterIds: int[] }` @@ -233,10 +234,10 @@ _none_ - Returns: `204 void` #### Get agent printer — `GET /agentprinter/{id}` - Params: `id: int` -- Returns: `200 { agentprinter: T26 }` +- Returns: `200 { agentprinter: T13 }` #### Update agent printer — `PATCH /agentprinter/{id}` - Params: `id: int, body: { enabled?: bool, sort?: int }` -- Returns: `200 { agentprinter: T26 }` +- Returns: `200 { agentprinter: T13 }` ### Section: /article @@ -254,7 +255,7 @@ _none_ - Returns: `204 void` #### Get article by SKU — `GET /article/{sku}` - Params: `sku: str` -- Returns: `200 { article: { id: int, sku: str, name: str, slug: str, desc: str|null, seo: str|null, track_stock: bool, unitamount: num|null, weight: num|null, unit: T28, brand: T27|null, categoryIds: int[], photos: { sort: int, fullHash: str, fullW: int, fullH: int, fullSize: int, thumbW: int, thumbH: int, thumbHash: str }[], eans: str[], prices: { minmultiplier: num, net: num, taxRate: num, customergroupId: int }[], suppliers: T8[], undeliveredOrders: { orderId: int, orderNumber: str, date: str, amount: num, customerName?: str|null }[] } }` +- Returns: `200 { article: { id: int, sku: str, name: str, slug: str, desc: str|null, seo: str|null, track_stock: bool, unitamount: num|null, weight: num|null, unit: T29, brand: T28|null, categoryIds: int[], photos: { sort: int, fullHash: str, fullW: int, fullH: int, fullSize: int, thumbW: int, thumbH: int, thumbHash: str }[], eans: str[], prices: { minmultiplier: num, net: num, taxRate: num, customergroupId: int }[], suppliers: T8[], undeliveredOrders: { orderId: int, orderNumber: str, date: str, amount: num, customerName?: str|null }[] } }` #### Update article by SKU — `PATCH /article/{sku}` - Params: `sku: str, body: { name?: str, desc?: str, seo?: str, unitamount?: num, unitSi?: str, track_stock?: bool }` - Returns: `204 void` @@ -353,19 +354,19 @@ _none_ #### List attribute names — `GET /attributename` _none_ -- Returns: `200 { attributenames: T16[] }` +- Returns: `200 { attributenames: T17[] }` #### Create attribute name — `POST /attributename` - Params: `body: { name: str, sort?: int, exclusive?: bool }` -- Returns: `201 { attributename: T16 }` +- Returns: `201 { attributename: T17 }` #### Reorder attribute names — `PUT /attributename/order` - Params: `body: { attributenameIds: int[] }` - Returns: `200 { ok: bool }` #### List values for an attribute — `GET /attributename/{attributeId}/value` - Params: `attributeId: int` -- Returns: `200 { values: T29[] }` +- Returns: `200 { values: T30[] }` #### Create value for an attribute — `POST /attributename/{attributeId}/value` - Params: `attributeId: int, body: { value: str, sort?: int }` -- Returns: `201 { attributevalue: T29 }` +- Returns: `201 { attributevalue: T30 }` #### Reorder values of an attribute — `PUT /attributename/{attributeId}/value/order` - Params: `attributeId: int, body: { attributevalueIds: int[] }` - Returns: `200 { ok: bool }` @@ -374,7 +375,7 @@ _none_ - Returns: `200 { ok: bool }` #### Update attribute name — `PATCH /attributename/{id}` - Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }` -- Returns: `200 { attributename: T16 }` +- Returns: `200 { attributename: T17 }` ### Section: /attributevalue @@ -383,28 +384,28 @@ _none_ - Returns: `200 { ok: bool }` #### Update attribute value — `PATCH /attributevalue/{id}` - Params: `id: int, body: { value?: str, sort?: int }` -- Returns: `200 { attributevalue: T29 }` +- Returns: `200 { attributevalue: T30 }` #### Delete attribute value image — `DELETE /attributevalue/{id}/image` - Params: `id: int` -- Returns: `200 { attributevalue: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T35[] } }` +- Returns: `200 { attributevalue: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T36[] } }` #### Add or replace attribute value image — `POST /attributevalue/{id}/image` - Params: `id: int, image/avif` -- Returns: `201 { attributevalue: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T35[] } }` +- Returns: `201 { attributevalue: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T36[] } }` ### Section: /auth #### Login with Google ID token — `POST /auth/login` - Params: `body: { idToken: str }` -- Returns: `200 { message: str, user: T34 }` +- Returns: `200 { message: str, user: T35 }` #### Logout — `POST /auth/logout` _none_ - Returns: `200 { message: str }` #### Current user — `GET /auth/me` _none_ -- Returns: `200 { user: T34, googleClientId: str, schemaVersion: int, vhost: bool, vhostSettings: str }` +- Returns: `200 { user: T35, googleClientId: str, schemaVersion: int, vhost: bool, vhostSettings: str }` #### Set selected company — `PUT /auth/selected-company` - Params: `body: { companyId: int }` -- Returns: `200 { user: T34 }` +- Returns: `200 { user: T35 }` ### Section: /backup @@ -425,7 +426,7 @@ _none_ - Returns: `200 { brands: { id: int, name: str, articleCount: int, pics: { fullHash: str, thumbW: int, thumbH: int, thumbHash: str, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null }[], gsprpinfo?: str|null }[], total: int, offset: int, limit: int }` #### Create brand — `POST /brand` - Params: `body: { name: str, gsprpinfo?: str }` -- Returns: `201 { brand: { id: int, name: str, pics: T35[], gsprpinfo?: str|null } }` +- Returns: `201 { brand: { id: int, name: str, pics: T36[], gsprpinfo?: str|null } }` #### Delete brand — `DELETE /brand/{id}` - Params: `id: int` - Returns: `204 void` @@ -434,19 +435,19 @@ _none_ - Returns: `200 { brand: { id: int, name: str, touchedArticleCount: int, gsprpinfo?: str|null } }` #### Delete brand image — `DELETE /brand/{id}/image` - Params: `id: int` -- Returns: `200 { brand: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T35[] } }` +- Returns: `200 { brand: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T36[] } }` #### Add or replace brand image — `POST /brand/{id}/image` - Params: `id: int, image/avif` -- Returns: `201 { brand: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T35[] } }` +- Returns: `201 { brand: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T36[] } }` ### Section: /carrier #### List carriers — `GET /carrier` _none_ -- Returns: `200 { carriers: T32[] }` +- Returns: `200 { carriers: T33[] }` #### Create carrier — `POST /carrier` - Params: `body: { name: str, sort?: int, hasPackages?: bool, isReverse?: bool }` -- Returns: `201 { carrier: T32 }` +- Returns: `201 { carrier: T33 }` #### Reorder carriers — `PUT /carrier/order` - Params: `body: { carrierIds: int[] }` - Returns: `200 { carrierIds: int[] }` @@ -455,10 +456,10 @@ _none_ - Returns: `204 void` #### Get carrier by ID — `GET /carrier/{id}` - Params: `id: int` -- Returns: `200 { carrier: T32 }` +- Returns: `200 { carrier: T33 }` #### Update carrier — `PATCH /carrier/{id}` - Params: `id: int, body: { name?: str, sort?: int, hasPackages?: bool, isReverse?: bool }` -- Returns: `200 { carrier: T32 }` +- Returns: `200 { carrier: T33 }` ### Section: /category @@ -482,7 +483,7 @@ _none_ - Returns: `200 { category: { id: int, name: str, slug: str, parentId: int, sort: int } }` #### Articles in category — `GET /category/{id}/articles` - Params: `id: int, query: includeChildren?: bool` -- Returns: `200 { articles: { id: int, sku: str, name: str, slug: str, track_stock: bool, optionsCount: int, articleListCount: int, childCount: int, net?: num|null, taxRate?: num|null, parentArticleId?: int|null, parentSku?: str|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null, brand?: T27|null, articlewarehousesummary?: { id: int, articleId: int, warehouseId: int, stock: num, article_id?: int, warehouse_id?: int, warehouseName?: str|null }[], warehouses?: { id: int, name: str, stock: num }[] }[] }` +- Returns: `200 { articles: { id: int, sku: str, name: str, slug: str, track_stock: bool, optionsCount: int, articleListCount: int, childCount: int, net?: num|null, taxRate?: num|null, parentArticleId?: int|null, parentSku?: str|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null, smallThumbW?: int|null, smallThumbH?: int|null, smallThumbBinary?: str|null, brand?: T28|null, articlewarehousesummary?: { id: int, articleId: int, warehouseId: int, stock: num, article_id?: int, warehouse_id?: int, warehouseName?: str|null }[], warehouses?: { id: int, name: str, stock: num }[] }[] }` #### List category attribute values — `GET /category/{id}/attributevalue` - Params: `id: int` - Returns: `200 { attributevalues: { id: int, attributeId: int, attributeName: str, attributeValueId: int, value: str, sort: int, categoryId?: int, exclusive?: bool }[] }` @@ -512,10 +513,10 @@ _none_ #### List companies — `GET /company` _none_ -- Returns: `200 { companies: T18[] }` +- Returns: `200 { companies: T19[] }` #### Create company — `POST /company` - Params: `body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }` -- Returns: `201 { company: T18, user: T34 }` +- Returns: `201 { company: T19, user: T35 }` #### Export company catalog as zip archive (SSE) — `GET /company/export` - Params: `query: stream?: str` - Returns: `200 SSE` @@ -545,7 +546,7 @@ _none_ - Returns: `204 void` #### Update company — `PUT /company/{id}` - Params: `id: int, body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }` -- Returns: `200 { company: T18 }` +- Returns: `200 { company: T19 }` ### Section: /customergroup @@ -569,7 +570,7 @@ _none_ #### List deliveries — `GET /delivery` - Params: `query: offset?: int, limit?: int, search?: str, onlyUnbooked?: bool, supplierId?: int, seekMonths?: int` -- Returns: `200 { deliveries: { id: int, number: str, type: str, supplierId: int, date: str, externalNumber?: str|null, createdAt?: str, ledger?: T38 }[], total: int, unfilteredTotal: int, offset: int, limit: int }` +- Returns: `200 { deliveries: { id: int, number: str, type: str, supplierId: int, date: str, externalNumber?: str|null, createdAt?: str, ledger?: T39 }[], total: int, unfilteredTotal: int, offset: int, limit: int }` #### Create delivery — `POST /delivery` - Params: `body: { externalNumber: str, date: str, supplierId: int, lines: { amount: num, net: num, taxrate: num, sku?: str|null, name?: str|null, pu?: num, rebate?: num, comment?: str|null }[], files?: { mimetype: str, name: str, content: str, sort?: int, size?: int, hash?: str, created?: str, modified?: str, meta?: { [k]: str } }[] }` - Returns: `201 { delivery: T4 }` @@ -596,46 +597,46 @@ _none_ #### List entities — `GET /entity` - Params: `query: customergroupId?: int, role?: str` -- Returns: `200 { entities: T25[] }` +- Returns: `200 { entities: T27[] }` #### Create entity — `POST /entity` - Params: `body: { customergroupId: int, name: str, firstName?: str|null, number?: str }` -- Returns: `201 { entity: T25 }` +- Returns: `201 { entity: T27 }` #### Peek next customer number — `GET /entity/next-number` _none_ - Returns: `200 { number: str }` #### List entity addresses — `GET /entity/{entityId}/address` - Params: `entityId: int` -- Returns: `200 { addresses: T13[] }` +- Returns: `200 { addresses: T14[] }` #### Create entity address — `POST /entity/{entityId}/address` - Params: `entityId: int, body: { addressType: str, firstName?: str|null, name?: str|null, street?: str|null, streetNumber?: str|null, zip?: str|null, city?: str|null, county?: str|null }` -- Returns: `201 { address: T13 }` +- Returns: `201 { address: T14 }` #### Delete entity address — `DELETE /entity/{entityId}/address/{id}` - Params: `entityId: int, id: int` - Returns: `204 void` #### Update entity address — `PATCH /entity/{entityId}/address/{id}` - Params: `entityId: int, id: int, body: { addressType?: str, firstName?: str|null, name?: str|null, street?: str|null, streetNumber?: str|null, zip?: str|null, city?: str|null, county?: str|null }` -- Returns: `200 { address: T13 }` +- Returns: `200 { address: T14 }` #### List entity contacts — `GET /entity/{entityId}/contact` - Params: `entityId: int` -- Returns: `200 { contacts: T36[] }` +- Returns: `200 { contacts: T37[] }` #### Create entity contact — `POST /entity/{entityId}/contact` - Params: `entityId: int, body: { contactType: str, contact: str }` -- Returns: `201 { contact: T36 }` +- Returns: `201 { contact: T37 }` #### Delete entity contact — `DELETE /entity/{entityId}/contact/{id}` - Params: `entityId: int, id: int` - Returns: `204 void` #### Update entity contact — `PATCH /entity/{entityId}/contact/{id}` - Params: `entityId: int, id: int, body: { contactType?: str, contact?: str }` -- Returns: `200 { contact: T36 }` +- Returns: `200 { contact: T37 }` #### Delete entity — `DELETE /entity/{id}` - Params: `id: int` - Returns: `204 void` #### Get entity — `GET /entity/{id}` - Params: `id: int` -- Returns: `200 { entity: T25 }` +- Returns: `200 { entity: T27 }` #### Update entity — `PATCH /entity/{id}` - Params: `id: int, body: { name?: str, firstName?: str|null, number?: str|null }` -- Returns: `200 { entity: T25 }` +- Returns: `200 { entity: T27 }` ### Section: /events @@ -655,6 +656,9 @@ _none_ - `propertyname`: `{}` - `labeltemplate`: `{}` - `printer`: `{}` + - `printeragent`: `{}` + - `agentprinter`: `{ printers } or {}` + - `printerjob`: `{ job } or { jobId, state }` - `warehouse`: `{}` - `supplier`: `{}` - `vfs`: `{}` @@ -683,7 +687,7 @@ _none_ _none_ - Returns: `200 { labeltemplates: { id: int, name: str, width: num, height: num, dpi: int, type: str, thumb?: str|null }[] }` #### Create label template — `POST /labeltemplate` -- Params: `body: { name: str, width: num, height: num, dpi: int, type: str, content: { objects: T23[] } }` +- Params: `body: { name: str, width: num, height: num, dpi: int, type: str, content: { objects: T25[] } }` - Returns: `201 { labeltemplate: T9 }` #### Delete label template — `DELETE /labeltemplate/{id}` - Params: `id: int` @@ -692,26 +696,26 @@ _none_ - Params: `id: int` - Returns: `200 { labeltemplate: T9 }` #### Update label template (partial) — `PATCH /labeltemplate/{id}` -- Params: `id: int, body: { name?: str, width?: num, height?: num, dpi?: int, type?: str, content?: { objects: T23[] } }` +- Params: `id: int, body: { name?: str, width?: num, height?: num, dpi?: int, type?: str, content?: { objects: T25[] } }` - Returns: `200 { labeltemplate: T9 }` #### Update label template — `PUT /labeltemplate/{id}` -- Params: `id: int, body: { name?: str, width?: num, height?: num, dpi?: int, type?: str, content?: { objects: T23[] } }` +- Params: `id: int, body: { name?: str, width?: num, height?: num, dpi?: int, type?: str, content?: { objects: T25[] } }` - Returns: `200 { labeltemplate: T9 }` ### Section: /ledger #### Query ledger by manifest article ID or SKU — `GET /ledger` - Params: `query: manifestarticle_id?: int, sku?: str, transaction_type?: str` -- Returns: `200 { ledger: T15[] }` +- Returns: `200 { ledger: T16[] }` #### Query company-wide ledger history — `GET /ledger/history` - Params: `query: offset?: int, limit?: int, search?: str, seekMonths?: int` - Returns: `200 { ledger: { id: int, date: str, transaction_type: str, transaction_text: str, sku?: str|null, name?: str|null, amount?: num }[], total: int, unfilteredTotal: int, offset: int, limit: int }` #### Query ledger by manifest article ID — `GET /ledger/manifestarticle/{manifestarticleId}` - Params: `manifestarticleId: int, query: transaction_type?: str` -- Returns: `200 { ledger: T15[] }` +- Returns: `200 { ledger: T16[] }` #### Query ledger by article SKU — `GET /ledger/sku/{sku}` - Params: `sku: str, query: transaction_type?: str` -- Returns: `200 { ledger: T15[] }` +- Returns: `200 { ledger: T16[] }` ### Section: /mcp @@ -741,16 +745,16 @@ _none_ #### List conversations — `GET /modelconversation` _none_ -- Returns: `200 { conversations: T17[] }` +- Returns: `200 { conversations: T18[] }` #### Create conversation — `POST /modelconversation` - Params: `body: { provider: str, model: str }` -- Returns: `201 { conversation: T17 }` +- Returns: `201 { conversation: T18 }` #### Delete conversation — `DELETE /modelconversation/{id}` - Params: `id: int` - Returns: `204 void` #### Get conversation — `GET /modelconversation/{id}` - Params: `id: int` -- Returns: `200 { conversation: T17 }` +- Returns: `200 { conversation: T18 }` #### List conversation messages — `GET /modelconversation/{id}/message` - Params: `id: int` - Returns: `200 { messages: { id: int, conversation_id: int, created_at: str, role: str, message: str }[] }` @@ -791,7 +795,7 @@ _none_ - Params: `query: offset?: int, limit?: int, search?: str, onlyUnpaid?: bool, onlyUndelivered?: bool, seekMonths?: int` - Returns: `200 { orders: T1[], total: int, unfilteredTotal: int, offset: int, limit: int }` #### Create order — `POST /order` -- Params: `body: { number: str, date: str, entityId: int, lines: T20[], externalNumber?: str|null }` +- Params: `body: { number: str, date: str, entityId: int, lines: T21[], externalNumber?: str|null }` - Returns: `201 { order: T1 }` #### Delete order — `DELETE /order/{id}` - Params: `id: int` @@ -800,7 +804,7 @@ _none_ - Params: `id: int` - Returns: `200 { order: T1 }` #### Update order — `PATCH /order/{id}` -- Params: `id: int, body: { number?: str, date?: str, entityId?: int|null, externalNumber?: str|null, lines?: T20[] }` +- Params: `id: int, body: { number?: str, date?: str, entityId?: int|null, externalNumber?: str|null, lines?: T21[] }` - Returns: `200 { order: T1 }` #### Delete order file attachment — `DELETE /order/{id}/file/{fileId}` - Params: `id: int, fileId: int` @@ -810,10 +814,10 @@ _none_ - Returns: `200 str` #### List payments of an order — `GET /order/{id}/payment` - Params: `id: int` -- Returns: `200 { payments: T31[] }` +- Returns: `200 { payments: T32[] }` #### Add payment to an order — `POST /order/{id}/payment` - Params: `id: int, body: { accountId: int, type: str, amount: num }` -- Returns: `201 { payment: T31 }` +- Returns: `201 { payment: T32 }` #### Generate and attach order PDF — `POST /order/{id}/pdf` - Params: `id: int` - Returns: `201 { attachment: T10, fileUrl: str }` @@ -825,10 +829,10 @@ _none_ - Returns: `201 { shipment: T2 }` #### List shippings of an order — `GET /order/{id}/shipping` - Params: `id: int` -- Returns: `200 { shippings: T21[] }` +- Returns: `200 { shippings: T23[] }` #### Create shipping for an order — `POST /order/{id}/shipping` - Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }` -- Returns: `201 { shipping: T21 }` +- Returns: `201 { shipping: T23 }` ### Section: /package @@ -873,10 +877,10 @@ _none_ #### List printers — `GET /printer` _none_ -- Returns: `200 { printers: T24[] }` +- Returns: `200 { printers: T26[] }` #### Create printer — `POST /printer` - Params: `body: { address: str, type: str, model?: str|null, serial?: str|null, sort?: int, desc?: str|null }` -- Returns: `201 { printer: T24 }` +- Returns: `201 { printer: T26 }` #### Reorder printers — `PUT /printer/order` - Params: `body: { printerIds: int[] }` - Returns: `200 { printerIds: int[] }` @@ -888,13 +892,13 @@ _none_ - Returns: `204 void` #### Get printer by ID — `GET /printer/{id}` - Params: `id: int` -- Returns: `200 { printer: T24 }` +- Returns: `200 { printer: T26 }` #### Update printer (partial) — `PATCH /printer/{id}` - Params: `id: int, body: { address?: str, type?: str, model?: str|null, serial?: str|null, sort?: int, desc?: str|null }` -- Returns: `200 { printer: T24 }` +- Returns: `200 { printer: T26 }` #### Update printer — `PUT /printer/{id}` - Params: `id: int, body: { address?: str, type?: str, model?: str|null, serial?: str|null, sort?: int, desc?: str|null }` -- Returns: `200 { printer: T24 }` +- Returns: `200 { printer: T26 }` #### Get live state for a printer — `GET /printer/{id}/state` - Params: `id: str` - Returns: `200 { printer: {} }` @@ -914,14 +918,32 @@ _none_ - Params: `id: int, body: { name?: str, sort?: int, enabled?: bool }` - Returns: `200 { printeragent: T12 }` +### Section: /printerjob + +#### List printer jobs — `GET /printerjob` +- Params: `query: agentprinterId?: int, state?: str` +- Returns: `200 { printerjobs: T22[] }` +#### Create print job — `POST /printerjob` +- Params: `body: { agentprinterId: int, data: str, type?: str }` +- Returns: `201 { printerjob: T22 }` +#### Cancel and delete printer job — `DELETE /printerjob/{id}` +- Params: `id: int` +- Returns: `200 { success: bool, deletedJob: T22 }` +#### Get printer job — `GET /printerjob/{id}` +- Params: `id: int` +- Returns: `200 { printerjob: T22 }` +#### Cancel printer job — `POST /printerjob/{id}/cancel` +- Params: `id: int` +- Returns: `200 { success: bool, printerjob: T22 }` + ### Section: /propertyname #### List property names — `GET /propertyname` _none_ -- Returns: `200 { propertynames: T30[] }` +- Returns: `200 { propertynames: T31[] }` #### Create property name — `POST /propertyname` - Params: `body: { name: str, sort?: int, exclusive?: bool }` -- Returns: `201 { propertyname: T30 }` +- Returns: `201 { propertyname: T31 }` #### Reorder property names — `PUT /propertyname/order` - Params: `body: { propertynameIds: int[] }` - Returns: `200 { ok: bool }` @@ -930,7 +952,7 @@ _none_ - Returns: `200 { ok: bool }` #### Update property name — `PATCH /propertyname/{id}` - Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }` -- Returns: `200 { propertyname: T30 }` +- Returns: `200 { propertyname: T31 }` ### Section: /public @@ -942,7 +964,7 @@ _none_ - Returns: `200 { articles: { id: int, sku: str, name: str, slug: str, net: num|null, taxRate: num|null, gross: num|null, trackStock: bool, brand: { id: int|null, name: str }, fullHash: str|null, thumbW: int|null, thumbH: int|null, thumbHash: str|null }[] }` #### Get public article detail — `GET /public/{companyId}/articles/{sku}` - Params: `companyId: int, sku: str` -- Returns: `200 { article: { id: int, sku: str, name: str, slug: str, description: str, unitamount: num|null, weight: num|null, trackStock: bool, unit: T28|null, brand: T27|null, price: { minmultiplier: num, net: num|null, taxRate: num|null, gross: num|null }, prices: { minmultiplier: num, net: num|null, taxRate: num|null, gross: num|null }[], categories: { id: int, name: str, slug: str }[], photos: { sort: int, fullHash: str, fullW: int, fullH: int, fullSize: int, thumbW: int, thumbH: int, thumbHash: str }[], eans: str[], isParent: bool, parentSku: str|null, variants: { id: int, sku: str, sort: int, name: str, slug: str, attributeValueId: int|null, attributeValue: str|null, unitamount: num|null, weight: num|null, trackStock: bool }[] } }` +- Returns: `200 { article: { id: int, sku: str, name: str, slug: str, description: str, unitamount: num|null, weight: num|null, trackStock: bool, unit: T29|null, brand: T28|null, price: { minmultiplier: num, net: num|null, taxRate: num|null, gross: num|null }, prices: { minmultiplier: num, net: num|null, taxRate: num|null, gross: num|null }[], categories: { id: int, name: str, slug: str }[], photos: { sort: int, fullHash: str, fullW: int, fullH: int, fullSize: int, thumbW: int, thumbH: int, thumbHash: str }[], eans: str[], isParent: bool, parentSku: str|null, variants: { id: int, sku: str, sort: int, name: str, slug: str, attributeValueId: int|null, attributeValue: str|null, unitamount: num|null, weight: num|null, trackStock: bool }[] } }` #### List public categories — `GET /public/{companyId}/categories` - Params: `companyId: int` - Returns: `200 { categories: { id: int, parentId: int|null, sort: int, name: str, slug: str, fullHash: str|null, thumbW: int|null, thumbH: int|null, thumbHash: str|null }[] }` @@ -953,7 +975,7 @@ _none_ - Params: `query: offset?: int, limit?: int, search?: str, seekMonths?: int` - Returns: `200 { quotes: T3[], total: int, unfilteredTotal: int, offset: int, limit: int }` #### Create quote — `POST /quote` -- Params: `body: { number: str, date: str, lines: T20[], entityId?: int|null, externalNumber?: str|null }` +- Params: `body: { number: str, date: str, lines: T21[], entityId?: int|null, externalNumber?: str|null }` - Returns: `201 { quote: T3 }` #### Delete quote — `DELETE /quote/{id}` - Params: `id: int` @@ -962,7 +984,7 @@ _none_ - Params: `id: int` - Returns: `200 { quote: T3 }` #### Update quote — `PATCH /quote/{id}` -- Params: `id: int, body: { number?: str, date?: str, entityId?: int|null, externalNumber?: str|null, lines?: T20[] }` +- Params: `id: int, body: { number?: str, date?: str, entityId?: int|null, externalNumber?: str|null, lines?: T21[] }` - Returns: `200 { quote: T3 }` #### Delete quote file attachment — `DELETE /quote/{id}/file/{fileId}` - Params: `id: int, fileId: int` @@ -971,7 +993,7 @@ _none_ - Params: `id: int, fileId: int, query: download?: bool` - Returns: `200 str` #### Create order from quote — `POST /quote/{id}/order` -- Params: `id: int, body?: { number?: str, date?: str, createdAt?: str, entityId?: int|null, externalNumber?: str|null, lines?: T20[] }` +- Params: `id: int, body?: { number?: str, date?: str, createdAt?: str, entityId?: int|null, externalNumber?: str|null, lines?: T21[] }` - Returns: `201 { order: T1 }` #### Generate and attach quote PDF — `POST /quote/{id}/pdf` - Params: `id: int` @@ -1065,10 +1087,10 @@ _none_ - Returns: `201 { attachment: T10, fileUrl: str }` #### List packages of a shipment — `GET /shipment/{id}/shipping` - Params: `id: int` -- Returns: `200 { shippings: T21[] }` +- Returns: `200 { shippings: T23[] }` #### Create package for a shipment — `POST /shipment/{id}/shipping` - Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }` -- Returns: `201 { shipping: T21 }` +- Returns: `201 { shipping: T23 }` ### Section: /shipping @@ -1077,7 +1099,7 @@ _none_ - Returns: `204 void` #### Update shipping — `PATCH /shipping/{id}` - Params: `id: int, body: { type?: str, state?: str, trackingCode?: str, carrierId?: int, warehouseId?: int }` -- Returns: `200 { shipping: T21 }` +- Returns: `200 { shipping: T23 }` #### List packages of a shipping — `GET /shipping/{id}/package` - Params: `id: int` - Returns: `200 { packages: { id: int, shippingId: int, entityaddressId: int, number: str, type: str, state: str, details?: str|null }[] }` @@ -1098,7 +1120,7 @@ _none_ - Returns: `200` #### Adjust stock manually — `POST /stock/adjust` - Params: `body: { sku?: str, warehouseId?: int, amount?: num, text?: str|null, lines?: { sku: str, amount: num, warehouseId?: int, text?: str }[] }` -- Returns: `201 { manifest: { id: int, number: str, type: str, date: str, createdAt: str }, lines: { manifestarticle_id: int, sku: str, name: str, warehouse_id: int, amount: num, text: str }[], ledger: T15[] }` +- Returns: `201 { manifest: { id: int, number: str, type: str, date: str, createdAt: str }, lines: { manifestarticle_id: int, sku: str, name: str, warehouse_id: int, amount: num, text: str }[], ledger: T16[] }` #### Ship shipment manifest item(s) — `POST /stock/ship` - Params: `body: { manifestarticleId?: int, warehouseId?: int, items?: { manifestarticleId: int, warehouseId?: int }[] }` - Returns: `200` @@ -1107,40 +1129,40 @@ _none_ #### List subagent schedules — `GET /subagentschedule` _none_ -- Returns: `200 { schedules: T14[] }` +- Returns: `200 { schedules: T15[] }` #### Create subagent schedule — `POST /subagentschedule` - Params: `body: { prompt: str, cron: str, desc?: str|null, skills?: str|null, lastagentnote?: str|null, max_itr?: int }` -- Returns: `201 { schedule: T14 }` +- Returns: `201 { schedule: T15 }` #### Delete subagent schedule — `DELETE /subagentschedule/{id}` - Params: `id: int` - Returns: `204 void` #### Get subagent schedule by ID — `GET /subagentschedule/{id}` - Params: `id: int` -- Returns: `200 { schedule: T14 }` +- Returns: `200 { schedule: T15 }` #### Update subagent schedule — `PUT /subagentschedule/{id}` - Params: `id: int, body: { prompt?: str, cron?: str, desc?: str|null, skills?: str|null, lastagentnote?: str|null, max_itr?: int, lastrun_at?: str|null }` -- Returns: `200 { schedule: T14 }` +- Returns: `200 { schedule: T15 }` ### Section: /supplier #### List suppliers — `GET /supplier` _none_ -- Returns: `200 { suppliers: T37[] }` +- Returns: `200 { suppliers: T38[] }` #### Create supplier — `POST /supplier` - Params: `body: { name: str }` -- Returns: `201 { supplier: T37 }` +- Returns: `201 { supplier: T38 }` #### Delete supplier — `DELETE /supplier/{id}` - Params: `id: int` - Returns: `204 void` #### Update supplier — `PATCH /supplier/{id}` - Params: `id: int, body: { name: str }` -- Returns: `200 { supplier: T37 }` +- Returns: `200 { supplier: T38 }` #### List supplier articles by SKUs — `GET /supplier/{id}/articles` - Params: `id: int, query: skus?: str` -- Returns: `200 { articles: { id: int, articleId: int, entityId: int, pu: num, sort: int, article: { id: int, sku: str, name?: str|null, slug?: str|null, photos?: { sort: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str }[], eans?: str[] }, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T40|null, incoming?: { date: str, amount: num }[] }[] }` +- Returns: `200 { articles: { id: int, articleId: int, entityId: int, pu: num, sort: int, article: { id: int, sku: str, name?: str|null, slug?: str|null, photos?: { sort: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str }[], eans?: str[] }, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T41|null, incoming?: { date: str, amount: num }[] }[] }` #### Query supplier articles by SKUs (bulk) — `POST /supplier/{id}/articles` - Params: `id: int, body?: { skus?: str[] }` -- Returns: `200 { articles: { id: int, articleId: int, entityId: int, pu: num, sort: int, article: { id: int, sku: str, name?: str|null, slug?: str|null, photos?: { sort: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str }[], eans?: str[] }, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T40|null, incoming?: { date: str, amount: num }[] }[] }` +- Returns: `200 { articles: { id: int, articleId: int, entityId: int, pu: num, sort: int, article: { id: int, sku: str, name?: str|null, slug?: str|null, photos?: { sort: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str }[], eans?: str[] }, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T41|null, incoming?: { date: str, amount: num }[] }[] }` ### Section: /thumb @@ -1155,10 +1177,10 @@ _none_ - Returns: `204 void` #### List units — `GET /unit` _none_ -- Returns: `200 { units: T28[] }` +- Returns: `200 { units: T29[] }` #### Upsert unit — `PUT /unit` - Params: `body: { si: str, basesi: str, basesifactor: num, symbol: str, name: str }` -- Returns: `200 { unit: T28 }` +- Returns: `200 { unit: T29 }` ### Section: /v1 @@ -1249,3 +1271,9 @@ _none_ #### Update warehouse — `PUT /warehouse/{id}` - Params: `id: int, body: { name?: str, sort?: int }` - Returns: `200 { warehouse: { id: int, name: str, sort: int } }` + +### Section: /zpljob + +#### Create ZPL print job — `POST /zpljob` +- Params: `body: { agentprinterId: int, data: str, copiescount?: int }` +- Returns: `201 { printerjob: T22 }` diff --git a/src/components/AppShell.jsx b/src/components/AppShell.jsx index c60b3e9..79c424c 100644 --- a/src/components/AppShell.jsx +++ b/src/components/AppShell.jsx @@ -8,6 +8,7 @@ import ButtonBase from '@mui/material/ButtonBase'; import Typography from '@mui/material/Typography'; import { Outlet, useLocation, useNavigate } from 'react-router-dom'; import UserMenu from './UserMenu'; +import OnlinePrinterIcons from './OnlinePrinterIcons'; import HelpBadge from './HelpBadge'; import { NAV_ITEMS, SUB_NAV, resolveActiveNav, resolveActiveSub } from '../nav'; import { artikelQueryPath, buildSearchUrl } from './article/artikelQuery'; @@ -198,7 +199,18 @@ class AppSidebar extends PureComponent { })} - + + diff --git a/src/components/OnlinePrinterIcons.jsx b/src/components/OnlinePrinterIcons.jsx new file mode 100644 index 0000000..d5b9ded --- /dev/null +++ b/src/components/OnlinePrinterIcons.jsx @@ -0,0 +1,290 @@ +import { PureComponent } from 'react'; +import Badge from '@mui/material/Badge'; +import Box from '@mui/material/Box'; +import Chip from '@mui/material/Chip'; +import Divider from '@mui/material/Divider'; +import IconButton from '@mui/material/IconButton'; +import ListItemIcon from '@mui/material/ListItemIcon'; +import ListItemText from '@mui/material/ListItemText'; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import Typography from '@mui/material/Typography'; +import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined'; +import SettingsIcon from '@mui/icons-material/Settings'; +import { enqueueSnackbar } from 'notistack'; +import companyAutomat from '../automats/companyAutomat'; +import { notifyError } from '../utils/notify'; + +export default class OnlinePrinterIcons extends PureComponent { + constructor(props) { + super(props); + this.state = { + agentprinters: Array.isArray(companyAutomat.state.agentprinters) + ? companyAutomat.state.agentprinters + : [], + livePrinters: Array.isArray(companyAutomat.state.livePrinters) + ? companyAutomat.state.livePrinters + : [], + menuAnchor: null, + testingId: null, + }; + this.handleOpenMenu = this.handleOpenMenu.bind(this); + this.handleCloseMenu = this.handleCloseMenu.bind(this); + this.handleTestPrint = this.handleTestPrint.bind(this); + this.handleOpenPrinterSettings = this.handleOpenPrinterSettings.bind(this); + } + + componentDidMount() { + this.unsub = companyAutomat.subscribe(this, (state) => ({ + agentprinters: Array.isArray(state.agentprinters) ? state.agentprinters : [], + livePrinters: Array.isArray(state.livePrinters) ? state.livePrinters : [], + })); + } + + componentWillUnmount() { + this.unsub?.(); + } + + getOnlinePrinters() { + const { agentprinters = [], livePrinters = [] } = this.state; + const liveBySerial = new Map(); + for (const lp of livePrinters) { + if (lp.serial) liveBySerial.set(String(lp.serial).toLowerCase(), lp); + } + + if (agentprinters.length > 0) { + return agentprinters + .filter((p) => { + if (p.online === true) return true; + const live = + (p.serial ? liveBySerial.get(String(p.serial).toLowerCase()) : null) ?? + livePrinters.find( + (lp) => + (lp.agentprinterId && lp.agentprinterId === p.id) || + (lp.agentId === p.printeragentId && lp.serial === p.serial), + ); + if (!live) return false; + return live.status !== 'offline' && !live.unreachable && !live.errors?.unreachable; + }) + .map((p) => { + const live = + (p.serial ? liveBySerial.get(String(p.serial).toLowerCase()) : null) ?? + livePrinters.find( + (lp) => + (lp.agentprinterId && lp.agentprinterId === p.id) || + (lp.agentId === p.printeragentId && lp.serial === p.serial), + ); + return { ...p, live }; + }); + } + + return livePrinters + .filter((lp) => lp.status !== 'offline' && !lp.unreachable && !lp.errors?.unreachable) + .map((lp) => ({ + id: lp.agentprinterId || lp.id || lp.serial, + model: lp.model, + serial: lp.serial, + type: lp.type, + online: true, + open: Boolean(lp.errors?.headOpen || lp.headOpen), + pause: Boolean(lp.errors?.pause || lp.pause), + error: Boolean(lp.errors?.other || lp.error), + labelLength: lp.labelLength, + live: lp, + })); + } + + handleOpenMenu(event, printer) { + this.setState({ + menuAnchor: { + el: event.currentTarget, + printer, + }, + }); + } + + handleCloseMenu() { + this.setState({ menuAnchor: null }); + } + + async handleTestPrint(printer) { + if (!printer?.id) return; + this.setState({ testingId: printer.id }); + try { + await companyAutomat.actions.sendTestPrint(printer.id, { + model: printer.model || printer.type || 'Zebra', + }); + enqueueSnackbar( + `Testdruck für ${printer.model || 'Drucker'} (#${printer.id}) an Warteschlange gesendet.`, + { variant: 'success' }, + ); + } catch (err) { + notifyError(err); + } finally { + this.setState({ testingId: null, menuAnchor: null }); + } + } + + handleOpenPrinterSettings() { + this.handleCloseMenu(); + window.dispatchEvent( + new CustomEvent('open-settings', { detail: { tab: 'printeragent' } }), + ); + } + + render() { + const { menuAnchor, testingId } = this.state; + const onlinePrinters = this.getOnlinePrinters(); + + if (onlinePrinters.length === 0) { + return null; + } + + const activePrinter = menuAnchor?.printer; + const activeHasError = Boolean( + activePrinter?.error || + activePrinter?.open || + activePrinter?.live?.errors?.other || + activePrinter?.live?.errors?.headOpen, + ); + const activeIsPaused = Boolean(activePrinter?.pause || activePrinter?.live?.errors?.pause); + const activeStatusText = activeHasError + ? activePrinter?.open || activePrinter?.live?.errors?.headOpen + ? 'Druckkopf offen' + : 'Fehler' + : activeIsPaused + ? 'Pausiert' + : 'Bereit'; + + const anchorEl = menuAnchor?.el; + const isTop = Boolean( + anchorEl && typeof anchorEl.getBoundingClientRect === 'function' && anchorEl.getBoundingClientRect().top < 200 + ); + + return ( + <> + + {onlinePrinters.map((p) => { + const hasError = Boolean( + p.error || p.open || p.live?.errors?.other || p.live?.errors?.headOpen, + ); + const isPaused = Boolean(p.pause || p.live?.errors?.pause); + const label = p.model || 'Drucker'; + const statusText = hasError + ? p.open || p.live?.errors?.headOpen + ? 'Druckkopf offen' + : 'Fehler' + : isPaused + ? 'Pausiert' + : 'Bereit'; + const tooltipTitle = `${label}${p.serial ? ` (${p.serial})` : ''} • ${statusText}`; + + return ( + this.handleOpenMenu(e, p)} + sx={(theme) => ({ + p: 0, + width: 32, + height: 32, + borderRadius: '50%', + color: theme.nav?.item || 'inherit', + '&:hover': { + color: theme.nav?.itemHoverText || 'inherit', + bgcolor: theme.nav?.itemHover || 'action.hover', + }, + })} + aria-label={`Drucker ${label}`} + > + + + + + ); + })} + + + + {activePrinter && ( + + + + {activePrinter.model || 'Drucker'} + + + + {activePrinter.serial ? ( + + S/N: {activePrinter.serial} + + ) : null} + {activePrinter.labelLength ? ( + + Etikett: {activePrinter.labelLength} px + + ) : null} + + )} + + + + void this.handleTestPrint(activePrinter)} + disabled={testingId === activePrinter?.id} + > + + + + + + + + + + + + + + + ); + } +} diff --git a/src/components/UserMenu.jsx b/src/components/UserMenu.jsx index 7e81c9f..528b730 100644 --- a/src/components/UserMenu.jsx +++ b/src/components/UserMenu.jsx @@ -25,6 +25,7 @@ class UserMenu extends PureComponent { this.state = { anchorEl: null, settingsOpen: false, + settingsInitialTab: null, user: authAutomat.state.user, helpEnabled: helpAutomat.state?.enabled ?? false, pwaUpdateAvailable: pwaAutomat.state.needRefresh, @@ -37,6 +38,7 @@ class UserMenu extends PureComponent { this.handleToggleHelp = this.handleToggleHelp.bind(this); this.handleOpenPwaUpdate = this.handleOpenPwaUpdate.bind(this); this.handleLogout = this.handleLogout.bind(this); + this.handleOpenSettingsEvent = this.handleOpenSettingsEvent.bind(this); } componentDidMount() { @@ -47,12 +49,23 @@ class UserMenu extends PureComponent { this.unsubscribePwa = pwaAutomat.subscribe(this, (state) => ({ pwaUpdateAvailable: Boolean(state?.needRefresh), })); + if (typeof window !== 'undefined') { + window.addEventListener('open-settings', this.handleOpenSettingsEvent); + } } componentWillUnmount() { this.unsubscribeAuth?.(); this.unsubscribeHelp?.(); this.unsubscribePwa?.(); + if (typeof window !== 'undefined') { + window.removeEventListener('open-settings', this.handleOpenSettingsEvent); + } + } + + handleOpenSettingsEvent(e) { + const tab = e?.detail?.tab; + this.setState({ settingsOpen: true, settingsInitialTab: tab || null }); } handleOpenPwaUpdate() { @@ -74,11 +87,11 @@ class UserMenu extends PureComponent { } handleOpenSettings() { - this.setState({ anchorEl: null, settingsOpen: true }); + this.setState({ anchorEl: null, settingsOpen: true, settingsInitialTab: null }); } handleCloseSettings() { - this.setState({ settingsOpen: false }); + this.setState({ settingsOpen: false, settingsInitialTab: null }); } handleToggleHelp(e) { @@ -98,7 +111,7 @@ class UserMenu extends PureComponent { } render() { - const { user, anchorEl, settingsOpen, helpEnabled, pwaUpdateAvailable } = this.state; + const { user, anchorEl, settingsOpen, settingsInitialTab, helpEnabled, pwaUpdateAvailable } = this.state; const open = Boolean(anchorEl); const pictureSrc = (() => { @@ -201,7 +214,7 @@ class UserMenu extends PureComponent { Sign out - + ); } diff --git a/src/components/settings/SettingsDialog.jsx b/src/components/settings/SettingsDialog.jsx index 1446644..1342673 100644 --- a/src/components/settings/SettingsDialog.jsx +++ b/src/components/settings/SettingsDialog.jsx @@ -100,6 +100,9 @@ export default class SettingsDialog extends Component { if (open && !prevProps.open) { const currentVhost = Boolean(authAutomat.state.vhost); const updates = {}; + if (this.props.initialTab) { + updates.tab = this.props.initialTab; + } if (this.state.schemaVersion !== authAutomat.state.schemaVersion) { updates.schemaVersion = authAutomat.state.schemaVersion; }