Compare commits
29 Commits
56d376c9bd
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90936a449d | ||
|
|
283ce3dc5f | ||
|
|
863422df8e | ||
|
|
9841002398 | ||
|
|
bc11a2c3ab | ||
|
|
ec9f2d9816 | ||
|
|
bc284c6d42 | ||
|
|
0181e08657 | ||
|
|
6071e59d30 | ||
|
|
e7103ac340 | ||
|
|
9c6d5d79e4 | ||
|
|
7c33c097d4 | ||
|
|
76e911ebaf | ||
|
|
d2139fee45 | ||
|
|
8a416ce384 | ||
|
|
7fe9f90f2c | ||
|
|
456389be1b | ||
|
|
e788c960d5 | ||
|
|
b7046d3bc6 | ||
|
|
fcaf3d5821 | ||
|
|
ca28f56f3f | ||
|
|
545eb98191 | ||
|
|
ee80646c1c | ||
|
|
df015da8fc | ||
|
|
2d1a7364f2 | ||
|
|
f6eb31b70d | ||
|
|
6719cf9d51 | ||
|
|
cdb031921b | ||
|
|
9cb82745e3 |
@@ -131,7 +131,7 @@ Strip supplierName?: str from T11 (resolve via entityId in cached supplier list)
|
|||||||
|
|
||||||
# Dash API Routes Overview (All)
|
# Dash API Routes Overview (All)
|
||||||
|
|
||||||
Overview of all 288 API endpoints across all modules.
|
Overview of all 314 API endpoints across all modules.
|
||||||
|
|
||||||
### Notation
|
### Notation
|
||||||
|
|
||||||
@@ -140,45 +140,48 @@ Params: path values first, then `query:` and `body:` (`body?` = optional body).
|
|||||||
|
|
||||||
### Reusable types
|
### 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?: T30|null, payments?: T30[], paid?: bool, shipped?: bool, delivered?: bool, orderTotal?: num, paidTotal?: num, orderedQuantity?: num, shippedQuantity?: num, shipments?: T2[], files?: T11[] }`
|
- `T1` = `{ id: int, number: str, type: str, entityId: int, date: str, lines: T20[], externalNumber?: str|null, createdAt?: str, shipping?: T23|null, shippings?: T23[], payment?: T33|null, payments?: T33[], 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?: T11[], state?: str }`
|
- `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: T19[], entityId?: int|null, externalNumber?: str|null, createdAt?: str, positions?: int, grossTotal?: num, totalQuantity?: num, customerName?: str|null, files?: T11[] }`
|
- `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: T22[], files: T11[], externalNumber?: str|null, createdAt?: str, ledger?: T37 }`
|
- `T4` = `{ id: int, number: str, type: str, supplierId: int, date: str, lines: T24[], files: T10[], externalNumber?: str|null, createdAt?: str, ledger?: T40 }`
|
||||||
- `T5` = `{ name: str, path: str, totalSizeBytes: int, timestamp: str|null, manifest?: T6|null }`
|
- `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: T12, totalSizeBytes: int, durationMs: int }`
|
- `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[] }`
|
- `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, name: str, companyId?: int, token?: str|null, pairingpin?: str|null, pairedAt?: str|null, clientserial?: str|null, clientmodel?: str|null, clientstate?: str|null, agentversion?: str|null, lastseenAt?: str|null, updatedAt?: str, sort?: 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?: T42|null, incoming?: { date: str, amount: num }[] }`
|
||||||
- `T9` = `{ id: int, articleId: int, entityId: int, pu: num, sort: int, supplierName?: str|null, sku?: str|null, stock?: num|null, priceId?: int|null, price?: T39|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, name: str, width: num, height: num, dpi: int, type: str, content: { objects: T23[] }, 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` = `{ 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: T41, storage: T41, database: T35 }`
|
||||||
- `T12` = `{ vfs: T38, storage: T38, database: T32 }`
|
- `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 }`
|
- `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, 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 }`
|
- `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, manifestarticle_id: int, transaction_type: str, amount: num, transaction_text: str, hash_version: int, prev_hash?: str, sku?: str|null, created_at?: str }`
|
- `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, name: str, sort: int, exclusive: bool, values: T28[], articleCount?: int }`
|
- `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, companyuser_id: int, provider: str, model: str, created_at: str, updated_at: str, state: str, started_by?: int|null, first_message?: str|null }`
|
- `T17` = `{ id: int, name: str, sort: int, exclusive: bool, values: T30[], articleCount?: int }`
|
||||||
- `T18` = `{ id: int, name: str, rootCategoryId: int|null, languageId: int|null, iso639: str|null, taxrate: num, reducedtaxrate: num, taxfreerate: num }`
|
- `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, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null, shippable: bool }`
|
- `T19` = `{ id: int, name: str, rootCategoryId: int|null, languageId: int|null, iso639: str|null, taxrate: num, reducedtaxrate: num, taxfreerate: num, role: str }`
|
||||||
- `T20` = `{ amount: num, net: num, taxrate: num, sku?: str|null, name?: str|null, pu?: num, rebate?: num, comment?: str|null, shippable?: bool }`
|
- `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` = `{ id: int, manifestId: int, number: str, carrierId: int, type: str, state: str, trackingCode?: str|null, carrier?: str|null }`
|
- `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, sku: str|null, name: str|null, pu: num, amount: num, net: num, rebate: num, taxrate: num, comment: str|null }`
|
- `T22` = `{ id: int, agentprinterId: int, type: str, state: str, data: str, createdAt: str, printeragentId?: int|null, completedAt?: str|null }`
|
||||||
- `T23` = `{ id: str, type: str, x: num, y: num, w?: num, h?: num, text?: str, font?: str, fontSize?: num, barcodeFormat?: str }`
|
- `T23` = `{ id: int, manifestId: int, number: str, carrierId: int, type: str, state: str, trackingCode?: str|null, carrier?: str|null }`
|
||||||
- `T24` = `{ id: int, company_id: int, address: str, type: str, sort: int, model?: str|null, serial?: str|null, desc?: 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: int, customergroupId: int, firstName: str|null, name: str, number: str|null, createdAt: str, updatedAt: str }`
|
- `T25` = `{ id: str, type: str, x: num, y: num, w?: num, h?: num, text?: str, font?: str, fontSize?: num, barcodeFormat?: str }`
|
||||||
- `T26` = `{ name: str, id?: int|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null }`
|
- `T26` = `{ id: int, company_id: int, address: str, type: str, sort: int, model?: str|null, serial?: str|null, desc?: str|null }`
|
||||||
- `T27` = `{ si: str, basesi: str, basesifactor: num, symbol?: str|null, name?: str|null }`
|
- `T27` = `{ id: int, customergroupId: int, firstName: str|null, name: str, number: str|null, createdAt: str, updatedAt: str }`
|
||||||
- `T28` = `{ id: int, attributeId: int, value: str, sort: int, articleCount?: int }`
|
- `T28` = `{ name: str, id?: int|null, fullHash?: str|null, thumbW?: int|null, thumbH?: int|null, thumbHash?: str|null }`
|
||||||
- `T29` = `{ id: int, name: str, sort: int, exclusive: bool, articleCount?: int }`
|
- `T29` = `{ si: str, basesi: str, basesifactor: num, symbol?: str|null, name?: str|null }`
|
||||||
- `T30` = `{ id: int, accountId: int, manifestId: int, type: str, amount: num }`
|
- `T30` = `{ id: int, attributeId: int, value: str, sort: int, articleCount?: int }`
|
||||||
- `T31` = `{ id: int, name: str, sort: int, hasPackages: bool, isReverse: bool }`
|
- `T31` = `{ id: int, googleAuthId: int, email: str, role: str, picture?: str|null }`
|
||||||
- `T32` = `{ name: str|null, sizeBytes: int, backedUp: bool, reason?: str|null }`
|
- `T32` = `{ id: int, name: str, sort: int, exclusive: bool, articleCount?: int }`
|
||||||
- `T33` = `{ id: int, email: str, selectedCompanyId: int|null, picture?: str }`
|
- `T33` = `{ id: int, accountId: int, manifestId: int, type: str, amount: num }`
|
||||||
- `T34` = `{ fullHash: str, thumbW: int, thumbH: int, thumbHash: str }`
|
- `T34` = `{ id: int, name: str, sort: int, hasPackages: bool, isReverse: bool }`
|
||||||
- `T35` = `{ id: int, entityId: int, contactType: str, contact: str }`
|
- `T35` = `{ name: str|null, sizeBytes: int, backedUp: bool, reason?: str|null }`
|
||||||
- `T36` = `{ id: int, name: str, createdAt: str, updatedAt: str }`
|
- `T36` = `{ id: int, email: str, selectedCompanyId: int|null, picture?: str }`
|
||||||
- `T37` = `{ totalPositions: int, completelyOnLedgerPositions: int }`
|
- `T37` = `{ fullHash: str, thumbW: int, thumbH: int, thumbHash: str }`
|
||||||
- `T38` = `{ name: str, sizeBytes: int, sourceExists: bool }`
|
- `T38` = `{ id: int, entityId: int, contactType: str, contact: str }`
|
||||||
- `T39` = `{ net: num, taxId: int, taxRate?: num|null }`
|
- `T39` = `{ id: int, name: str, createdAt: str, updatedAt: str }`
|
||||||
|
- `T40` = `{ totalPositions: int, completelyOnLedgerPositions: int }`
|
||||||
|
- `T41` = `{ name: str, sizeBytes: int, sourceExists: bool }`
|
||||||
|
- `T42` = `{ net: num, taxId: int, taxRate?: num|null }`
|
||||||
|
|
||||||
### Routes
|
### Routes
|
||||||
|
|
||||||
@@ -204,6 +207,39 @@ _none_
|
|||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
|
|
||||||
|
### Section: /agent
|
||||||
|
|
||||||
|
#### Printer agent SSE stream — `GET /agent/events`
|
||||||
|
- Params: `query: token?: str, agentversion?: str`
|
||||||
|
- Returns: `200 SSE`
|
||||||
|
#### Pair printer agent via query parameters — `GET /agent/pair`
|
||||||
|
- Params: `query: authCode?: str, pairingpin?: str, serial?: str, model?: str, version?: str`
|
||||||
|
- Returns: `200`
|
||||||
|
#### Pair printer agent — `POST /agent/pair`
|
||||||
|
- Params: `body: { pairingpin: str, clientserial?: str, clientmodel?: str, agentversion?: str }`
|
||||||
|
- Returns: `200 { id: int, name: str, companyId: int, token: str, pairedAt: str, clientserial: str|null, clientmodel: str|null, agentversion: str|null, sort: int }`
|
||||||
|
#### Post agent state — `POST /agent/state`
|
||||||
|
- Params: `body: { state?: any }`
|
||||||
|
- Returns: `200 { success: bool, agent: T12 }`
|
||||||
|
|
||||||
|
### Section: /agentprinter
|
||||||
|
|
||||||
|
#### List agent printers — `GET /agentprinter`
|
||||||
|
- Params: `query: printeragentId?: int`
|
||||||
|
- Returns: `200 { agentprinters: T13[] }`
|
||||||
|
#### Reorder agent printers — `PUT /agentprinter/order`
|
||||||
|
- Params: `body: { agentprinterIds: int[], printeragentId?: int }`
|
||||||
|
- Returns: `200 { agentprinterIds: int[] }`
|
||||||
|
#### Delete agent printer — `DELETE /agentprinter/{id}`
|
||||||
|
- Params: `id: int`
|
||||||
|
- Returns: `204 void`
|
||||||
|
#### Get agent printer — `GET /agentprinter/{id}`
|
||||||
|
- Params: `id: int`
|
||||||
|
- Returns: `200 { agentprinter: T13 }`
|
||||||
|
#### Update agent printer — `PATCH /agentprinter/{id}`
|
||||||
|
- Params: `id: int, body: { enabled?: bool, sort?: int }`
|
||||||
|
- Returns: `200 { agentprinter: T13 }`
|
||||||
|
|
||||||
### Section: /article
|
### Section: /article
|
||||||
|
|
||||||
#### Create article in category — `POST /article`
|
#### Create article in category — `POST /article`
|
||||||
@@ -220,7 +256,7 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get article by SKU — `GET /article/{sku}`
|
#### Get article by SKU — `GET /article/{sku}`
|
||||||
- Params: `sku: str`
|
- 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: T27, brand: T26|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: T9[], 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}`
|
#### Update article by SKU — `PATCH /article/{sku}`
|
||||||
- Params: `sku: str, body: { name?: str, desc?: str, seo?: str, unitamount?: num, unitSi?: str, track_stock?: bool }`
|
- Params: `sku: str, body: { name?: str, desc?: str, seo?: str, unitamount?: num, unitSi?: str, track_stock?: bool }`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
@@ -278,11 +314,11 @@ _none_
|
|||||||
#### Toggle parent mode for an article — `POST /article/{sku}/parent`
|
#### Toggle parent mode for an article — `POST /article/{sku}/parent`
|
||||||
- Params: `sku: str, body: { isParent: bool, attributeNameId?: int }`
|
- Params: `sku: str, body: { isParent: bool, attributeNameId?: int }`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Replace POS prices by SKU (net > gross; price=net, tax=taxRate %) — `PUT /article/{sku}/prices`
|
#### Replace POS prices by SKU (net > gross) — `PUT /article/{sku}/prices`
|
||||||
- Params: `sku: str, body: { prices: { net?: num, gross?: num, price?: num, taxRate?: num, tax?: num, minmultiplier?: num }[] }`
|
- Params: `sku: str, body: { prices: { net?: num, gross?: num, taxRate?: num, minmultiplier?: num }[] }`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Print article label — `POST /article/{sku}/print`
|
#### Print article label — `POST /article/{sku}/print`
|
||||||
- Params: `sku: str, body: { templateId: int, printerId: int, quantity: int }`
|
- Params: `sku: str, body: { templateId: int, agentprinterId: int, quantity: int }`
|
||||||
- Returns: `200 { success: bool }`
|
- Returns: `200 { success: bool }`
|
||||||
#### List article properties — `GET /article/{sku}/property`
|
#### List article properties — `GET /article/{sku}/property`
|
||||||
- Params: `sku: str`
|
- Params: `sku: str`
|
||||||
@@ -295,10 +331,10 @@ _none_
|
|||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
#### List article suppliers — `GET /article/{sku}/supplier`
|
#### List article suppliers — `GET /article/{sku}/supplier`
|
||||||
- Params: `sku: str`
|
- Params: `sku: str`
|
||||||
- Returns: `200 { suppliers: T9[] }`
|
- Returns: `200 { suppliers: T8[] }`
|
||||||
#### Assign supplier to article — `POST /article/{sku}/supplier`
|
#### Assign supplier to article — `POST /article/{sku}/supplier`
|
||||||
- Params: `sku: str, body: { entityId: int, sku?: str|null, pu?: num, stock?: num|null, sort?: int|null, netPrice?: num|null, taxId?: int|null, taxRate?: num|null }`
|
- Params: `sku: str, body: { entityId: int, sku?: str|null, pu?: num, stock?: num|null, sort?: int|null, netPrice?: num|null, taxId?: int|null, taxRate?: num|null }`
|
||||||
- Returns: `201 { supplier: T9 }`
|
- Returns: `201 { supplier: T8 }`
|
||||||
#### Reorder article suppliers — `PUT /article/{sku}/supplier/order`
|
#### Reorder article suppliers — `PUT /article/{sku}/supplier/order`
|
||||||
- Params: `sku: str, body: { ids: int[] }`
|
- Params: `sku: str, body: { ids: int[] }`
|
||||||
- Returns: `200 { ids: int[] }`
|
- Returns: `200 { ids: int[] }`
|
||||||
@@ -307,7 +343,7 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update article supplier assignment — `PATCH /article/{sku}/supplier/{id}`
|
#### Update article supplier assignment — `PATCH /article/{sku}/supplier/{id}`
|
||||||
- Params: `sku: str, id: int, body: { sku?: str|null, pu?: num, stock?: num|null, sort?: int, netPrice?: num|null, taxId?: int|null, taxRate?: num|null }`
|
- Params: `sku: str, id: int, body: { sku?: str|null, pu?: num, stock?: num|null, sort?: int, netPrice?: num|null, taxId?: int|null, taxRate?: num|null }`
|
||||||
- Returns: `200 { supplier: T9 }`
|
- Returns: `200 { supplier: T8 }`
|
||||||
#### Set article track_stock flag by SKU — `PUT /article/{sku}/track_stock`
|
#### Set article track_stock flag by SKU — `PUT /article/{sku}/track_stock`
|
||||||
- Params: `sku: str, body: { track_stock: bool }`
|
- Params: `sku: str, body: { track_stock: bool }`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
@@ -319,19 +355,19 @@ _none_
|
|||||||
|
|
||||||
#### List attribute names — `GET /attributename`
|
#### List attribute names — `GET /attributename`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { attributenames: T16[] }`
|
- Returns: `200 { attributenames: T17[] }`
|
||||||
#### Create attribute name — `POST /attributename`
|
#### Create attribute name — `POST /attributename`
|
||||||
- Params: `body: { name: str, sort?: int, exclusive?: bool }`
|
- Params: `body: { name: str, sort?: int, exclusive?: bool }`
|
||||||
- Returns: `201 { attributename: T16 }`
|
- Returns: `201 { attributename: T17 }`
|
||||||
#### Reorder attribute names — `PUT /attributename/order`
|
#### Reorder attribute names — `PUT /attributename/order`
|
||||||
- Params: `body: { attributenameIds: int[] }`
|
- Params: `body: { attributenameIds: int[] }`
|
||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
#### List values for an attribute — `GET /attributename/{attributeId}/value`
|
#### List values for an attribute — `GET /attributename/{attributeId}/value`
|
||||||
- Params: `attributeId: int`
|
- Params: `attributeId: int`
|
||||||
- Returns: `200 { values: T28[] }`
|
- Returns: `200 { values: T30[] }`
|
||||||
#### Create value for an attribute — `POST /attributename/{attributeId}/value`
|
#### Create value for an attribute — `POST /attributename/{attributeId}/value`
|
||||||
- Params: `attributeId: int, body: { value: str, sort?: int }`
|
- Params: `attributeId: int, body: { value: str, sort?: int }`
|
||||||
- Returns: `201 { attributevalue: T28 }`
|
- Returns: `201 { attributevalue: T30 }`
|
||||||
#### Reorder values of an attribute — `PUT /attributename/{attributeId}/value/order`
|
#### Reorder values of an attribute — `PUT /attributename/{attributeId}/value/order`
|
||||||
- Params: `attributeId: int, body: { attributevalueIds: int[] }`
|
- Params: `attributeId: int, body: { attributevalueIds: int[] }`
|
||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
@@ -340,7 +376,7 @@ _none_
|
|||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
#### Update attribute name — `PATCH /attributename/{id}`
|
#### Update attribute name — `PATCH /attributename/{id}`
|
||||||
- Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }`
|
- Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }`
|
||||||
- Returns: `200 { attributename: T16 }`
|
- Returns: `200 { attributename: T17 }`
|
||||||
|
|
||||||
### Section: /attributevalue
|
### Section: /attributevalue
|
||||||
|
|
||||||
@@ -349,28 +385,40 @@ _none_
|
|||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
#### Update attribute value — `PATCH /attributevalue/{id}`
|
#### Update attribute value — `PATCH /attributevalue/{id}`
|
||||||
- Params: `id: int, body: { value?: str, sort?: int }`
|
- Params: `id: int, body: { value?: str, sort?: int }`
|
||||||
- Returns: `200 { attributevalue: T28 }`
|
- Returns: `200 { attributevalue: T30 }`
|
||||||
#### Delete attribute value image — `DELETE /attributevalue/{id}/image`
|
#### Delete attribute value image — `DELETE /attributevalue/{id}/image`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { attributevalue: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T34[] } }`
|
- Returns: `200 { attributevalue: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T37[] } }`
|
||||||
#### Add or replace attribute value image — `POST /attributevalue/{id}/image`
|
#### Add or replace attribute value image — `POST /attributevalue/{id}/image`
|
||||||
- Params: `id: int, image/avif`
|
- Params: `id: int, image/avif`
|
||||||
- Returns: `201 { attributevalue: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T34[] } }`
|
- Returns: `201 { attributevalue: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T37[] } }`
|
||||||
|
|
||||||
### Section: /auth
|
### Section: /auth
|
||||||
|
|
||||||
#### Login with Google ID token — `POST /auth/login`
|
#### Login with Google ID token — `POST /auth/login`
|
||||||
- Params: `body: { idToken: str }`
|
- Params: `body: { idToken: str }`
|
||||||
- Returns: `200 { message: str, user: T33 }`
|
- Returns: `200 { message: str, user: T36 }`
|
||||||
#### Logout — `POST /auth/logout`
|
#### Logout — `POST /auth/logout`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { message: str }`
|
- Returns: `200 { message: str }`
|
||||||
#### Current user — `GET /auth/me`
|
#### Current user — `GET /auth/me`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { user: T33, googleClientId: str, schemaVersion: int, vhost: bool, vhostSettings: str }`
|
- Returns: `200 { user: T36, googleClientId: str, schemaVersion: int, vhost: bool, vhostSettings: str }`
|
||||||
#### Set selected company — `PUT /auth/selected-company`
|
#### Set selected company — `PUT /auth/selected-company`
|
||||||
- Params: `body: { companyId: int }`
|
- Params: `body: { companyId: int }`
|
||||||
- Returns: `200 { user: T33 }`
|
- Returns: `200 { user: T36 }`
|
||||||
|
|
||||||
|
### Section: /autoinvite
|
||||||
|
|
||||||
|
#### List auto-invitations — `GET /autoinvite`
|
||||||
|
_none_
|
||||||
|
- Returns: `200 { autoinvites: { id: int, email: str, role: str, createdAt: str }[] }`
|
||||||
|
#### Create auto-invitation — `POST /autoinvite`
|
||||||
|
- Params: `body: { email: str, role?: str }`
|
||||||
|
- Returns: `201 { autoinvite: { id: int, email: str, role: str } }`
|
||||||
|
#### Delete auto-invitation — `DELETE /autoinvite/{id}`
|
||||||
|
- Params: `id: int`
|
||||||
|
- Returns: `204 void`
|
||||||
|
|
||||||
### Section: /backup
|
### Section: /backup
|
||||||
|
|
||||||
@@ -391,7 +439,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 }`
|
- 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`
|
#### Create brand — `POST /brand`
|
||||||
- Params: `body: { name: str, gsprpinfo?: str }`
|
- Params: `body: { name: str, gsprpinfo?: str }`
|
||||||
- Returns: `201 { brand: { id: int, name: str, pics: T34[], gsprpinfo?: str|null } }`
|
- Returns: `201 { brand: { id: int, name: str, pics: T37[], gsprpinfo?: str|null } }`
|
||||||
#### Delete brand — `DELETE /brand/{id}`
|
#### Delete brand — `DELETE /brand/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
@@ -400,19 +448,19 @@ _none_
|
|||||||
- Returns: `200 { brand: { id: int, name: str, touchedArticleCount: int, gsprpinfo?: str|null } }`
|
- Returns: `200 { brand: { id: int, name: str, touchedArticleCount: int, gsprpinfo?: str|null } }`
|
||||||
#### Delete brand image — `DELETE /brand/{id}/image`
|
#### Delete brand image — `DELETE /brand/{id}/image`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { brand: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T34[] } }`
|
- Returns: `200 { brand: { id: int, thumbW: int|null, thumbH: int|null, thumbHash: str|null, pics: T37[] } }`
|
||||||
#### Add or replace brand image — `POST /brand/{id}/image`
|
#### Add or replace brand image — `POST /brand/{id}/image`
|
||||||
- Params: `id: int, image/avif`
|
- Params: `id: int, image/avif`
|
||||||
- Returns: `201 { brand: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T34[] } }`
|
- Returns: `201 { brand: { id: int, fullHash: str, thumbW: int, thumbH: int, thumbHash: str, pics: T37[] } }`
|
||||||
|
|
||||||
### Section: /carrier
|
### Section: /carrier
|
||||||
|
|
||||||
#### List carriers — `GET /carrier`
|
#### List carriers — `GET /carrier`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { carriers: T31[] }`
|
- Returns: `200 { carriers: T34[] }`
|
||||||
#### Create carrier — `POST /carrier`
|
#### Create carrier — `POST /carrier`
|
||||||
- Params: `body: { name: str, sort?: int, hasPackages?: bool, isReverse?: bool }`
|
- Params: `body: { name: str, sort?: int, hasPackages?: bool, isReverse?: bool }`
|
||||||
- Returns: `201 { carrier: T31 }`
|
- Returns: `201 { carrier: T34 }`
|
||||||
#### Reorder carriers — `PUT /carrier/order`
|
#### Reorder carriers — `PUT /carrier/order`
|
||||||
- Params: `body: { carrierIds: int[] }`
|
- Params: `body: { carrierIds: int[] }`
|
||||||
- Returns: `200 { carrierIds: int[] }`
|
- Returns: `200 { carrierIds: int[] }`
|
||||||
@@ -421,10 +469,10 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get carrier by ID — `GET /carrier/{id}`
|
#### Get carrier by ID — `GET /carrier/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { carrier: T31 }`
|
- Returns: `200 { carrier: T34 }`
|
||||||
#### Update carrier — `PATCH /carrier/{id}`
|
#### Update carrier — `PATCH /carrier/{id}`
|
||||||
- Params: `id: int, body: { name?: str, sort?: int, hasPackages?: bool, isReverse?: bool }`
|
- Params: `id: int, body: { name?: str, sort?: int, hasPackages?: bool, isReverse?: bool }`
|
||||||
- Returns: `200 { carrier: T31 }`
|
- Returns: `200 { carrier: T34 }`
|
||||||
|
|
||||||
### Section: /category
|
### Section: /category
|
||||||
|
|
||||||
@@ -448,7 +496,7 @@ _none_
|
|||||||
- Returns: `200 { category: { id: int, name: str, slug: str, parentId: int, sort: int } }`
|
- Returns: `200 { category: { id: int, name: str, slug: str, parentId: int, sort: int } }`
|
||||||
#### Articles in category — `GET /category/{id}/articles`
|
#### Articles in category — `GET /category/{id}/articles`
|
||||||
- Params: `id: int, query: includeChildren?: bool`
|
- 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?: T26|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`
|
#### List category attribute values — `GET /category/{id}/attributevalue`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { attributevalues: { id: int, attributeId: int, attributeName: str, attributeValueId: int, value: str, sort: int, categoryId?: int, exclusive?: bool }[] }`
|
- Returns: `200 { attributevalues: { id: int, attributeId: int, attributeName: str, attributeValueId: int, value: str, sort: int, categoryId?: int, exclusive?: bool }[] }`
|
||||||
@@ -478,10 +526,10 @@ _none_
|
|||||||
|
|
||||||
#### List companies — `GET /company`
|
#### List companies — `GET /company`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { companies: T18[] }`
|
- Returns: `200 { companies: T19[] }`
|
||||||
#### Create company — `POST /company`
|
#### Create company — `POST /company`
|
||||||
- Params: `body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }`
|
- Params: `body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }`
|
||||||
- Returns: `201 { company: T18, user: T33 }`
|
- Returns: `201 { company: T19, user: T36 }`
|
||||||
#### Export company catalog as zip archive (SSE) — `GET /company/export`
|
#### Export company catalog as zip archive (SSE) — `GET /company/export`
|
||||||
- Params: `query: stream?: str`
|
- Params: `query: stream?: str`
|
||||||
- Returns: `200 SSE`
|
- Returns: `200 SSE`
|
||||||
@@ -511,7 +559,22 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update company — `PUT /company/{id}`
|
#### Update company — `PUT /company/{id}`
|
||||||
- Params: `id: int, body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }`
|
- Params: `id: int, body: { iso639: str, name: str, taxrate: num, reducedtaxrate: num }`
|
||||||
- Returns: `200 { company: T18 }`
|
- Returns: `200 { company: T19 }`
|
||||||
|
|
||||||
|
### Section: /companyuser
|
||||||
|
|
||||||
|
#### List company users — `GET /companyuser`
|
||||||
|
_none_
|
||||||
|
- Returns: `200 { companyusers: T31[] }`
|
||||||
|
#### Add an existing user to the company — `POST /companyuser`
|
||||||
|
- Params: `body: { email: str, role?: str }`
|
||||||
|
- Returns: `201 { companyuser: T31 }`
|
||||||
|
#### Remove a user from the company — `DELETE /companyuser/{id}`
|
||||||
|
- Params: `id: int`
|
||||||
|
- Returns: `204 void`
|
||||||
|
#### Change a company user's role — `PATCH /companyuser/{id}`
|
||||||
|
- Params: `id: int, body: { role: str }`
|
||||||
|
- Returns: `200 { companyuser: T31 }`
|
||||||
|
|
||||||
### Section: /customergroup
|
### Section: /customergroup
|
||||||
|
|
||||||
@@ -535,7 +598,7 @@ _none_
|
|||||||
|
|
||||||
#### List deliveries — `GET /delivery`
|
#### List deliveries — `GET /delivery`
|
||||||
- Params: `query: offset?: int, limit?: int, search?: str, onlyUnbooked?: bool, supplierId?: int, seekMonths?: int`
|
- 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?: T37 }[], 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?: T40 }[], total: int, unfilteredTotal: int, offset: int, limit: int }`
|
||||||
#### Create delivery — `POST /delivery`
|
#### 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 } }[] }`
|
- 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 }`
|
- Returns: `201 { delivery: T4 }`
|
||||||
@@ -556,52 +619,52 @@ _none_
|
|||||||
- Returns: `200 str`
|
- Returns: `200 str`
|
||||||
#### Generate and attach delivery note PDF (goods receipt) — `POST /delivery/{id}/pdf`
|
#### Generate and attach delivery note PDF (goods receipt) — `POST /delivery/{id}/pdf`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `201 { attachment: T11, fileUrl: str }`
|
- Returns: `201 { attachment: T10, fileUrl: str }`
|
||||||
|
|
||||||
### Section: /entity
|
### Section: /entity
|
||||||
|
|
||||||
#### List entities — `GET /entity`
|
#### List entities — `GET /entity`
|
||||||
- Params: `query: customergroupId?: int, role?: str`
|
- Params: `query: customergroupId?: int, role?: str`
|
||||||
- Returns: `200 { entities: T25[] }`
|
- Returns: `200 { entities: T27[] }`
|
||||||
#### Create entity — `POST /entity`
|
#### Create entity — `POST /entity`
|
||||||
- Params: `body: { customergroupId: int, name: str, firstName?: str|null, number?: str }`
|
- 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`
|
#### Peek next customer number — `GET /entity/next-number`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { number: str }`
|
- Returns: `200 { number: str }`
|
||||||
#### List entity addresses — `GET /entity/{entityId}/address`
|
#### List entity addresses — `GET /entity/{entityId}/address`
|
||||||
- Params: `entityId: int`
|
- Params: `entityId: int`
|
||||||
- Returns: `200 { addresses: T13[] }`
|
- Returns: `200 { addresses: T14[] }`
|
||||||
#### Create entity address — `POST /entity/{entityId}/address`
|
#### 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 }`
|
- 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}`
|
#### Delete entity address — `DELETE /entity/{entityId}/address/{id}`
|
||||||
- Params: `entityId: int, id: int`
|
- Params: `entityId: int, id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update entity address — `PATCH /entity/{entityId}/address/{id}`
|
#### 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 }`
|
- 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`
|
#### List entity contacts — `GET /entity/{entityId}/contact`
|
||||||
- Params: `entityId: int`
|
- Params: `entityId: int`
|
||||||
- Returns: `200 { contacts: T35[] }`
|
- Returns: `200 { contacts: T38[] }`
|
||||||
#### Create entity contact — `POST /entity/{entityId}/contact`
|
#### Create entity contact — `POST /entity/{entityId}/contact`
|
||||||
- Params: `entityId: int, body: { contactType: str, contact: str }`
|
- Params: `entityId: int, body: { contactType: str, contact: str }`
|
||||||
- Returns: `201 { contact: T35 }`
|
- Returns: `201 { contact: T38 }`
|
||||||
#### Delete entity contact — `DELETE /entity/{entityId}/contact/{id}`
|
#### Delete entity contact — `DELETE /entity/{entityId}/contact/{id}`
|
||||||
- Params: `entityId: int, id: int`
|
- Params: `entityId: int, id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update entity contact — `PATCH /entity/{entityId}/contact/{id}`
|
#### Update entity contact — `PATCH /entity/{entityId}/contact/{id}`
|
||||||
- Params: `entityId: int, id: int, body: { contactType?: str, contact?: str }`
|
- Params: `entityId: int, id: int, body: { contactType?: str, contact?: str }`
|
||||||
- Returns: `200 { contact: T35 }`
|
- Returns: `200 { contact: T38 }`
|
||||||
#### Delete entity — `DELETE /entity/{id}`
|
#### Delete entity — `DELETE /entity/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get entity — `GET /entity/{id}`
|
#### Get entity — `GET /entity/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { entity: T25 }`
|
- Returns: `200 { entity: T27 }`
|
||||||
#### Update entity — `PATCH /entity/{id}`
|
#### Update entity — `PATCH /entity/{id}`
|
||||||
- Params: `id: int, body: { name?: str, firstName?: str|null, number?: str|null }`
|
- Params: `id: int, body: { name?: str, firstName?: str|null, number?: str|null }`
|
||||||
- Returns: `200 { entity: T25 }`
|
- Returns: `200 { entity: T27 }`
|
||||||
|
|
||||||
### Section: /events
|
### Section: /events
|
||||||
|
|
||||||
@@ -619,8 +682,13 @@ _none_
|
|||||||
- `ledger`: `{}`
|
- `ledger`: `{}`
|
||||||
- `attributename`: `{}`
|
- `attributename`: `{}`
|
||||||
- `propertyname`: `{}`
|
- `propertyname`: `{}`
|
||||||
|
- `companyuser`: `{}`
|
||||||
|
- `autoinvite`: `{}`
|
||||||
- `labeltemplate`: `{}`
|
- `labeltemplate`: `{}`
|
||||||
- `printer`: `{}`
|
- `printer`: `{}`
|
||||||
|
- `printeragent`: `{}`
|
||||||
|
- `agentprinter`: `{ printers } or {}`
|
||||||
|
- `printerjob`: `{ job } or { jobId, state }`
|
||||||
- `warehouse`: `{}`
|
- `warehouse`: `{}`
|
||||||
- `supplier`: `{}`
|
- `supplier`: `{}`
|
||||||
- `vfs`: `{}`
|
- `vfs`: `{}`
|
||||||
@@ -649,35 +717,38 @@ _none_
|
|||||||
_none_
|
_none_
|
||||||
- Returns: `200 { labeltemplates: { id: int, name: str, width: num, height: num, dpi: int, type: str, thumb?: str|null }[] }`
|
- Returns: `200 { labeltemplates: { id: int, name: str, width: num, height: num, dpi: int, type: str, thumb?: str|null }[] }`
|
||||||
#### Create label template — `POST /labeltemplate`
|
#### 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: T10 }`
|
- Returns: `201 { labeltemplate: T9 }`
|
||||||
|
#### Test print label template — `POST /labeltemplate/testprint`
|
||||||
|
- Params: `body: { agentprinterId: int, templateId?: int, objects?: any[], width?: int, height?: int, dpi?: int, sku?: str, quantity?: int }`
|
||||||
|
- Returns: `200 { success: bool }`
|
||||||
#### Delete label template — `DELETE /labeltemplate/{id}`
|
#### Delete label template — `DELETE /labeltemplate/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get label template by ID — `GET /labeltemplate/{id}`
|
#### Get label template by ID — `GET /labeltemplate/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { labeltemplate: T10 }`
|
- Returns: `200 { labeltemplate: T9 }`
|
||||||
#### Update label template (partial) — `PATCH /labeltemplate/{id}`
|
#### 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: T10 }`
|
- Returns: `200 { labeltemplate: T9 }`
|
||||||
#### Update label template — `PUT /labeltemplate/{id}`
|
#### 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: T10 }`
|
- Returns: `200 { labeltemplate: T9 }`
|
||||||
|
|
||||||
### Section: /ledger
|
### Section: /ledger
|
||||||
|
|
||||||
#### Query ledger by manifest article ID or SKU — `GET /ledger`
|
#### Query ledger by manifest article ID or SKU — `GET /ledger`
|
||||||
- Params: `query: manifestarticle_id?: int, sku?: str, transaction_type?: str`
|
- 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`
|
#### Query company-wide ledger history — `GET /ledger/history`
|
||||||
- Params: `query: offset?: int, limit?: int, search?: str, seekMonths?: int`
|
- 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 }`
|
- 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}`
|
#### Query ledger by manifest article ID — `GET /ledger/manifestarticle/{manifestarticleId}`
|
||||||
- Params: `manifestarticleId: int, query: transaction_type?: str`
|
- Params: `manifestarticleId: int, query: transaction_type?: str`
|
||||||
- Returns: `200 { ledger: T15[] }`
|
- Returns: `200 { ledger: T16[] }`
|
||||||
#### Query ledger by article SKU — `GET /ledger/sku/{sku}`
|
#### Query ledger by article SKU — `GET /ledger/sku/{sku}`
|
||||||
- Params: `sku: str, query: transaction_type?: str`
|
- Params: `sku: str, query: transaction_type?: str`
|
||||||
- Returns: `200 { ledger: T15[] }`
|
- Returns: `200 { ledger: T16[] }`
|
||||||
|
|
||||||
### Section: /mcp
|
### Section: /mcp
|
||||||
|
|
||||||
@@ -707,16 +778,16 @@ _none_
|
|||||||
|
|
||||||
#### List conversations — `GET /modelconversation`
|
#### List conversations — `GET /modelconversation`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { conversations: T17[] }`
|
- Returns: `200 { conversations: T18[] }`
|
||||||
#### Create conversation — `POST /modelconversation`
|
#### Create conversation — `POST /modelconversation`
|
||||||
- Params: `body: { provider: str, model: str }`
|
- Params: `body: { provider: str, model: str }`
|
||||||
- Returns: `201 { conversation: T17 }`
|
- Returns: `201 { conversation: T18 }`
|
||||||
#### Delete conversation — `DELETE /modelconversation/{id}`
|
#### Delete conversation — `DELETE /modelconversation/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get conversation — `GET /modelconversation/{id}`
|
#### Get conversation — `GET /modelconversation/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { conversation: T17 }`
|
- Returns: `200 { conversation: T18 }`
|
||||||
#### List conversation messages — `GET /modelconversation/{id}/message`
|
#### List conversation messages — `GET /modelconversation/{id}/message`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { messages: { id: int, conversation_id: int, created_at: str, role: str, message: str }[] }`
|
- Returns: `200 { messages: { id: int, conversation_id: int, created_at: str, role: str, message: str }[] }`
|
||||||
@@ -757,7 +828,7 @@ _none_
|
|||||||
- Params: `query: offset?: int, limit?: int, search?: str, onlyUnpaid?: bool, onlyUndelivered?: bool, seekMonths?: int`
|
- 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 }`
|
- Returns: `200 { orders: T1[], total: int, unfilteredTotal: int, offset: int, limit: int }`
|
||||||
#### Create order — `POST /order`
|
#### 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 }`
|
- Returns: `201 { order: T1 }`
|
||||||
#### Delete order — `DELETE /order/{id}`
|
#### Delete order — `DELETE /order/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
@@ -766,7 +837,7 @@ _none_
|
|||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { order: T1 }`
|
- Returns: `200 { order: T1 }`
|
||||||
#### Update order — `PATCH /order/{id}`
|
#### 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 }`
|
- Returns: `200 { order: T1 }`
|
||||||
#### Delete order file attachment — `DELETE /order/{id}/file/{fileId}`
|
#### Delete order file attachment — `DELETE /order/{id}/file/{fileId}`
|
||||||
- Params: `id: int, fileId: int`
|
- Params: `id: int, fileId: int`
|
||||||
@@ -776,13 +847,13 @@ _none_
|
|||||||
- Returns: `200 str`
|
- Returns: `200 str`
|
||||||
#### List payments of an order — `GET /order/{id}/payment`
|
#### List payments of an order — `GET /order/{id}/payment`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { payments: T30[] }`
|
- Returns: `200 { payments: T33[] }`
|
||||||
#### Add payment to an order — `POST /order/{id}/payment`
|
#### Add payment to an order — `POST /order/{id}/payment`
|
||||||
- Params: `id: int, body: { accountId: int, type: str, amount: num }`
|
- Params: `id: int, body: { accountId: int, type: str, amount: num }`
|
||||||
- Returns: `201 { payment: T30 }`
|
- Returns: `201 { payment: T33 }`
|
||||||
#### Generate and attach order PDF — `POST /order/{id}/pdf`
|
#### Generate and attach order PDF — `POST /order/{id}/pdf`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `201 { attachment: T11, fileUrl: str }`
|
- Returns: `201 { attachment: T10, fileUrl: str }`
|
||||||
#### List shipments of an order — `GET /order/{id}/shipment`
|
#### List shipments of an order — `GET /order/{id}/shipment`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { shipments: T2[] }`
|
- Returns: `200 { shipments: T2[] }`
|
||||||
@@ -791,10 +862,10 @@ _none_
|
|||||||
- Returns: `201 { shipment: T2 }`
|
- Returns: `201 { shipment: T2 }`
|
||||||
#### List shippings of an order — `GET /order/{id}/shipping`
|
#### List shippings of an order — `GET /order/{id}/shipping`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { shippings: T21[] }`
|
- Returns: `200 { shippings: T23[] }`
|
||||||
#### Create shipping for an order — `POST /order/{id}/shipping`
|
#### Create shipping for an order — `POST /order/{id}/shipping`
|
||||||
- Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }`
|
- Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }`
|
||||||
- Returns: `201 { shipping: T21 }`
|
- Returns: `201 { shipping: T23 }`
|
||||||
|
|
||||||
### Section: /package
|
### Section: /package
|
||||||
|
|
||||||
@@ -839,49 +910,76 @@ _none_
|
|||||||
|
|
||||||
#### List printers — `GET /printer`
|
#### List printers — `GET /printer`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { printers: T24[] }`
|
- Returns: `200 { printers: T26[] }`
|
||||||
#### Create printer — `POST /printer`
|
#### Create printer — `POST /printer`
|
||||||
- Params: `body: { address: str, type: str, model?: str|null, serial?: str|null, sort?: int, desc?: str|null }`
|
- 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`
|
#### Reorder printers — `PUT /printer/order`
|
||||||
- Params: `body: { printerIds: int[] }`
|
- Params: `body: { printerIds: int[] }`
|
||||||
- Returns: `200 { printerIds: int[] }`
|
- Returns: `200 { printerIds: int[] }`
|
||||||
|
#### Get live printer states — `GET /printer/state`
|
||||||
|
- Params: `query: serial?: str, agentId?: int`
|
||||||
|
- Returns: `200 { printers: {}[] }`
|
||||||
#### Delete printer — `DELETE /printer/{id}`
|
#### Delete printer — `DELETE /printer/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get printer by ID — `GET /printer/{id}`
|
#### Get printer by ID — `GET /printer/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { printer: T24 }`
|
- Returns: `200 { printer: T26 }`
|
||||||
#### Update printer (partial) — `PATCH /printer/{id}`
|
#### 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 }`
|
- 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}`
|
#### Update printer — `PUT /printer/{id}`
|
||||||
- Params: `id: int, body: { address?: str, type?: str, model?: str|null, serial?: str|null, sort?: int, desc?: str|null }`
|
- 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: {} }`
|
||||||
|
|
||||||
### Section: /printeragent
|
### Section: /printeragent
|
||||||
|
|
||||||
#### List printer agents — `GET /printeragent`
|
#### List printer agents — `GET /printeragent`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { printeragents: T8[] }`
|
- Returns: `200 { printeragents: T12[] }`
|
||||||
#### Create printer agent — `PUT /printeragent`
|
#### Create printer agent — `PUT /printeragent`
|
||||||
- Params: `body: { name: str, sort?: int }`
|
- Params: `body: { name: str, sort?: int, enabled?: bool }`
|
||||||
- Returns: `200 { printeragent: T8 }`
|
- Returns: `200 { printeragent: T12 }`
|
||||||
#### Delete printer agent — `DELETE /printeragent/{id}`
|
#### Delete printer agent — `DELETE /printeragent/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update printer agent — `PATCH /printeragent/{id}`
|
#### Update printer agent — `PATCH /printeragent/{id}`
|
||||||
- Params: `id: int, body: { name?: str, sort?: int }`
|
- Params: `id: int, body: { name?: str, sort?: int, enabled?: bool }`
|
||||||
- Returns: `200 { printeragent: T8 }`
|
- 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 all pending and processing printer jobs — `POST /printerjob/cancel-all`
|
||||||
|
- Params: `body?: { agentprinterId?: int }`
|
||||||
|
- Returns: `200 { success: bool, cancelledCount: int, jobs: 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
|
### Section: /propertyname
|
||||||
|
|
||||||
#### List property names — `GET /propertyname`
|
#### List property names — `GET /propertyname`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { propertynames: T29[] }`
|
- Returns: `200 { propertynames: T32[] }`
|
||||||
#### Create property name — `POST /propertyname`
|
#### Create property name — `POST /propertyname`
|
||||||
- Params: `body: { name: str, sort?: int, exclusive?: bool }`
|
- Params: `body: { name: str, sort?: int, exclusive?: bool }`
|
||||||
- Returns: `201 { propertyname: T29 }`
|
- Returns: `201 { propertyname: T32 }`
|
||||||
#### Reorder property names — `PUT /propertyname/order`
|
#### Reorder property names — `PUT /propertyname/order`
|
||||||
- Params: `body: { propertynameIds: int[] }`
|
- Params: `body: { propertynameIds: int[] }`
|
||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
@@ -890,7 +988,7 @@ _none_
|
|||||||
- Returns: `200 { ok: bool }`
|
- Returns: `200 { ok: bool }`
|
||||||
#### Update property name — `PATCH /propertyname/{id}`
|
#### Update property name — `PATCH /propertyname/{id}`
|
||||||
- Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }`
|
- Params: `id: int, body: { name?: str, sort?: int, exclusive?: bool }`
|
||||||
- Returns: `200 { propertyname: T29 }`
|
- Returns: `200 { propertyname: T32 }`
|
||||||
|
|
||||||
### Section: /public
|
### Section: /public
|
||||||
|
|
||||||
@@ -902,7 +1000,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 }[] }`
|
- 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}`
|
#### Get public article detail — `GET /public/{companyId}/articles/{sku}`
|
||||||
- Params: `companyId: int, sku: str`
|
- 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: T27|null, brand: T26|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`
|
#### List public categories — `GET /public/{companyId}/categories`
|
||||||
- Params: `companyId: int`
|
- 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 }[] }`
|
- 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 }[] }`
|
||||||
@@ -913,7 +1011,7 @@ _none_
|
|||||||
- Params: `query: offset?: int, limit?: int, search?: str, seekMonths?: int`
|
- Params: `query: offset?: int, limit?: int, search?: str, seekMonths?: int`
|
||||||
- Returns: `200 { quotes: T3[], total: int, unfilteredTotal: int, offset: int, limit: int }`
|
- Returns: `200 { quotes: T3[], total: int, unfilteredTotal: int, offset: int, limit: int }`
|
||||||
#### Create quote — `POST /quote`
|
#### 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 }`
|
- Returns: `201 { quote: T3 }`
|
||||||
#### Delete quote — `DELETE /quote/{id}`
|
#### Delete quote — `DELETE /quote/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
@@ -922,7 +1020,7 @@ _none_
|
|||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { quote: T3 }`
|
- Returns: `200 { quote: T3 }`
|
||||||
#### Update quote — `PATCH /quote/{id}`
|
#### 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 }`
|
- Returns: `200 { quote: T3 }`
|
||||||
#### Delete quote file attachment — `DELETE /quote/{id}/file/{fileId}`
|
#### Delete quote file attachment — `DELETE /quote/{id}/file/{fileId}`
|
||||||
- Params: `id: int, fileId: int`
|
- Params: `id: int, fileId: int`
|
||||||
@@ -931,11 +1029,11 @@ _none_
|
|||||||
- Params: `id: int, fileId: int, query: download?: bool`
|
- Params: `id: int, fileId: int, query: download?: bool`
|
||||||
- Returns: `200 str`
|
- Returns: `200 str`
|
||||||
#### Create order from quote — `POST /quote/{id}/order`
|
#### 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 }`
|
- Returns: `201 { order: T1 }`
|
||||||
#### Generate and attach quote PDF — `POST /quote/{id}/pdf`
|
#### Generate and attach quote PDF — `POST /quote/{id}/pdf`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `201 { attachment: T11, fileUrl: str }`
|
- Returns: `201 { attachment: T10, fileUrl: str }`
|
||||||
|
|
||||||
### Section: /retoure
|
### Section: /retoure
|
||||||
|
|
||||||
@@ -1022,13 +1120,13 @@ _none_
|
|||||||
- Returns: `200 str`
|
- Returns: `200 str`
|
||||||
#### Generate and attach shipment PDF (delivery note) — `POST /shipment/{id}/pdf`
|
#### Generate and attach shipment PDF (delivery note) — `POST /shipment/{id}/pdf`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `201 { attachment: T11, fileUrl: str }`
|
- Returns: `201 { attachment: T10, fileUrl: str }`
|
||||||
#### List packages of a shipment — `GET /shipment/{id}/shipping`
|
#### List packages of a shipment — `GET /shipment/{id}/shipping`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { shippings: T21[] }`
|
- Returns: `200 { shippings: T23[] }`
|
||||||
#### Create package for a shipment — `POST /shipment/{id}/shipping`
|
#### Create package for a shipment — `POST /shipment/{id}/shipping`
|
||||||
- Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }`
|
- Params: `id: int, body: { carrierId: int, type: str, state: str, trackingCode?: str, warehouseId?: int }`
|
||||||
- Returns: `201 { shipping: T21 }`
|
- Returns: `201 { shipping: T23 }`
|
||||||
|
|
||||||
### Section: /shipping
|
### Section: /shipping
|
||||||
|
|
||||||
@@ -1037,7 +1135,7 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update shipping — `PATCH /shipping/{id}`
|
#### Update shipping — `PATCH /shipping/{id}`
|
||||||
- Params: `id: int, body: { type?: str, state?: str, trackingCode?: str, carrierId?: int, warehouseId?: int }`
|
- 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`
|
#### List packages of a shipping — `GET /shipping/{id}/package`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { packages: { id: int, shippingId: int, entityaddressId: int, number: str, type: str, state: str, details?: str|null }[] }`
|
- Returns: `200 { packages: { id: int, shippingId: int, entityaddressId: int, number: str, type: str, state: str, details?: str|null }[] }`
|
||||||
@@ -1058,7 +1156,7 @@ _none_
|
|||||||
- Returns: `200`
|
- Returns: `200`
|
||||||
#### Adjust stock manually — `POST /stock/adjust`
|
#### 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 }[] }`
|
- 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`
|
#### Ship shipment manifest item(s) — `POST /stock/ship`
|
||||||
- Params: `body: { manifestarticleId?: int, warehouseId?: int, items?: { manifestarticleId: int, warehouseId?: int }[] }`
|
- Params: `body: { manifestarticleId?: int, warehouseId?: int, items?: { manifestarticleId: int, warehouseId?: int }[] }`
|
||||||
- Returns: `200`
|
- Returns: `200`
|
||||||
@@ -1067,40 +1165,40 @@ _none_
|
|||||||
|
|
||||||
#### List subagent schedules — `GET /subagentschedule`
|
#### List subagent schedules — `GET /subagentschedule`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { schedules: T14[] }`
|
- Returns: `200 { schedules: T15[] }`
|
||||||
#### Create subagent schedule — `POST /subagentschedule`
|
#### Create subagent schedule — `POST /subagentschedule`
|
||||||
- Params: `body: { prompt: str, cron: str, desc?: str|null, skills?: str|null, lastagentnote?: str|null, max_itr?: int }`
|
- 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}`
|
#### Delete subagent schedule — `DELETE /subagentschedule/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Get subagent schedule by ID — `GET /subagentschedule/{id}`
|
#### Get subagent schedule by ID — `GET /subagentschedule/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `200 { schedule: T14 }`
|
- Returns: `200 { schedule: T15 }`
|
||||||
#### Update subagent schedule — `PUT /subagentschedule/{id}`
|
#### 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 }`
|
- 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
|
### Section: /supplier
|
||||||
|
|
||||||
#### List suppliers — `GET /supplier`
|
#### List suppliers — `GET /supplier`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { suppliers: T36[] }`
|
- Returns: `200 { suppliers: T39[] }`
|
||||||
#### Create supplier — `POST /supplier`
|
#### Create supplier — `POST /supplier`
|
||||||
- Params: `body: { name: str }`
|
- Params: `body: { name: str }`
|
||||||
- Returns: `201 { supplier: T36 }`
|
- Returns: `201 { supplier: T39 }`
|
||||||
#### Delete supplier — `DELETE /supplier/{id}`
|
#### Delete supplier — `DELETE /supplier/{id}`
|
||||||
- Params: `id: int`
|
- Params: `id: int`
|
||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### Update supplier — `PATCH /supplier/{id}`
|
#### Update supplier — `PATCH /supplier/{id}`
|
||||||
- Params: `id: int, body: { name: str }`
|
- Params: `id: int, body: { name: str }`
|
||||||
- Returns: `200 { supplier: T36 }`
|
- Returns: `200 { supplier: T39 }`
|
||||||
#### List supplier articles by SKUs — `GET /supplier/{id}/articles`
|
#### List supplier articles by SKUs — `GET /supplier/{id}/articles`
|
||||||
- Params: `id: int, query: skus?: str`
|
- 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?: T39|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?: T42|null, incoming?: { date: str, amount: num }[] }[] }`
|
||||||
#### Query supplier articles by SKUs (bulk) — `POST /supplier/{id}/articles`
|
#### Query supplier articles by SKUs (bulk) — `POST /supplier/{id}/articles`
|
||||||
- Params: `id: int, body?: { skus?: str[] }`
|
- 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?: T39|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?: T42|null, incoming?: { date: str, amount: num }[] }[] }`
|
||||||
|
|
||||||
### Section: /thumb
|
### Section: /thumb
|
||||||
|
|
||||||
@@ -1115,10 +1213,10 @@ _none_
|
|||||||
- Returns: `204 void`
|
- Returns: `204 void`
|
||||||
#### List units — `GET /unit`
|
#### List units — `GET /unit`
|
||||||
_none_
|
_none_
|
||||||
- Returns: `200 { units: T27[] }`
|
- Returns: `200 { units: T29[] }`
|
||||||
#### Upsert unit — `PUT /unit`
|
#### Upsert unit — `PUT /unit`
|
||||||
- Params: `body: { si: str, basesi: str, basesifactor: num, symbol: str, name: str }`
|
- Params: `body: { si: str, basesi: str, basesifactor: num, symbol: str, name: str }`
|
||||||
- Returns: `200 { unit: T27 }`
|
- Returns: `200 { unit: T29 }`
|
||||||
|
|
||||||
### Section: /v1
|
### Section: /v1
|
||||||
|
|
||||||
@@ -1209,3 +1307,9 @@ _none_
|
|||||||
#### Update warehouse — `PUT /warehouse/{id}`
|
#### Update warehouse — `PUT /warehouse/{id}`
|
||||||
- Params: `id: int, body: { name?: str, sort?: int }`
|
- Params: `id: int, body: { name?: str, sort?: int }`
|
||||||
- Returns: `200 { warehouse: { id: int, 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 }`
|
||||||
|
|||||||
@@ -2,6 +2,67 @@ import js from '@eslint/js';
|
|||||||
import globals from 'globals';
|
import globals from 'globals';
|
||||||
import reactHooks from 'eslint-plugin-react-hooks';
|
import reactHooks from 'eslint-plugin-react-hooks';
|
||||||
|
|
||||||
|
const banMuiTooltipRule = {
|
||||||
|
meta: {
|
||||||
|
type: 'problem',
|
||||||
|
docs: {
|
||||||
|
description: 'Ban MUI Tooltip component',
|
||||||
|
},
|
||||||
|
messages: {
|
||||||
|
badDesign: '<Tooltip> is bad design',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
const muiTooltipIdentifiers = new Set();
|
||||||
|
|
||||||
|
return {
|
||||||
|
ImportDeclaration(node) {
|
||||||
|
if (node.source.value === '@mui/material/Tooltip') {
|
||||||
|
context.report({
|
||||||
|
node,
|
||||||
|
messageId: 'badDesign',
|
||||||
|
});
|
||||||
|
for (const specifier of node.specifiers) {
|
||||||
|
if (specifier.local?.name) {
|
||||||
|
muiTooltipIdentifiers.add(specifier.local.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (node.source.value === '@mui/material') {
|
||||||
|
for (const specifier of node.specifiers) {
|
||||||
|
if (
|
||||||
|
specifier.type === 'ImportSpecifier' &&
|
||||||
|
specifier.imported?.name === 'Tooltip'
|
||||||
|
) {
|
||||||
|
context.report({
|
||||||
|
node: specifier,
|
||||||
|
messageId: 'badDesign',
|
||||||
|
});
|
||||||
|
if (specifier.local?.name) {
|
||||||
|
muiTooltipIdentifiers.add(specifier.local.name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
JSXOpeningElement(node) {
|
||||||
|
let tagName = '';
|
||||||
|
if (node.name.type === 'JSXIdentifier') {
|
||||||
|
tagName = node.name.name;
|
||||||
|
} else if (node.name.type === 'JSXMemberExpression') {
|
||||||
|
tagName = node.name.property.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (muiTooltipIdentifiers.has(tagName) || tagName === 'Tooltip') {
|
||||||
|
context.report({
|
||||||
|
node,
|
||||||
|
messageId: 'badDesign',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export default [
|
export default [
|
||||||
{
|
{
|
||||||
ignores: [
|
ignores: [
|
||||||
@@ -32,10 +93,16 @@ export default [
|
|||||||
},
|
},
|
||||||
plugins: {
|
plugins: {
|
||||||
'react-hooks': reactHooks,
|
'react-hooks': reactHooks,
|
||||||
|
react: {
|
||||||
|
rules: {
|
||||||
|
'no-mui-tooltip': banMuiTooltipRule,
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
'react-hooks/rules-of-hooks': 'error',
|
'react-hooks/rules-of-hooks': 'error',
|
||||||
'react-hooks/exhaustive-deps': 'warn',
|
'react-hooks/exhaustive-deps': 'warn',
|
||||||
|
'react/no-mui-tooltip': 'error',
|
||||||
'no-unused-vars': [
|
'no-unused-vars': [
|
||||||
'warn',
|
'warn',
|
||||||
{
|
{
|
||||||
|
|||||||
1081
package-lock.json
generated
@@ -10,6 +10,7 @@
|
|||||||
"dev:pwa:https": "VITE_HTTPS=1 node scripts/dev.mjs",
|
"dev:pwa:https": "VITE_HTTPS=1 node scripts/dev.mjs",
|
||||||
"cert": "./scripts/generate-cert.sh",
|
"cert": "./scripts/generate-cert.sh",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
|
"lint": "eslint .",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"preview:https": "VITE_HTTPS=1 vite preview",
|
"preview:https": "VITE_HTTPS=1 vite preview",
|
||||||
"rig:collect": "node test/collect.mjs",
|
"rig:collect": "node test/collect.mjs",
|
||||||
@@ -40,7 +41,7 @@
|
|||||||
"pdfconvert-wasm": "^0.3.0",
|
"pdfconvert-wasm": "^0.3.0",
|
||||||
"react": "^19.3.1",
|
"react": "^19.3.1",
|
||||||
"react-automat": "file:../automat",
|
"react-automat": "file:../automat",
|
||||||
"react-canvas-label-editor": "github:sebseb7/react-canvas-label-editor",
|
"react-canvas-label-editor": "github:sebseb7/react-canvas-label-editor#v20.0.0",
|
||||||
"react-dom": "^19.3.1",
|
"react-dom": "^19.3.1",
|
||||||
"react-router-dom": "^7.18.4",
|
"react-router-dom": "^7.18.4",
|
||||||
"react-window": "^2.3.4",
|
"react-window": "^2.3.4",
|
||||||
@@ -61,6 +62,7 @@
|
|||||||
},
|
},
|
||||||
"allowScripts": {
|
"allowScripts": {
|
||||||
"canvas@3.2.3": true,
|
"canvas@3.2.3": true,
|
||||||
|
"react-canvas-label-editor@20.0.0": true,
|
||||||
"github:sebseb7/react-canvas-label-editor#7f0e31b66ff22da011e872b201017398b14e9dd9": true
|
"github:sebseb7/react-canvas-label-editor#7f0e31b66ff22da011e872b201017398b14e9dd9": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
69
src/api/agentprinter.js
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
import { http } from './http.js';
|
||||||
|
|
||||||
|
export const agentprinter = {
|
||||||
|
/**
|
||||||
|
* GET /api/agentprinter
|
||||||
|
* Query: ?printeragentId=<id>
|
||||||
|
* → { agentprinters: Agentprinter[] }
|
||||||
|
*/
|
||||||
|
list(printeragentId) {
|
||||||
|
const url =
|
||||||
|
printeragentId != null
|
||||||
|
? `/api/agentprinter?printeragentId=${encodeURIComponent(printeragentId)}`
|
||||||
|
: '/api/agentprinter';
|
||||||
|
return http(url);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/agentprinter/:id
|
||||||
|
* → { agentprinter: Agentprinter }
|
||||||
|
*/
|
||||||
|
get(id) {
|
||||||
|
return http(`/api/agentprinter/${id}`);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PATCH /api/agentprinter/:id
|
||||||
|
* Body: { enabled?: boolean, sort?: number }
|
||||||
|
* → { agentprinter: Agentprinter }
|
||||||
|
*/
|
||||||
|
update(id, patch = {}) {
|
||||||
|
const body = {};
|
||||||
|
if (patch.enabled !== undefined) body.enabled = Boolean(patch.enabled);
|
||||||
|
if (patch.sort !== undefined && patch.sort !== null && patch.sort !== '') {
|
||||||
|
body.sort = Number(patch.sort);
|
||||||
|
}
|
||||||
|
return http(`/api/agentprinter/${id}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
body,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PUT /api/agentprinter/order
|
||||||
|
* Body: { printeragentId?: number, agentprinterIds: number[] }
|
||||||
|
* → { agentprinterIds: number[] }
|
||||||
|
*/
|
||||||
|
order({ printeragentId, agentprinterIds }) {
|
||||||
|
const body = {
|
||||||
|
agentprinterIds: Array.isArray(agentprinterIds) ? agentprinterIds.map(Number) : [],
|
||||||
|
};
|
||||||
|
if (printeragentId != null) {
|
||||||
|
body.printeragentId = Number(printeragentId);
|
||||||
|
}
|
||||||
|
return http('/api/agentprinter/order', {
|
||||||
|
method: 'PUT',
|
||||||
|
body,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DELETE /api/agentprinter/:id → 204
|
||||||
|
*/
|
||||||
|
delete(id) {
|
||||||
|
return http(`/api/agentprinter/${id}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
24
src/api/autoinvite.js
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { http } from './http.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pending invites for emails that are not registered yet (admin only).
|
||||||
|
*/
|
||||||
|
export const autoinvite = {
|
||||||
|
// #region GET /api/autoinvite — list pending invites
|
||||||
|
list() {
|
||||||
|
return http('/api/autoinvite');
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region POST /api/autoinvite — create an invite
|
||||||
|
create(body) {
|
||||||
|
return http('/api/autoinvite', { method: 'POST', body });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region DELETE /api/autoinvite/:id — delete an invite
|
||||||
|
delete(id) {
|
||||||
|
return http(`/api/autoinvite/${id}`, { method: 'DELETE' });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
};
|
||||||
30
src/api/companyuser.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import { http } from './http.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Company members (admin only).
|
||||||
|
*/
|
||||||
|
export const companyuser = {
|
||||||
|
// #region GET /api/companyuser — list members
|
||||||
|
list() {
|
||||||
|
return http('/api/companyuser');
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region POST /api/companyuser — add an existing user by email
|
||||||
|
create(body) {
|
||||||
|
return http('/api/companyuser', { method: 'POST', body });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region PATCH /api/companyuser/:id — change role
|
||||||
|
setRole(id, role) {
|
||||||
|
return http(`/api/companyuser/${id}`, { method: 'PATCH', body: { role } });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region DELETE /api/companyuser/:id — remove a member
|
||||||
|
delete(id) {
|
||||||
|
return http(`/api/companyuser/${id}`, { method: 'DELETE' });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
};
|
||||||
@@ -16,6 +16,8 @@ export { order } from './order.js';
|
|||||||
export { posterminal } from './posterminal.js';
|
export { posterminal } from './posterminal.js';
|
||||||
export { printer } from './printer.js';
|
export { printer } from './printer.js';
|
||||||
export { printeragent } from './printeragent.js';
|
export { printeragent } from './printeragent.js';
|
||||||
|
export { agentprinter } from './agentprinter.js';
|
||||||
|
export { printerjob } from './printerjob.js';
|
||||||
export { propertyname } from './propertyname.js';
|
export { propertyname } from './propertyname.js';
|
||||||
export { quote } from './quote.js';
|
export { quote } from './quote.js';
|
||||||
export { retoure } from './retoure.js';
|
export { retoure } from './retoure.js';
|
||||||
@@ -32,6 +34,8 @@ export { shipment } from './shipment.js';
|
|||||||
export { shipping } from './shipping.js';
|
export { shipping } from './shipping.js';
|
||||||
export { payment } from './payment.js';
|
export { payment } from './payment.js';
|
||||||
export { account } from './account.js';
|
export { account } from './account.js';
|
||||||
|
export { companyuser } from './companyuser.js';
|
||||||
|
export { autoinvite } from './autoinvite.js';
|
||||||
export { mcp } from './mcp.js';
|
export { mcp } from './mcp.js';
|
||||||
export { backup } from './backup.js';
|
export { backup } from './backup.js';
|
||||||
export { carrier } from './carrier.js';
|
export { carrier } from './carrier.js';
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ import { http } from './http.js';
|
|||||||
* Shape: LabelTemplate = { id, company_id, name, width, height, dpi, type, content, thumb }
|
* Shape: LabelTemplate = { id, company_id, name, width, height, dpi, type, content, thumb }
|
||||||
*/
|
*/
|
||||||
export const labeltemplate = {
|
export const labeltemplate = {
|
||||||
/** GET /api/labeltemplate → { labeltemplates: LabelTemplate[] } */
|
/** GET /api/labeltemplate(?sku=...) → { labeltemplates: LabelTemplate[] } */
|
||||||
// #region GET /api/labeltemplate — list
|
// #region GET /api/labeltemplate — list
|
||||||
list() {
|
list(params) {
|
||||||
return http('/api/labeltemplate');
|
const search = params?.sku ? `?sku=${encodeURIComponent(params.sku)}` : '';
|
||||||
|
return http(`/api/labeltemplate${search}`);
|
||||||
},
|
},
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
@@ -48,5 +49,23 @@ export const labeltemplate = {
|
|||||||
},
|
},
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/labeltemplate/testprint (or /api/labeltemplate/:id/testprint)
|
||||||
|
* @param {number|object} idOrBody
|
||||||
|
* @param {object} [maybeBody]
|
||||||
|
* → 200 { success: true, printerjob?: PrinterJob }
|
||||||
|
*/
|
||||||
|
// #region POST /api/labeltemplate/testprint — testprint
|
||||||
|
testprint(idOrBody, maybeBody) {
|
||||||
|
if (typeof idOrBody === 'object' && idOrBody !== null) {
|
||||||
|
return http('/api/labeltemplate/testprint', { method: 'POST', body: idOrBody });
|
||||||
|
}
|
||||||
|
return http(`/api/labeltemplate/${encodeURIComponent(idOrBody)}/testprint`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: maybeBody || {},
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
// thumb is returned inline as a base64 string in list/get responses
|
// thumb is returned inline as a base64 string in list/get responses
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -51,4 +51,29 @@ export const printer = {
|
|||||||
return http('/api/printer/order', { method: 'PUT', body: { printerIds } });
|
return http('/api/printer/order', { method: 'PUT', body: { printerIds } });
|
||||||
},
|
},
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/printer/state
|
||||||
|
* Query: ?serial=, ?agentId=
|
||||||
|
* → { printers: LivePrinter[] }
|
||||||
|
*/
|
||||||
|
// #region GET /api/printer/state — live state
|
||||||
|
state({ serial, agentId } = {}) {
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (serial) params.set('serial', serial);
|
||||||
|
if (agentId != null) params.set('agentId', agentId);
|
||||||
|
const query = params.toString();
|
||||||
|
return http(`/api/printer/state${query ? `?${query}` : ''}`);
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/printer/:id/state
|
||||||
|
* → { printer: LivePrinter }
|
||||||
|
*/
|
||||||
|
// #region GET /api/printer/:id/state — single printer state
|
||||||
|
printerState(id) {
|
||||||
|
return http(`/api/printer/${id}/state`);
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ export const printeragent = {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* PATCH /api/printeragent/:id
|
* PATCH /api/printeragent/:id
|
||||||
* Body: { name?: string, sort?: number }
|
* Body: { name?: string, sort?: number, enabled?: boolean }
|
||||||
* Updates name, sort, or both.
|
* Updates name, sort, enabled, or any combination.
|
||||||
* → 200 { printeragent: Printeragent }
|
* → 200 { printeragent: Printeragent }
|
||||||
*/
|
*/
|
||||||
update(id, patch = {}) {
|
update(id, patch = {}) {
|
||||||
@@ -38,6 +38,7 @@ export const printeragent = {
|
|||||||
if (patch.sort !== undefined && patch.sort !== null && patch.sort !== '') {
|
if (patch.sort !== undefined && patch.sort !== null && patch.sort !== '') {
|
||||||
body.sort = Number(patch.sort);
|
body.sort = Number(patch.sort);
|
||||||
}
|
}
|
||||||
|
if (patch.enabled !== undefined) body.enabled = Boolean(patch.enabled);
|
||||||
return http(`/api/printeragent/${id}`, {
|
return http(`/api/printeragent/${id}`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
body,
|
body,
|
||||||
|
|||||||
142
src/api/printerjob.js
Normal file
@@ -0,0 +1,142 @@
|
|||||||
|
import { http } from './http.js';
|
||||||
|
|
||||||
|
export const printerjob = {
|
||||||
|
/**
|
||||||
|
* POST /api/zpljob
|
||||||
|
* @param {{ agentprinterId: number, data: string, copiescount?: number }} payload
|
||||||
|
* → { printerjob: PrinterJob }
|
||||||
|
*/
|
||||||
|
createZplJob({ agentprinterId, data, copiescount = 1 }) {
|
||||||
|
return http('/api/zpljob', {
|
||||||
|
method: 'POST',
|
||||||
|
body: {
|
||||||
|
agentprinterId: Number(agentprinterId),
|
||||||
|
data: String(data),
|
||||||
|
copiescount: Number(copiescount) || 1,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends a minimal ZPL test label to a specific agent printer.
|
||||||
|
* @param {number} agentprinterId
|
||||||
|
* @param {{ model?: string }} [options]
|
||||||
|
* → { printerjob: PrinterJob }
|
||||||
|
*/
|
||||||
|
sendTestZpl(agentprinterId, { model = 'Zebra' } = {}) {
|
||||||
|
const timeStr = new Date().toLocaleTimeString('de-DE');
|
||||||
|
const safeModel = String(model || 'Drucker').replace(/[\^~]/g, '');
|
||||||
|
const zpl = [
|
||||||
|
'^XA',
|
||||||
|
'^FO40,40^ADN,36,20^FDTestdruck OK^FS',
|
||||||
|
`^FO40,85^ADN,18,10^FD${safeModel}^FS`,
|
||||||
|
`^FO40,115^ADN,18,10^FDID: ${agentprinterId} - ${timeStr}^FS`,
|
||||||
|
'^XZ',
|
||||||
|
].join('\n');
|
||||||
|
return this.createZplJob({
|
||||||
|
agentprinterId,
|
||||||
|
data: zpl,
|
||||||
|
copiescount: 1,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/printerjob
|
||||||
|
* @param {{ agentprinterId?: number, state?: string }} [query]
|
||||||
|
* → { printerjobs: PrinterJob[] }
|
||||||
|
*/
|
||||||
|
list(query = {}) {
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
if (query.agentprinterId != null) params.set('agentprinterId', String(query.agentprinterId));
|
||||||
|
if (query.state != null) params.set('state', String(query.state));
|
||||||
|
const qs = params.toString();
|
||||||
|
return http(qs ? `/api/printerjob?${qs}` : '/api/printerjob');
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /api/printerjob/:id
|
||||||
|
* → { printerjob: PrinterJob }
|
||||||
|
*/
|
||||||
|
get(id) {
|
||||||
|
return http(`/api/printerjob/${id}`);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/printerjob
|
||||||
|
* @param {{ agentprinterId: number, type?: 'zpl'|'pdf'|'epos', data: string }} payload
|
||||||
|
* → { printerjob: PrinterJob }
|
||||||
|
*/
|
||||||
|
create({ agentprinterId, type = 'zpl', data }) {
|
||||||
|
return http('/api/printerjob', {
|
||||||
|
method: 'POST',
|
||||||
|
body: {
|
||||||
|
agentprinterId: Number(agentprinterId),
|
||||||
|
type,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/printerjob/:id/cancel
|
||||||
|
* → { success: true, printerjob: PrinterJob }
|
||||||
|
*/
|
||||||
|
cancel(id) {
|
||||||
|
return http(`/api/printerjob/${id}/cancel`, {
|
||||||
|
method: 'POST',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* POST /api/printerjob/cancel-all
|
||||||
|
* Sends ~JA to clear printer buffer and cancels all queued jobs.
|
||||||
|
* @param {{ agentprinterId?: number }} [payload]
|
||||||
|
* → { success: true, cancelledCount: number, jobs: PrinterJob[] }
|
||||||
|
*/
|
||||||
|
async cancelAll({ agentprinterId } = {}) {
|
||||||
|
if (agentprinterId != null) {
|
||||||
|
try {
|
||||||
|
await this.createZplJob({
|
||||||
|
agentprinterId: Number(agentprinterId),
|
||||||
|
data: '~JA',
|
||||||
|
copiescount: 1,
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('Failed to send ~JA to printer:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await http('/api/printerjob/cancel-all', {
|
||||||
|
method: 'POST',
|
||||||
|
body: agentprinterId != null ? { agentprinterId: Number(agentprinterId) } : {},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
if (err?.status === 404) {
|
||||||
|
const { printerjobs = [] } = await this.list({ agentprinterId });
|
||||||
|
const cancellable = printerjobs.filter(
|
||||||
|
(j) => j.state === 'pending' || j.state === 'processing',
|
||||||
|
);
|
||||||
|
if (cancellable.length === 0) return { success: true, cancelledCount: 0, jobs: [] };
|
||||||
|
const results = await Promise.all(cancellable.map((j) => this.cancel(j.id)));
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
cancelledCount: results.length,
|
||||||
|
jobs: results.map((r) => r.printerjob),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DELETE /api/printerjob/:id
|
||||||
|
* → { success: true, deletedJob: PrinterJob }
|
||||||
|
*/
|
||||||
|
delete(id) {
|
||||||
|
return http(`/api/printerjob/${id}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
15
src/assets/printers/index.js
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import zd41x from './zd41x.png';
|
||||||
|
|
||||||
|
// Library of printer images. Entries are matched in order against the
|
||||||
|
// printer model (as reported by the agent), case-insensitively.
|
||||||
|
const PRINTER_IMAGES = [
|
||||||
|
{ pattern: /^ZD41/i, image: zd41x }, // ZD410, ZD411, ZD410-200dpi, ...
|
||||||
|
];
|
||||||
|
|
||||||
|
export function getPrinterImage(model) {
|
||||||
|
if (!model) return null;
|
||||||
|
const entry = PRINTER_IMAGES.find(({ pattern }) => pattern.test(String(model).trim()));
|
||||||
|
return entry?.image ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default PRINTER_IMAGES;
|
||||||
BIN
src/assets/printers/zd41x.png
Normal file
|
After Width: | Height: | Size: 40 KiB |
@@ -84,7 +84,7 @@ export function setAuthEventDispatcher(dispatch) {
|
|||||||
emit = dispatch;
|
emit = dispatch;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizePicture(picture) {
|
export function normalizePicture(picture) {
|
||||||
if (!picture || typeof picture !== 'string') return null;
|
if (!picture || typeof picture !== 'string') return null;
|
||||||
if (picture.startsWith('http://') || picture.startsWith('https://') || picture.startsWith('data:')) {
|
if (picture.startsWith('http://') || picture.startsWith('https://') || picture.startsWith('data:')) {
|
||||||
return picture;
|
return picture;
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
* - Brands (`brands`, `filteredBrands`, `brandFilter`)
|
* - Brands (`brands`, `filteredBrands`, `brandFilter`)
|
||||||
* - Product attributes & values (`attributes`)
|
* - Product attributes & values (`attributes`)
|
||||||
* - Payment accounts (`accounts`)
|
* - Payment accounts (`accounts`)
|
||||||
|
* - Members & pending invites (`members`, `invites`; admin only, loaded on demand)
|
||||||
*
|
*
|
||||||
* Lives with the 1st-level navigation shell (`AppShell`) and triggers when
|
* Lives with the 1st-level navigation shell (`AppShell`) and triggers when
|
||||||
* `authAutomat.state.hasCompany` is true (`hasCompany` requires `hasAuth`).
|
* `authAutomat.state.hasCompany` is true (`hasCompany` requires `hasAuth`).
|
||||||
@@ -25,7 +26,10 @@ import {
|
|||||||
company as companyApi,
|
company as companyApi,
|
||||||
number as numberApi,
|
number as numberApi,
|
||||||
posterminal as posterminalApi,
|
posterminal as posterminalApi,
|
||||||
|
printer as printerApi,
|
||||||
printeragent as printeragentApi,
|
printeragent as printeragentApi,
|
||||||
|
agentprinter as agentprinterApi,
|
||||||
|
printerjob as printerjobApi,
|
||||||
supplier as supplierApi,
|
supplier as supplierApi,
|
||||||
unit as unitApi,
|
unit as unitApi,
|
||||||
warehouse as warehouseApi,
|
warehouse as warehouseApi,
|
||||||
@@ -36,6 +40,8 @@ import {
|
|||||||
attributename as attributenameApi,
|
attributename as attributenameApi,
|
||||||
attributevalue as attributevalueApi,
|
attributevalue as attributevalueApi,
|
||||||
account as accountApi,
|
account as accountApi,
|
||||||
|
companyuser as companyuserApi,
|
||||||
|
autoinvite as autoinviteApi,
|
||||||
} from '../api';
|
} from '../api';
|
||||||
import { requireArray, requireDefined, requireObject } from '../utils/apiShape';
|
import { requireArray, requireDefined, requireObject } from '../utils/apiShape';
|
||||||
import { normalizeCompany } from '../utils/companyForm';
|
import { normalizeCompany } from '../utils/companyForm';
|
||||||
@@ -178,6 +184,15 @@ const sortPrinterAgents = (agents) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const sortAgentPrinters = (printers) => {
|
||||||
|
if (!Array.isArray(printers)) return [];
|
||||||
|
return [...printers].sort((a, b) => {
|
||||||
|
const sDiff = (Number(a.sort) || 0) - (Number(b.sort) || 0);
|
||||||
|
if (sDiff !== 0) return sDiff;
|
||||||
|
return (Number(a.id) || 0) - (Number(b.id) || 0);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const sortAccounts = (items) =>
|
const sortAccounts = (items) =>
|
||||||
[...items].sort((a, b) => String(a.name ?? '').localeCompare(String(b.name ?? ''), 'de'));
|
[...items].sort((a, b) => String(a.name ?? '').localeCompare(String(b.name ?? ''), 'de'));
|
||||||
|
|
||||||
@@ -247,12 +262,19 @@ const initialState = {
|
|||||||
terminalsStatus: 'idle',
|
terminalsStatus: 'idle',
|
||||||
terminalsError: null,
|
terminalsError: null,
|
||||||
|
|
||||||
// Printer agents
|
// Printer agents & agent printers
|
||||||
printeragents: [],
|
printeragents: [],
|
||||||
printeragentsCompanyId: null,
|
printeragentsCompanyId: null,
|
||||||
printeragentsStatus: 'idle',
|
printeragentsStatus: 'idle',
|
||||||
printeragentsError: null,
|
printeragentsError: null,
|
||||||
|
|
||||||
|
agentprinters: [],
|
||||||
|
agentprintersCompanyId: null,
|
||||||
|
agentprintersStatus: 'idle',
|
||||||
|
agentprintersError: null,
|
||||||
|
|
||||||
|
livePrinters: [], // LivePrinter[] from /api/printer/state or SSE printer/printerstate
|
||||||
|
|
||||||
// 4. Suppliers
|
// 4. Suppliers
|
||||||
suppliers: [],
|
suppliers: [],
|
||||||
articlesBySupplier: {},
|
articlesBySupplier: {},
|
||||||
@@ -311,6 +333,14 @@ const initialState = {
|
|||||||
accounts: [],
|
accounts: [],
|
||||||
accountsStatus: 'idle',
|
accountsStatus: 'idle',
|
||||||
accountsError: null,
|
accountsError: null,
|
||||||
|
|
||||||
|
// 14. Members & invites (admin only; never part of loadAll)
|
||||||
|
members: [],
|
||||||
|
membersStatus: 'idle',
|
||||||
|
membersError: null,
|
||||||
|
invites: [],
|
||||||
|
invitesStatus: 'idle',
|
||||||
|
invitesError: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
let companyAutomat;
|
let companyAutomat;
|
||||||
@@ -320,6 +350,8 @@ let inflightCompany = null;
|
|||||||
let inflightNumbers = null;
|
let inflightNumbers = null;
|
||||||
let inflightTerminals = null;
|
let inflightTerminals = null;
|
||||||
let inflightPrinterAgents = null;
|
let inflightPrinterAgents = null;
|
||||||
|
let inflightAgentPrinters = null;
|
||||||
|
let inflightLivePrinters = null;
|
||||||
let inflightSuppliers = null;
|
let inflightSuppliers = null;
|
||||||
let inflightUnits = null;
|
let inflightUnits = null;
|
||||||
let inflightWarehouses = null;
|
let inflightWarehouses = null;
|
||||||
@@ -329,6 +361,8 @@ let inflightCarriers = null;
|
|||||||
let inflightBrands = null;
|
let inflightBrands = null;
|
||||||
let inflightAttributes = null;
|
let inflightAttributes = null;
|
||||||
let inflightAccounts = null;
|
let inflightAccounts = null;
|
||||||
|
let inflightMembers = null;
|
||||||
|
let inflightInvites = null;
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
// #region internal state updaters & fetchers
|
// #region internal state updaters & fetchers
|
||||||
@@ -514,6 +548,8 @@ const actions = {
|
|||||||
actions.loadNumbers(),
|
actions.loadNumbers(),
|
||||||
actions.loadTerminals(),
|
actions.loadTerminals(),
|
||||||
actions.loadPrinterAgents(),
|
actions.loadPrinterAgents(),
|
||||||
|
actions.loadAgentPrinters(),
|
||||||
|
actions.loadLivePrinters(),
|
||||||
actions.loadSuppliers(),
|
actions.loadSuppliers(),
|
||||||
actions.loadUnits(),
|
actions.loadUnits(),
|
||||||
actions.loadWarehouses(),
|
actions.loadWarehouses(),
|
||||||
@@ -531,6 +567,8 @@ const actions = {
|
|||||||
inflightNumbers = null;
|
inflightNumbers = null;
|
||||||
inflightTerminals = null;
|
inflightTerminals = null;
|
||||||
inflightPrinterAgents = null;
|
inflightPrinterAgents = null;
|
||||||
|
inflightAgentPrinters = null;
|
||||||
|
inflightLivePrinters = null;
|
||||||
inflightSuppliers = null;
|
inflightSuppliers = null;
|
||||||
inflightUnits = null;
|
inflightUnits = null;
|
||||||
inflightWarehouses = null;
|
inflightWarehouses = null;
|
||||||
@@ -540,6 +578,8 @@ const actions = {
|
|||||||
inflightBrands = null;
|
inflightBrands = null;
|
||||||
inflightAttributes = null;
|
inflightAttributes = null;
|
||||||
inflightAccounts = null;
|
inflightAccounts = null;
|
||||||
|
inflightMembers = null;
|
||||||
|
inflightInvites = null;
|
||||||
companyAutomat.setState({
|
companyAutomat.setState({
|
||||||
...initialState,
|
...initialState,
|
||||||
viewerPosition: companyAutomat.state.viewerPosition,
|
viewerPosition: companyAutomat.state.viewerPosition,
|
||||||
@@ -779,6 +819,114 @@ const actions = {
|
|||||||
await printeragentApi.delete(agentId);
|
await printeragentApi.delete(agentId);
|
||||||
companyAutomat.setState({
|
companyAutomat.setState({
|
||||||
printeragents: companyAutomat.state.printeragents.filter((a) => a.id !== agentId),
|
printeragents: companyAutomat.state.printeragents.filter((a) => a.id !== agentId),
|
||||||
|
agentprinters: companyAutomat.state.agentprinters.filter((p) => p.printeragentId !== agentId),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
// #region Agent printers (agentprinter) & live telemetry
|
||||||
|
// MARK: calls agentprinter.list from ../api/index.js
|
||||||
|
async loadAgentPrinters(printeragentId) {
|
||||||
|
const companyId =
|
||||||
|
authAutomat.state.user?.selectedCompanyId ?? companyAutomat.state.current?.id;
|
||||||
|
if (!companyId) return [];
|
||||||
|
if (inflightAgentPrinters) return inflightAgentPrinters;
|
||||||
|
companyAutomat.setState({ agentprintersStatus: 'loading', agentprintersError: null });
|
||||||
|
inflightAgentPrinters = (async () => {
|
||||||
|
try {
|
||||||
|
const res = await agentprinterApi.list(printeragentId);
|
||||||
|
const agentprinters = sortAgentPrinters(Array.isArray(res.agentprinters) ? res.agentprinters : []);
|
||||||
|
companyAutomat.setState({
|
||||||
|
agentprinters,
|
||||||
|
agentprintersCompanyId: companyId,
|
||||||
|
agentprintersStatus: 'succeeded',
|
||||||
|
agentprintersError: null,
|
||||||
|
});
|
||||||
|
return agentprinters;
|
||||||
|
} catch (err) {
|
||||||
|
companyAutomat.setState({
|
||||||
|
agentprintersStatus: 'failed',
|
||||||
|
agentprintersError: err?.message ?? String(err),
|
||||||
|
});
|
||||||
|
throw err;
|
||||||
|
} finally {
|
||||||
|
inflightAgentPrinters = null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
return inflightAgentPrinters;
|
||||||
|
},
|
||||||
|
|
||||||
|
reloadAgentPrinters(printeragentId) {
|
||||||
|
return actions.loadAgentPrinters(printeragentId);
|
||||||
|
},
|
||||||
|
|
||||||
|
async updateAgentPrinter(id, patch) {
|
||||||
|
const res = await agentprinterApi.update(id, patch);
|
||||||
|
const updated = res.agentprinter;
|
||||||
|
companyAutomat.setState({
|
||||||
|
agentprinters: sortAgentPrinters(
|
||||||
|
companyAutomat.state.agentprinters.map((p) =>
|
||||||
|
p.id === id ? { ...p, ...updated } : p,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
return updated;
|
||||||
|
},
|
||||||
|
|
||||||
|
async reorderAgentPrinters({ printeragentId, agentprinterIds }) {
|
||||||
|
await agentprinterApi.order({ printeragentId, agentprinterIds });
|
||||||
|
const idOrder = new Map(agentprinterIds.map((id, index) => [id, index]));
|
||||||
|
companyAutomat.setState({
|
||||||
|
agentprinters: sortAgentPrinters(
|
||||||
|
companyAutomat.state.agentprinters.map((p) =>
|
||||||
|
idOrder.has(p.id) ? { ...p, sort: idOrder.get(p.id) } : p,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
async deleteAgentPrinter(id) {
|
||||||
|
await agentprinterApi.delete(id);
|
||||||
|
companyAutomat.setState({
|
||||||
|
agentprinters: companyAutomat.state.agentprinters.filter((p) => p.id !== id),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
async sendTestPrint(agentprinterId, options = {}) {
|
||||||
|
return printerjobApi.sendTestZpl(agentprinterId, options);
|
||||||
|
},
|
||||||
|
|
||||||
|
async cancelAllPrinterJobs(agentprinterId) {
|
||||||
|
return printerjobApi.cancelAll({ agentprinterId });
|
||||||
|
},
|
||||||
|
|
||||||
|
async createZplJob(payload) {
|
||||||
|
return printerjobApi.createZplJob(payload);
|
||||||
|
},
|
||||||
|
|
||||||
|
async loadLivePrinters() {
|
||||||
|
const companyId =
|
||||||
|
authAutomat.state.user?.selectedCompanyId ?? companyAutomat.state.current?.id;
|
||||||
|
if (!companyId) return [];
|
||||||
|
if (inflightLivePrinters) return inflightLivePrinters;
|
||||||
|
inflightLivePrinters = (async () => {
|
||||||
|
try {
|
||||||
|
const res = await printerApi.state();
|
||||||
|
const livePrinters = Array.isArray(res.printers) ? res.printers : [];
|
||||||
|
companyAutomat.setState({ livePrinters });
|
||||||
|
return livePrinters;
|
||||||
|
} catch (err) {
|
||||||
|
return [];
|
||||||
|
} finally {
|
||||||
|
inflightLivePrinters = null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
return inflightLivePrinters;
|
||||||
|
},
|
||||||
|
|
||||||
|
setLivePrinters(printers) {
|
||||||
|
companyAutomat.setState({
|
||||||
|
livePrinters: Array.isArray(printers) ? printers : [],
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// #endregion
|
// #endregion
|
||||||
@@ -1576,6 +1724,122 @@ const actions = {
|
|||||||
return accounts;
|
return accounts;
|
||||||
},
|
},
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
|
// #region 14. Members (companyuser) & invites (autoinvite) — admin only
|
||||||
|
// MARK: calls companyuser.* / autoinvite.* from ../api/index.js
|
||||||
|
loadMembers() {
|
||||||
|
if (inflightMembers) return inflightMembers;
|
||||||
|
inflightMembers = (async () => {
|
||||||
|
companyAutomat.setState({ membersStatus: 'loading', membersError: null });
|
||||||
|
try {
|
||||||
|
const res = await companyuserApi.list();
|
||||||
|
const members = requireArray(res?.companyusers, 'companyusers');
|
||||||
|
companyAutomat.setState({ members, membersStatus: 'ready', membersError: null });
|
||||||
|
return members;
|
||||||
|
} catch (error) {
|
||||||
|
companyAutomat.setState({ membersStatus: 'failed', membersError: error });
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
inflightMembers = null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
return inflightMembers;
|
||||||
|
},
|
||||||
|
|
||||||
|
async reloadMembers() {
|
||||||
|
try {
|
||||||
|
const res = await companyuserApi.list();
|
||||||
|
const members = requireArray(res?.companyusers, 'companyusers');
|
||||||
|
companyAutomat.setState({ members, membersStatus: 'ready', membersError: null });
|
||||||
|
return members;
|
||||||
|
} catch (error) {
|
||||||
|
companyAutomat.setState({ membersError: error });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
ensureMembersLoaded() {
|
||||||
|
if (companyAutomat.state.membersStatus === 'ready') {
|
||||||
|
return Promise.resolve(companyAutomat.state.members);
|
||||||
|
}
|
||||||
|
return actions.loadMembers();
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Adds an already registered user by email. Rejects with 404/409 from the backend. */
|
||||||
|
async addMember(email, role = 'user') {
|
||||||
|
const res = await companyuserApi.create({ email, role });
|
||||||
|
const member = requireObject(res?.companyuser, 'companyuser');
|
||||||
|
companyAutomat.setState({ members: [...companyAutomat.state.members, member] });
|
||||||
|
return member;
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Rejects with 409 when demoting the last admin. */
|
||||||
|
async setMemberRole(id, role) {
|
||||||
|
const res = await companyuserApi.setRole(id, role);
|
||||||
|
const member = requireObject(res?.companyuser, 'companyuser');
|
||||||
|
companyAutomat.setState({
|
||||||
|
members: companyAutomat.state.members.map((m) => (m.id === member.id ? member : m)),
|
||||||
|
});
|
||||||
|
return member;
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Rejects with 409 when removing the last admin. */
|
||||||
|
async removeMember(id) {
|
||||||
|
await companyuserApi.delete(id);
|
||||||
|
companyAutomat.setState({ members: companyAutomat.state.members.filter((m) => m.id !== id) });
|
||||||
|
},
|
||||||
|
|
||||||
|
loadInvites() {
|
||||||
|
if (inflightInvites) return inflightInvites;
|
||||||
|
inflightInvites = (async () => {
|
||||||
|
companyAutomat.setState({ invitesStatus: 'loading', invitesError: null });
|
||||||
|
try {
|
||||||
|
const res = await autoinviteApi.list();
|
||||||
|
const invites = requireArray(res?.autoinvites, 'autoinvites');
|
||||||
|
companyAutomat.setState({ invites, invitesStatus: 'ready', invitesError: null });
|
||||||
|
return invites;
|
||||||
|
} catch (error) {
|
||||||
|
companyAutomat.setState({ invitesStatus: 'failed', invitesError: error });
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
inflightInvites = null;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
return inflightInvites;
|
||||||
|
},
|
||||||
|
|
||||||
|
async reloadInvites() {
|
||||||
|
try {
|
||||||
|
const res = await autoinviteApi.list();
|
||||||
|
const invites = requireArray(res?.autoinvites, 'autoinvites');
|
||||||
|
companyAutomat.setState({ invites, invitesStatus: 'ready', invitesError: null });
|
||||||
|
return invites;
|
||||||
|
} catch (error) {
|
||||||
|
companyAutomat.setState({ invitesError: error });
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
ensureInvitesLoaded() {
|
||||||
|
if (companyAutomat.state.invitesStatus === 'ready') {
|
||||||
|
return Promise.resolve(companyAutomat.state.invites);
|
||||||
|
}
|
||||||
|
return actions.loadInvites();
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Rejects with 409 when the email is already registered (use addMember then). */
|
||||||
|
async createInvite(email, role = 'user') {
|
||||||
|
const res = await autoinviteApi.create({ email, role });
|
||||||
|
const invite = requireObject(res?.autoinvite, 'autoinvite');
|
||||||
|
companyAutomat.setState({ invites: [...companyAutomat.state.invites, invite] });
|
||||||
|
return invite;
|
||||||
|
},
|
||||||
|
|
||||||
|
async deleteInvite(id) {
|
||||||
|
await autoinviteApi.delete(id);
|
||||||
|
companyAutomat.setState({ invites: companyAutomat.state.invites.filter((i) => i.id !== id) });
|
||||||
|
},
|
||||||
|
// #endregion
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1641,6 +1905,27 @@ sseAutomat.actions.on('posterminal', () => {
|
|||||||
sseAutomat.actions.on('printeragent', () => {
|
sseAutomat.actions.on('printeragent', () => {
|
||||||
void companyAutomat.actions.loadPrinterAgents().catch(() => {});
|
void companyAutomat.actions.loadPrinterAgents().catch(() => {});
|
||||||
});
|
});
|
||||||
|
sseAutomat.actions.on('agentprinter', () => {
|
||||||
|
void companyAutomat.actions.loadAgentPrinters().catch(() => {});
|
||||||
|
});
|
||||||
|
sseAutomat.actions.on('printerstate', (ev) => {
|
||||||
|
try {
|
||||||
|
const payload = typeof ev?.data === 'string' ? JSON.parse(ev.data || '{}') : (ev?.data || {});
|
||||||
|
if (Array.isArray(payload.printers)) {
|
||||||
|
companyAutomat.actions.setLivePrinters(payload.printers);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
void companyAutomat.actions.loadLivePrinters().catch(() => {});
|
||||||
|
});
|
||||||
|
sseAutomat.actions.on('printer', (ev) => {
|
||||||
|
try {
|
||||||
|
const payload = typeof ev?.data === 'string' ? JSON.parse(ev.data || '{}') : (ev?.data || {});
|
||||||
|
if (Array.isArray(payload.printers)) {
|
||||||
|
companyAutomat.actions.setLivePrinters(payload.printers);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
});
|
||||||
sseAutomat.actions.on('customergroup', () => {
|
sseAutomat.actions.on('customergroup', () => {
|
||||||
void companyAutomat.actions.reloadCustomergroups().catch(() => {});
|
void companyAutomat.actions.reloadCustomergroups().catch(() => {});
|
||||||
});
|
});
|
||||||
@@ -1653,6 +1938,15 @@ sseAutomat.actions.on('attributename', () => {
|
|||||||
sseAutomat.actions.on('account', () => {
|
sseAutomat.actions.on('account', () => {
|
||||||
void companyAutomat.actions.reloadAccounts().catch(() => {});
|
void companyAutomat.actions.reloadAccounts().catch(() => {});
|
||||||
});
|
});
|
||||||
|
// Admin-only lists: only refresh once an admin view has loaded them.
|
||||||
|
sseAutomat.actions.on('companyuser', () => {
|
||||||
|
if (companyAutomat.state.membersStatus !== 'ready') return;
|
||||||
|
void companyAutomat.actions.reloadMembers().catch(() => {});
|
||||||
|
});
|
||||||
|
sseAutomat.actions.on('autoinvite', () => {
|
||||||
|
if (companyAutomat.state.invitesStatus !== 'ready') return;
|
||||||
|
void companyAutomat.actions.reloadInvites().catch(() => {});
|
||||||
|
});
|
||||||
sseAutomat.actions.on('company', () => {
|
sseAutomat.actions.on('company', () => {
|
||||||
void companyAutomat.actions.reload().catch(() => {});
|
void companyAutomat.actions.reload().catch(() => {});
|
||||||
});
|
});
|
||||||
@@ -1686,6 +1980,11 @@ export const selectPrinterAgents = () => companyAutomat.state.printeragents;
|
|||||||
export const selectPrinterAgentStatus = () => companyAutomat.state.printeragentsStatus;
|
export const selectPrinterAgentStatus = () => companyAutomat.state.printeragentsStatus;
|
||||||
export const selectHasPrinterAgents = () => companyAutomat.state.printeragents.length > 0;
|
export const selectHasPrinterAgents = () => companyAutomat.state.printeragents.length > 0;
|
||||||
|
|
||||||
|
// Agent printers selectors
|
||||||
|
export const selectAgentPrinters = () => companyAutomat.state.agentprinters;
|
||||||
|
export const selectAgentPrinterStatus = () => companyAutomat.state.agentprintersStatus;
|
||||||
|
export const selectLivePrinters = () => companyAutomat.state.livePrinters;
|
||||||
|
|
||||||
// Suppliers selectors
|
// Suppliers selectors
|
||||||
export const selectSuppliers = () => companyAutomat.state.suppliers;
|
export const selectSuppliers = () => companyAutomat.state.suppliers;
|
||||||
export const selectSuppliersStatus = () => companyAutomat.state.suppliersStatus;
|
export const selectSuppliersStatus = () => companyAutomat.state.suppliersStatus;
|
||||||
@@ -1726,6 +2025,16 @@ export const selectAttributeStatus = () => companyAutomat.state.attributesStatus
|
|||||||
// Accounts selectors
|
// Accounts selectors
|
||||||
export const selectAccounts = () => companyAutomat.state.accounts;
|
export const selectAccounts = () => companyAutomat.state.accounts;
|
||||||
export const selectAccountsStatus = () => companyAutomat.state.accountsStatus;
|
export const selectAccountsStatus = () => companyAutomat.state.accountsStatus;
|
||||||
|
|
||||||
|
// Own role in the selected company ('admin' | 'user' | undefined)
|
||||||
|
export const selectCompanyRole = () => companyAutomat.state.current?.role;
|
||||||
|
export const selectIsCompanyAdmin = () => companyAutomat.state.current?.role === 'admin';
|
||||||
|
|
||||||
|
// Members & invites selectors (admin only)
|
||||||
|
export const selectMembers = () => companyAutomat.state.members;
|
||||||
|
export const selectMembersStatus = () => companyAutomat.state.membersStatus;
|
||||||
|
export const selectInvites = () => companyAutomat.state.invites;
|
||||||
|
export const selectInvitesStatus = () => companyAutomat.state.invitesStatus;
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
export default companyAutomat;
|
export default companyAutomat;
|
||||||
|
|||||||
@@ -154,6 +154,9 @@ export {
|
|||||||
selectPrinterAgents,
|
selectPrinterAgents,
|
||||||
selectPrinterAgentStatus,
|
selectPrinterAgentStatus,
|
||||||
selectHasPrinterAgents,
|
selectHasPrinterAgents,
|
||||||
|
selectAgentPrinters,
|
||||||
|
selectAgentPrinterStatus,
|
||||||
|
selectLivePrinters,
|
||||||
selectSuppliers,
|
selectSuppliers,
|
||||||
selectSuppliersStatus,
|
selectSuppliersStatus,
|
||||||
selectUnits,
|
selectUnits,
|
||||||
@@ -175,6 +178,12 @@ export {
|
|||||||
selectAttributeStatus,
|
selectAttributeStatus,
|
||||||
selectAccounts,
|
selectAccounts,
|
||||||
selectAccountsStatus,
|
selectAccountsStatus,
|
||||||
|
selectCompanyRole,
|
||||||
|
selectIsCompanyAdmin,
|
||||||
|
selectMembers,
|
||||||
|
selectMembersStatus,
|
||||||
|
selectInvites,
|
||||||
|
selectInvitesStatus,
|
||||||
} from './companyAutomat';
|
} from './companyAutomat';
|
||||||
|
|
||||||
export { default as categoryAutomat } from './categoryAutomat';
|
export { default as categoryAutomat } from './categoryAutomat';
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import ButtonBase from '@mui/material/ButtonBase';
|
|||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import { Outlet, useLocation, useNavigate } from 'react-router-dom';
|
import { Outlet, useLocation, useNavigate } from 'react-router-dom';
|
||||||
import UserMenu from './UserMenu';
|
import UserMenu from './UserMenu';
|
||||||
|
import OnlinePrinterIcons from './OnlinePrinterIcons';
|
||||||
import HelpBadge from './HelpBadge';
|
import HelpBadge from './HelpBadge';
|
||||||
import { NAV_ITEMS, SUB_NAV, resolveActiveNav, resolveActiveSub } from '../nav';
|
import { NAV_ITEMS, SUB_NAV, resolveActiveNav, resolveActiveSub } from '../nav';
|
||||||
import { artikelQueryPath, buildSearchUrl } from './article/artikelQuery';
|
import { artikelQueryPath, buildSearchUrl } from './article/artikelQuery';
|
||||||
@@ -198,8 +199,20 @@ class AppSidebar extends PureComponent {
|
|||||||
})}
|
})}
|
||||||
</List>
|
</List>
|
||||||
|
|
||||||
<Box sx={{ ml: { xs: 'auto', lg: 0 }, flexShrink: 0, display: 'flex', alignItems: 'center' }}>
|
<Box
|
||||||
|
sx={{
|
||||||
|
ml: { xs: 'auto', lg: 0 },
|
||||||
|
flexShrink: 0,
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: { xs: 'row', lg: 'column' },
|
||||||
|
alignItems: { xs: 'center', lg: 'flex-start' },
|
||||||
|
width: { xs: 'auto', lg: '100%' },
|
||||||
|
gap: { xs: 0.5, lg: 0 },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<OnlinePrinterIcons />
|
||||||
<UserMenu />
|
<UserMenu />
|
||||||
|
<ChatFab />
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
@@ -418,7 +431,6 @@ export default function AppShell() {
|
|||||||
</Suspense>
|
</Suspense>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
<ChatFab />
|
|
||||||
<ChatDrawer />
|
<ChatDrawer />
|
||||||
<PinnedAppletFabs pathname={pathname} />
|
<PinnedAppletFabs pathname={pathname} />
|
||||||
<PinnedAppletDialog />
|
<PinnedAppletDialog />
|
||||||
|
|||||||
318
src/components/OnlinePrinterIcons.jsx
Normal file
@@ -0,0 +1,318 @@
|
|||||||
|
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 CancelScheduleSendOutlinedIcon from '@mui/icons-material/CancelScheduleSendOutlined';
|
||||||
|
import SettingsIcon from '@mui/icons-material/Settings';
|
||||||
|
import { enqueueSnackbar } from 'notistack';
|
||||||
|
import companyAutomat from '../automats/companyAutomat';
|
||||||
|
import { notifyError } from '../utils/notify';
|
||||||
|
import { getPrinterImage } from '../assets/printers';
|
||||||
|
|
||||||
|
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,
|
||||||
|
};
|
||||||
|
this.handleOpenMenu = this.handleOpenMenu.bind(this);
|
||||||
|
this.handleCloseMenu = this.handleCloseMenu.bind(this);
|
||||||
|
this.handleTestPrint = this.handleTestPrint.bind(this);
|
||||||
|
this.handleCancelAllJobs = this.handleCancelAllJobs.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 });
|
||||||
|
}
|
||||||
|
|
||||||
|
handleTestPrint(printer) {
|
||||||
|
if (!printer?.id) return;
|
||||||
|
this.handleCloseMenu();
|
||||||
|
companyAutomat.actions
|
||||||
|
.sendTestPrint(printer.id, {
|
||||||
|
model: printer.model || printer.type || 'Zebra',
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
enqueueSnackbar(
|
||||||
|
`Testdruck für ${printer.model || 'Drucker'} (#${printer.id}) an Warteschlange gesendet.`,
|
||||||
|
{ variant: 'success' },
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.catch(notifyError);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleCancelAllJobs(printer) {
|
||||||
|
if (!printer?.id) return;
|
||||||
|
this.handleCloseMenu();
|
||||||
|
companyAutomat.actions
|
||||||
|
.cancelAllPrinterJobs(printer.id)
|
||||||
|
.then(() => {
|
||||||
|
enqueueSnackbar(`Druckaufträge für ${printer.model || 'Drucker'} abgebrochen.`, {
|
||||||
|
variant: 'info',
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch(notifyError);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleOpenPrinterSettings() {
|
||||||
|
this.handleCloseMenu();
|
||||||
|
window.dispatchEvent(
|
||||||
|
new CustomEvent('open-settings', { detail: { tab: 'printeragent' } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { menuAnchor } = 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 (
|
||||||
|
<>
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: { xs: 'row', lg: 'column' },
|
||||||
|
alignItems: { xs: 'center', lg: 'flex-start' },
|
||||||
|
alignSelf: { xs: 'center', lg: 'flex-start' },
|
||||||
|
px: { xs: 0.5, sm: 1, lg: 1.5 },
|
||||||
|
py: { xs: 0.5, lg: 0.5 },
|
||||||
|
gap: { xs: 0.5, lg: 1 },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{onlinePrinters.map((p, index) => {
|
||||||
|
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 (
|
||||||
|
<IconButton
|
||||||
|
key={p.id || p.serial || index}
|
||||||
|
onClick={(e) => this.handleOpenMenu(e, p)}
|
||||||
|
title={tooltipTitle}
|
||||||
|
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}`}
|
||||||
|
>
|
||||||
|
<Badge
|
||||||
|
variant="dot"
|
||||||
|
color={hasError ? 'error' : isPaused ? 'warning' : 'success'}
|
||||||
|
overlap="circular"
|
||||||
|
anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
|
||||||
|
>
|
||||||
|
<PrintOutlinedIcon sx={{ fontSize: 20 }} />
|
||||||
|
</Badge>
|
||||||
|
</IconButton>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Menu
|
||||||
|
anchorEl={anchorEl}
|
||||||
|
open={Boolean(menuAnchor)}
|
||||||
|
onClose={this.handleCloseMenu}
|
||||||
|
anchorOrigin={{
|
||||||
|
vertical: isTop ? 'bottom' : 'top',
|
||||||
|
horizontal: isTop ? 'right' : 'left',
|
||||||
|
}}
|
||||||
|
transformOrigin={{
|
||||||
|
vertical: isTop ? 'top' : 'bottom',
|
||||||
|
horizontal: isTop ? 'right' : 'left',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{activePrinter && (
|
||||||
|
<Box sx={{ px: 2, py: 1, minWidth: 210 }}>
|
||||||
|
{getPrinterImage(activePrinter.model) ? (
|
||||||
|
<Box
|
||||||
|
component="img"
|
||||||
|
src={getPrinterImage(activePrinter.model)}
|
||||||
|
alt={activePrinter.model}
|
||||||
|
sx={{ display: 'block', mx: 'auto', mb: 1, maxWidth: 80, height: 'auto' }}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 1 }}>
|
||||||
|
<Typography variant="subtitle2" fontWeight={600} noWrap>
|
||||||
|
{activePrinter.model || 'Drucker'}
|
||||||
|
</Typography>
|
||||||
|
<Chip
|
||||||
|
label={activeStatusText}
|
||||||
|
size="small"
|
||||||
|
color={activeHasError ? 'error' : activeIsPaused ? 'warning' : 'success'}
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontSize: '0.65rem', height: 18, fontWeight: 600 }}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
{activePrinter.serial ? (
|
||||||
|
<Typography
|
||||||
|
variant="caption"
|
||||||
|
color="text.secondary"
|
||||||
|
sx={{ fontFamily: 'monospace', display: 'block' }}
|
||||||
|
>
|
||||||
|
S/N: {activePrinter.serial}
|
||||||
|
</Typography>
|
||||||
|
) : null}
|
||||||
|
{activePrinter.labelLength ? (
|
||||||
|
<Typography variant="caption" color="text.secondary" display="block">
|
||||||
|
Etikett: {activePrinter.labelLength} px
|
||||||
|
</Typography>
|
||||||
|
) : null}
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Divider />
|
||||||
|
|
||||||
|
<MenuItem onClick={() => this.handleTestPrint(activePrinter)}>
|
||||||
|
<ListItemIcon>
|
||||||
|
<PrintOutlinedIcon fontSize="small" color="primary" />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText
|
||||||
|
primary="Testdruck"
|
||||||
|
/>
|
||||||
|
</MenuItem>
|
||||||
|
|
||||||
|
<MenuItem onClick={() => this.handleCancelAllJobs(activePrinter)}>
|
||||||
|
<ListItemIcon>
|
||||||
|
<CancelScheduleSendOutlinedIcon fontSize="small" color="error" />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText
|
||||||
|
primary="Aufträge abbrechen"
|
||||||
|
/>
|
||||||
|
</MenuItem>
|
||||||
|
|
||||||
|
<MenuItem onClick={this.handleOpenPrinterSettings}>
|
||||||
|
<ListItemIcon>
|
||||||
|
<SettingsIcon fontSize="small" />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText primary="Einstellungen" />
|
||||||
|
</MenuItem>
|
||||||
|
</Menu>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,6 +25,7 @@ class UserMenu extends PureComponent {
|
|||||||
this.state = {
|
this.state = {
|
||||||
anchorEl: null,
|
anchorEl: null,
|
||||||
settingsOpen: false,
|
settingsOpen: false,
|
||||||
|
settingsInitialTab: null,
|
||||||
user: authAutomat.state.user,
|
user: authAutomat.state.user,
|
||||||
helpEnabled: helpAutomat.state?.enabled ?? false,
|
helpEnabled: helpAutomat.state?.enabled ?? false,
|
||||||
pwaUpdateAvailable: pwaAutomat.state.needRefresh,
|
pwaUpdateAvailable: pwaAutomat.state.needRefresh,
|
||||||
@@ -37,6 +38,7 @@ class UserMenu extends PureComponent {
|
|||||||
this.handleToggleHelp = this.handleToggleHelp.bind(this);
|
this.handleToggleHelp = this.handleToggleHelp.bind(this);
|
||||||
this.handleOpenPwaUpdate = this.handleOpenPwaUpdate.bind(this);
|
this.handleOpenPwaUpdate = this.handleOpenPwaUpdate.bind(this);
|
||||||
this.handleLogout = this.handleLogout.bind(this);
|
this.handleLogout = this.handleLogout.bind(this);
|
||||||
|
this.handleOpenSettingsEvent = this.handleOpenSettingsEvent.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
@@ -47,12 +49,23 @@ class UserMenu extends PureComponent {
|
|||||||
this.unsubscribePwa = pwaAutomat.subscribe(this, (state) => ({
|
this.unsubscribePwa = pwaAutomat.subscribe(this, (state) => ({
|
||||||
pwaUpdateAvailable: Boolean(state?.needRefresh),
|
pwaUpdateAvailable: Boolean(state?.needRefresh),
|
||||||
}));
|
}));
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
window.addEventListener('open-settings', this.handleOpenSettingsEvent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
this.unsubscribeAuth?.();
|
this.unsubscribeAuth?.();
|
||||||
this.unsubscribeHelp?.();
|
this.unsubscribeHelp?.();
|
||||||
this.unsubscribePwa?.();
|
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() {
|
handleOpenPwaUpdate() {
|
||||||
@@ -74,11 +87,11 @@ class UserMenu extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleOpenSettings() {
|
handleOpenSettings() {
|
||||||
this.setState({ anchorEl: null, settingsOpen: true });
|
this.setState({ anchorEl: null, settingsOpen: true, settingsInitialTab: null });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleCloseSettings() {
|
handleCloseSettings() {
|
||||||
this.setState({ settingsOpen: false });
|
this.setState({ settingsOpen: false, settingsInitialTab: null });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleToggleHelp(e) {
|
handleToggleHelp(e) {
|
||||||
@@ -98,7 +111,7 @@ class UserMenu extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { user, anchorEl, settingsOpen, helpEnabled, pwaUpdateAvailable } = this.state;
|
const { user, anchorEl, settingsOpen, settingsInitialTab, helpEnabled, pwaUpdateAvailable } = this.state;
|
||||||
const open = Boolean(anchorEl);
|
const open = Boolean(anchorEl);
|
||||||
|
|
||||||
const pictureSrc = (() => {
|
const pictureSrc = (() => {
|
||||||
@@ -201,7 +214,7 @@ class UserMenu extends PureComponent {
|
|||||||
<ListItemText>Sign out</ListItemText>
|
<ListItemText>Sign out</ListItemText>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</Menu>
|
</Menu>
|
||||||
<SettingsDialog open={settingsOpen} onClose={this.handleCloseSettings} />
|
<SettingsDialog open={settingsOpen} initialTab={settingsInitialTab} onClose={this.handleCloseSettings} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,20 +9,70 @@ import Grid from '@mui/material/Grid';
|
|||||||
import Paper from '@mui/material/Paper';
|
import Paper from '@mui/material/Paper';
|
||||||
import PrintIcon from '@mui/icons-material/Print';
|
import PrintIcon from '@mui/icons-material/Print';
|
||||||
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
|
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
|
||||||
|
import CancelScheduleSendOutlinedIcon from '@mui/icons-material/CancelScheduleSendOutlined';
|
||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
|
|
||||||
import { labeltemplate, printer, article } from '../../../api';
|
import { labeltemplate, article } from '../../../api';
|
||||||
|
import { companyAutomat } from '../../../automats';
|
||||||
import { notifyError } from '../../../utils/notify';
|
import { notifyError } from '../../../utils/notify';
|
||||||
import BackendError from '../../BackendError';
|
import BackendError from '../../BackendError';
|
||||||
|
|
||||||
|
function filterZplPrinters(agentprinters) {
|
||||||
|
return (Array.isArray(agentprinters) ? agentprinters : []).filter(
|
||||||
|
(p) => p.enabled !== false && (!p.type || p.type.toLowerCase() === 'zpl'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPrinterLabel(p) {
|
||||||
|
let label;
|
||||||
|
if (p.model && p.serial) {
|
||||||
|
label = `${p.model} (${p.serial})`;
|
||||||
|
} else if (p.model) {
|
||||||
|
label = p.model;
|
||||||
|
} else if (p.serial) {
|
||||||
|
label = `Drucker (${p.serial})`;
|
||||||
|
} else if (p.desc && p.address) {
|
||||||
|
label = `${p.desc} (${p.address})`;
|
||||||
|
} else if (p.address) {
|
||||||
|
label = p.address;
|
||||||
|
} else if (p.desc) {
|
||||||
|
label = p.desc;
|
||||||
|
} else {
|
||||||
|
label = `Drucker #${p.id}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p.online === false) {
|
||||||
|
return `${label} (offline)`;
|
||||||
|
}
|
||||||
|
return label;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPrinterLabelLength(printer, livePrinters = []) {
|
||||||
|
if (!printer) return null;
|
||||||
|
const live = (livePrinters || []).find(
|
||||||
|
(lp) =>
|
||||||
|
(lp.agentprinterId && lp.agentprinterId === printer.id) ||
|
||||||
|
(lp.id && lp.id === printer.id) ||
|
||||||
|
(printer.serial && lp.serial && String(printer.serial).toLowerCase() === String(lp.serial).toLowerCase()),
|
||||||
|
);
|
||||||
|
const raw = printer.labelLength ?? live?.labelLength;
|
||||||
|
if (raw == null) return null;
|
||||||
|
const num = Number(raw);
|
||||||
|
return Number.isFinite(num) && num > 0 ? num : null;
|
||||||
|
}
|
||||||
|
|
||||||
export default class ArticleLabelTab extends PureComponent {
|
export default class ArticleLabelTab extends PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
const initialPrinters = filterZplPrinters(companyAutomat.state.agentprinters);
|
||||||
this.state = {
|
this.state = {
|
||||||
templates: null,
|
templates: null,
|
||||||
printers: null,
|
printers: initialPrinters,
|
||||||
|
livePrinters: Array.isArray(companyAutomat.state.livePrinters)
|
||||||
|
? companyAutomat.state.livePrinters
|
||||||
|
: [],
|
||||||
selectedTemplateId: '',
|
selectedTemplateId: '',
|
||||||
selectedPrinterId: '',
|
selectedPrinterId: initialPrinters.length > 0 ? initialPrinters[0].id : '',
|
||||||
quantity: 1,
|
quantity: 1,
|
||||||
loading: true,
|
loading: true,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -30,27 +80,61 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => {
|
||||||
|
const zplPrinters = filterZplPrinters(state.agentprinters);
|
||||||
|
this.setState((prev) => ({
|
||||||
|
printers: zplPrinters,
|
||||||
|
livePrinters: Array.isArray(state.livePrinters) ? state.livePrinters : [],
|
||||||
|
selectedPrinterId:
|
||||||
|
prev.selectedPrinterId && zplPrinters.some((p) => p.id === prev.selectedPrinterId)
|
||||||
|
? prev.selectedPrinterId
|
||||||
|
: (zplPrinters[0]?.id ?? ''),
|
||||||
|
}));
|
||||||
|
});
|
||||||
this.loadData();
|
this.loadData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(prevProps) {
|
||||||
|
if (
|
||||||
|
prevProps.article?.sku !== this.props.article?.sku ||
|
||||||
|
prevProps.article?.name !== this.props.article?.name ||
|
||||||
|
prevProps.article?.prices !== this.props.article?.prices ||
|
||||||
|
prevProps.article?.eans !== this.props.article?.eans
|
||||||
|
) {
|
||||||
|
this.loadData();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
|
}
|
||||||
|
|
||||||
async loadData() {
|
async loadData() {
|
||||||
this.setState({ loading: true, error: null });
|
this.setState({ loading: true, error: null });
|
||||||
|
const sku = this.props.article?.sku;
|
||||||
try {
|
try {
|
||||||
const [resTemplates, resPrinters] = await Promise.all([
|
const resTemplates = await labeltemplate.list(sku ? { sku } : undefined);
|
||||||
labeltemplate.list(),
|
|
||||||
printer.list(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const templates = resTemplates.labeltemplates || [];
|
const templates = resTemplates.labeltemplates || [];
|
||||||
const zplPrinters = (resPrinters.printers || []).filter((p) => p.type === 'zpl');
|
const zplPrinters = filterZplPrinters(companyAutomat.state.agentprinters);
|
||||||
|
|
||||||
this.setState({
|
this.setState((prev) => ({
|
||||||
templates,
|
templates,
|
||||||
printers: zplPrinters,
|
printers: zplPrinters,
|
||||||
selectedTemplateId: templates.length > 0 ? templates[0].id : '',
|
livePrinters: Array.isArray(companyAutomat.state.livePrinters)
|
||||||
selectedPrinterId: zplPrinters.length > 0 ? zplPrinters[0].id : '',
|
? companyAutomat.state.livePrinters
|
||||||
|
: prev.livePrinters,
|
||||||
|
selectedTemplateId:
|
||||||
|
templates.length > 0
|
||||||
|
? prev.selectedTemplateId && templates.some((t) => t.id === prev.selectedTemplateId)
|
||||||
|
? prev.selectedTemplateId
|
||||||
|
: templates[0].id
|
||||||
|
: '',
|
||||||
|
selectedPrinterId:
|
||||||
|
prev.selectedPrinterId && zplPrinters.some((p) => p.id === prev.selectedPrinterId)
|
||||||
|
? prev.selectedPrinterId
|
||||||
|
: (zplPrinters[0]?.id ?? ''),
|
||||||
loading: false,
|
loading: false,
|
||||||
});
|
}));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.setState({ error, loading: false });
|
this.setState({ error, loading: false });
|
||||||
}
|
}
|
||||||
@@ -68,7 +152,7 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
try {
|
try {
|
||||||
await article.printLabel(articleData.sku, {
|
await article.printLabel(articleData.sku, {
|
||||||
templateId: selectedTemplateId,
|
templateId: selectedTemplateId,
|
||||||
printerId: selectedPrinterId,
|
agentprinterId: selectedPrinterId,
|
||||||
quantity,
|
quantity,
|
||||||
});
|
});
|
||||||
enqueueSnackbar('Druckauftrag erfolgreich gesendet', { variant: 'success' });
|
enqueueSnackbar('Druckauftrag erfolgreich gesendet', { variant: 'success' });
|
||||||
@@ -77,10 +161,24 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
handleCancelAllJobs = async () => {
|
||||||
|
const { selectedPrinterId, printers } = this.state;
|
||||||
|
const p = (printers || []).find((item) => item.id === selectedPrinterId);
|
||||||
|
const printerName = p ? getPrinterLabel(p) : 'Drucker';
|
||||||
|
|
||||||
|
try {
|
||||||
|
await companyAutomat.actions.cancelAllPrinterJobs(selectedPrinterId || undefined);
|
||||||
|
enqueueSnackbar(`Druckaufträge für ${printerName} abgebrochen.`, { variant: 'info' });
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
templates,
|
templates,
|
||||||
printers,
|
printers,
|
||||||
|
livePrinters,
|
||||||
selectedTemplateId,
|
selectedTemplateId,
|
||||||
selectedPrinterId,
|
selectedPrinterId,
|
||||||
quantity,
|
quantity,
|
||||||
@@ -88,6 +186,9 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
error,
|
error,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
|
const currentPrinter = (printers || []).find((p) => p.id === selectedPrinterId);
|
||||||
|
const printerLabelLength = getPrinterLabelLength(currentPrinter, livePrinters);
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<Box sx={{ p: 4, display: 'flex', justifyContent: 'center' }}>
|
<Box sx={{ p: 4, display: 'flex', justifyContent: 'center' }}>
|
||||||
@@ -130,8 +231,18 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
<Grid container spacing={2}>
|
<Grid container spacing={2}>
|
||||||
{templates.map((t) => {
|
{templates.map((t) => {
|
||||||
const isSelected = t.id === selectedTemplateId;
|
const isSelected = t.id === selectedTemplateId;
|
||||||
|
const dpi = t.dpi === 300 ? 300 : 203;
|
||||||
|
const tmplHeight = t.height || 200;
|
||||||
|
const tmplWidth = t.width || 448;
|
||||||
|
const hasPrinterLength = printerLabelLength != null && printerLabelLength > 0;
|
||||||
|
const totalHeight = hasPrinterLength ? Math.max(tmplHeight, printerLabelLength) : tmplHeight;
|
||||||
|
const isCutoff = hasPrinterLength && printerLabelLength < tmplHeight;
|
||||||
|
const outlineColor = isCutoff ? '#d32f2f' : '#1976d2';
|
||||||
|
const tmplHeightPercent = (tmplHeight / totalHeight) * 100;
|
||||||
|
const printerHeightPercent = hasPrinterLength ? (printerLabelLength / totalHeight) * 100 : 100;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Grid item xs={12} sm={6} md={4} key={t.id}>
|
<Grid size={{ xs: 12, sm: 6, md: 4 }} key={t.id}>
|
||||||
<Paper
|
<Paper
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
onClick={() => this.setState({ selectedTemplateId: t.id })}
|
onClick={() => this.setState({ selectedTemplateId: t.id })}
|
||||||
@@ -175,18 +286,81 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
bgcolor: 'background.default',
|
bgcolor: 'background.default',
|
||||||
borderRadius: 1,
|
borderRadius: 1,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
|
position: 'relative',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{t.thumb ? (
|
{t.thumb ? (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
position: 'relative',
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'center',
|
||||||
|
maxWidth: '100%',
|
||||||
|
maxHeight: '100%',
|
||||||
|
aspectRatio: `${tmplWidth} / ${totalHeight}`,
|
||||||
|
boxSizing: 'border-box',
|
||||||
|
bgcolor: '#fff',
|
||||||
|
borderRadius: 0.5,
|
||||||
|
boxShadow: '0 1px 2px rgba(0,0,0,0.1)',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{/* Template preview image */}
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
width: '100%',
|
||||||
|
height: `${tmplHeightPercent}%`,
|
||||||
|
position: 'relative',
|
||||||
|
display: 'flex',
|
||||||
|
overflow: 'hidden',
|
||||||
|
borderRadius: 0.5,
|
||||||
|
}}
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
src={`data:image/png;base64,${t.thumb}`}
|
src={`data:image/png;base64,${t.thumb}`}
|
||||||
alt={t.name}
|
alt={t.name}
|
||||||
style={{
|
style={{
|
||||||
maxWidth: '100%',
|
width: '100%',
|
||||||
maxHeight: '100%',
|
height: '100%',
|
||||||
objectFit: 'contain',
|
objectFit: 'contain',
|
||||||
|
display: 'block',
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
{/* If template exceeds printer label length, shade the cutoff overflow */}
|
||||||
|
{isCutoff && (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
position: 'absolute',
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
top: `${(printerLabelLength / tmplHeight) * 100}%`,
|
||||||
|
bottom: 0,
|
||||||
|
bgcolor: 'rgba(211, 47, 47, 0.22)',
|
||||||
|
zIndex: 1,
|
||||||
|
pointerEvents: 'none',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
{/* Dotted outline for printer label length */}
|
||||||
|
{hasPrinterLength && (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
position: 'absolute',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
height: `${printerHeightPercent}%`,
|
||||||
|
border: `2px dotted ${outlineColor}`,
|
||||||
|
borderRadius: 0.5,
|
||||||
|
pointerEvents: 'none',
|
||||||
|
boxSizing: 'border-box',
|
||||||
|
zIndex: 2,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
) : (
|
) : (
|
||||||
<Typography variant="caption" color="text.disabled">
|
<Typography variant="caption" color="text.disabled">
|
||||||
Keine Vorschau
|
Keine Vorschau
|
||||||
@@ -198,7 +372,7 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
{t.name}
|
{t.name}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="caption" color="text.secondary">
|
<Typography variant="caption" color="text.secondary">
|
||||||
{t.width}x{t.height} ({t.dpi} dpi)
|
{t.width}x{t.height} ({dpi} dpi)
|
||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
</Paper>
|
</Paper>
|
||||||
@@ -217,11 +391,14 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
onChange={(e) => this.setState({ selectedPrinterId: e.target.value })}
|
onChange={(e) => this.setState({ selectedPrinterId: e.target.value })}
|
||||||
sx={{ minWidth: 200 }}
|
sx={{ minWidth: 200 }}
|
||||||
>
|
>
|
||||||
{printers.map((p) => (
|
{printers.map((p) => {
|
||||||
|
const len = getPrinterLabelLength(p, livePrinters);
|
||||||
|
return (
|
||||||
<MenuItem key={p.id} value={p.id}>
|
<MenuItem key={p.id} value={p.id}>
|
||||||
{p.desc ? `${p.desc} (${p.address})` : p.address}
|
{getPrinterLabel(p)}{len != null ? ` (${len} px)` : ''}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</TextInput>
|
</TextInput>
|
||||||
|
|
||||||
<TextInput
|
<TextInput
|
||||||
@@ -246,6 +423,18 @@ export default class ArticleLabelTab extends PureComponent {
|
|||||||
>
|
>
|
||||||
Etiketten drucken
|
Etiketten drucken
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
variant="outlined"
|
||||||
|
color="error"
|
||||||
|
size="large"
|
||||||
|
startIcon={<CancelScheduleSendOutlinedIcon />}
|
||||||
|
onClick={this.handleCancelAllJobs}
|
||||||
|
disabled={!selectedPrinterId}
|
||||||
|
sx={{ height: 40 }}
|
||||||
|
>
|
||||||
|
Druckaufträge abbrechen
|
||||||
|
</Button>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ class CarrierItem extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleBlur = () => {
|
handleBlur = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.carrier ?? this.props.item;
|
const item = this.props.carrier ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const draft = this.state.draft.trim();
|
const draft = this.state.draft.trim();
|
||||||
@@ -63,6 +64,7 @@ class CarrierItem extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleToggleHasPackages = (e) => {
|
handleToggleHasPackages = (e) => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.carrier ?? this.props.item;
|
const item = this.props.carrier ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const nextVal = e.target.checked;
|
const nextVal = e.target.checked;
|
||||||
@@ -70,6 +72,7 @@ class CarrierItem extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleToggleIsReverse = (e) => {
|
handleToggleIsReverse = (e) => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.carrier ?? this.props.item;
|
const item = this.props.carrier ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const nextVal = e.target.checked;
|
const nextVal = e.target.checked;
|
||||||
@@ -77,6 +80,7 @@ class CarrierItem extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleKeyDown = (event) => {
|
handleKeyDown = (event) => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.carrier ?? this.props.item;
|
const item = this.props.carrier ?? this.props.item;
|
||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@@ -90,6 +94,7 @@ class CarrierItem extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleDelete = () => {
|
handleDelete = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.carrier ?? this.props.item;
|
const item = this.props.carrier ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
if (!window.confirm(`Versandart „${item.name}“ wirklich löschen?`)) return;
|
if (!window.confirm(`Versandart „${item.name}“ wirklich löschen?`)) return;
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import React, { PureComponent } from 'react';
|
import React, { PureComponent } from 'react';
|
||||||
import Box from '@mui/material/Box';
|
import Box from '@mui/material/Box';
|
||||||
import Fab from '@mui/material/Fab';
|
import Avatar from '@mui/material/Avatar';
|
||||||
|
import IconButton from '@mui/material/IconButton';
|
||||||
import Badge from '@mui/material/Badge';
|
import Badge from '@mui/material/Badge';
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
|
||||||
import CircularProgress from '@mui/material/CircularProgress';
|
import CircularProgress from '@mui/material/CircularProgress';
|
||||||
import ChatRoundedIcon from '@mui/icons-material/ChatRounded';
|
|
||||||
import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
|
import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
|
||||||
import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';
|
import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';
|
||||||
import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded';
|
import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded';
|
||||||
@@ -70,23 +69,24 @@ export default class ChatFab extends PureComponent {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
sx={(theme) => ({
|
sx={{
|
||||||
position: 'fixed',
|
px: { xs: 0.5, sm: 1, lg: 1.5 },
|
||||||
bottom: { xs: 20, sm: 28 },
|
py: { xs: 0.5, lg: 1 },
|
||||||
left: { xs: 20, lg: 164 },
|
alignSelf: { xs: 'center', lg: 'flex-start' },
|
||||||
zIndex: theme.zIndex.speedDial || 1050,
|
display: 'flex',
|
||||||
})}
|
alignItems: 'center',
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Box sx={{ position: 'relative' }}>
|
<Box sx={{ position: 'relative', display: 'inline-flex' }}>
|
||||||
{/* Animated pulsing halo when awaiting user answer */}
|
{/* Animated pulsing halo when awaiting user answer */}
|
||||||
{hasPendingAsk && !isOpen && (
|
{hasPendingAsk && !isOpen && (
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
top: -8,
|
top: -4,
|
||||||
left: -8,
|
left: -4,
|
||||||
right: -8,
|
right: -4,
|
||||||
bottom: -8,
|
bottom: -4,
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
bgcolor: CHAT_BUSY,
|
bgcolor: CHAT_BUSY,
|
||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
@@ -105,10 +105,10 @@ export default class ChatFab extends PureComponent {
|
|||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
top: -6,
|
top: -4,
|
||||||
left: -6,
|
left: -4,
|
||||||
right: -6,
|
right: -4,
|
||||||
bottom: -6,
|
bottom: -4,
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
bgcolor: 'warning.main',
|
bgcolor: 'warning.main',
|
||||||
opacity: 0.4,
|
opacity: 0.4,
|
||||||
@@ -125,18 +125,23 @@ export default class ChatFab extends PureComponent {
|
|||||||
{/* Circular spinner ring when model is busy */}
|
{/* Circular spinner ring when model is busy */}
|
||||||
{!hasPendingAsk && isBusy && !isOpen && (
|
{!hasPendingAsk && isBusy && !isOpen && (
|
||||||
<CircularProgress
|
<CircularProgress
|
||||||
size={66}
|
size={38}
|
||||||
thickness={2.5}
|
thickness={3}
|
||||||
sx={{
|
sx={{
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
top: -6,
|
top: -3,
|
||||||
left: -6,
|
left: -3,
|
||||||
color: CHAT_BUSY,
|
color: CHAT_BUSY,
|
||||||
pointerEvents: 'none',
|
pointerEvents: 'none',
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
onClick={this.handleClick}
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
sx={{ p: 0, width: 32, height: 32, borderRadius: '50%' }}
|
||||||
|
>
|
||||||
<Badge
|
<Badge
|
||||||
badgeContent={hasPendingAsk ? '?' : undefined}
|
badgeContent={hasPendingAsk ? '?' : undefined}
|
||||||
color={hasPendingAsk ? 'error' : isBusy ? 'warning' : 'default'}
|
color={hasPendingAsk ? 'error' : isBusy ? 'warning' : 'default'}
|
||||||
@@ -150,11 +155,11 @@ export default class ChatFab extends PureComponent {
|
|||||||
bgcolor: RED,
|
bgcolor: RED,
|
||||||
color: WHITE,
|
color: WHITE,
|
||||||
fontWeight: 900,
|
fontWeight: 900,
|
||||||
fontSize: '0.85rem',
|
fontSize: '0.75rem',
|
||||||
minWidth: 22,
|
minWidth: 18,
|
||||||
height: 22,
|
height: 18,
|
||||||
borderRadius: '50%',
|
borderRadius: '50%',
|
||||||
boxShadow: `0 2px 10px ${RED_GLOW}`,
|
boxShadow: `0 2px 8px ${RED_GLOW}`,
|
||||||
animation: 'badgePop 1.5s ease infinite',
|
animation: 'badgePop 1.5s ease infinite',
|
||||||
'@keyframes badgePop': {
|
'@keyframes badgePop': {
|
||||||
'0%, 100%': { transform: 'scale(1)' },
|
'0%, 100%': { transform: 'scale(1)' },
|
||||||
@@ -164,31 +169,41 @@ export default class ChatFab extends PureComponent {
|
|||||||
: undefined,
|
: undefined,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Fab
|
<Avatar
|
||||||
color="primary"
|
|
||||||
aria-label={ariaLabel}
|
|
||||||
onClick={this.handleClick}
|
|
||||||
sx={(theme) => ({
|
sx={(theme) => ({
|
||||||
width: 54,
|
width: 32,
|
||||||
height: 54,
|
height: 32,
|
||||||
boxShadow: hasPendingAsk
|
bgcolor: hasPendingAsk
|
||||||
? CHAT_FAB_SHADOW_PENDING
|
? CHAT_FAB_PENDING
|
||||||
: isBusy
|
: isBusy
|
||||||
? CHAT_FAB_SHADOW_BUSY
|
? CHAT_FAB_BUSY
|
||||||
: CHAT_FAB_SHADOW_IDLE,
|
: isOpen
|
||||||
|
? theme.palette.primary.main
|
||||||
|
: `linear-gradient(135deg, ${theme.palette.primary.main} 0%, ${theme.palette.primary.dark} 100%)`,
|
||||||
background: hasPendingAsk
|
background: hasPendingAsk
|
||||||
? CHAT_FAB_PENDING
|
? CHAT_FAB_PENDING
|
||||||
: isBusy
|
: isBusy
|
||||||
? CHAT_FAB_BUSY
|
? CHAT_FAB_BUSY
|
||||||
|
: isOpen
|
||||||
|
? theme.palette.primary.main
|
||||||
: `linear-gradient(135deg, ${theme.palette.primary.main} 0%, ${theme.palette.primary.dark} 100%)`,
|
: `linear-gradient(135deg, ${theme.palette.primary.main} 0%, ${theme.palette.primary.dark} 100%)`,
|
||||||
|
color: WHITE,
|
||||||
|
transition: 'all 0.2s ease',
|
||||||
|
boxShadow: hasPendingAsk
|
||||||
|
? CHAT_FAB_SHADOW_PENDING
|
||||||
|
: isBusy
|
||||||
|
? CHAT_FAB_SHADOW_BUSY
|
||||||
|
: isOpen
|
||||||
|
? `0 2px 8px rgba(0,0,0,0.25)`
|
||||||
|
: 'none',
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
{isOpen ? (
|
{isOpen ? (
|
||||||
<CloseRoundedIcon sx={{ fontSize: 24 }} />
|
<CloseRoundedIcon sx={{ fontSize: 18 }} />
|
||||||
) : hasPendingAsk ? (
|
) : hasPendingAsk ? (
|
||||||
<HelpOutlineRoundedIcon
|
<HelpOutlineRoundedIcon
|
||||||
sx={{
|
sx={{
|
||||||
fontSize: 26,
|
fontSize: 18,
|
||||||
animation: 'fabWiggle 2s ease infinite',
|
animation: 'fabWiggle 2s ease infinite',
|
||||||
'@keyframes fabWiggle': {
|
'@keyframes fabWiggle': {
|
||||||
'0%, 100%': { transform: 'rotate(0deg)' },
|
'0%, 100%': { transform: 'rotate(0deg)' },
|
||||||
@@ -200,12 +215,13 @@ export default class ChatFab extends PureComponent {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : isBusy ? (
|
) : isBusy ? (
|
||||||
<AutoAwesomeRoundedIcon sx={{ fontSize: 24 }} />
|
<AutoAwesomeRoundedIcon sx={{ fontSize: 18 }} />
|
||||||
) : (
|
) : (
|
||||||
<ChatRoundedIcon sx={{ fontSize: 24 }} />
|
<AutoAwesomeRoundedIcon sx={{ fontSize: 18 }} />
|
||||||
)}
|
)}
|
||||||
</Fab>
|
</Avatar>
|
||||||
</Badge>
|
</Badge>
|
||||||
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class KundeGruppe extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleBlur = () => {
|
handleBlur = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.group ?? this.props.item;
|
const item = this.props.group ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const editable = item.editable !== false;
|
const editable = item.editable !== false;
|
||||||
@@ -79,6 +80,7 @@ class KundeGruppe extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleDelete = () => {
|
handleDelete = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.group ?? this.props.item;
|
const item = this.props.group ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const editable = item.editable !== false;
|
const editable = item.editable !== false;
|
||||||
|
|||||||
@@ -44,6 +44,8 @@ import WidgetsOutlinedIcon from '@mui/icons-material/WidgetsOutlined';
|
|||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
import { vfs } from '../../api';
|
import { vfs } from '../../api';
|
||||||
import backupAutomat from '../../automats/backupAutomat';
|
import backupAutomat from '../../automats/backupAutomat';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
|
import { isProtectedVfsFile } from '../vfs/vfsUtils';
|
||||||
import { notifyError } from '../../utils/notify';
|
import { notifyError } from '../../utils/notify';
|
||||||
import {
|
import {
|
||||||
BORDER,
|
BORDER,
|
||||||
@@ -93,6 +95,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
super(props);
|
super(props);
|
||||||
const { status, error, backupStatus, backups, vfsFilesByBackup, vfsLoadingByBackup } = backupAutomat.state;
|
const { status, error, backupStatus, backups, vfsFilesByBackup, vfsLoadingByBackup } = backupAutomat.state;
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status,
|
status,
|
||||||
error,
|
error,
|
||||||
backupStatus,
|
backupStatus,
|
||||||
@@ -115,6 +118,9 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsubCompany = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
this.unsub = backupAutomat.subscribe(this, (state) => ({
|
this.unsub = backupAutomat.subscribe(this, (state) => ({
|
||||||
status: state.status,
|
status: state.status,
|
||||||
error: state.error,
|
error: state.error,
|
||||||
@@ -130,6 +136,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
this.unsubCompany?.();
|
||||||
this.unsub?.();
|
this.unsub?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,6 +162,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleOpenConfirm(type) {
|
handleOpenConfirm(type) {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
this.setState({ confirmRestore: type });
|
this.setState({ confirmRestore: type });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,6 +223,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
status,
|
status,
|
||||||
error,
|
error,
|
||||||
backupStatus,
|
backupStatus,
|
||||||
@@ -463,6 +472,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
<BackupTableRow
|
<BackupTableRow
|
||||||
key={item.name}
|
key={item.name}
|
||||||
item={item}
|
item={item}
|
||||||
|
isAdmin={isAdmin}
|
||||||
isExpanded={isExpanded}
|
isExpanded={isExpanded}
|
||||||
manifest={manifest}
|
manifest={manifest}
|
||||||
vfsFiles={vfsFiles}
|
vfsFiles={vfsFiles}
|
||||||
@@ -549,7 +559,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
variant="contained"
|
variant="contained"
|
||||||
startIcon={restoringSkills ? <CircularProgress size={14} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
startIcon={restoringSkills ? <CircularProgress size={14} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
||||||
onClick={() => this.handleOpenConfirm('skills')}
|
onClick={() => this.handleOpenConfirm('skills')}
|
||||||
disabled={restoringSkills}
|
disabled={!isAdmin || restoringSkills}
|
||||||
sx={{ textTransform: 'none', minHeight: 30, fontSize: '0.8rem', fontWeight: 600 }}
|
sx={{ textTransform: 'none', minHeight: 30, fontSize: '0.8rem', fontWeight: 600 }}
|
||||||
>
|
>
|
||||||
Skills wiederherstellen
|
Skills wiederherstellen
|
||||||
@@ -607,7 +617,7 @@ export default class BackupSettingsPanel extends Component {
|
|||||||
variant="contained"
|
variant="contained"
|
||||||
startIcon={restoringApplets ? <CircularProgress size={14} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
startIcon={restoringApplets ? <CircularProgress size={14} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
||||||
onClick={() => this.handleOpenConfirm('applets')}
|
onClick={() => this.handleOpenConfirm('applets')}
|
||||||
disabled={restoringApplets}
|
disabled={!isAdmin || restoringApplets}
|
||||||
sx={{ textTransform: 'none', minHeight: 30, fontSize: '0.8rem', fontWeight: 600 }}
|
sx={{ textTransform: 'none', minHeight: 30, fontSize: '0.8rem', fontWeight: 600 }}
|
||||||
>
|
>
|
||||||
Applets wiederherstellen
|
Applets wiederherstellen
|
||||||
@@ -740,6 +750,7 @@ class BackupTableRow extends Component {
|
|||||||
// MARK: calls POST /backup/:id/vfs/recover via backupAutomat.actions.recoverBackupVfs from ./api/index.js
|
// MARK: calls POST /backup/:id/vfs/recover via backupAutomat.actions.recoverBackupVfs from ./api/index.js
|
||||||
async handleRecoverFile(e, path) {
|
async handleRecoverFile(e, path) {
|
||||||
e?.stopPropagation?.();
|
e?.stopPropagation?.();
|
||||||
|
if (!this.props.isAdmin && isProtectedVfsFile(path)) return;
|
||||||
if (this.state.recoveringPath) return;
|
if (this.state.recoveringPath) return;
|
||||||
|
|
||||||
this.setState({ recoveringPath: path });
|
this.setState({ recoveringPath: path });
|
||||||
@@ -991,7 +1002,7 @@ class BackupTableRow extends Component {
|
|||||||
color="primary"
|
color="primary"
|
||||||
startIcon={isRecovering ? <CircularProgress size={12} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
startIcon={isRecovering ? <CircularProgress size={12} color="inherit" /> : <SettingsBackupRestoreIcon fontSize="small" />}
|
||||||
onClick={(e) => this.handleRecoverFile(e, f.name)}
|
onClick={(e) => this.handleRecoverFile(e, f.name)}
|
||||||
disabled={Boolean(recoveringPath)}
|
disabled={Boolean(recoveringPath) || (!this.props.isAdmin && isProtectedVfsFile(f.name))}
|
||||||
sx={{ textTransform: 'none', py: 0.25, px: 1, minHeight: 26, fontSize: '0.75rem' }}
|
sx={{ textTransform: 'none', py: 0.25, px: 1, minHeight: 26, fontSize: '0.75rem' }}
|
||||||
>
|
>
|
||||||
{isRecovering ? 'Wiederherstellen...' : 'Wiederherstellen'}
|
{isRecovering ? 'Wiederherstellen...' : 'Wiederherstellen'}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
super(props);
|
super(props);
|
||||||
const current = companyAutomat.state.current;
|
const current = companyAutomat.state.current;
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: current?.role === 'admin',
|
||||||
status: current ? 'ready' : 'loading',
|
status: current ? 'ready' : 'loading',
|
||||||
busy: false,
|
busy: false,
|
||||||
error: null,
|
error: null,
|
||||||
@@ -42,6 +43,9 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
if (state.current && this.state.status === 'loading') {
|
if (state.current && this.state.status === 'loading') {
|
||||||
this.syncFormFromCompany(state.current);
|
this.syncFormFromCompany(state.current);
|
||||||
}
|
}
|
||||||
|
return {
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
};
|
||||||
});
|
});
|
||||||
if (companyAutomat.state.current) {
|
if (companyAutomat.state.current) {
|
||||||
this.syncFormFromCompany(companyAutomat.state.current);
|
this.syncFormFromCompany(companyAutomat.state.current);
|
||||||
@@ -86,6 +90,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
|
|
||||||
async handleSubmit(event) {
|
async handleSubmit(event) {
|
||||||
event?.preventDefault?.();
|
event?.preventDefault?.();
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const { name, iso639, taxrate, reducedtaxrate } = this.state;
|
const { name, iso639, taxrate, reducedtaxrate } = this.state;
|
||||||
const parsedTaxrate = parseTaxRate(taxrate);
|
const parsedTaxrate = parseTaxRate(taxrate);
|
||||||
const parsedReducedtaxrate = parseTaxRate(reducedtaxrate);
|
const parsedReducedtaxrate = parseTaxRate(reducedtaxrate);
|
||||||
@@ -123,7 +128,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, busy, error, name, iso639, taxrate, reducedtaxrate } = this.state;
|
const { isAdmin, status, busy, error, name, iso639, taxrate, reducedtaxrate } = this.state;
|
||||||
|
|
||||||
if (status === 'loading' && !name) {
|
if (status === 'loading' && !name) {
|
||||||
return (
|
return (
|
||||||
@@ -146,6 +151,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
taxrate.trim() !== this._initial.taxrate.trim() ||
|
taxrate.trim() !== this._initial.taxrate.trim() ||
|
||||||
reducedtaxrate.trim() !== this._initial.reducedtaxrate.trim());
|
reducedtaxrate.trim() !== this._initial.reducedtaxrate.trim());
|
||||||
const canSave =
|
const canSave =
|
||||||
|
isAdmin &&
|
||||||
isDirty &&
|
isDirty &&
|
||||||
name.trim() !== '' &&
|
name.trim() !== '' &&
|
||||||
ISO639_OPTIONS.includes(iso639) &&
|
ISO639_OPTIONS.includes(iso639) &&
|
||||||
@@ -175,7 +181,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
label="Name"
|
label="Name"
|
||||||
value={name}
|
value={name}
|
||||||
disabled={busy}
|
disabled={!isAdmin || busy}
|
||||||
onChange={(nextName) => this.setState({ name: nextName })}
|
onChange={(nextName) => this.setState({ name: nextName })}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
autoFocus
|
autoFocus
|
||||||
@@ -188,7 +194,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
required
|
required
|
||||||
size="small"
|
size="small"
|
||||||
value={iso639}
|
value={iso639}
|
||||||
disabled={busy}
|
disabled={!isAdmin || busy}
|
||||||
onChange={(_event, value) => {
|
onChange={(_event, value) => {
|
||||||
if (value) this.setState({ iso639: value });
|
if (value) this.setState({ iso639: value });
|
||||||
}}
|
}}
|
||||||
@@ -206,7 +212,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
type="number"
|
type="number"
|
||||||
label="Normalsatz"
|
label="Normalsatz"
|
||||||
value={taxrate}
|
value={taxrate}
|
||||||
disabled={busy}
|
disabled={!isAdmin || busy}
|
||||||
onChange={(e) => this.setState({ taxrate: e.target.value })}
|
onChange={(e) => this.setState({ taxrate: e.target.value })}
|
||||||
error={taxrate !== '' && parsedTaxrate == null}
|
error={taxrate !== '' && parsedTaxrate == null}
|
||||||
slotProps={{
|
slotProps={{
|
||||||
@@ -223,7 +229,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
type="number"
|
type="number"
|
||||||
label="Ermäßigter Satz"
|
label="Ermäßigter Satz"
|
||||||
value={reducedtaxrate}
|
value={reducedtaxrate}
|
||||||
disabled={busy}
|
disabled={!isAdmin || busy}
|
||||||
onChange={(e) => this.setState({ reducedtaxrate: e.target.value })}
|
onChange={(e) => this.setState({ reducedtaxrate: e.target.value })}
|
||||||
error={reducedtaxrate !== '' && parsedReducedtaxrate == null}
|
error={reducedtaxrate !== '' && parsedReducedtaxrate == null}
|
||||||
slotProps={{
|
slotProps={{
|
||||||
@@ -240,7 +246,7 @@ export default class CompanySettingsPanel extends Component {
|
|||||||
type="submit"
|
type="submit"
|
||||||
variant="contained"
|
variant="contained"
|
||||||
color={canSave ? 'success' : 'inherit'}
|
color={canSave ? 'success' : 'inherit'}
|
||||||
disabled={busy || !canSave}
|
disabled={!isAdmin || busy || !canSave}
|
||||||
startIcon={busy ? <CircularProgress size={16} color="inherit" /> : null}
|
startIcon={busy ? <CircularProgress size={16} color="inherit" /> : null}
|
||||||
sx={
|
sx={
|
||||||
canSave
|
canSave
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
// Export state
|
// Export state
|
||||||
downloading: false,
|
downloading: false,
|
||||||
downloadProgress: null, // null = unknown, number 0-100
|
downloadProgress: null, // null = unknown, number 0-100
|
||||||
@@ -84,7 +85,14 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
this.handleCancelUpload = this.handleCancelUpload.bind(this);
|
this.handleCancelUpload = this.handleCancelUpload.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
if (this.uploadAbortController) {
|
if (this.uploadAbortController) {
|
||||||
this.uploadAbortController.abort();
|
this.uploadAbortController.abort();
|
||||||
}
|
}
|
||||||
@@ -147,6 +155,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleFileChange(event) {
|
handleFileChange(event) {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const file = event.target.files?.[0];
|
const file = event.target.files?.[0];
|
||||||
if (file) {
|
if (file) {
|
||||||
if (!isZipFile(file)) {
|
if (!isZipFile(file)) {
|
||||||
@@ -169,6 +178,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleStartUpload() {
|
async handleStartUpload() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const { selectedFile } = this.state;
|
const { selectedFile } = this.state;
|
||||||
if (!selectedFile) return;
|
if (!selectedFile) return;
|
||||||
|
|
||||||
@@ -282,6 +292,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
downloading,
|
downloading,
|
||||||
downloadProgress,
|
downloadProgress,
|
||||||
downloadStatus,
|
downloadStatus,
|
||||||
@@ -583,7 +594,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
accept=".zip,application/zip,application/x-zip-compressed"
|
accept=".zip,application/zip,application/x-zip-compressed"
|
||||||
style={{ display: 'none' }}
|
style={{ display: 'none' }}
|
||||||
onChange={this.handleFileChange}
|
onChange={this.handleFileChange}
|
||||||
disabled={uploading}
|
disabled={!isAdmin || uploading}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{!selectedFile ? (
|
{!selectedFile ? (
|
||||||
@@ -592,7 +603,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
startIcon={<InsertDriveFileOutlinedIcon />}
|
startIcon={<InsertDriveFileOutlinedIcon />}
|
||||||
onClick={() => this.fileInputRef.current?.click()}
|
onClick={() => this.fileInputRef.current?.click()}
|
||||||
disabled={uploading}
|
disabled={!isAdmin || uploading}
|
||||||
>
|
>
|
||||||
ZIP-Datei auswählen
|
ZIP-Datei auswählen
|
||||||
</Button>
|
</Button>
|
||||||
@@ -625,6 +636,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
{!uploading && (
|
{!uploading && (
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
|
disabled={!isAdmin}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
this.setState({ selectedFile: null });
|
this.setState({ selectedFile: null });
|
||||||
if (this.fileInputRef.current) this.fileInputRef.current.value = '';
|
if (this.fileInputRef.current) this.fileInputRef.current.value = '';
|
||||||
@@ -760,7 +772,7 @@ export default class ImportExportSettingsPanel extends Component {
|
|||||||
<CloudUploadOutlinedIcon />
|
<CloudUploadOutlinedIcon />
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
disabled={uploading || !selectedFile}
|
disabled={!isAdmin || uploading || !selectedFile}
|
||||||
onClick={this.handleStartUpload}
|
onClick={this.handleStartUpload}
|
||||||
>
|
>
|
||||||
{uploading ? 'Import läuft…' : 'Upload & Import starten'}
|
{uploading ? 'Import läuft…' : 'Upload & Import starten'}
|
||||||
|
|||||||
219
src/components/settings/MembersSettingsPanel.jsx
Normal file
@@ -0,0 +1,219 @@
|
|||||||
|
import { PureComponent } from 'react';
|
||||||
|
import Avatar from '@mui/material/Avatar';
|
||||||
|
import Box from '@mui/material/Box';
|
||||||
|
import Button from '@mui/material/Button';
|
||||||
|
import CircularProgress from '@mui/material/CircularProgress';
|
||||||
|
import IconButton from '@mui/material/IconButton';
|
||||||
|
import MenuItem from '@mui/material/MenuItem';
|
||||||
|
import Select from '@mui/material/Select';
|
||||||
|
import Stack from '@mui/material/Stack';
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import Typography from '@mui/material/Typography';
|
||||||
|
import DeleteOutlineIcon from '@mui/icons-material/DeleteOutlined';
|
||||||
|
import MailOutlinedIcon from '@mui/icons-material/MailOutlined';
|
||||||
|
import { enqueueSnackbar } from 'notistack';
|
||||||
|
import companyAutomat, { selectIsCompanyAdmin } from '../../automats/companyAutomat';
|
||||||
|
import { normalizePicture } from '../../automats/authAutomat';
|
||||||
|
import { notifyError } from '../../utils/notify';
|
||||||
|
import { backendErrorFrom } from '../../utils/backendError';
|
||||||
|
|
||||||
|
const ROLES = [
|
||||||
|
{ value: 'user', label: 'Benutzer' },
|
||||||
|
{ value: 'admin', label: 'Administrator' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const selectState = (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
members: state.members,
|
||||||
|
membersStatus: state.membersStatus,
|
||||||
|
invites: state.invites,
|
||||||
|
invitesStatus: state.invitesStatus,
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Company members and pending auto-invites. Visible and usable by admins only.
|
||||||
|
*/
|
||||||
|
export default class MembersSettingsPanel extends PureComponent {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
...selectState(companyAutomat.state),
|
||||||
|
memberEmail: '',
|
||||||
|
inviteEmail: '',
|
||||||
|
inviteRole: 'user',
|
||||||
|
busy: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, selectState);
|
||||||
|
this.loadIfAdmin();
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(_prevProps, prevState) {
|
||||||
|
if (!prevState.isAdmin && this.state.isAdmin) this.loadIfAdmin();
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
loadIfAdmin() {
|
||||||
|
if (!selectIsCompanyAdmin()) return;
|
||||||
|
companyAutomat.actions.ensureMembersLoaded().catch(notifyError);
|
||||||
|
companyAutomat.actions.ensureInvitesLoaded().catch(notifyError);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Runs a mutation, mapping the backend's 404/409 to friendly messages.
|
||||||
|
run = async (fn, messages = {}) => {
|
||||||
|
this.setState({ busy: true });
|
||||||
|
try {
|
||||||
|
await fn();
|
||||||
|
return true;
|
||||||
|
} catch (err) {
|
||||||
|
const normalized = backendErrorFrom(err);
|
||||||
|
const text = messages[normalized.status];
|
||||||
|
if (text) enqueueSnackbar(text, { variant: 'warning' });
|
||||||
|
else notifyError(err);
|
||||||
|
return false;
|
||||||
|
} finally {
|
||||||
|
this.setState({ busy: false });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handleAddMember = async (event) => {
|
||||||
|
event.preventDefault();
|
||||||
|
const email = this.state.memberEmail.trim();
|
||||||
|
if (!email) return;
|
||||||
|
const ok = await this.run(() => companyAutomat.actions.addMember(email, 'user'), {
|
||||||
|
404: 'Kein registrierter Benutzer mit dieser E-Mail. Bitte stattdessen einladen.',
|
||||||
|
409: 'Benutzer gehört bereits zum Unternehmen.',
|
||||||
|
});
|
||||||
|
if (ok) this.setState({ memberEmail: '' });
|
||||||
|
};
|
||||||
|
|
||||||
|
handleSetRole = (member, role) =>
|
||||||
|
this.run(() => companyAutomat.actions.setMemberRole(member.id, role), {
|
||||||
|
409: 'Der letzte Administrator kann nicht herabgestuft werden.',
|
||||||
|
});
|
||||||
|
|
||||||
|
handleRemoveMember = (member) =>
|
||||||
|
this.run(() => companyAutomat.actions.removeMember(member.id), {
|
||||||
|
409: 'Der letzte Administrator kann nicht entfernt werden.',
|
||||||
|
});
|
||||||
|
|
||||||
|
handleCreateInvite = async (event) => {
|
||||||
|
event.preventDefault();
|
||||||
|
const email = this.state.inviteEmail.trim();
|
||||||
|
if (!email) return;
|
||||||
|
const ok = await this.run(() => companyAutomat.actions.createInvite(email, this.state.inviteRole), {
|
||||||
|
409: 'Diese E-Mail ist bereits eingeladen oder registriert (dann direkt als Mitglied hinzufügen).',
|
||||||
|
});
|
||||||
|
if (ok) this.setState({ inviteEmail: '' });
|
||||||
|
};
|
||||||
|
|
||||||
|
handleDeleteInvite = (invite) => this.run(() => companyAutomat.actions.deleteInvite(invite.id));
|
||||||
|
|
||||||
|
renderRoleSelect(value, onChange, disabled) {
|
||||||
|
return (
|
||||||
|
<Select size="small" value={value} disabled={disabled} onChange={(e) => onChange(e.target.value)}>
|
||||||
|
{ROLES.map((r) => (
|
||||||
|
<MenuItem key={r.value} value={r.value}>
|
||||||
|
{r.label}
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { isAdmin, members, membersStatus, invites, invitesStatus, memberEmail, inviteEmail, inviteRole, busy } =
|
||||||
|
this.state;
|
||||||
|
|
||||||
|
if (!isAdmin) {
|
||||||
|
return <Typography color="text.secondary">Nur Administratoren können Mitglieder verwalten.</Typography>;
|
||||||
|
}
|
||||||
|
|
||||||
|
const loading = membersStatus === 'loading' || invitesStatus === 'loading';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack spacing={4}>
|
||||||
|
<Box>
|
||||||
|
<Typography variant="h6" gutterBottom>
|
||||||
|
Mitglieder
|
||||||
|
</Typography>
|
||||||
|
<Stack component="form" direction="row" spacing={1} onSubmit={this.handleAddMember} sx={{ mb: 2 }}>
|
||||||
|
<TextField
|
||||||
|
size="small"
|
||||||
|
type="email"
|
||||||
|
label="E-Mail"
|
||||||
|
value={memberEmail}
|
||||||
|
onChange={(e) => this.setState({ memberEmail: e.target.value })}
|
||||||
|
sx={{ flex: 1 }}
|
||||||
|
/>
|
||||||
|
<Button type="submit" variant="contained" disabled={busy || !memberEmail.trim()}>
|
||||||
|
Hinzufügen
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
{loading && members.length === 0 && <CircularProgress size={20} />}
|
||||||
|
{members.map((m) => (
|
||||||
|
<Stack key={m.id} direction="row" spacing={1.5} sx={{ alignItems: 'center', py: 0.75 }}>
|
||||||
|
<Avatar
|
||||||
|
src={normalizePicture(m.picture) || undefined}
|
||||||
|
alt={m.email}
|
||||||
|
sx={{ width: 32, height: 32, fontSize: '0.875rem' }}
|
||||||
|
>
|
||||||
|
{m.email?.[0]?.toUpperCase()}
|
||||||
|
</Avatar>
|
||||||
|
<Typography sx={{ flex: 1 }}>{m.email}</Typography>
|
||||||
|
{this.renderRoleSelect(m.role, (role) => this.handleSetRole(m, role), busy)}
|
||||||
|
<IconButton aria-label="Entfernen" disabled={busy} onClick={() => this.handleRemoveMember(m)}>
|
||||||
|
<DeleteOutlineIcon fontSize="small" />
|
||||||
|
</IconButton>
|
||||||
|
</Stack>
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box>
|
||||||
|
<Typography variant="h6" gutterBottom>
|
||||||
|
Einladungen
|
||||||
|
</Typography>
|
||||||
|
<Stack component="form" direction="row" spacing={1} onSubmit={this.handleCreateInvite} sx={{ mb: 2 }}>
|
||||||
|
<TextField
|
||||||
|
size="small"
|
||||||
|
type="email"
|
||||||
|
label="E-Mail"
|
||||||
|
value={inviteEmail}
|
||||||
|
onChange={(e) => this.setState({ inviteEmail: e.target.value })}
|
||||||
|
sx={{ flex: 1 }}
|
||||||
|
/>
|
||||||
|
{this.renderRoleSelect(inviteRole, (role) => this.setState({ inviteRole: role }), busy)}
|
||||||
|
<Button type="submit" variant="contained" disabled={busy || !inviteEmail.trim()}>
|
||||||
|
Einladen
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
{invites.map((i) => (
|
||||||
|
<Stack key={i.id} direction="row" spacing={1.5} sx={{ alignItems: 'center', py: 0.75 }}>
|
||||||
|
<Avatar
|
||||||
|
sx={{
|
||||||
|
width: 32,
|
||||||
|
height: 32,
|
||||||
|
fontSize: '0.875rem',
|
||||||
|
bgcolor: 'action.selected',
|
||||||
|
color: 'text.secondary',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<MailOutlinedIcon sx={{ fontSize: 18 }} />
|
||||||
|
</Avatar>
|
||||||
|
<Typography sx={{ flex: 1 }}>{i.email}</Typography>
|
||||||
|
<Typography color="text.secondary">{ROLES.find((r) => r.value === i.role)?.label ?? i.role}</Typography>
|
||||||
|
<IconButton aria-label="Einladung löschen" disabled={busy} onClick={() => this.handleDeleteInvite(i)}>
|
||||||
|
<DeleteOutlineIcon fontSize="small" />
|
||||||
|
</IconButton>
|
||||||
|
</Stack>
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,6 +59,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
: [];
|
: [];
|
||||||
const numbersStatus = companyAutomat.state.numbersStatus;
|
const numbersStatus = companyAutomat.state.numbersStatus;
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status:
|
status:
|
||||||
numbersStatus === 'ready'
|
numbersStatus === 'ready'
|
||||||
? 'ready'
|
? 'ready'
|
||||||
@@ -81,6 +82,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
this.unsub = companyAutomat.subscribe(this, (state) => {
|
this.unsub = companyAutomat.subscribe(this, (state) => {
|
||||||
const numbers = Array.isArray(state.numbers) ? state.numbers : [];
|
const numbers = Array.isArray(state.numbers) ? state.numbers : [];
|
||||||
return {
|
return {
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
status:
|
status:
|
||||||
state.numbersStatus === 'ready'
|
state.numbersStatus === 'ready'
|
||||||
? 'ready'
|
? 'ready'
|
||||||
@@ -121,6 +123,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleSave(id) {
|
async handleSave(id) {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const draft = this.state.drafts[id];
|
const draft = this.state.drafts[id];
|
||||||
if (!draft || draft.busy) return;
|
if (!draft || draft.busy) return;
|
||||||
const row = this.state.numbers.find((r) => r.id === id);
|
const row = this.state.numbers.find((r) => r.id === id);
|
||||||
@@ -211,7 +214,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, error, numbers, drafts } = this.state;
|
const { isAdmin, status, error, numbers, drafts } = this.state;
|
||||||
|
|
||||||
if (status === 'loading') {
|
if (status === 'loading') {
|
||||||
return (
|
return (
|
||||||
@@ -249,7 +252,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
<TextInput
|
<TextInput
|
||||||
size="small"
|
size="small"
|
||||||
value={draft.prefix}
|
value={draft.prefix}
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
onChange={(e) => this.handleChange(row.id, 'prefix', e.target.value)}
|
onChange={(e) => this.handleChange(row.id, 'prefix', e.target.value)}
|
||||||
sx={{ input: { fontFamily: 'monospace' } }}
|
sx={{ input: { fontFamily: 'monospace' } }}
|
||||||
/>
|
/>
|
||||||
@@ -259,7 +262,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
size="small"
|
size="small"
|
||||||
type="number"
|
type="number"
|
||||||
value={draft.padding}
|
value={draft.padding}
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
slotProps={{ htmlInput: { min: 1, step: 1 } }}
|
slotProps={{ htmlInput: { min: 1, step: 1 } }}
|
||||||
onChange={(e) => this.handleChange(row.id, 'padding', e.target.value)}
|
onChange={(e) => this.handleChange(row.id, 'padding', e.target.value)}
|
||||||
sx={{ input: { fontFamily: 'monospace' } }}
|
sx={{ input: { fontFamily: 'monospace' } }}
|
||||||
@@ -270,7 +273,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
size="small"
|
size="small"
|
||||||
type="number"
|
type="number"
|
||||||
value={draft.next}
|
value={draft.next}
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
slotProps={{ htmlInput: { min: 0, step: 1 } }}
|
slotProps={{ htmlInput: { min: 0, step: 1 } }}
|
||||||
onChange={(e) => this.handleChange(row.id, 'next', e.target.value)}
|
onChange={(e) => this.handleChange(row.id, 'next', e.target.value)}
|
||||||
sx={{ input: { fontFamily: 'monospace' } }}
|
sx={{ input: { fontFamily: 'monospace' } }}
|
||||||
@@ -295,7 +298,7 @@ export default class NumberSettingsPanel extends PureComponent {
|
|||||||
size="small"
|
size="small"
|
||||||
aria-label="Speichern"
|
aria-label="Speichern"
|
||||||
color="primary"
|
color="primary"
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
onClick={() => void this.handleSave(row.id)}
|
onClick={() => void this.handleSave(row.id)}
|
||||||
>
|
>
|
||||||
<SaveOutlinedIcon fontSize="small" />
|
<SaveOutlinedIcon fontSize="small" />
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
super(props);
|
super(props);
|
||||||
const terminals = companyAutomat.state.terminals ?? [];
|
const terminals = companyAutomat.state.terminals ?? [];
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: companyAutomat.state.terminalsStatus === 'succeeded' ? 'ready' : 'loading',
|
status: companyAutomat.state.terminalsStatus === 'succeeded' ? 'ready' : 'loading',
|
||||||
error: null,
|
error: null,
|
||||||
terminals,
|
terminals,
|
||||||
@@ -93,6 +94,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
terminals: Array.isArray(state.terminals) ? state.terminals : [],
|
terminals: Array.isArray(state.terminals) ? state.terminals : [],
|
||||||
status: state.terminalsStatus === 'succeeded' ? 'ready' : state.terminalsStatus === 'failed' ? 'failed' : this.state.status,
|
status: state.terminalsStatus === 'succeeded' ? 'ready' : state.terminalsStatus === 'failed' ? 'failed' : this.state.status,
|
||||||
}));
|
}));
|
||||||
@@ -133,6 +135,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleCreateTerminal() {
|
async handleCreateTerminal() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const { newTerminalName, enableAllForNew, terminals } = this.state;
|
const { newTerminalName, enableAllForNew, terminals } = this.state;
|
||||||
const trimmed = newTerminalName.trim();
|
const trimmed = newTerminalName.trim();
|
||||||
if (!trimmed) return;
|
if (!trimmed) return;
|
||||||
@@ -294,6 +297,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
status,
|
status,
|
||||||
error,
|
error,
|
||||||
terminals,
|
terminals,
|
||||||
@@ -362,7 +366,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
placeholder="Neues Terminal..."
|
placeholder="Neues Terminal..."
|
||||||
value={newTerminalName}
|
value={newTerminalName}
|
||||||
onChange={(e) => this.setState({ newTerminalName: e.target.value })}
|
onChange={(e) => this.setState({ newTerminalName: e.target.value })}
|
||||||
disabled={creatingTerminal}
|
disabled={!isAdmin || creatingTerminal}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
slotProps={{
|
slotProps={{
|
||||||
htmlInput: {
|
htmlInput: {
|
||||||
@@ -387,7 +391,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
checked={enableAllForNew}
|
checked={enableAllForNew}
|
||||||
onChange={(e) => this.setState({ enableAllForNew: e.target.checked })}
|
onChange={(e) => this.setState({ enableAllForNew: e.target.checked })}
|
||||||
disabled={creatingTerminal}
|
disabled={!isAdmin || creatingTerminal}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -396,7 +400,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
startIcon={creatingTerminal ? <CircularProgress size={16} color="inherit" /> : <AddIcon />}
|
startIcon={creatingTerminal ? <CircularProgress size={16} color="inherit" /> : <AddIcon />}
|
||||||
onClick={this.handleCreateTerminal}
|
onClick={this.handleCreateTerminal}
|
||||||
disabled={creatingTerminal || !newTerminalName.trim()}
|
disabled={!isAdmin || creatingTerminal || !newTerminalName.trim()}
|
||||||
>
|
>
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
</Button>
|
</Button>
|
||||||
@@ -492,7 +496,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<Switch
|
<Switch
|
||||||
size="small"
|
size="small"
|
||||||
checked={isEnabled}
|
checked={isEnabled}
|
||||||
disabled={isPatching || isDeleting}
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
onChange={(e) => void this.handleToggleEnabled(terminal, e.target.checked)}
|
onChange={(e) => void this.handleToggleEnabled(terminal, e.target.checked)}
|
||||||
color="success"
|
color="success"
|
||||||
/>
|
/>
|
||||||
@@ -516,7 +520,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
aria-label={`Terminal ${terminal.name} löschen`}
|
aria-label={`Terminal ${terminal.name} löschen`}
|
||||||
onClick={() => void this.handleDeleteTerminal(terminal)}
|
onClick={() => void this.handleDeleteTerminal(terminal)}
|
||||||
disabled={isDeleting || creatingTerminal || isPatching}
|
disabled={!isAdmin || isDeleting || creatingTerminal || isPatching}
|
||||||
color="error"
|
color="error"
|
||||||
>
|
>
|
||||||
{isDeleting ? (
|
{isDeleting ? (
|
||||||
@@ -546,13 +550,14 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<Chip
|
<Chip
|
||||||
icon={<FolderIcon />}
|
icon={<FolderIcon />}
|
||||||
label={this.getCategoryLabel(terminal)}
|
label={this.getCategoryLabel(terminal)}
|
||||||
onClick={() => this.setState({ pickerTerminal: terminal })}
|
onClick={isAdmin ? () => this.setState({ pickerTerminal: terminal }) : undefined}
|
||||||
onDelete={
|
onDelete={
|
||||||
terminal.rootCategoryId != null
|
isAdmin && terminal.rootCategoryId != null
|
||||||
? () => void this.handleSetRootCategory(terminal, null)
|
? () => void this.handleSetRootCategory(terminal, null)
|
||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
clickable
|
clickable={isAdmin}
|
||||||
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
variant={terminal.rootCategoryId != null ? 'filled' : 'outlined'}
|
variant={terminal.rootCategoryId != null ? 'filled' : 'outlined'}
|
||||||
color={terminal.rootCategoryId != null ? 'primary' : 'default'}
|
color={terminal.rootCategoryId != null ? 'primary' : 'default'}
|
||||||
size="small"
|
size="small"
|
||||||
@@ -560,6 +565,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<Button
|
<Button
|
||||||
size="small"
|
size="small"
|
||||||
variant="text"
|
variant="text"
|
||||||
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
onClick={() => this.setState({ pickerTerminal: terminal })}
|
onClick={() => this.setState({ pickerTerminal: terminal })}
|
||||||
sx={{ minWidth: 'auto', p: 0.5, fontSize: '0.75rem' }}
|
sx={{ minWidth: 'auto', p: 0.5, fontSize: '0.75rem' }}
|
||||||
>
|
>
|
||||||
@@ -576,7 +582,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<span>
|
<span>
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
disabled={index === 0 || isPatching || isDeleting}
|
disabled={!isAdmin || index === 0 || isPatching || isDeleting}
|
||||||
onClick={() => void this.handleMoveTerminal(terminal, 'up')}
|
onClick={() => void this.handleMoveTerminal(terminal, 'up')}
|
||||||
sx={{ p: 0.25 }}
|
sx={{ p: 0.25 }}
|
||||||
>
|
>
|
||||||
@@ -588,7 +594,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<span>
|
<span>
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
disabled={index === terminals.length - 1 || isPatching || isDeleting}
|
disabled={!isAdmin || index === terminals.length - 1 || isPatching || isDeleting}
|
||||||
onClick={() => void this.handleMoveTerminal(terminal, 'down')}
|
onClick={() => void this.handleMoveTerminal(terminal, 'down')}
|
||||||
sx={{ p: 0.25 }}
|
sx={{ p: 0.25 }}
|
||||||
>
|
>
|
||||||
@@ -599,7 +605,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<TextField
|
<TextField
|
||||||
type="number"
|
type="number"
|
||||||
size="small"
|
size="small"
|
||||||
disabled={isPatching || isDeleting}
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
value={this.state.sortDrafts[terminal.id] ?? terminal.sort ?? 0}
|
value={this.state.sortDrafts[terminal.id] ?? terminal.sort ?? 0}
|
||||||
onChange={(e) => this.handleSortDraftChange(terminal.id, e.target.value)}
|
onChange={(e) => this.handleSortDraftChange(terminal.id, e.target.value)}
|
||||||
onBlur={() => void this.handleSortSubmit(terminal)}
|
onBlur={() => void this.handleSortSubmit(terminal)}
|
||||||
@@ -624,7 +630,7 @@ export default class PosTerminalSettingsPanel extends Component {
|
|||||||
<Switch
|
<Switch
|
||||||
size="small"
|
size="small"
|
||||||
checked={Boolean(terminal.syncRootArticles)}
|
checked={Boolean(terminal.syncRootArticles)}
|
||||||
disabled={isPatching || isDeleting}
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
onChange={(e) => void this.handleToggleSyncRootArticles(terminal, e.target.checked)}
|
onChange={(e) => void this.handleToggleSyncRootArticles(terminal, e.target.checked)}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,9 +3,11 @@ import Box from '@mui/material/Box';
|
|||||||
import Button from '@mui/material/Button';
|
import Button from '@mui/material/Button';
|
||||||
import Chip from '@mui/material/Chip';
|
import Chip from '@mui/material/Chip';
|
||||||
import Divider from '@mui/material/Divider';
|
import Divider from '@mui/material/Divider';
|
||||||
|
import FormControlLabel from '@mui/material/FormControlLabel';
|
||||||
import IconButton from '@mui/material/IconButton';
|
import IconButton from '@mui/material/IconButton';
|
||||||
|
import Link from '@mui/material/Link';
|
||||||
|
import Switch from '@mui/material/Switch';
|
||||||
import TextField from '@mui/material/TextField';
|
import TextField from '@mui/material/TextField';
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
|
||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import AddIcon from '@mui/icons-material/Add';
|
import AddIcon from '@mui/icons-material/Add';
|
||||||
import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';
|
import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';
|
||||||
@@ -16,9 +18,12 @@ import ContentCopyIcon from '@mui/icons-material/ContentCopy';
|
|||||||
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
|
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
|
||||||
import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
|
import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
|
||||||
import LocalPrintshopOutlinedIcon from '@mui/icons-material/LocalPrintshopOutlined';
|
import LocalPrintshopOutlinedIcon from '@mui/icons-material/LocalPrintshopOutlined';
|
||||||
|
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
|
||||||
|
import PrintOutlinedIcon from '@mui/icons-material/PrintOutlined';
|
||||||
import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined';
|
import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined';
|
||||||
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
|
import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
|
||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
|
import QRCode from 'qrcode';
|
||||||
import BackendError from '../BackendError';
|
import BackendError from '../BackendError';
|
||||||
import companyAutomat from '../../automats/companyAutomat';
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import { backendErrorFrom } from '../../utils/backendError';
|
import { backendErrorFrom } from '../../utils/backendError';
|
||||||
@@ -41,13 +46,185 @@ function formatDateTime(val) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class AgentQrCode extends PureComponent {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = { dataUrl: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.generateQr();
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(prevProps) {
|
||||||
|
if (prevProps.value !== this.props.value || prevProps.size !== this.props.size) {
|
||||||
|
this.generateQr();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async generateQr() {
|
||||||
|
const { value, size = 110 } = this.props;
|
||||||
|
if (!value) {
|
||||||
|
this.setState({ dataUrl: null });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const dataUrl = await QRCode.toDataURL(value, {
|
||||||
|
width: size,
|
||||||
|
margin: 1,
|
||||||
|
color: {
|
||||||
|
dark: '#000000',
|
||||||
|
light: '#ffffff',
|
||||||
|
},
|
||||||
|
errorCorrectionLevel: 'M',
|
||||||
|
});
|
||||||
|
this.setState({ dataUrl });
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to generate QR code:', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { size = 110 } = this.props;
|
||||||
|
const { dataUrl } = this.state;
|
||||||
|
if (!dataUrl) {
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
width: size,
|
||||||
|
height: size,
|
||||||
|
bgcolor: 'action.hover',
|
||||||
|
borderRadius: 1,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
component="img"
|
||||||
|
src={dataUrl}
|
||||||
|
alt="Pairing QR Code"
|
||||||
|
sx={{
|
||||||
|
width: size,
|
||||||
|
height: size,
|
||||||
|
borderRadius: 1,
|
||||||
|
border: '1px solid',
|
||||||
|
borderColor: 'divider',
|
||||||
|
bgcolor: '#fff',
|
||||||
|
p: 0.5,
|
||||||
|
display: 'block',
|
||||||
|
flexShrink: 0,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderPrinterDiagnostics(printer, live) {
|
||||||
|
const isOnline = printer?.online ?? (live ? !live.unreachable && live.status !== 'offline' : false);
|
||||||
|
const isOpen = printer?.open ?? (live?.errors?.headOpen || live?.headOpen || false);
|
||||||
|
const isPaused = printer?.pause ?? (live?.errors?.pause || live?.pause || false);
|
||||||
|
const isError = printer?.error ?? (live?.errors?.other || live?.error || false);
|
||||||
|
const isUnreachable = !isOnline || (live?.errors?.unreachable || false);
|
||||||
|
const labelLength = printer?.labelLength ?? live?.labelLength;
|
||||||
|
|
||||||
|
if (!isOnline) {
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
label="Offline"
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
color="default"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20 }}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const errorChips = [];
|
||||||
|
if (isOpen) {
|
||||||
|
errorChips.push(
|
||||||
|
<Chip
|
||||||
|
key="headOpen"
|
||||||
|
label="Druckkopf offen"
|
||||||
|
size="small"
|
||||||
|
color="error"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20, fontWeight: 600 }}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (isPaused) {
|
||||||
|
errorChips.push(
|
||||||
|
<Chip
|
||||||
|
key="pause"
|
||||||
|
label="Pausiert"
|
||||||
|
size="small"
|
||||||
|
color="warning"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20, fontWeight: 600 }}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (isUnreachable) {
|
||||||
|
errorChips.push(
|
||||||
|
<Chip
|
||||||
|
key="unreachable"
|
||||||
|
label="Nicht erreichbar"
|
||||||
|
size="small"
|
||||||
|
color="error"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20, fontWeight: 600 }}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (isError) {
|
||||||
|
errorChips.push(
|
||||||
|
<Chip
|
||||||
|
key="other"
|
||||||
|
label="Fehler"
|
||||||
|
size="small"
|
||||||
|
color="error"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20, fontWeight: 600 }}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (errorChips.length > 0) {
|
||||||
|
return <Box sx={{ display: 'inline-flex', gap: 0.5, flexWrap: 'wrap' }}>{errorChips}</Box>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box sx={{ display: 'inline-flex', gap: 0.5, alignItems: 'center', flexWrap: 'wrap' }}>
|
||||||
|
<Chip
|
||||||
|
label="Bereit"
|
||||||
|
size="small"
|
||||||
|
color="success"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20, fontWeight: 600 }}
|
||||||
|
/>
|
||||||
|
{labelLength != null ? (
|
||||||
|
<Chip
|
||||||
|
label={`Etikett: ${labelLength} px`}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20 }}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default class PrinterAgentSettingsPanel extends PureComponent {
|
export default class PrinterAgentSettingsPanel extends PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
printeragents: Array.isArray(companyAutomat.state.printeragents)
|
printeragents: Array.isArray(companyAutomat.state.printeragents)
|
||||||
? companyAutomat.state.printeragents
|
? companyAutomat.state.printeragents
|
||||||
: [],
|
: [],
|
||||||
|
agentprinters: Array.isArray(companyAutomat.state.agentprinters)
|
||||||
|
? companyAutomat.state.agentprinters
|
||||||
|
: [],
|
||||||
|
livePrinters: Array.isArray(companyAutomat.state.livePrinters)
|
||||||
|
? companyAutomat.state.livePrinters
|
||||||
|
: [],
|
||||||
error: companyAutomat.state.printeragentsError
|
error: companyAutomat.state.printeragentsError
|
||||||
? backendErrorFrom(companyAutomat.state.printeragentsError)
|
? backendErrorFrom(companyAutomat.state.printeragentsError)
|
||||||
: null,
|
: null,
|
||||||
@@ -58,26 +235,39 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
editingId: null,
|
editingId: null,
|
||||||
editNameDraft: '',
|
editNameDraft: '',
|
||||||
sortDrafts: {},
|
sortDrafts: {},
|
||||||
|
testingPrinterId: null,
|
||||||
};
|
};
|
||||||
this.handleRetry = this.handleRetry.bind(this);
|
this.handleRetry = this.handleRetry.bind(this);
|
||||||
this.handleCreateAgent = this.handleCreateAgent.bind(this);
|
this.handleCreateAgent = this.handleCreateAgent.bind(this);
|
||||||
this.handleDeleteAgent = this.handleDeleteAgent.bind(this);
|
this.handleDeleteAgent = this.handleDeleteAgent.bind(this);
|
||||||
|
this.handleToggleAgentEnabled = this.handleToggleAgentEnabled.bind(this);
|
||||||
this.handleStartRename = this.handleStartRename.bind(this);
|
this.handleStartRename = this.handleStartRename.bind(this);
|
||||||
this.handleCancelRename = this.handleCancelRename.bind(this);
|
this.handleCancelRename = this.handleCancelRename.bind(this);
|
||||||
this.handleSaveRename = this.handleSaveRename.bind(this);
|
this.handleSaveRename = this.handleSaveRename.bind(this);
|
||||||
this.handleSortDraftChange = this.handleSortDraftChange.bind(this);
|
this.handleSortDraftChange = this.handleSortDraftChange.bind(this);
|
||||||
this.handleSortSubmit = this.handleSortSubmit.bind(this);
|
this.handleSortSubmit = this.handleSortSubmit.bind(this);
|
||||||
this.handleMoveAgent = this.handleMoveAgent.bind(this);
|
this.handleMoveAgent = this.handleMoveAgent.bind(this);
|
||||||
|
this.handleTogglePrinterEnabled = this.handleTogglePrinterEnabled.bind(this);
|
||||||
|
this.handleMovePrinter = this.handleMovePrinter.bind(this);
|
||||||
|
this.handleDeletePrinter = this.handleDeletePrinter.bind(this);
|
||||||
|
this.handleTestPrint = this.handleTestPrint.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
printeragents: Array.isArray(state.printeragents) ? state.printeragents : [],
|
printeragents: Array.isArray(state.printeragents) ? state.printeragents : [],
|
||||||
|
agentprinters: Array.isArray(state.agentprinters) ? state.agentprinters : [],
|
||||||
|
livePrinters: Array.isArray(state.livePrinters) ? state.livePrinters : [],
|
||||||
error: state.printeragentsError ? backendErrorFrom(state.printeragentsError) : null,
|
error: state.printeragentsError ? backendErrorFrom(state.printeragentsError) : null,
|
||||||
}));
|
}));
|
||||||
if (companyAutomat.state.printeragentsStatus === 'idle') {
|
if (companyAutomat.state.printeragentsStatus === 'idle') {
|
||||||
void companyAutomat.actions.loadPrinterAgents().catch(() => { });
|
void companyAutomat.actions.loadPrinterAgents().catch(() => { });
|
||||||
}
|
}
|
||||||
|
if (companyAutomat.state.agentprintersStatus === 'idle') {
|
||||||
|
void companyAutomat.actions.loadAgentPrinters().catch(() => { });
|
||||||
|
}
|
||||||
|
void companyAutomat.actions.loadLivePrinters().catch(() => { });
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
@@ -86,9 +276,12 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
|
|
||||||
handleRetry() {
|
handleRetry() {
|
||||||
void companyAutomat.actions.loadPrinterAgents().catch(notifyError);
|
void companyAutomat.actions.loadPrinterAgents().catch(notifyError);
|
||||||
|
void companyAutomat.actions.loadAgentPrinters().catch(notifyError);
|
||||||
|
void companyAutomat.actions.loadLivePrinters().catch(() => { });
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleCreateAgent() {
|
async handleCreateAgent() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const { newAgentName, printeragents } = this.state;
|
const { newAgentName, printeragents } = this.state;
|
||||||
const trimmed = newAgentName.trim();
|
const trimmed = newAgentName.trim();
|
||||||
if (!trimmed) return;
|
if (!trimmed) return;
|
||||||
@@ -127,6 +320,23 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async handleToggleAgentEnabled(agent, nextValue) {
|
||||||
|
this.setState({ patchingAgentId: agent.id });
|
||||||
|
try {
|
||||||
|
await companyAutomat.actions.updatePrinterAgent(agent.id, {
|
||||||
|
enabled: Boolean(nextValue),
|
||||||
|
});
|
||||||
|
enqueueSnackbar(
|
||||||
|
nextValue ? 'Drucker-Agent aktiviert.' : 'Drucker-Agent deaktiviert.',
|
||||||
|
{ variant: 'success' },
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
} finally {
|
||||||
|
this.setState({ patchingAgentId: null });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
handleStartRename(agent) {
|
handleStartRename(agent) {
|
||||||
this.setState({ editingId: agent.id, editNameDraft: agent.name || '' });
|
this.setState({ editingId: agent.id, editNameDraft: agent.name || '' });
|
||||||
}
|
}
|
||||||
@@ -218,16 +428,90 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async handleTogglePrinterEnabled(printer, nextValue) {
|
||||||
|
try {
|
||||||
|
await companyAutomat.actions.updateAgentPrinter(printer.id, {
|
||||||
|
enabled: Boolean(nextValue),
|
||||||
|
});
|
||||||
|
enqueueSnackbar(
|
||||||
|
nextValue ? 'Drucker aktiviert.' : 'Drucker deaktiviert.',
|
||||||
|
{ variant: 'success' },
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async handleMovePrinter(printer, direction) {
|
||||||
|
const { agentprinters } = this.state;
|
||||||
|
const currentIndex = agentprinters.findIndex((p) => p.id === printer.id);
|
||||||
|
if (currentIndex === -1) return;
|
||||||
|
const targetIndex = direction === 'up' ? currentIndex - 1 : currentIndex + 1;
|
||||||
|
if (targetIndex < 0 || targetIndex >= agentprinters.length) return;
|
||||||
|
|
||||||
|
const reordered = [...agentprinters];
|
||||||
|
const [moved] = reordered.splice(currentIndex, 1);
|
||||||
|
reordered.splice(targetIndex, 0, moved);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await companyAutomat.actions.reorderAgentPrinters({
|
||||||
|
agentprinterIds: reordered.map((p) => p.id),
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async handleDeletePrinter(printer) {
|
||||||
|
const isOnline = Boolean(printer?.online);
|
||||||
|
if (isOnline) {
|
||||||
|
enqueueSnackbar('Online-Drucker können nicht entfernt werden.', { variant: 'warning' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const label = printer.model || printer.serial || `#${printer.id}`;
|
||||||
|
if (!window.confirm(`Möchten Sie den Drucker „${label}“ wirklich entfernen?`)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await companyAutomat.actions.deleteAgentPrinter(printer.id);
|
||||||
|
enqueueSnackbar('Drucker entfernt.', { variant: 'success' });
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async handleTestPrint(printer) {
|
||||||
|
if (!printer?.id) return;
|
||||||
|
this.setState({ testingPrinterId: 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 Drucker-Warteschlange gesendet.`,
|
||||||
|
{ variant: 'success' },
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
} finally {
|
||||||
|
this.setState({ testingPrinterId: null });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
error,
|
error,
|
||||||
printeragents,
|
printeragents,
|
||||||
|
agentprinters,
|
||||||
|
livePrinters,
|
||||||
newAgentName,
|
newAgentName,
|
||||||
creatingAgent,
|
creatingAgent,
|
||||||
deletingId,
|
deletingId,
|
||||||
patchingAgentId,
|
patchingAgentId,
|
||||||
editingId,
|
editingId,
|
||||||
editNameDraft,
|
editNameDraft,
|
||||||
|
testingPrinterId,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
if (error && printeragents.length === 0) {
|
if (error && printeragents.length === 0) {
|
||||||
@@ -238,23 +522,71 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Build lookup maps for fast access
|
||||||
|
const livePrintersBySerial = new Map();
|
||||||
|
for (const lp of livePrinters) {
|
||||||
|
if (lp.serial) livePrintersBySerial.set(lp.serial, lp);
|
||||||
|
}
|
||||||
|
const agentMap = new Map(printeragents.map((a) => [a.id, a]));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box sx={{ p: 3, maxWidth: 900, mx: 'auto' }}>
|
<Box sx={{ p: 3, maxWidth: 900, mx: 'auto' }}>
|
||||||
<Box sx={{ mb: 2 }}>
|
<Box
|
||||||
<Typography variant="h6" fontWeight={600} gutterBottom>
|
sx={{
|
||||||
|
mb: 2,
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
gap: 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" fontWeight={600}>
|
||||||
Drucker-Agenten
|
Drucker-Agenten
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="body2" color="text.secondary">
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 2, flexWrap: 'wrap' }}>
|
||||||
Verwalten Sie externe Drucker-Agenten für Druckaufträge. Nach Erstellung eines Agenten
|
<Link
|
||||||
geben Sie die 6-stellige PIN auf dem Agenten-Gerät ein, um die Kopplung abzuschließen.
|
href="https://github.com/sebseb7/zebragent/releases/latest"
|
||||||
</Typography>
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
underline="hover"
|
||||||
|
sx={{
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: 0.5,
|
||||||
|
fontSize: '0.8125rem',
|
||||||
|
color: 'primary.main',
|
||||||
|
fontWeight: 500,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
zebragent (Linux / Windows)
|
||||||
|
<OpenInNewIcon sx={{ fontSize: 15 }} />
|
||||||
|
</Link>
|
||||||
|
<Link
|
||||||
|
href="https://github.com/QuixPos-com/AndroidPrinterAgent/releases/latest"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
underline="hover"
|
||||||
|
sx={{
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: 0.5,
|
||||||
|
fontSize: '0.8125rem',
|
||||||
|
color: 'primary.main',
|
||||||
|
fontWeight: 500,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Android Agent
|
||||||
|
<OpenInNewIcon sx={{ fontSize: 15 }} />
|
||||||
|
</Link>
|
||||||
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
{/* Add new agent row */}
|
{/* Add new agent row */}
|
||||||
<Box sx={{ display: 'flex', gap: 1.5, mb: 3, alignItems: 'center' }}>
|
<Box sx={{ display: 'flex', gap: 1.5, mb: 3, alignItems: 'center' }}>
|
||||||
<TextField
|
<TextField
|
||||||
size="small"
|
size="small"
|
||||||
placeholder="Neuer Drucker-Agent Name (z.B. Bar Receipt Printer)"
|
placeholder="Agent Name (z.B. Bar, Küche)"
|
||||||
value={newAgentName}
|
value={newAgentName}
|
||||||
onChange={(e) => this.setState({ newAgentName: e.target.value })}
|
onChange={(e) => this.setState({ newAgentName: e.target.value })}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
@@ -263,7 +595,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
void this.handleCreateAgent();
|
void this.handleCreateAgent();
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
disabled={creatingAgent}
|
disabled={!isAdmin || creatingAgent}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
slotProps={{
|
slotProps={{
|
||||||
htmlInput: {
|
htmlInput: {
|
||||||
@@ -273,7 +605,9 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
spellCheck: false,
|
spellCheck: false,
|
||||||
},
|
},
|
||||||
input: {
|
input: {
|
||||||
startAdornment: <LocalPrintshopOutlinedIcon sx={{ mr: 1, color: 'text.secondary' }} />,
|
startAdornment: (
|
||||||
|
<LocalPrintshopOutlinedIcon sx={{ mr: 1, color: 'text.secondary' }} />
|
||||||
|
),
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
sx={{ flex: 1 }}
|
sx={{ flex: 1 }}
|
||||||
@@ -283,7 +617,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
size="small"
|
size="small"
|
||||||
startIcon={<AddIcon />}
|
startIcon={<AddIcon />}
|
||||||
onClick={this.handleCreateAgent}
|
onClick={this.handleCreateAgent}
|
||||||
disabled={creatingAgent || !newAgentName.trim()}
|
disabled={!isAdmin || creatingAgent || !newAgentName.trim()}
|
||||||
>
|
>
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
</Button>
|
</Button>
|
||||||
@@ -297,12 +631,13 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
<Typography variant="body2">Keine Drucker-Agenten angelegt.</Typography>
|
<Typography variant="body2">Keine Drucker-Agenten angelegt.</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
) : (
|
) : (
|
||||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
|
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2.5 }}>
|
||||||
{printeragents.map((agent, index) => {
|
{printeragents.map((agent, index) => {
|
||||||
const isDeleting = deletingId === agent.id;
|
const isDeleting = deletingId === agent.id;
|
||||||
const isPatching = patchingAgentId === agent.id;
|
const isPatching = patchingAgentId === agent.id;
|
||||||
const isEditing = editingId === agent.id;
|
const isEditing = editingId === agent.id;
|
||||||
const isPaired = agent.pairedAt != null;
|
const isPaired = agent.pairedAt != null;
|
||||||
|
const isEnabled = agent.enabled !== false;
|
||||||
const pairedDateText = formatDateTime(agent.pairedAt);
|
const pairedDateText = formatDateTime(agent.pairedAt);
|
||||||
const lastseenText = formatDateTime(agent.lastseenAt) ?? 'Nie';
|
const lastseenText = formatDateTime(agent.lastseenAt) ?? 'Nie';
|
||||||
const updatedText = formatDateTime(agent.updatedAt) ?? '—';
|
const updatedText = formatDateTime(agent.updatedAt) ?? '—';
|
||||||
@@ -314,15 +649,20 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
p: 2,
|
p: 2,
|
||||||
borderRadius: 2,
|
borderRadius: 2,
|
||||||
border: '1px solid',
|
border: '1px solid',
|
||||||
borderColor: isPaired ? 'divider' : 'warning.light',
|
borderColor: !isEnabled
|
||||||
|
? 'action.disabledBackground'
|
||||||
|
: isPaired
|
||||||
|
? 'divider'
|
||||||
|
: 'warning.light',
|
||||||
bgcolor: 'background.paper',
|
bgcolor: 'background.paper',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
gap: 1.5,
|
gap: 1.5,
|
||||||
transition: 'border-color 0.2s ease',
|
opacity: isEnabled ? 1 : 0.72,
|
||||||
|
transition: 'opacity 0.2s ease, border-color 0.2s ease',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{/* Header: Icon, Name (or Edit input), Status chip, Actions */}
|
{/* Header: Icon, Name (or Edit input), Status chips, Enabled switch, Delete */}
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -334,7 +674,14 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
>
|
>
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5, flex: 1, minWidth: 260 }}>
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5, flex: 1, minWidth: 260 }}>
|
||||||
<LocalPrintshopOutlinedIcon
|
<LocalPrintshopOutlinedIcon
|
||||||
sx={{ color: isPaired ? 'primary.main' : 'warning.main', fontSize: 24 }}
|
sx={{
|
||||||
|
color: !isEnabled
|
||||||
|
? 'text.disabled'
|
||||||
|
: isPaired
|
||||||
|
? 'primary.main'
|
||||||
|
: 'warning.main',
|
||||||
|
fontSize: 24,
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
@@ -382,22 +729,25 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
</Box>
|
</Box>
|
||||||
) : (
|
) : (
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
<Typography variant="subtitle1" fontWeight={600}>
|
<Typography
|
||||||
|
variant="subtitle1"
|
||||||
|
fontWeight={600}
|
||||||
|
sx={{ color: isEnabled ? 'text.primary' : 'text.disabled' }}
|
||||||
|
>
|
||||||
{agent.name}
|
{agent.name}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Tooltip title="Name bearbeiten">
|
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
onClick={() => this.handleStartRename(agent)}
|
onClick={() => this.handleStartRename(agent)}
|
||||||
disabled={isPatching || isDeleting}
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
sx={{ p: 0.5, color: 'text.secondary' }}
|
sx={{ p: 0.5, color: 'text.secondary' }}
|
||||||
>
|
>
|
||||||
<EditOutlinedIcon sx={{ fontSize: 16 }} />
|
<EditOutlinedIcon sx={{ fontSize: 16 }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Tooltip>
|
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Pairing status badge */}
|
||||||
{isPaired ? (
|
{isPaired ? (
|
||||||
<Chip
|
<Chip
|
||||||
icon={<CheckCircleOutlinedIcon />}
|
icon={<CheckCircleOutlinedIcon />}
|
||||||
@@ -417,15 +767,51 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
sx={{ fontWeight: 600, fontSize: '0.75rem' }}
|
sx={{ fontWeight: 600, fontSize: '0.75rem' }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Agent version */}
|
||||||
|
{agent.agentversion ? (
|
||||||
|
<Chip
|
||||||
|
label={`v${agent.agentversion}`}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
color="info"
|
||||||
|
sx={{ fontFamily: 'monospace', fontWeight: 600, fontSize: '0.75rem' }}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
{/* Delete control */}
|
{/* Enabled Switch and Delete action */}
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
size="small"
|
||||||
|
checked={isEnabled}
|
||||||
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
|
onChange={(e) => void this.handleToggleAgentEnabled(agent, e.target.checked)}
|
||||||
|
color="success"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={
|
||||||
|
<Typography
|
||||||
|
variant="body2"
|
||||||
|
sx={{
|
||||||
|
fontSize: '0.8125rem',
|
||||||
|
fontWeight: 500,
|
||||||
|
color: isEnabled ? 'text.primary' : 'text.disabled',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{isEnabled ? 'Aktiv' : 'Inaktiv'}
|
||||||
|
</Typography>
|
||||||
|
}
|
||||||
|
sx={{ m: 0 }}
|
||||||
|
/>
|
||||||
|
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
aria-label={`Drucker-Agent ${agent.name} löschen`}
|
aria-label={`Drucker-Agent ${agent.name} löschen`}
|
||||||
onClick={() => void this.handleDeleteAgent(agent)}
|
onClick={() => void this.handleDeleteAgent(agent)}
|
||||||
disabled={isDeleting || creatingAgent || isPatching}
|
disabled={!isAdmin || isDeleting || creatingAgent || isPatching}
|
||||||
color="error"
|
color="error"
|
||||||
>
|
>
|
||||||
<DeleteOutlinedIcon fontSize="small" />
|
<DeleteOutlinedIcon fontSize="small" />
|
||||||
@@ -433,23 +819,45 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
{/* Body: Pairing details or PIN info */}
|
{/* Body: Pairing details with QR code or Discovered Printers */}
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
flexDirection: 'column',
|
||||||
justifyContent: 'space-between',
|
gap: 1.5,
|
||||||
flexWrap: 'wrap',
|
|
||||||
gap: 2,
|
|
||||||
pt: 0.5,
|
pt: 0.5,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{!isPaired ? (
|
{!isPaired ? (
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5, flexWrap: 'wrap' }}>
|
(() => {
|
||||||
<Typography variant="body2" color="text.secondary">
|
const domain = typeof window !== 'undefined' ? window.location.host : '';
|
||||||
|
const qrPayload = JSON.stringify({
|
||||||
|
domain,
|
||||||
|
pin: String(agent.pairingpin || ''),
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: 2,
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
bgcolor: 'action.hover',
|
||||||
|
p: 1.5,
|
||||||
|
borderRadius: 1.5,
|
||||||
|
border: '1px solid',
|
||||||
|
borderColor: 'warning.light',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box sx={{ display: 'inline-flex' }}>
|
||||||
|
<AgentQrCode value={qrPayload} size={110} />
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1, flex: 1, minWidth: 220 }}>
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, flexWrap: 'wrap' }}>
|
||||||
|
<Typography variant="body2" color="text.secondary" sx={{ fontWeight: 500 }}>
|
||||||
Kopplungs-PIN:
|
Kopplungs-PIN:
|
||||||
</Typography>
|
</Typography>
|
||||||
<Tooltip title="PIN in die Zwischenablage kopieren">
|
|
||||||
<Chip
|
<Chip
|
||||||
icon={<ContentCopyIcon sx={{ fontSize: 14 }} />}
|
icon={<ContentCopyIcon sx={{ fontSize: 14 }} />}
|
||||||
label={agent.pairingpin || '—'}
|
label={agent.pairingpin || '—'}
|
||||||
@@ -470,82 +878,76 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
px: 0.5,
|
px: 0.5,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Box>
|
||||||
|
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, flexWrap: 'wrap' }}>
|
||||||
|
<Typography variant="body2" color="text.secondary" sx={{ fontWeight: 500 }}>
|
||||||
|
Domain:
|
||||||
|
</Typography>
|
||||||
|
<Chip
|
||||||
|
label={domain}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontFamily: 'monospace', fontSize: '0.8rem' }}
|
||||||
|
/>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
onClick={() => {
|
||||||
|
navigator.clipboard?.writeText(qrPayload);
|
||||||
|
enqueueSnackbar('QR-Daten kopiert.', { variant: 'info' });
|
||||||
|
}}
|
||||||
|
sx={{ p: 0.5 }}
|
||||||
|
>
|
||||||
|
<ContentCopyIcon sx={{ fontSize: 14 }} />
|
||||||
|
</IconButton>
|
||||||
|
</Box>
|
||||||
|
|
||||||
<Typography variant="caption" color="text.secondary">
|
<Typography variant="caption" color="text.secondary">
|
||||||
Geben Sie diesen PIN auf dem Drucker-Agent-Gerät ein.
|
Scannen Sie den QR-Code mit dem Drucker-Agenten oder geben Sie Domain und PIN manuell ein.
|
||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
) : (
|
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5, flexWrap: 'wrap' }}>
|
|
||||||
{agent.clientserial ? (
|
|
||||||
<Chip
|
|
||||||
label={`S/N: ${agent.clientserial}`}
|
|
||||||
size="small"
|
|
||||||
variant="outlined"
|
|
||||||
sx={{ fontFamily: 'monospace', fontSize: '0.75rem' }}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{agent.clientmodel ? (
|
|
||||||
<Chip
|
|
||||||
label={`Modell: ${agent.clientmodel}`}
|
|
||||||
size="small"
|
|
||||||
variant="outlined"
|
|
||||||
sx={{ fontSize: '0.75rem' }}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{agent.agentversion ? (
|
|
||||||
<Chip
|
|
||||||
label={`v${agent.agentversion}`}
|
|
||||||
size="small"
|
|
||||||
variant="outlined"
|
|
||||||
color="info"
|
|
||||||
sx={{ fontFamily: 'monospace', fontWeight: 600, fontSize: '0.75rem' }}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
{agent.clientstate ? (
|
|
||||||
<Chip
|
|
||||||
label={`Status: ${agent.clientstate}`}
|
|
||||||
size="small"
|
|
||||||
variant="outlined"
|
|
||||||
sx={{ fontSize: '0.75rem' }}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
);
|
||||||
|
})()
|
||||||
|
) : null}
|
||||||
|
|
||||||
{/* Sort Order Controls */}
|
{/* Agent sort order controls */}
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5, ml: 'auto' }}>
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'flex-end',
|
||||||
|
gap: 0.5,
|
||||||
|
pt: 0.5,
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Typography variant="body2" color="text.secondary">
|
<Typography variant="body2" color="text.secondary">
|
||||||
Reihenfolge:
|
Reihenfolge:
|
||||||
</Typography>
|
</Typography>
|
||||||
<Tooltip title="Nach oben verschieben">
|
|
||||||
<span>
|
<span>
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
disabled={index === 0 || isPatching || isDeleting}
|
disabled={!isAdmin || index === 0 || isPatching || isDeleting}
|
||||||
onClick={() => void this.handleMoveAgent(agent, 'up')}
|
onClick={() => void this.handleMoveAgent(agent, 'up')}
|
||||||
sx={{ p: 0.25 }}
|
sx={{ p: 0.25 }}
|
||||||
>
|
>
|
||||||
<ArrowUpwardIcon sx={{ fontSize: 16 }} />
|
<ArrowUpwardIcon sx={{ fontSize: 16 }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</span>
|
</span>
|
||||||
</Tooltip>
|
|
||||||
<Tooltip title="Nach unten verschieben">
|
|
||||||
<span>
|
<span>
|
||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
disabled={index === printeragents.length - 1 || isPatching || isDeleting}
|
disabled={!isAdmin || index === printeragents.length - 1 || isPatching || isDeleting}
|
||||||
onClick={() => void this.handleMoveAgent(agent, 'down')}
|
onClick={() => void this.handleMoveAgent(agent, 'down')}
|
||||||
sx={{ p: 0.25 }}
|
sx={{ p: 0.25 }}
|
||||||
>
|
>
|
||||||
<ArrowDownwardIcon sx={{ fontSize: 16 }} />
|
<ArrowDownwardIcon sx={{ fontSize: 16 }} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</span>
|
</span>
|
||||||
</Tooltip>
|
|
||||||
<TextField
|
<TextField
|
||||||
type="number"
|
type="number"
|
||||||
size="small"
|
size="small"
|
||||||
disabled={isPatching || isDeleting}
|
disabled={!isAdmin || isPatching || isDeleting}
|
||||||
value={this.state.sortDrafts[agent.id] ?? agent.sort ?? 0}
|
value={this.state.sortDrafts[agent.id] ?? agent.sort ?? 0}
|
||||||
onChange={(e) => this.handleSortDraftChange(agent.id, e.target.value)}
|
onChange={(e) => this.handleSortDraftChange(agent.id, e.target.value)}
|
||||||
onBlur={() => void this.handleSortSubmit(agent)}
|
onBlur={() => void this.handleSortSubmit(agent)}
|
||||||
@@ -594,6 +996,171 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
|
|||||||
})}
|
})}
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Separate Printers Section */}
|
||||||
|
<Divider sx={{ my: 4 }} />
|
||||||
|
|
||||||
|
<Box sx={{ mb: 2 }}>
|
||||||
|
<Typography variant="h6" fontWeight={600} gutterBottom>
|
||||||
|
Drucker
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
{agentprinters.length === 0 ? null : (
|
||||||
|
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 1.5 }}>
|
||||||
|
{agentprinters.map((p, pIdx) => {
|
||||||
|
const pEnabled = p.enabled !== false;
|
||||||
|
const live =
|
||||||
|
(p.serial ? livePrintersBySerial.get(p.serial) : null) ??
|
||||||
|
livePrinters.find(
|
||||||
|
(lp) => lp.agentId === p.printeragentId && lp.serial === p.serial,
|
||||||
|
);
|
||||||
|
const isOnline = Boolean(
|
||||||
|
p.online ?? (live ? !live.unreachable && live.status !== 'offline' : false),
|
||||||
|
);
|
||||||
|
const parentAgent = agentMap.get(p.printeragentId);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
key={p.id}
|
||||||
|
sx={{
|
||||||
|
p: 1.5,
|
||||||
|
borderRadius: 1.5,
|
||||||
|
border: '1px solid',
|
||||||
|
borderColor: 'divider',
|
||||||
|
bgcolor: 'background.paper',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
gap: 1.5,
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
opacity: pEnabled ? 1 : 0.65,
|
||||||
|
transition: 'opacity 0.2s ease',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, flexWrap: 'wrap' }}>
|
||||||
|
<PrintOutlinedIcon sx={{ fontSize: 22, color: 'text.secondary' }} />
|
||||||
|
<Typography variant="body2" fontWeight={600}>
|
||||||
|
{p.model || 'Drucker'}
|
||||||
|
</Typography>
|
||||||
|
{p.type ? (
|
||||||
|
<Chip
|
||||||
|
label={p.type.toUpperCase()}
|
||||||
|
size="small"
|
||||||
|
color="primary"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontWeight: 600, fontSize: '0.7rem', height: 20 }}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
{p.serial ? (
|
||||||
|
<Typography
|
||||||
|
variant="caption"
|
||||||
|
color="text.secondary"
|
||||||
|
sx={{ fontFamily: 'monospace' }}
|
||||||
|
>
|
||||||
|
({p.serial})
|
||||||
|
</Typography>
|
||||||
|
) : null}
|
||||||
|
{parentAgent ? (
|
||||||
|
<Chip
|
||||||
|
label={`Agent: ${parentAgent.name}`}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ fontSize: '0.7rem', height: 20 }}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
{renderPrinterDiagnostics(p, live)}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
|
{/* Test print button */}
|
||||||
|
<span>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
color="primary"
|
||||||
|
startIcon={<PrintOutlinedIcon sx={{ fontSize: 15 }} />}
|
||||||
|
disabled={testingPrinterId === p.id}
|
||||||
|
onClick={() => void this.handleTestPrint(p)}
|
||||||
|
sx={{
|
||||||
|
textTransform: 'none',
|
||||||
|
fontSize: '0.75rem',
|
||||||
|
py: 0.25,
|
||||||
|
px: 1,
|
||||||
|
minHeight: 26,
|
||||||
|
fontWeight: 600,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{testingPrinterId === p.id ? 'Druckt…' : 'Testdruck'}
|
||||||
|
</Button>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
{/* Enabled toggle switch */}
|
||||||
|
<FormControlLabel
|
||||||
|
control={
|
||||||
|
<Switch
|
||||||
|
size="small"
|
||||||
|
checked={pEnabled}
|
||||||
|
disabled={!isAdmin}
|
||||||
|
onChange={(e) =>
|
||||||
|
void this.handleTogglePrinterEnabled(p, e.target.checked)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
label={
|
||||||
|
<Typography
|
||||||
|
variant="caption"
|
||||||
|
color={pEnabled ? 'text.primary' : 'text.disabled'}
|
||||||
|
>
|
||||||
|
{pEnabled ? 'Aktiv' : 'Inaktiv'}
|
||||||
|
</Typography>
|
||||||
|
}
|
||||||
|
sx={{ m: 0 }}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Reorder buttons across all printers */}
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center' }}>
|
||||||
|
<span>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
disabled={!isAdmin || pIdx === 0}
|
||||||
|
onClick={() => void this.handleMovePrinter(p, 'up')}
|
||||||
|
sx={{ p: 0.25 }}
|
||||||
|
>
|
||||||
|
<ArrowUpwardIcon sx={{ fontSize: 16 }} />
|
||||||
|
</IconButton>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<span>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
disabled={!isAdmin || pIdx === agentprinters.length - 1}
|
||||||
|
onClick={() => void this.handleMovePrinter(p, 'down')}
|
||||||
|
sx={{ p: 0.25 }}
|
||||||
|
>
|
||||||
|
<ArrowDownwardIcon sx={{ fontSize: 16 }} />
|
||||||
|
</IconButton>
|
||||||
|
</span>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
{/* Delete printer button: disabled when online! */}
|
||||||
|
<span>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
color="error"
|
||||||
|
disabled={!isAdmin || isOnline}
|
||||||
|
onClick={() => void this.handleDeletePrinter(p)}
|
||||||
|
sx={{ p: 0.5 }}
|
||||||
|
>
|
||||||
|
<DeleteOutlinedIcon sx={{ fontSize: 18 }} />
|
||||||
|
</IconButton>
|
||||||
|
</span>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
|
|||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
import BackendError from '../BackendError';
|
import BackendError from '../BackendError';
|
||||||
import { printer as printerApi } from '../../api';
|
import { printer as printerApi } from '../../api';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import { requireArray, requireObject } from '../../utils/apiShape';
|
import { requireArray, requireObject } from '../../utils/apiShape';
|
||||||
import { backendErrorFrom } from '../../utils/backendError';
|
import { backendErrorFrom } from '../../utils/backendError';
|
||||||
import { notifyError } from '../../utils/notify';
|
import { notifyError } from '../../utils/notify';
|
||||||
@@ -189,6 +190,7 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: 'loading',
|
status: 'loading',
|
||||||
error: null,
|
error: null,
|
||||||
printers: [],
|
printers: [],
|
||||||
@@ -208,6 +210,9 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
void this.load();
|
void this.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,10 +331,12 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
this._unmounted = true;
|
this._unmounted = true;
|
||||||
|
this.unsub?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
status, error, printers,
|
status, error, printers,
|
||||||
draggingId, dragOverId,
|
draggingId, dragOverId,
|
||||||
addOpen, editPrinter,
|
addOpen, editPrinter,
|
||||||
@@ -354,6 +361,7 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
startIcon={<AddIcon />}
|
startIcon={<AddIcon />}
|
||||||
|
disabled={!isAdmin}
|
||||||
onClick={this.handleAdd}
|
onClick={this.handleAdd}
|
||||||
>
|
>
|
||||||
Drucker hinzufügen
|
Drucker hinzufügen
|
||||||
@@ -386,17 +394,17 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
<TableRow
|
<TableRow
|
||||||
key={printer.id}
|
key={printer.id}
|
||||||
hover
|
hover
|
||||||
draggable
|
draggable={isAdmin}
|
||||||
onDragStart={() => this.handleDragStart(printer.id)}
|
onDragStart={isAdmin ? () => this.handleDragStart(printer.id) : undefined}
|
||||||
onDragOver={(e) => this.handleDragOver(e, printer.id)}
|
onDragOver={isAdmin ? (e) => this.handleDragOver(e, printer.id) : undefined}
|
||||||
onDragLeave={() => this.handleDragLeave()}
|
onDragLeave={isAdmin ? () => this.handleDragLeave() : undefined}
|
||||||
onDrop={() => this.handleDrop(printer.id)}
|
onDrop={isAdmin ? () => this.handleDrop(printer.id) : undefined}
|
||||||
onDragEnd={() => this.handleDragEnd()}
|
onDragEnd={isAdmin ? () => this.handleDragEnd() : undefined}
|
||||||
sx={{
|
sx={{
|
||||||
opacity: isDragging ? 0.4 : 1,
|
opacity: isDragging ? 0.4 : 1,
|
||||||
outline: isDragOver ? '2px solid' : 'none',
|
outline: isDragOver ? '2px solid' : 'none',
|
||||||
outlineColor: 'primary.main',
|
outlineColor: 'primary.main',
|
||||||
cursor: 'grab',
|
cursor: isAdmin ? 'grab' : 'default',
|
||||||
transition: 'opacity 0.15s',
|
transition: 'opacity 0.15s',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -426,7 +434,7 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
<IconButton
|
<IconButton
|
||||||
size="small"
|
size="small"
|
||||||
aria-label="Bearbeiten"
|
aria-label="Bearbeiten"
|
||||||
disabled={isDeleting}
|
disabled={!isAdmin || isDeleting}
|
||||||
onClick={() => this.setState({ editPrinter: printer })}
|
onClick={() => this.setState({ editPrinter: printer })}
|
||||||
>
|
>
|
||||||
<EditOutlinedIcon fontSize="small" />
|
<EditOutlinedIcon fontSize="small" />
|
||||||
@@ -435,7 +443,7 @@ export default class PrinterSettingsPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
aria-label="Löschen"
|
aria-label="Löschen"
|
||||||
color="error"
|
color="error"
|
||||||
disabled={isDeleting}
|
disabled={!isAdmin || isDeleting}
|
||||||
onClick={() => void this.handleDelete(printer.id)}
|
onClick={() => void this.handleDelete(printer.id)}
|
||||||
>
|
>
|
||||||
{isDeleting ? (
|
{isDeleting ? (
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ import SettingsKeysPanel from './SettingsKeysPanel';
|
|||||||
import ImportExportSettingsPanel from './ImportExportSettingsPanel';
|
import ImportExportSettingsPanel from './ImportExportSettingsPanel';
|
||||||
import PosTerminalSettingsPanel from './PosTerminalSettingsPanel';
|
import PosTerminalSettingsPanel from './PosTerminalSettingsPanel';
|
||||||
import McpAuthorizationsPanel from './McpAuthorizationsPanel';
|
import McpAuthorizationsPanel from './McpAuthorizationsPanel';
|
||||||
|
import MembersSettingsPanel from './MembersSettingsPanel';
|
||||||
|
import GroupOutlinedIcon from '@mui/icons-material/GroupOutlined';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import BackupSettingsPanel from './BackupSettingsPanel';
|
import BackupSettingsPanel from './BackupSettingsPanel';
|
||||||
import HealthSettingsPanel from './HealthSettingsPanel';
|
import HealthSettingsPanel from './HealthSettingsPanel';
|
||||||
import MonitorHeartOutlinedIcon from '@mui/icons-material/MonitorHeartOutlined';
|
import MonitorHeartOutlinedIcon from '@mui/icons-material/MonitorHeartOutlined';
|
||||||
@@ -42,6 +45,7 @@ const TAB_KEYS = {
|
|||||||
backup: 'backup',
|
backup: 'backup',
|
||||||
posterminal: 'posterminal',
|
posterminal: 'posterminal',
|
||||||
security: 'security',
|
security: 'security',
|
||||||
|
members: 'members',
|
||||||
};
|
};
|
||||||
|
|
||||||
const TABS = [
|
const TABS = [
|
||||||
@@ -54,6 +58,7 @@ const TABS = [
|
|||||||
{ id: TAB_KEYS.importExport, label: 'Import/Export', icon: <ImportExportIcon />, Panel: ImportExportSettingsPanel },
|
{ id: TAB_KEYS.importExport, label: 'Import/Export', icon: <ImportExportIcon />, Panel: ImportExportSettingsPanel },
|
||||||
{ id: TAB_KEYS.backup, label: 'Backups', icon: <BackupTableOutlinedIcon />, Panel: BackupSettingsPanel },
|
{ id: TAB_KEYS.backup, label: 'Backups', icon: <BackupTableOutlinedIcon />, Panel: BackupSettingsPanel },
|
||||||
{ id: TAB_KEYS.posterminal, label: 'POS Terminal', icon: <PointOfSaleIcon />, Panel: PosTerminalSettingsPanel },
|
{ id: TAB_KEYS.posterminal, label: 'POS Terminal', icon: <PointOfSaleIcon />, Panel: PosTerminalSettingsPanel },
|
||||||
|
{ id: TAB_KEYS.members, label: 'Mitglieder', icon: <GroupOutlinedIcon />, Panel: MembersSettingsPanel },
|
||||||
{ id: TAB_KEYS.security, label: 'Sicherheit & MCP', icon: <SecurityIcon />, Panel: McpAuthorizationsPanel },
|
{ id: TAB_KEYS.security, label: 'Sicherheit & MCP', icon: <SecurityIcon />, Panel: McpAuthorizationsPanel },
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -61,9 +66,10 @@ function getDefaultTab(vhost) {
|
|||||||
return vhost ? TAB_KEYS.company : TAB_KEYS.health;
|
return vhost ? TAB_KEYS.company : TAB_KEYS.health;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getVisibleTabs(vhost) {
|
function getVisibleTabs(vhost, isAdmin) {
|
||||||
if (!vhost) return TABS;
|
const tabs = isAdmin ? TABS : TABS.filter((t) => t.id !== TAB_KEYS.members);
|
||||||
return TABS.filter(
|
if (!vhost) return tabs;
|
||||||
|
return tabs.filter(
|
||||||
(t) => t.id !== TAB_KEYS.health && t.id !== TAB_KEYS.backup && t.id !== TAB_KEYS.printers
|
(t) => t.id !== TAB_KEYS.health && t.id !== TAB_KEYS.backup && t.id !== TAB_KEYS.printers
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -76,6 +82,7 @@ export default class SettingsDialog extends Component {
|
|||||||
tab: getDefaultTab(vhost),
|
tab: getDefaultTab(vhost),
|
||||||
schemaVersion: authAutomat.state.schemaVersion,
|
schemaVersion: authAutomat.state.schemaVersion,
|
||||||
vhost,
|
vhost,
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
};
|
};
|
||||||
this.handleTabChange = this.handleTabChange.bind(this);
|
this.handleTabChange = this.handleTabChange.bind(this);
|
||||||
}
|
}
|
||||||
@@ -85,10 +92,14 @@ export default class SettingsDialog extends Component {
|
|||||||
schemaVersion: state.schemaVersion,
|
schemaVersion: state.schemaVersion,
|
||||||
vhost: Boolean(state.vhost),
|
vhost: Boolean(state.vhost),
|
||||||
}));
|
}));
|
||||||
|
this.unsubCompany = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
this.unsubAuth?.();
|
this.unsubAuth?.();
|
||||||
|
this.unsubCompany?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
componentDidUpdate(prevProps) {
|
||||||
@@ -100,6 +111,9 @@ export default class SettingsDialog extends Component {
|
|||||||
if (open && !prevProps.open) {
|
if (open && !prevProps.open) {
|
||||||
const currentVhost = Boolean(authAutomat.state.vhost);
|
const currentVhost = Boolean(authAutomat.state.vhost);
|
||||||
const updates = {};
|
const updates = {};
|
||||||
|
if (this.props.initialTab) {
|
||||||
|
updates.tab = this.props.initialTab;
|
||||||
|
}
|
||||||
if (this.state.schemaVersion !== authAutomat.state.schemaVersion) {
|
if (this.state.schemaVersion !== authAutomat.state.schemaVersion) {
|
||||||
updates.schemaVersion = authAutomat.state.schemaVersion;
|
updates.schemaVersion = authAutomat.state.schemaVersion;
|
||||||
}
|
}
|
||||||
@@ -126,8 +140,8 @@ export default class SettingsDialog extends Component {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { open, onClose } = this.props;
|
const { open, onClose } = this.props;
|
||||||
const { tab, schemaVersion, vhost } = this.state;
|
const { tab, schemaVersion, vhost, isAdmin } = this.state;
|
||||||
const visibleTabs = getVisibleTabs(vhost);
|
const visibleTabs = getVisibleTabs(vhost, isAdmin);
|
||||||
const activeTab = visibleTabs.some((t) => t.id === tab) ? tab : visibleTabs[0]?.id;
|
const activeTab = visibleTabs.some((t) => t.id === tab) ? tab : visibleTabs[0]?.id;
|
||||||
|
|
||||||
const paperSx = {
|
const paperSx = {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import SaveOutlinedIcon from '@mui/icons-material/SaveOutlined';
|
|||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
import BackendError from '../BackendError';
|
import BackendError from '../BackendError';
|
||||||
import { setting as settingApi } from '../../api';
|
import { setting as settingApi } from '../../api';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import { requireArray, requireDefined, requireObject } from '../../utils/apiShape';
|
import { requireArray, requireDefined, requireObject } from '../../utils/apiShape';
|
||||||
import { backendErrorFrom } from '../../utils/backendError';
|
import { backendErrorFrom } from '../../utils/backendError';
|
||||||
import { notifyError } from '../../utils/notify';
|
import { notifyError } from '../../utils/notify';
|
||||||
@@ -68,6 +69,7 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: 'loading',
|
status: 'loading',
|
||||||
error: null,
|
error: null,
|
||||||
settings: [],
|
settings: [],
|
||||||
@@ -79,6 +81,9 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
void this.load();
|
void this.load();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,6 +129,7 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleSave(key) {
|
async handleSave(key) {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const draft = this.state.drafts[key];
|
const draft = this.state.drafts[key];
|
||||||
if (!draft || draft.busy) return;
|
if (!draft || draft.busy) return;
|
||||||
const row = this.state.settings.find((s) => s.key === key);
|
const row = this.state.settings.find((s) => s.key === key);
|
||||||
@@ -172,10 +178,11 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
this._unmounted = true;
|
this._unmounted = true;
|
||||||
|
this.unsub?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, error, settings, drafts } = this.state;
|
const { isAdmin, status, error, settings, drafts } = this.state;
|
||||||
|
|
||||||
if (status === 'loading') {
|
if (status === 'loading') {
|
||||||
return (
|
return (
|
||||||
@@ -224,7 +231,7 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
fullWidth
|
fullWidth
|
||||||
value={draft.value !== undefined && draft.value !== null ? draft.value : (DEFAULT_SETTINGS[row.key] ?? '')}
|
value={draft.value !== undefined && draft.value !== null ? draft.value : (DEFAULT_SETTINGS[row.key] ?? '')}
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
onChange={(e) => this.handleChange(row.key, 'value', e.target.value)}
|
onChange={(e) => this.handleChange(row.key, 'value', e.target.value)}
|
||||||
slotProps={{ htmlInput: { spellCheck: false } }}
|
slotProps={{ htmlInput: { spellCheck: false } }}
|
||||||
>
|
>
|
||||||
@@ -247,7 +254,7 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
maxRows={isMultiline ? 6 : undefined}
|
maxRows={isMultiline ? 6 : undefined}
|
||||||
placeholder={DEFAULT_SETTINGS[row.key] ?? undefined}
|
placeholder={DEFAULT_SETTINGS[row.key] ?? undefined}
|
||||||
value={draft.value}
|
value={draft.value}
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
onChange={(e) => this.handleChange(row.key, 'value', e.target.value)}
|
onChange={(e) => this.handleChange(row.key, 'value', e.target.value)}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if (!isMultiline && e.key === 'Enter') {
|
if (!isMultiline && e.key === 'Enter') {
|
||||||
@@ -279,7 +286,7 @@ export default class SettingsKeysPanel extends Component {
|
|||||||
size="small"
|
size="small"
|
||||||
aria-label="Speichern"
|
aria-label="Speichern"
|
||||||
color="primary"
|
color="primary"
|
||||||
disabled={draft.busy}
|
disabled={!isAdmin || draft.busy}
|
||||||
onClick={() => void this.handleSave(row.key)}
|
onClick={() => void this.handleSave(row.key)}
|
||||||
>
|
>
|
||||||
<SaveOutlinedIcon fontSize="small" />
|
<SaveOutlinedIcon fontSize="small" />
|
||||||
|
|||||||
@@ -8,3 +8,4 @@ export { default as ImportExportSettingsPanel } from './ImportExportSettingsPane
|
|||||||
export { default as McpAuthorizationsPanel } from './McpAuthorizationsPanel';
|
export { default as McpAuthorizationsPanel } from './McpAuthorizationsPanel';
|
||||||
export { default as BackupSettingsPanel } from './BackupSettingsPanel';
|
export { default as BackupSettingsPanel } from './BackupSettingsPanel';
|
||||||
export { default as HealthSettingsPanel } from './HealthSettingsPanel';
|
export { default as HealthSettingsPanel } from './HealthSettingsPanel';
|
||||||
|
export { default as MembersSettingsPanel } from './MembersSettingsPanel';
|
||||||
|
|||||||
@@ -5,19 +5,21 @@ import IconButton from '@mui/material/IconButton';
|
|||||||
import FolderOpenRoundedIcon from '@mui/icons-material/FolderOpenRounded';
|
import FolderOpenRoundedIcon from '@mui/icons-material/FolderOpenRounded';
|
||||||
import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
|
import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
|
||||||
|
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import vfsAutomat from '../../automats/vfsAutomat';
|
import vfsAutomat from '../../automats/vfsAutomat';
|
||||||
import VfsFileExplorer from './VfsFileExplorer';
|
import VfsFileExplorer from './VfsFileExplorer';
|
||||||
import VfsTextEditor from './VfsTextEditor';
|
import VfsTextEditor from './VfsTextEditor';
|
||||||
import VfsFilePreview from './VfsFilePreview';
|
import VfsFilePreview from './VfsFilePreview';
|
||||||
import VfsAppletRunner from './VfsAppletRunner';
|
import VfsAppletRunner from './VfsAppletRunner';
|
||||||
import VfsNewFileDialog from './VfsNewFileDialog';
|
import VfsNewFileDialog from './VfsNewFileDialog';
|
||||||
import { isAppletFile } from './vfsUtils';
|
import { isAppletFile, isProtectedVfsFile } from './vfsUtils';
|
||||||
|
|
||||||
export default class VfsEditorPanel extends PureComponent {
|
export default class VfsEditorPanel extends PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
const s = vfsAutomat.state;
|
const s = vfsAutomat.state;
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
files: s.files,
|
files: s.files,
|
||||||
loadingFiles: s.loadingFiles,
|
loadingFiles: s.loadingFiles,
|
||||||
loadError: s.loadError,
|
loadError: s.loadError,
|
||||||
@@ -39,6 +41,9 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsubCompany = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
this.unsub = vfsAutomat.subscribe(this, (state) => ({
|
this.unsub = vfsAutomat.subscribe(this, (state) => ({
|
||||||
files: state.files,
|
files: state.files,
|
||||||
loadingFiles: state.loadingFiles,
|
loadingFiles: state.loadingFiles,
|
||||||
@@ -72,6 +77,7 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
this.unsubCompany?.();
|
||||||
this.unsub?.();
|
this.unsub?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,6 +114,7 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
isAdmin,
|
||||||
files,
|
files,
|
||||||
loadingFiles,
|
loadingFiles,
|
||||||
selectedFileName,
|
selectedFileName,
|
||||||
@@ -124,6 +131,7 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
const isApplet = Boolean(selectedFileName && isAppletFile(selectedFileName));
|
const isApplet = Boolean(selectedFileName && isAppletFile(selectedFileName));
|
||||||
|
const isProtectedFile = Boolean(selectedFileName && isProtectedVfsFile(selectedFileName));
|
||||||
const showAppletRunner = isApplet && selectedFile?.isText && appletView === 'run';
|
const showAppletRunner = isApplet && selectedFile?.isText && appletView === 'run';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -161,6 +169,8 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
isSaving={isSaving}
|
isSaving={isSaving}
|
||||||
saveError={saveError}
|
saveError={saveError}
|
||||||
loadingContent={loadingContent}
|
loadingContent={loadingContent}
|
||||||
|
isAdmin={isAdmin}
|
||||||
|
readOnly={!isAdmin && isProtectedFile}
|
||||||
onChange={(c) => vfsAutomat.actions.updateContent(c)}
|
onChange={(c) => vfsAutomat.actions.updateContent(c)}
|
||||||
onSave={() => vfsAutomat.actions.saveCurrentFile()}
|
onSave={() => vfsAutomat.actions.saveCurrentFile()}
|
||||||
onClose={() => vfsAutomat.actions.selectFile(null)}
|
onClose={() => vfsAutomat.actions.selectFile(null)}
|
||||||
@@ -216,6 +226,7 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
<VfsFileExplorer
|
<VfsFileExplorer
|
||||||
files={files}
|
files={files}
|
||||||
loading={loadingFiles}
|
loading={loadingFiles}
|
||||||
|
isAdmin={isAdmin}
|
||||||
selectedFileName={selectedFileName}
|
selectedFileName={selectedFileName}
|
||||||
searchQuery={searchQuery}
|
searchQuery={searchQuery}
|
||||||
onSelectFile={(name) => vfsAutomat.actions.selectFile(name)}
|
onSelectFile={(name) => vfsAutomat.actions.selectFile(name)}
|
||||||
@@ -238,6 +249,7 @@ export default class VfsEditorPanel extends PureComponent {
|
|||||||
<VfsNewFileDialog
|
<VfsNewFileDialog
|
||||||
open={newFileDialogOpen}
|
open={newFileDialogOpen}
|
||||||
defaultFolder={this.state.newFileDefaultFolder}
|
defaultFolder={this.state.newFileDefaultFolder}
|
||||||
|
isAdmin={isAdmin}
|
||||||
onClose={() => vfsAutomat.actions.setNewFileDialogOpen(false)}
|
onClose={() => vfsAutomat.actions.setNewFileDialogOpen(false)}
|
||||||
onCreate={(name) => vfsAutomat.actions.createFile(name)}
|
onCreate={(name) => vfsAutomat.actions.createFile(name)}
|
||||||
isCreating={isSaving}
|
isCreating={isSaving}
|
||||||
|
|||||||
@@ -27,11 +27,25 @@ import CreateNewFolderRoundedIcon from '@mui/icons-material/CreateNewFolderRound
|
|||||||
import DriveFileRenameOutlineRoundedIcon from '@mui/icons-material/DriveFileRenameOutlineRounded';
|
import DriveFileRenameOutlineRoundedIcon from '@mui/icons-material/DriveFileRenameOutlineRounded';
|
||||||
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
||||||
|
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import VfsFileIcon from './VfsFileIcon';
|
import VfsFileIcon from './VfsFileIcon';
|
||||||
import { formatVfsSize, formatVfsDate, isAppletFile } from './vfsUtils';
|
import { formatVfsSize, formatVfsDate, isAppletFile, isProtectedVfsFile } from './vfsUtils';
|
||||||
import VfsNewFolderDialog from './VfsNewFolderDialog';
|
import VfsNewFolderDialog from './VfsNewFolderDialog';
|
||||||
import VfsRenameDialog from './VfsRenameDialog';
|
import VfsRenameDialog from './VfsRenameDialog';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if the given folder path contains any admin-protected VFS files
|
||||||
|
* (`.skill` or `.applet.js`, case-insensitive).
|
||||||
|
*/
|
||||||
|
function folderContainsProtectedFiles(folderPath, files) {
|
||||||
|
if (!folderPath || !Array.isArray(files)) return false;
|
||||||
|
const prefix = `${String(folderPath).replace(/^\/+/, '').replace(/\/+$/, '')}/`;
|
||||||
|
return files.some((f) => {
|
||||||
|
const clean = String(f?.name || '').replace(/^\/+/, '');
|
||||||
|
return clean.startsWith(prefix) && isProtectedVfsFile(clean);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns all ancestor directory paths for a file or folder path.
|
* Returns all ancestor directory paths for a file or folder path.
|
||||||
* e.g. "docs/api/v1/spec.json" -> ["docs", "docs/api", "docs/api/v1"]
|
* e.g. "docs/api/v1/spec.json" -> ["docs", "docs/api", "docs/api/v1"]
|
||||||
@@ -126,6 +140,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
menuAnchor: null,
|
menuAnchor: null,
|
||||||
menuFile: null,
|
menuFile: null,
|
||||||
folderMenuAnchor: null,
|
folderMenuAnchor: null,
|
||||||
@@ -143,6 +158,16 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
this.fileInputRef = React.createRef();
|
this.fileInputRef = React.createRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.unsubCompany = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsubCompany?.();
|
||||||
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
componentDidUpdate(prevProps) {
|
||||||
if (this.props.selectedFileName && this.props.selectedFileName !== prevProps.selectedFileName) {
|
if (this.props.selectedFileName && this.props.selectedFileName !== prevProps.selectedFileName) {
|
||||||
const parents = getParentFolderPaths(this.props.selectedFileName);
|
const parents = getParentFolderPaths(this.props.selectedFileName);
|
||||||
@@ -632,7 +657,12 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
isRenaming,
|
isRenaming,
|
||||||
isDraggingOver,
|
isDraggingOver,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
const isText = menuFile?.isText;
|
const isText = menuFile?.isText;
|
||||||
|
const isMenuFileProtected = Boolean(menuFile && isProtectedVfsFile(menuFile.name));
|
||||||
|
const isFolderProtected = Boolean(
|
||||||
|
folderMenuNode && folderContainsProtectedFiles(folderMenuNode.path, this.props.files)
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
@@ -832,6 +862,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
disabled={!isAdmin && isMenuFileProtected}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const file = menuFile;
|
const file = menuFile;
|
||||||
this.handleCloseMenu();
|
this.handleCloseMenu();
|
||||||
@@ -860,6 +891,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
disabled={!isAdmin && isMenuFileProtected}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (menuFile && window.confirm(`Möchtest du "${menuFile.name}" wirklich aus dem VFS löschen?`)) {
|
if (menuFile && window.confirm(`Möchtest du "${menuFile.name}" wirklich aus dem VFS löschen?`)) {
|
||||||
this.props.onDelete(menuFile.name);
|
this.props.onDelete(menuFile.name);
|
||||||
@@ -915,6 +947,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
disabled={!isAdmin && isFolderProtected}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const folder = folderMenuNode;
|
const folder = folderMenuNode;
|
||||||
this.handleCloseFolderMenu();
|
this.handleCloseFolderMenu();
|
||||||
@@ -934,6 +967,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
disabled={!isAdmin && isFolderProtected}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
const folder = folderMenuNode;
|
const folder = folderMenuNode;
|
||||||
this.handleCloseFolderMenu();
|
this.handleCloseFolderMenu();
|
||||||
@@ -963,6 +997,7 @@ export default class VfsFileExplorer extends PureComponent {
|
|||||||
<VfsRenameDialog
|
<VfsRenameDialog
|
||||||
open={renameDialogOpen}
|
open={renameDialogOpen}
|
||||||
item={renameItem}
|
item={renameItem}
|
||||||
|
isAdmin={isAdmin}
|
||||||
onClose={() => this.setState({ renameDialogOpen: false, renameItem: null })}
|
onClose={() => this.setState({ renameDialogOpen: false, renameItem: null })}
|
||||||
onRename={this.handleRenameItem}
|
onRename={this.handleRenameItem}
|
||||||
isRenaming={isRenaming}
|
isRenaming={isRenaming}
|
||||||
|
|||||||
@@ -7,17 +7,30 @@ import Button from '@mui/material/Button';
|
|||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import NoteAddRoundedIcon from '@mui/icons-material/NoteAddRounded';
|
import NoteAddRoundedIcon from '@mui/icons-material/NoteAddRounded';
|
||||||
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
|
import { isProtectedVfsFile } from './vfsUtils';
|
||||||
|
|
||||||
export default class VfsNewFileDialog extends PureComponent {
|
export default class VfsNewFileDialog extends PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
const folder = props.defaultFolder ? `${String(props.defaultFolder).replace(/^\/+/, '').replace(/\/+$/, '')}/` : '';
|
const folder = props.defaultFolder ? `${String(props.defaultFolder).replace(/^\/+/, '').replace(/\/+$/, '')}/` : '';
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
filename: folder,
|
filename: folder,
|
||||||
error: '',
|
error: '',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
componentDidUpdate(prevProps) {
|
||||||
if (!prevProps.open && this.props.open) {
|
if (!prevProps.open && this.props.open) {
|
||||||
const folder = this.props.defaultFolder ? `${String(this.props.defaultFolder).replace(/^\/+/, '').replace(/\/+$/, '')}/` : '';
|
const folder = this.props.defaultFolder ? `${String(this.props.defaultFolder).replace(/^\/+/, '').replace(/\/+$/, '')}/` : '';
|
||||||
@@ -27,6 +40,7 @@ export default class VfsNewFileDialog extends PureComponent {
|
|||||||
|
|
||||||
handleSubmit = (e) => {
|
handleSubmit = (e) => {
|
||||||
e?.preventDefault();
|
e?.preventDefault();
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
const clean = this.state.filename.trim().replace(/^[/\\]+/, '');
|
const clean = this.state.filename.trim().replace(/^[/\\]+/, '');
|
||||||
if (!clean) {
|
if (!clean) {
|
||||||
this.setState({ error: 'Bitte gib einen Dateinamen ein.' });
|
this.setState({ error: 'Bitte gib einen Dateinamen ein.' });
|
||||||
@@ -36,12 +50,21 @@ export default class VfsNewFileDialog extends PureComponent {
|
|||||||
this.setState({ error: 'Ungültige Zeichen im Dateinamen.' });
|
this.setState({ error: 'Ungültige Zeichen im Dateinamen.' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!isAdmin && isProtectedVfsFile(clean)) {
|
||||||
|
this.setState({ error: 'Nur Administratoren dürfen .SKILL- und .applet.js-Dateien erstellen.' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.props.onCreate(clean);
|
this.props.onCreate(clean);
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { open, onClose, isCreating } = this.props;
|
const { open, onClose, isCreating } = this.props;
|
||||||
const { filename, error } = this.state;
|
const { filename, error } = this.state;
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
|
const clean = filename.trim().replace(/^[/\\]+/, '');
|
||||||
|
const isProtected = Boolean(!isAdmin && clean && isProtectedVfsFile(clean));
|
||||||
|
const displayError =
|
||||||
|
error || (isProtected ? 'Nur Administratoren dürfen .SKILL- und .applet.js-Dateien erstellen.' : '');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog
|
<Dialog
|
||||||
@@ -70,8 +93,8 @@ export default class VfsNewFileDialog extends PureComponent {
|
|||||||
label=""
|
label=""
|
||||||
value={filename}
|
value={filename}
|
||||||
onChange={(nextVal) => this.setState({ filename: nextVal, error: '' })}
|
onChange={(nextVal) => this.setState({ filename: nextVal, error: '' })}
|
||||||
error={Boolean(error)}
|
error={Boolean(displayError)}
|
||||||
helperText={error}
|
helperText={displayError}
|
||||||
disabled={isCreating}
|
disabled={isCreating}
|
||||||
/>
|
/>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
@@ -83,7 +106,7 @@ export default class VfsNewFileDialog extends PureComponent {
|
|||||||
<Button
|
<Button
|
||||||
type="submit"
|
type="submit"
|
||||||
variant="contained"
|
variant="contained"
|
||||||
disabled={isCreating || !filename.trim()}
|
disabled={isCreating || !clean || isProtected}
|
||||||
sx={{ borderRadius: 2 }}
|
sx={{ borderRadius: 2 }}
|
||||||
>
|
>
|
||||||
{isCreating ? 'Erstelle…' : 'Erstellen & Öffnen'}
|
{isCreating ? 'Erstelle…' : 'Erstellen & Öffnen'}
|
||||||
|
|||||||
@@ -7,16 +7,29 @@ import Button from '@mui/material/Button';
|
|||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import DriveFileRenameOutlineRoundedIcon from '@mui/icons-material/DriveFileRenameOutlineRounded';
|
import DriveFileRenameOutlineRoundedIcon from '@mui/icons-material/DriveFileRenameOutlineRounded';
|
||||||
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
|
import { isProtectedVfsFile } from './vfsUtils';
|
||||||
|
|
||||||
export default class VfsRenameDialog extends PureComponent {
|
export default class VfsRenameDialog extends PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
targetPath: props.item?.path || '',
|
targetPath: props.item?.path || '',
|
||||||
error: '',
|
error: '',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
componentDidUpdate(prevProps) {
|
||||||
if (!prevProps.open && this.props.open) {
|
if (!prevProps.open && this.props.open) {
|
||||||
this.setState({
|
this.setState({
|
||||||
@@ -28,6 +41,7 @@ export default class VfsRenameDialog extends PureComponent {
|
|||||||
|
|
||||||
handleSubmit = (e) => {
|
handleSubmit = (e) => {
|
||||||
e?.preventDefault();
|
e?.preventDefault();
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
const raw = this.state.targetPath.trim();
|
const raw = this.state.targetPath.trim();
|
||||||
if (!raw) {
|
if (!raw) {
|
||||||
this.setState({ error: 'Bitte gib einen neuen Namen bzw. Pfad ein.' });
|
this.setState({ error: 'Bitte gib einen neuen Namen bzw. Pfad ein.' });
|
||||||
@@ -41,6 +55,11 @@ export default class VfsRenameDialog extends PureComponent {
|
|||||||
const cleanNew = raw.replace(/^[/\\]+/, '').replace(/[/\\]+$/, '');
|
const cleanNew = raw.replace(/^[/\\]+/, '').replace(/[/\\]+$/, '');
|
||||||
const cleanOld = String(this.props.item?.path || '').replace(/^[/\\]+/, '').replace(/[/\\]+$/, '');
|
const cleanOld = String(this.props.item?.path || '').replace(/^[/\\]+/, '').replace(/[/\\]+$/, '');
|
||||||
|
|
||||||
|
if (!isAdmin && (isProtectedVfsFile(cleanOld) || isProtectedVfsFile(cleanNew))) {
|
||||||
|
this.setState({ error: 'Nur Administratoren dürfen .SKILL- und .applet.js-Dateien umbenennen.' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (cleanNew === cleanOld) {
|
if (cleanNew === cleanOld) {
|
||||||
this.props.onClose?.();
|
this.props.onClose?.();
|
||||||
return;
|
return;
|
||||||
@@ -53,6 +72,11 @@ export default class VfsRenameDialog extends PureComponent {
|
|||||||
const { open, onClose, isRenaming, item } = this.props;
|
const { open, onClose, isRenaming, item } = this.props;
|
||||||
const { targetPath, error } = this.state;
|
const { targetPath, error } = this.state;
|
||||||
const isDir = Boolean(item?.isDirectory);
|
const isDir = Boolean(item?.isDirectory);
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
|
const cleanNew = targetPath.trim().replace(/^[/\\]+/, '').replace(/[/\\]+$/, '');
|
||||||
|
const isProtected = Boolean(!isAdmin && cleanNew && isProtectedVfsFile(cleanNew));
|
||||||
|
const displayError =
|
||||||
|
error || (isProtected ? 'Nur Administratoren dürfen .SKILL- und .applet.js-Dateien umbenennen.' : '');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog
|
<Dialog
|
||||||
@@ -81,8 +105,8 @@ export default class VfsRenameDialog extends PureComponent {
|
|||||||
label=""
|
label=""
|
||||||
value={targetPath}
|
value={targetPath}
|
||||||
onChange={(nextVal) => this.setState({ targetPath: nextVal, error: '' })}
|
onChange={(nextVal) => this.setState({ targetPath: nextVal, error: '' })}
|
||||||
error={Boolean(error)}
|
error={Boolean(displayError)}
|
||||||
helperText={error}
|
helperText={displayError}
|
||||||
disabled={isRenaming}
|
disabled={isRenaming}
|
||||||
/>
|
/>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
@@ -94,7 +118,7 @@ export default class VfsRenameDialog extends PureComponent {
|
|||||||
<Button
|
<Button
|
||||||
type="submit"
|
type="submit"
|
||||||
variant="contained"
|
variant="contained"
|
||||||
disabled={isRenaming || !targetPath.trim()}
|
disabled={isRenaming || !cleanNew || isProtected}
|
||||||
sx={{ borderRadius: 2 }}
|
sx={{ borderRadius: 2 }}
|
||||||
>
|
>
|
||||||
{isRenaming ? 'Speichere…' : 'Umbenennen'}
|
{isRenaming ? 'Speichere…' : 'Umbenennen'}
|
||||||
|
|||||||
@@ -16,8 +16,9 @@ import ChatBubbleOutlineRoundedIcon from '@mui/icons-material/ChatBubbleOutlineR
|
|||||||
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
import PlayArrowRoundedIcon from '@mui/icons-material/PlayArrowRounded';
|
||||||
import WrapTextRoundedIcon from '@mui/icons-material/WrapTextRounded';
|
import WrapTextRoundedIcon from '@mui/icons-material/WrapTextRounded';
|
||||||
|
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import VfsFileIcon from './VfsFileIcon';
|
import VfsFileIcon from './VfsFileIcon';
|
||||||
import { formatVfsSize } from './vfsUtils';
|
import { formatVfsSize, isProtectedVfsFile } from './vfsUtils';
|
||||||
|
|
||||||
const CodeMirrorCore = React.lazy(() => import('./CodeMirrorCore'));
|
const CodeMirrorCore = React.lazy(() => import('./CodeMirrorCore'));
|
||||||
|
|
||||||
@@ -72,6 +73,7 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
super(props);
|
super(props);
|
||||||
this.editorView = null;
|
this.editorView = null;
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
wrapLines: true,
|
wrapLines: true,
|
||||||
cursorLine: 1,
|
cursorLine: 1,
|
||||||
cursorCol: 1,
|
cursorCol: 1,
|
||||||
@@ -79,9 +81,16 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
|
}));
|
||||||
this.focusEditor();
|
this.focusEditor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
this.unsub?.();
|
||||||
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps) {
|
componentDidUpdate(prevProps) {
|
||||||
if (prevProps.fileName !== this.props.fileName) {
|
if (prevProps.fileName !== this.props.fileName) {
|
||||||
this.focusEditor();
|
this.focusEditor();
|
||||||
@@ -145,6 +154,9 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleSaveShortcut = () => {
|
handleSaveShortcut = () => {
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
|
const isProtectedFile = isProtectedVfsFile(this.props.fileName);
|
||||||
|
if (this.props.readOnly || (!isAdmin && isProtectedFile)) return;
|
||||||
if (this.props.isDirty && !this.props.isSaving) {
|
if (this.props.isDirty && !this.props.isSaving) {
|
||||||
this.props.onSave?.();
|
this.props.onSave?.();
|
||||||
}
|
}
|
||||||
@@ -168,6 +180,9 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
const { wrapLines, cursorLine, cursorCol } = this.state;
|
const { wrapLines, cursorLine, cursorCol } = this.state;
|
||||||
|
const isAdmin = this.props.isAdmin ?? this.state.isAdmin;
|
||||||
|
const isProtectedFile = isProtectedVfsFile(fileName);
|
||||||
|
const isReadOnly = Boolean(this.props.readOnly || (!isAdmin && isProtectedFile));
|
||||||
const text = content || '';
|
const text = content || '';
|
||||||
const lineCount = text.split('\n').length;
|
const lineCount = text.split('\n').length;
|
||||||
const charCount = text.length;
|
const charCount = text.length;
|
||||||
@@ -292,17 +307,17 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
<Button
|
<Button
|
||||||
size="small"
|
size="small"
|
||||||
variant="contained"
|
variant="contained"
|
||||||
color={isDirty ? 'success' : 'inherit'}
|
color={!isReadOnly && isDirty ? 'success' : 'inherit'}
|
||||||
startIcon={isSaving ? <CircularProgress size={14} color="inherit" /> : <SaveRoundedIcon />}
|
startIcon={isSaving ? <CircularProgress size={14} color="inherit" /> : <SaveRoundedIcon />}
|
||||||
onClick={onSave}
|
onClick={onSave}
|
||||||
disabled={!isDirty || isSaving}
|
disabled={isReadOnly || !isDirty || isSaving}
|
||||||
sx={{
|
sx={{
|
||||||
borderRadius: 2,
|
borderRadius: 2,
|
||||||
px: 1.5,
|
px: 1.5,
|
||||||
py: 0.4,
|
py: 0.4,
|
||||||
fontSize: '0.78rem',
|
fontSize: '0.78rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
...(isDirty && {
|
...(!isReadOnly && isDirty && {
|
||||||
bgcolor: 'success.main',
|
bgcolor: 'success.main',
|
||||||
color: '#fff',
|
color: '#fff',
|
||||||
'&:hover': { bgcolor: 'success.dark' },
|
'&:hover': { bgcolor: 'success.dark' },
|
||||||
@@ -396,7 +411,7 @@ export default class VfsTextEditor extends PureComponent {
|
|||||||
fileName={fileName}
|
fileName={fileName}
|
||||||
mime={file?.mime}
|
mime={file?.mime}
|
||||||
wrapLines={wrapLines}
|
wrapLines={wrapLines}
|
||||||
readOnly={this.props.readOnly}
|
readOnly={isReadOnly}
|
||||||
onSaveShortcut={this.handleSaveShortcut}
|
onSaveShortcut={this.handleSaveShortcut}
|
||||||
onCreateEditor={this.handleEditorCreate}
|
onCreateEditor={this.handleEditorCreate}
|
||||||
onUpdate={this.handleViewUpdate}
|
onUpdate={this.handleViewUpdate}
|
||||||
|
|||||||
@@ -87,10 +87,30 @@ export function getVfsCategory(filePath, mime = '') {
|
|||||||
* @returns {boolean}
|
* @returns {boolean}
|
||||||
*/
|
*/
|
||||||
export function isAppletFile(filePath) {
|
export function isAppletFile(filePath) {
|
||||||
const p = String(filePath || '').toLowerCase();
|
const p = String(filePath || '').trim().toLowerCase();
|
||||||
return p.endsWith('.applet.js');
|
return p.endsWith('.applet.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether a VFS path is a skill file (`*.skill`, case-insensitive).
|
||||||
|
* @param {string} filePath
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
export function isSkillFile(filePath) {
|
||||||
|
const p = String(filePath || '').trim().toLowerCase();
|
||||||
|
return p.endsWith('.skill');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether a VFS path is an admin-protected file (`*.skill` or `*.applet.js`, case-insensitive).
|
||||||
|
* @param {string} filePath
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
export function isProtectedVfsFile(filePath) {
|
||||||
|
const p = String(filePath || '').trim().toLowerCase();
|
||||||
|
return p.endsWith('.skill') || p.endsWith('.applet.js');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Split a VFS file path into directory and basename.
|
* Split a VFS file path into directory and basename.
|
||||||
* @param {string} path
|
* @param {string} path
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class ArtikelLager extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleBlur = () => {
|
handleBlur = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.warehouse ?? this.props.item;
|
const item = this.props.warehouse ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
const draft = this.state.draft.trim();
|
const draft = this.state.draft.trim();
|
||||||
@@ -60,6 +61,7 @@ class ArtikelLager extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleKeyDown = (event) => {
|
handleKeyDown = (event) => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.warehouse ?? this.props.item;
|
const item = this.props.warehouse ?? this.props.item;
|
||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@@ -73,6 +75,7 @@ class ArtikelLager extends PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleDelete = () => {
|
handleDelete = () => {
|
||||||
|
if (this.props.disabled) return;
|
||||||
const item = this.props.warehouse ?? this.props.item;
|
const item = this.props.warehouse ?? this.props.item;
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
if (!window.confirm(`Lager „${item.name}" wirklich löschen?`)) return;
|
if (!window.confirm(`Lager „${item.name}" wirklich löschen?`)) return;
|
||||||
|
|||||||
@@ -282,8 +282,8 @@ export const SUB_NAV = {
|
|||||||
'/infos': [
|
'/infos': [
|
||||||
{
|
{
|
||||||
segment: '',
|
segment: '',
|
||||||
label: 'ArticleHistory',
|
label: 'Artikel-Historie',
|
||||||
title: 'ArticleHistory',
|
title: 'Artikel-Historie',
|
||||||
icon: HistoryIcon,
|
icon: HistoryIcon,
|
||||||
help: 'Historie aller Artikeländerungen und Ereignisse',
|
help: 'Historie aller Artikeländerungen und Ereignisse',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ class ArtikelLagerSearchField extends PureComponent {
|
|||||||
super(props);
|
super(props);
|
||||||
const initial = companyAutomat.state.warehouseFilter || props.prefill || '';
|
const initial = companyAutomat.state.warehouseFilter || props.prefill || '';
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
input: initial,
|
input: initial,
|
||||||
submitting: false,
|
submitting: false,
|
||||||
};
|
};
|
||||||
@@ -50,6 +51,7 @@ class ArtikelLagerSearchField extends PureComponent {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
input: state.warehouseFilter,
|
input: state.warehouseFilter,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -64,6 +66,7 @@ class ArtikelLagerSearchField extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleSubmit() {
|
async handleSubmit() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const name = this.state.input.trim();
|
const name = this.state.input.trim();
|
||||||
if (!name || this.state.submitting) return;
|
if (!name || this.state.submitting) return;
|
||||||
|
|
||||||
@@ -84,8 +87,8 @@ class ArtikelLagerSearchField extends PureComponent {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { inputRef, returnTo, navigate } = this.props;
|
const { inputRef, returnTo, navigate } = this.props;
|
||||||
const { input, submitting } = this.state;
|
const { isAdmin, input, submitting } = this.state;
|
||||||
const canSubmit = Boolean(input.trim()) && !submitting;
|
const canCreate = isAdmin && Boolean(input.trim()) && !submitting;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PanelTileGrid>
|
<PanelTileGrid>
|
||||||
@@ -141,7 +144,7 @@ class ArtikelLagerSearchField extends PureComponent {
|
|||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
disabled={!canSubmit}
|
disabled={!canCreate}
|
||||||
onClick={() => void this.handleSubmit()}
|
onClick={() => void this.handleSubmit()}
|
||||||
>
|
>
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
@@ -159,6 +162,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
const initialWarehouses =
|
const initialWarehouses =
|
||||||
companyAutomat.state.filteredWarehouses ?? companyAutomat.state.warehouses ?? [];
|
companyAutomat.state.filteredWarehouses ?? companyAutomat.state.warehouses ?? [];
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: companyAutomat.state.warehousesStatus === 'ready' ? 'ready' : 'loading',
|
status: companyAutomat.state.warehousesStatus === 'ready' ? 'ready' : 'loading',
|
||||||
error: companyAutomat.state.warehousesError ? backendErrorFrom(companyAutomat.state.warehousesError) : null,
|
error: companyAutomat.state.warehousesError ? backendErrorFrom(companyAutomat.state.warehousesError) : null,
|
||||||
warehouses: initialWarehouses,
|
warehouses: initialWarehouses,
|
||||||
@@ -178,6 +182,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
this._cancelled = false;
|
this._cancelled = false;
|
||||||
|
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
warehouses: state.filteredWarehouses ?? state.warehouses,
|
warehouses: state.filteredWarehouses ?? state.warehouses,
|
||||||
filter: state.warehouseFilter ?? '',
|
filter: state.warehouseFilter ?? '',
|
||||||
status: state.warehousesStatus,
|
status: state.warehousesStatus,
|
||||||
@@ -191,6 +196,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
|
|
||||||
componentDidUpdate(prevProps, prevState) {
|
componentDidUpdate(prevProps, prevState) {
|
||||||
if (
|
if (
|
||||||
|
prevState.isAdmin !== this.state.isAdmin ||
|
||||||
prevState.status !== this.state.status ||
|
prevState.status !== this.state.status ||
|
||||||
prevState.warehouses !== this.state.warehouses ||
|
prevState.warehouses !== this.state.warehouses ||
|
||||||
prevState.filter !== this.state.filter
|
prevState.filter !== this.state.filter
|
||||||
@@ -219,7 +225,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
animation: 150,
|
animation: 150,
|
||||||
ghostClass: 'sortable-ghost',
|
ghostClass: 'sortable-ghost',
|
||||||
chosenClass: 'sortable-chosen',
|
chosenClass: 'sortable-chosen',
|
||||||
disabled: isFiltered,
|
disabled: !this.state.isAdmin || isFiltered,
|
||||||
onEnd: (evt) => {
|
onEnd: (evt) => {
|
||||||
const { oldIndex, newIndex } = evt;
|
const { oldIndex, newIndex } = evt;
|
||||||
if (oldIndex === newIndex) return;
|
if (oldIndex === newIndex) return;
|
||||||
@@ -260,7 +266,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, error, warehouses, filter } = this.state;
|
const { isAdmin, status, error, warehouses, filter } = this.state;
|
||||||
const { prefill, returnTo } = getInitialParams(this.props);
|
const { prefill, returnTo } = getInitialParams(this.props);
|
||||||
|
|
||||||
if (status === 'loading' || status === 'idle') {
|
if (status === 'loading' || status === 'idle') {
|
||||||
@@ -299,6 +305,7 @@ class ArtikelLagerPage extends PureComponent {
|
|||||||
<ArtikelLager
|
<ArtikelLager
|
||||||
key={wh.id}
|
key={wh.id}
|
||||||
warehouse={wh}
|
warehouse={wh}
|
||||||
|
disabled={!isAdmin}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -9,20 +9,27 @@ import DialogTitle from '@mui/material/DialogTitle';
|
|||||||
import Divider from '@mui/material/Divider';
|
import Divider from '@mui/material/Divider';
|
||||||
import IconButton from '@mui/material/IconButton';
|
import IconButton from '@mui/material/IconButton';
|
||||||
import InputAdornment from '@mui/material/InputAdornment';
|
import InputAdornment from '@mui/material/InputAdornment';
|
||||||
|
import Menu from '@mui/material/Menu';
|
||||||
|
import MenuItem from '@mui/material/MenuItem';
|
||||||
|
import ListItemIcon from '@mui/material/ListItemIcon';
|
||||||
|
import ListItemText from '@mui/material/ListItemText';
|
||||||
import TextField from '@mui/material/TextField';
|
import TextField from '@mui/material/TextField';
|
||||||
import ToggleButton from '@mui/material/ToggleButton';
|
import ToggleButton from '@mui/material/ToggleButton';
|
||||||
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
|
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
import Tooltip from '@mui/material/Tooltip';
|
||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import AddIcon from '@mui/icons-material/Add';
|
import AddIcon from '@mui/icons-material/Add';
|
||||||
|
import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
|
||||||
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
|
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
|
||||||
import EditIcon from '@mui/icons-material/Edit';
|
import EditIcon from '@mui/icons-material/Edit';
|
||||||
import LabelIcon from '@mui/icons-material/Label';
|
import LabelIcon from '@mui/icons-material/Label';
|
||||||
|
import PrintIcon from '@mui/icons-material/Print';
|
||||||
import BackendError from '../../components/BackendError';
|
import BackendError from '../../components/BackendError';
|
||||||
import { PanelTile, PanelTileGrid } from 'dashgui/panels';
|
import { PanelTile, PanelTileGrid } from 'dashgui/panels';
|
||||||
import { backendErrorFrom } from '../../utils/backendError';
|
import { backendErrorFrom } from '../../utils/backendError';
|
||||||
import { notifyError } from '../../utils/notify';
|
import { notifyError } from '../../utils/notify';
|
||||||
import { setLastArticleSku } from '../../automats/navigationAutomat';
|
import { setLastArticleSku } from '../../automats/navigationAutomat';
|
||||||
|
import companyAutomat from '../../automats/companyAutomat';
|
||||||
import { labeltemplate } from '../../api';
|
import { labeltemplate } from '../../api';
|
||||||
import { enqueueSnackbar } from 'notistack';
|
import { enqueueSnackbar } from 'notistack';
|
||||||
import {
|
import {
|
||||||
@@ -30,6 +37,36 @@ import {
|
|||||||
SURFACE_BASE,
|
SURFACE_BASE,
|
||||||
} from '../../colors';
|
} from '../../colors';
|
||||||
|
|
||||||
|
function filterZplPrinters(agentprinters) {
|
||||||
|
return (Array.isArray(agentprinters) ? agentprinters : []).filter(
|
||||||
|
(p) => p.enabled !== false && (!p.type || p.type.toLowerCase() === 'zpl'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getPrinterLabel(p) {
|
||||||
|
let label;
|
||||||
|
if (p.model && p.serial) {
|
||||||
|
label = `${p.model} (${p.serial})`;
|
||||||
|
} else if (p.model) {
|
||||||
|
label = p.model;
|
||||||
|
} else if (p.serial) {
|
||||||
|
label = `Drucker (${p.serial})`;
|
||||||
|
} else if (p.desc && p.address) {
|
||||||
|
label = `${p.desc} (${p.address})`;
|
||||||
|
} else if (p.address) {
|
||||||
|
label = p.address;
|
||||||
|
} else if (p.desc) {
|
||||||
|
label = p.desc;
|
||||||
|
} else {
|
||||||
|
label = `Drucker #${p.id}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p.online === false) {
|
||||||
|
return `${label} (offline)`;
|
||||||
|
}
|
||||||
|
return label;
|
||||||
|
}
|
||||||
|
|
||||||
const CanvasEditor = lazy(async () => {
|
const CanvasEditor = lazy(async () => {
|
||||||
await import('react-canvas-label-editor/style.css');
|
await import('react-canvas-label-editor/style.css');
|
||||||
const mod = await import('react-canvas-label-editor');
|
const mod = await import('react-canvas-label-editor');
|
||||||
@@ -65,11 +102,15 @@ class ArtikelVorlagenPage extends PureComponent {
|
|||||||
const initialDpi = DEFAULT_DPI;
|
const initialDpi = DEFAULT_DPI;
|
||||||
const initialWidthClass = '2';
|
const initialWidthClass = '2';
|
||||||
const initialHeightMm = DEFAULT_HEIGHT_MM;
|
const initialHeightMm = DEFAULT_HEIGHT_MM;
|
||||||
|
const initialPrinters = filterZplPrinters(companyAutomat.state.agentprinters);
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
status: 'loading',
|
status: 'loading',
|
||||||
error: null,
|
error: null,
|
||||||
templates: [],
|
templates: [],
|
||||||
|
printers: initialPrinters,
|
||||||
|
printerMenuAnchor: null,
|
||||||
|
printing: false,
|
||||||
// Editor dialog state
|
// Editor dialog state
|
||||||
editorOpen: false,
|
editorOpen: false,
|
||||||
editorLoading: false,
|
editorLoading: false,
|
||||||
@@ -97,16 +138,23 @@ class ArtikelVorlagenPage extends PureComponent {
|
|||||||
this.handleDpiChange = this.handleDpiChange.bind(this);
|
this.handleDpiChange = this.handleDpiChange.bind(this);
|
||||||
this.handleHeightMmChange = this.handleHeightMmChange.bind(this);
|
this.handleHeightMmChange = this.handleHeightMmChange.bind(this);
|
||||||
this.handleHeightMmBlur = this.handleHeightMmBlur.bind(this);
|
this.handleHeightMmBlur = this.handleHeightMmBlur.bind(this);
|
||||||
|
this.handlePrintClick = this.handlePrintClick.bind(this);
|
||||||
|
this.handleClosePrinterMenu = this.handleClosePrinterMenu.bind(this);
|
||||||
|
this.handleSelectPrinterForPrint = this.handleSelectPrinterForPrint.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
setLastArticleSku(null);
|
setLastArticleSku(null);
|
||||||
this._cancelled = false;
|
this._cancelled = false;
|
||||||
void this.loadTemplates();
|
void this.loadTemplates();
|
||||||
|
this.unsubPrinters = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
printers: filterZplPrinters(state.agentprinters),
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
this._cancelled = true;
|
this._cancelled = true;
|
||||||
|
this.unsubPrinters?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadTemplates() {
|
async loadTemplates() {
|
||||||
@@ -246,9 +294,66 @@ class ArtikelVorlagenPage extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleEditorClose() {
|
handleEditorClose() {
|
||||||
if (this.state.saving) return;
|
if (this.state.saving || this.state.printing) return;
|
||||||
this._currentEditId = null;
|
this._currentEditId = null;
|
||||||
this.setState({ editorOpen: false, editorLoading: false, editorTemplate: null });
|
this.setState({
|
||||||
|
editorOpen: false,
|
||||||
|
editorLoading: false,
|
||||||
|
editorTemplate: null,
|
||||||
|
printerMenuAnchor: null,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
handlePrintClick(event) {
|
||||||
|
const { printers } = this.state;
|
||||||
|
if (!printers || printers.length === 0) {
|
||||||
|
enqueueSnackbar('Kein ZPL-Drucker gefunden', { variant: 'warning' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (printers.length === 1) {
|
||||||
|
void this.executeTestPrint(printers[0]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.setState({ printerMenuAnchor: event.currentTarget });
|
||||||
|
}
|
||||||
|
|
||||||
|
handleClosePrinterMenu() {
|
||||||
|
this.setState({ printerMenuAnchor: null });
|
||||||
|
}
|
||||||
|
|
||||||
|
handleSelectPrinterForPrint(targetPrinter) {
|
||||||
|
this.setState({ printerMenuAnchor: null });
|
||||||
|
void this.executeTestPrint(targetPrinter);
|
||||||
|
}
|
||||||
|
|
||||||
|
async executeTestPrint(targetPrinter) {
|
||||||
|
if (!targetPrinter?.id) return;
|
||||||
|
const {
|
||||||
|
editorTemplate, editorObjects, editorWidth, editorHeight, editorDpi, editorName,
|
||||||
|
} = this.state;
|
||||||
|
|
||||||
|
this.setState({ printing: true });
|
||||||
|
try {
|
||||||
|
const payload = {
|
||||||
|
agentprinterId: targetPrinter.id,
|
||||||
|
templateId: editorTemplate?.id,
|
||||||
|
name: editorName,
|
||||||
|
width: editorWidth,
|
||||||
|
height: editorHeight,
|
||||||
|
dpi: editorDpi,
|
||||||
|
objects: editorObjects,
|
||||||
|
};
|
||||||
|
await labeltemplate.testprint(payload);
|
||||||
|
enqueueSnackbar(`Testdruck an ${getPrinterLabel(targetPrinter)} gesendet.`, {
|
||||||
|
variant: 'success',
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
notifyError(err);
|
||||||
|
} finally {
|
||||||
|
if (!this._cancelled) {
|
||||||
|
this.setState({ printing: false });
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleEditorSave() {
|
async handleEditorSave() {
|
||||||
@@ -320,7 +425,7 @@ class ArtikelVorlagenPage extends PureComponent {
|
|||||||
const {
|
const {
|
||||||
editorOpen, editorLoading, editorTemplate, editorName, editorObjects,
|
editorOpen, editorLoading, editorTemplate, editorName, editorObjects,
|
||||||
editorHeight, editorWidth, editorDpi, editorWidthClass, editorHeightMm,
|
editorHeight, editorWidth, editorDpi, editorWidthClass, editorHeightMm,
|
||||||
editorClipboard, saving,
|
editorClipboard, saving, printing, printers, printerMenuAnchor,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
const minHeightPx = getMinHeightPx(editorDpi);
|
const minHeightPx = getMinHeightPx(editorDpi);
|
||||||
@@ -438,18 +543,66 @@ class ArtikelVorlagenPage extends PureComponent {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
<DialogActions sx={{ px: 3, pb: 2 }}>
|
<DialogActions sx={{ px: 3, pb: 2, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
|
||||||
<Button onClick={this.handleEditorClose} disabled={saving}>
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
|
<Tooltip
|
||||||
|
title={
|
||||||
|
printers.length === 0
|
||||||
|
? 'Kein ZPL-Drucker verfügbar'
|
||||||
|
: printers.length === 1
|
||||||
|
? `Drucken auf ${getPrinterLabel(printers[0])}`
|
||||||
|
: 'Testdruck an Drucker senden'
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<span>
|
||||||
|
<Button
|
||||||
|
variant="outlined"
|
||||||
|
color="primary"
|
||||||
|
startIcon={printing ? <CircularProgress size={18} /> : <PrintIcon />}
|
||||||
|
endIcon={printers.length > 1 ? <ArrowDropDownIcon /> : null}
|
||||||
|
onClick={this.handlePrintClick}
|
||||||
|
disabled={printing || saving || editorLoading || printers.length === 0}
|
||||||
|
>
|
||||||
|
{printing ? 'Druckt…' : 'Testdruck'}
|
||||||
|
</Button>
|
||||||
|
</span>
|
||||||
|
</Tooltip>
|
||||||
|
{printers.length > 1 && (
|
||||||
|
<Menu
|
||||||
|
anchorEl={printerMenuAnchor}
|
||||||
|
open={Boolean(printerMenuAnchor)}
|
||||||
|
onClose={this.handleClosePrinterMenu}
|
||||||
|
>
|
||||||
|
{printers.map((p) => (
|
||||||
|
<MenuItem
|
||||||
|
key={p.id}
|
||||||
|
onClick={() => this.handleSelectPrinterForPrint(p)}
|
||||||
|
>
|
||||||
|
<ListItemIcon>
|
||||||
|
<PrintIcon fontSize="small" />
|
||||||
|
</ListItemIcon>
|
||||||
|
<ListItemText
|
||||||
|
primary={getPrinterLabel(p)}
|
||||||
|
secondary={p.serial ? `Seriennummer: ${p.serial}` : undefined}
|
||||||
|
/>
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Menu>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
|
||||||
|
<Button onClick={this.handleEditorClose} disabled={saving || printing}>
|
||||||
Abbrechen
|
Abbrechen
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
onClick={this.handleEditorSave}
|
onClick={this.handleEditorSave}
|
||||||
disabled={saving || editorLoading || !editorName.trim()}
|
disabled={saving || printing || editorLoading || !editorName.trim()}
|
||||||
>
|
>
|
||||||
{saving ? <CircularProgress size={18} sx={{ mr: 1 }} /> : null}
|
{saving ? <CircularProgress size={18} sx={{ mr: 1 }} /> : null}
|
||||||
{saving ? 'Speichert…' : 'Speichern'}
|
{saving ? 'Speichert…' : 'Speichern'}
|
||||||
</Button>
|
</Button>
|
||||||
|
</Box>
|
||||||
</DialogActions>
|
</DialogActions>
|
||||||
</AppDialog>
|
</AppDialog>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ class VersandartenSearchField extends PureComponent {
|
|||||||
super(props);
|
super(props);
|
||||||
const initial = companyAutomat.state.carrierFilter || '';
|
const initial = companyAutomat.state.carrierFilter || '';
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
input: initial,
|
input: initial,
|
||||||
submitting: false,
|
submitting: false,
|
||||||
};
|
};
|
||||||
@@ -29,6 +30,7 @@ class VersandartenSearchField extends PureComponent {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
input: state.carrierFilter,
|
input: state.carrierFilter,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -43,6 +45,7 @@ class VersandartenSearchField extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleSubmit() {
|
async handleSubmit() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const name = this.state.input.trim();
|
const name = this.state.input.trim();
|
||||||
if (!name || this.state.submitting) return;
|
if (!name || this.state.submitting) return;
|
||||||
|
|
||||||
@@ -64,8 +67,8 @@ class VersandartenSearchField extends PureComponent {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { inputRef } = this.props;
|
const { inputRef } = this.props;
|
||||||
const { input, submitting } = this.state;
|
const { isAdmin, input, submitting } = this.state;
|
||||||
const canSubmit = Boolean(input.trim()) && !submitting;
|
const canCreate = isAdmin && Boolean(input.trim()) && !submitting;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PanelTileGrid>
|
<PanelTileGrid>
|
||||||
@@ -102,7 +105,7 @@ class VersandartenSearchField extends PureComponent {
|
|||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
disabled={!canSubmit}
|
disabled={!canCreate}
|
||||||
onClick={() => void this.handleSubmit()}
|
onClick={() => void this.handleSubmit()}
|
||||||
>
|
>
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
@@ -120,6 +123,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
const initialCarriers =
|
const initialCarriers =
|
||||||
companyAutomat.state.filteredCarriers ?? companyAutomat.state.carriers ?? [];
|
companyAutomat.state.filteredCarriers ?? companyAutomat.state.carriers ?? [];
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: companyAutomat.state.carriersStatus === 'ready' ? 'ready' : 'loading',
|
status: companyAutomat.state.carriersStatus === 'ready' ? 'ready' : 'loading',
|
||||||
error: companyAutomat.state.carriersError ? backendErrorFrom(companyAutomat.state.carriersError) : null,
|
error: companyAutomat.state.carriersError ? backendErrorFrom(companyAutomat.state.carriersError) : null,
|
||||||
carriers: initialCarriers,
|
carriers: initialCarriers,
|
||||||
@@ -138,6 +142,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
this._cancelled = false;
|
this._cancelled = false;
|
||||||
|
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
carriers: state.filteredCarriers ?? state.carriers,
|
carriers: state.filteredCarriers ?? state.carriers,
|
||||||
filter: state.carrierFilter ?? '',
|
filter: state.carrierFilter ?? '',
|
||||||
status: state.carriersStatus,
|
status: state.carriersStatus,
|
||||||
@@ -151,6 +156,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
|
|
||||||
componentDidUpdate(prevProps, prevState) {
|
componentDidUpdate(prevProps, prevState) {
|
||||||
if (
|
if (
|
||||||
|
prevState.isAdmin !== this.state.isAdmin ||
|
||||||
prevState.status !== this.state.status ||
|
prevState.status !== this.state.status ||
|
||||||
prevState.carriers !== this.state.carriers ||
|
prevState.carriers !== this.state.carriers ||
|
||||||
prevState.filter !== this.state.filter
|
prevState.filter !== this.state.filter
|
||||||
@@ -179,7 +185,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
animation: 150,
|
animation: 150,
|
||||||
ghostClass: 'sortable-ghost',
|
ghostClass: 'sortable-ghost',
|
||||||
chosenClass: 'sortable-chosen',
|
chosenClass: 'sortable-chosen',
|
||||||
disabled: isFiltered,
|
disabled: !this.state.isAdmin || isFiltered,
|
||||||
onEnd: (evt) => {
|
onEnd: (evt) => {
|
||||||
const { oldIndex, newIndex } = evt;
|
const { oldIndex, newIndex } = evt;
|
||||||
if (oldIndex === newIndex) return;
|
if (oldIndex === newIndex) return;
|
||||||
@@ -220,7 +226,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, error, carriers, filter } = this.state;
|
const { isAdmin, status, error, carriers, filter } = this.state;
|
||||||
|
|
||||||
if (status === 'loading' || status === 'idle') {
|
if (status === 'loading' || status === 'idle') {
|
||||||
return (
|
return (
|
||||||
@@ -253,6 +259,7 @@ class AuftragVersandartenPage extends PureComponent {
|
|||||||
<CarrierItem
|
<CarrierItem
|
||||||
key={c.id}
|
key={c.id}
|
||||||
carrier={c}
|
carrier={c}
|
||||||
|
disabled={!isAdmin}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import CircularProgress from '@mui/material/CircularProgress';
|
|||||||
import ListItemButton from '@mui/material/ListItemButton';
|
import ListItemButton from '@mui/material/ListItemButton';
|
||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import Skeleton from '@mui/material/Skeleton';
|
import Skeleton from '@mui/material/Skeleton';
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
|
||||||
import ViewModuleIcon from '@mui/icons-material/ViewModule';
|
import ViewModuleIcon from '@mui/icons-material/ViewModule';
|
||||||
import Chip from '@mui/material/Chip';
|
import Chip from '@mui/material/Chip';
|
||||||
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
|
||||||
@@ -207,11 +206,9 @@ class GlobalHistoryRow extends PureComponent {
|
|||||||
|
|
||||||
{/* 4. Meldung / Beschreibung */}
|
{/* 4. Meldung / Beschreibung */}
|
||||||
<Box sx={{ gridColumn: 4, gridRow: 2, minWidth: 0 }}>
|
<Box sx={{ gridColumn: 4, gridRow: 2, minWidth: 0 }}>
|
||||||
<Tooltip title={item.text || item.value || ''} placement="top-start" enterDelay={500}>
|
|
||||||
<Typography variant="body2" sx={ellipsisSx}>
|
<Typography variant="body2" sx={ellipsisSx}>
|
||||||
{item.text || item.value || '–'}
|
{item.text || item.value || '–'}
|
||||||
</Typography>
|
</Typography>
|
||||||
</Tooltip>
|
|
||||||
</Box>
|
</Box>
|
||||||
</ListItemButton>
|
</ListItemButton>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -22,13 +22,6 @@ export default class StatisticsPage extends PureComponent {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<BarChartIcon sx={{ fontSize: 48, opacity: 0.4 }} />
|
<BarChartIcon sx={{ fontSize: 48, opacity: 0.4 }} />
|
||||||
<Typography variant="h6" color="text.primary" fontWeight={600}>
|
|
||||||
Statistik & Auswertungen
|
|
||||||
</Typography>
|
|
||||||
<Typography variant="body2" color="text.secondary" sx={{ maxWidth: 420 }}>
|
|
||||||
Hier entstehen demnächst grafische Auswertungen, Umsatzstatistiken und
|
|
||||||
Bestandskennzahlen.
|
|
||||||
</Typography>
|
|
||||||
</Box>
|
</Box>
|
||||||
</PanelTile>
|
</PanelTile>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ class KundeGruppenSearchField extends PureComponent {
|
|||||||
super(props);
|
super(props);
|
||||||
const initial = companyAutomat.state.customergroupFilter || props.prefill || '';
|
const initial = companyAutomat.state.customergroupFilter || props.prefill || '';
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
input: initial,
|
input: initial,
|
||||||
submitting: false,
|
submitting: false,
|
||||||
};
|
};
|
||||||
@@ -49,6 +50,7 @@ class KundeGruppenSearchField extends PureComponent {
|
|||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
input: state.customergroupFilter,
|
input: state.customergroupFilter,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -63,6 +65,7 @@ class KundeGruppenSearchField extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handleSubmit() {
|
async handleSubmit() {
|
||||||
|
if (!this.state.isAdmin) return;
|
||||||
const name = this.state.input.trim();
|
const name = this.state.input.trim();
|
||||||
if (!name || this.state.submitting) return;
|
if (!name || this.state.submitting) return;
|
||||||
|
|
||||||
@@ -83,8 +86,8 @@ class KundeGruppenSearchField extends PureComponent {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { inputRef, returnTo, navigate } = this.props;
|
const { inputRef, returnTo, navigate } = this.props;
|
||||||
const { input, submitting } = this.state;
|
const { isAdmin, input, submitting } = this.state;
|
||||||
const canSubmit = Boolean(input.trim()) && !submitting;
|
const canCreate = isAdmin && Boolean(input.trim()) && !submitting;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PanelTileGrid>
|
<PanelTileGrid>
|
||||||
@@ -141,7 +144,7 @@ class KundeGruppenSearchField extends PureComponent {
|
|||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
variant="contained"
|
||||||
disabled={!canSubmit}
|
disabled={!canCreate}
|
||||||
onClick={() => void this.handleSubmit()}
|
onClick={() => void this.handleSubmit()}
|
||||||
>
|
>
|
||||||
Hinzufügen
|
Hinzufügen
|
||||||
@@ -159,6 +162,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
const initialGroups =
|
const initialGroups =
|
||||||
companyAutomat.state.filteredCustomergroups ?? companyAutomat.state.customergroups ?? [];
|
companyAutomat.state.filteredCustomergroups ?? companyAutomat.state.customergroups ?? [];
|
||||||
this.state = {
|
this.state = {
|
||||||
|
isAdmin: companyAutomat.state.current?.role === 'admin',
|
||||||
status: companyAutomat.state.customergroupsStatus === 'ready' ? 'ready' : 'loading',
|
status: companyAutomat.state.customergroupsStatus === 'ready' ? 'ready' : 'loading',
|
||||||
error: companyAutomat.state.customergroupsError ? backendErrorFrom(companyAutomat.state.customergroupsError) : null,
|
error: companyAutomat.state.customergroupsError ? backendErrorFrom(companyAutomat.state.customergroupsError) : null,
|
||||||
groups: initialGroups,
|
groups: initialGroups,
|
||||||
@@ -177,6 +181,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
this._cancelled = false;
|
this._cancelled = false;
|
||||||
|
|
||||||
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
this.unsub = companyAutomat.subscribe(this, (state) => ({
|
||||||
|
isAdmin: state.current?.role === 'admin',
|
||||||
groups: state.filteredCustomergroups ?? state.customergroups,
|
groups: state.filteredCustomergroups ?? state.customergroups,
|
||||||
filter: state.customergroupFilter ?? '',
|
filter: state.customergroupFilter ?? '',
|
||||||
status: state.customergroupsStatus,
|
status: state.customergroupsStatus,
|
||||||
@@ -190,6 +195,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
|
|
||||||
componentDidUpdate(prevProps, prevState) {
|
componentDidUpdate(prevProps, prevState) {
|
||||||
if (
|
if (
|
||||||
|
prevState.isAdmin !== this.state.isAdmin ||
|
||||||
prevState.status !== this.state.status ||
|
prevState.status !== this.state.status ||
|
||||||
prevState.groups !== this.state.groups ||
|
prevState.groups !== this.state.groups ||
|
||||||
prevState.filter !== this.state.filter
|
prevState.filter !== this.state.filter
|
||||||
@@ -218,7 +224,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
animation: 150,
|
animation: 150,
|
||||||
ghostClass: 'sortable-ghost',
|
ghostClass: 'sortable-ghost',
|
||||||
chosenClass: 'sortable-chosen',
|
chosenClass: 'sortable-chosen',
|
||||||
disabled: isFiltered,
|
disabled: !this.state.isAdmin || isFiltered,
|
||||||
onEnd: (evt) => {
|
onEnd: (evt) => {
|
||||||
const { oldIndex, newIndex } = evt;
|
const { oldIndex, newIndex } = evt;
|
||||||
if (oldIndex === newIndex) return;
|
if (oldIndex === newIndex) return;
|
||||||
@@ -259,7 +265,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { status, error, groups, filter } = this.state;
|
const { isAdmin, status, error, groups, filter } = this.state;
|
||||||
const { prefill, returnTo } = getInitialParams(this.props);
|
const { prefill, returnTo } = getInitialParams(this.props);
|
||||||
|
|
||||||
if (status === 'loading' || status === 'idle') {
|
if (status === 'loading' || status === 'idle') {
|
||||||
@@ -298,6 +304,7 @@ class KundeGruppenPage extends PureComponent {
|
|||||||
<KundeGruppe
|
<KundeGruppe
|
||||||
key={group.id}
|
key={group.id}
|
||||||
group={group}
|
group={group}
|
||||||
|
disabled={!isAdmin}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -22,5 +22,6 @@ export function normalizeCompany(raw, overrides = {}) {
|
|||||||
reducedtaxrate: overrides.reducedtaxrate !== undefined ? overrides.reducedtaxrate : raw.reducedtaxrate,
|
reducedtaxrate: overrides.reducedtaxrate !== undefined ? overrides.reducedtaxrate : raw.reducedtaxrate,
|
||||||
taxfreerate: overrides.taxfreerate !== undefined ? overrides.taxfreerate : raw.taxfreerate,
|
taxfreerate: overrides.taxfreerate !== undefined ? overrides.taxfreerate : raw.taxfreerate,
|
||||||
rootCategoryId: overrides.rootCategoryId !== undefined ? overrides.rootCategoryId : raw.rootCategoryId,
|
rootCategoryId: overrides.rootCategoryId !== undefined ? overrides.rootCategoryId : raw.rootCategoryId,
|
||||||
|
role: overrides.role !== undefined ? overrides.role : raw.role,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 278 KiB |
|
Before Width: | Height: | Size: 194 KiB After Width: | Height: | Size: 420 KiB |
|
Before Width: | Height: | Size: 144 KiB After Width: | Height: | Size: 445 KiB |
|
Before Width: | Height: | Size: 218 KiB After Width: | Height: | Size: 695 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 180 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 342 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 180 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 342 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 137 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 251 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 430 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 171 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 244 KiB |
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 251 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 430 KiB |
|
Before Width: | Height: | Size: 530 KiB After Width: | Height: | Size: 529 KiB |
|
Before Width: | Height: | Size: 546 KiB After Width: | Height: | Size: 540 KiB |
|
Before Width: | Height: | Size: 574 KiB After Width: | Height: | Size: 564 KiB |
|
Before Width: | Height: | Size: 598 KiB After Width: | Height: | Size: 586 KiB |
|
Before Width: | Height: | Size: 110 KiB After Width: | Height: | Size: 256 KiB |
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 406 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 128 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 499 KiB After Width: | Height: | Size: 936 KiB |
|
Before Width: | Height: | Size: 594 KiB After Width: | Height: | Size: 693 KiB |
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 204 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 322 KiB |
|
Before Width: | Height: | Size: 143 KiB After Width: | Height: | Size: 380 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 193 KiB |
|
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 330 KiB |
|
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 219 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 348 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 167 KiB |