This commit is contained in:
seb
2026-10-09 21:19:38 +02:00
parent 9b47190d47
commit 2800fb64e0
4 changed files with 107 additions and 126 deletions

View File

@@ -6,13 +6,18 @@ import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
import CopyrightIcon from '@mui/icons-material/Copyright'; import CopyrightIcon from '@mui/icons-material/Copyright';
import ImageSearchIcon from '@mui/icons-material/ImageSearch'; import ImageSearchIcon from '@mui/icons-material/ImageSearch';
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit'; import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
import { enqueueSnackbar } from 'notistack';
import brandAutomat from '../../automats/brandAutomat';
import { notifyError } from '../../utils/notify';
import BrandThumb from './BrandThumb'; import BrandThumb from './BrandThumb';
import BrandImageSearchDialog from './BrandImageSearchDialog';
class ArtikelMarke extends PureComponent { class ArtikelMarke extends PureComponent {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
draft: props.brand?.name ?? '', draft: props.brand?.name ?? '',
logoOpen: false,
}; };
} }
@@ -32,17 +37,27 @@ class ArtikelMarke extends PureComponent {
}; };
handleBlur = () => { handleBlur = () => {
const { onRename, brand } = this.props; const { brand } = this.props;
const draft = this.state.draft.trim(); const draft = this.state.draft.trim();
if (!draft) { if (!draft) {
this.setState({ draft: brand?.name ?? '' }); this.setState({ draft: brand?.name ?? '' });
return; return;
} }
if (draft !== brand?.name) { if (draft !== brand?.name) {
onRename?.(brand, draft); void this.renameBrand(brand, draft);
} }
}; };
async renameBrand(brand, name) {
try {
await brandAutomat.actions.rename(brand.id, { name });
enqueueSnackbar('Marke gespeichert.', { variant: 'success' });
} catch (err) {
this.setState({ draft: brand?.name ?? '' });
notifyError(err);
}
}
handleKeyDown = (event) => { handleKeyDown = (event) => {
const { brand } = this.props; const { brand } = this.props;
if (event.key === 'Enter') { if (event.key === 'Enter') {
@@ -57,21 +72,33 @@ class ArtikelMarke extends PureComponent {
}; };
handleSearchLogo = () => { handleSearchLogo = () => {
const { onSearchLogo, brand } = this.props; this.setState({ logoOpen: true });
onSearchLogo?.(brand); };
handleLogoClose = () => {
this.setState({ logoOpen: false });
}; };
handleDelete = () => { handleDelete = () => {
const { onDelete, brand } = this.props; const { brand } = this.props;
onDelete?.(brand); if (!window.confirm(`Marke „${brand.name}" wirklich löschen?`)) return;
void (async () => {
try {
await brandAutomat.actions.remove(brand.id);
enqueueSnackbar('Marke gelöscht.', { variant: 'success' });
} catch (err) {
notifyError(err);
}
})();
}; };
render() { render() {
const { brand, disabled, sx } = this.props; const { brand, disabled, sx } = this.props;
const { draft } = this.state; const { draft, logoOpen } = this.state;
const name = brand?.name ?? ''; const name = brand?.name ?? '';
return ( return (
<>
<ListItem <ListItem
disableGutters disableGutters
sx={{ gap: 1, py: 0.75, alignItems: 'center', width: '100%', minWidth: 0, ...sx }} sx={{ gap: 1, py: 0.75, alignItems: 'center', width: '100%', minWidth: 0, ...sx }}
@@ -117,6 +144,14 @@ class ArtikelMarke extends PureComponent {
</span> </span>
</Tooltip> </Tooltip>
</ListItem> </ListItem>
{logoOpen ? (
<BrandImageSearchDialog
open
brand={brand}
onClose={this.handleLogoClose}
/>
) : null}
</>
); );
} }
} }

View File

@@ -0,0 +1,61 @@
import { PureComponent } from 'react';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
import { enqueueSnackbar } from 'notistack';
import brandAutomat from '../../automats/brandAutomat';
import { notifyError } from '../../utils/notify';
// Own component so typing a new brand name never rerenders ArtikelMarkenPage
// (and its FillSpace measurement). Holds the draft locally and performs the
// automat mutation itself — no callbacks.
class ArtikelMarkeNew extends PureComponent {
constructor(props) {
super(props);
this.state = { newName: '' };
}
async submit() {
const name = this.state.newName.trim();
if (!name) return;
try {
const row = await brandAutomat.actions.create({ name });
enqueueSnackbar(`Marke „${row.name || name}" angelegt.`, { variant: 'success' });
this.setState({ newName: '' });
} catch (err) {
notifyError(err);
}
}
render() {
const { rowRef } = this.props;
const { newName } = this.state;
return (
<Box ref={rowRef} sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 2, pb: 2 }}>
<SingleLineTextEdit
size="small"
label="Neue Marke"
value={newName}
onChange={(next) => this.setState({ newName: next })}
onKeyDown={(event) => {
if (event.key === 'Enter') {
event.preventDefault();
void this.submit();
}
}}
sx={{ flex: 1 }}
/>
<Button
variant="contained"
size="small"
disabled={!newName.trim()}
onClick={() => void this.submit()}
>
Hinzufügen
</Button>
</Box>
);
}
}
export default ArtikelMarkeNew;

View File

@@ -2,4 +2,5 @@ export { default as BrandThumb, extractBrandThumbInfo } from './BrandThumb';
export { default as BrandLabel } from './BrandLabel'; export { default as BrandLabel } from './BrandLabel';
export { default as BrandImageSearchDialog } from './BrandImageSearchDialog'; export { default as BrandImageSearchDialog } from './BrandImageSearchDialog';
export { default as ArtikelMarke } from './ArtikelMarke'; export { default as ArtikelMarke } from './ArtikelMarke';
export { default as ArtikelMarkeNew } from './ArtikelMarkeNew';
export { default as ArtikelMarkenTable } from './ArtikelMarkenTable'; export { default as ArtikelMarkenTable } from './ArtikelMarkenTable';

View File

@@ -1,69 +1,22 @@
import { PureComponent, createRef } from 'react'; import { PureComponent, createRef } from 'react';
import Box from '@mui/material/Box'; import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import CircularProgress from '@mui/material/CircularProgress'; import CircularProgress from '@mui/material/CircularProgress';
import BackendError from '../../components/BackendError'; import BackendError from '../../components/BackendError';
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
import FillSpace from 'dashgui/FillSpace'; import FillSpace from 'dashgui/FillSpace';
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'; import { setLastArticleSku } from '../../automats';
import brandAutomat from '../../automats/brandAutomat'; import brandAutomat from '../../automats/brandAutomat';
import { enqueueSnackbar } from 'notistack';
import { import {
BrandImageSearchDialog,
ArtikelMarke, ArtikelMarke,
ArtikelMarkeNew,
} from '../../components/brand'; } from '../../components/brand';
import { import {
PURPLE_PANEL, PURPLE_PANEL,
} from '../../colors'; } from '../../colors';
class ArtikelMarkeNew extends PureComponent {
constructor(props) {
super(props);
this.state = { newName: '' };
}
async submit() {
const name = this.state.newName.trim();
if (!name) return;
await this.props.onCreate?.(name);
this.setState({ newName: '' });
}
render() {
const { rowRef } = this.props;
const { newName } = this.state;
return (
<Box ref={rowRef} sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 2, pb: 2 }}>
<SingleLineTextEdit
size="small"
label="Neue Marke"
value={newName}
onChange={(next) => this.setState({ newName: next })}
onKeyDown={(event) => {
if (event.key === 'Enter') {
event.preventDefault();
void this.submit();
}
}}
sx={{ flex: 1 }}
/>
<Button
variant="contained"
size="small"
disabled={!newName.trim()}
onClick={() => void this.submit()}
>
Hinzufügen
</Button>
</Box>
);
}
}
class ArtikelMarkenPage extends PureComponent { class ArtikelMarkenPage extends PureComponent {
constructor(props) { constructor(props) {
super(props); super(props);
@@ -71,23 +24,14 @@ class ArtikelMarkenPage extends PureComponent {
status: brandAutomat.state.status, status: brandAutomat.state.status,
error: brandAutomat.state.error ? backendErrorFrom({ message: brandAutomat.state.error }) : null, error: brandAutomat.state.error ? backendErrorFrom({ message: brandAutomat.state.error }) : null,
brands: brandAutomat.state.brands, brands: brandAutomat.state.brands,
searchBrand: null,
}; };
this._cancelled = false;
this.createRowRef = createRef(); this.createRowRef = createRef();
this.handleCreate = this.handleCreate.bind(this);
this.handleRetry = this.handleRetry.bind(this); this.handleRetry = this.handleRetry.bind(this);
this.handleRename = this.handleRename.bind(this);
this.handleDelete = this.handleDelete.bind(this);
this.handleSearchLogo = this.handleSearchLogo.bind(this);
} }
componentDidMount() { componentDidMount() {
setLastArticleSku(null); setLastArticleSku(null);
this._cancelled = false;
// Mirror the automat's brands slice directly — the automat owns
// fetching (auth/SSE), the component never triggers loads.
this.unsub = brandAutomat.subscribe(this, (state) => ({ this.unsub = brandAutomat.subscribe(this, (state) => ({
brands: state.brands, brands: state.brands,
status: state.status, status: state.status,
@@ -96,7 +40,6 @@ class ArtikelMarkenPage extends PureComponent {
} }
componentWillUnmount() { componentWillUnmount() {
this._cancelled = true;
this.unsub?.(); this.unsub?.();
} }
@@ -105,52 +48,6 @@ class ArtikelMarkenPage extends PureComponent {
void brandAutomat.actions.load().catch((err) => notifyError(err)); void brandAutomat.actions.load().catch((err) => notifyError(err));
} }
handleSearchLogo(brand) {
this.setState({ searchBrand: brand });
}
async handleCreate(name) {
const trimmed = String(name ?? '').trim();
if (!trimmed) return;
try {
const row = await brandAutomat.actions.create({ name: trimmed });
if (this._cancelled) return;
enqueueSnackbar(`Marke „${row.name || trimmed}" angelegt.`, { variant: 'success' });
} catch (err) {
if (this._cancelled) return;
notifyError(err);
throw err;
}
}
async handleRename(brand, draft) {
const nextName = String(draft ?? '').trim();
if (!nextName || nextName === brand.name) return;
try {
await brandAutomat.actions.rename(brand.id, { name: nextName });
if (this._cancelled) return;
enqueueSnackbar('Marke gespeichert.', { variant: 'success' });
} catch (err) {
if (this._cancelled) return;
notifyError(err);
}
}
async handleDelete(brand) {
if (!window.confirm(`Marke „${brand.name}" wirklich löschen?`)) return;
try {
await brandAutomat.actions.remove(brand.id);
if (this._cancelled) return;
enqueueSnackbar('Marke gelöscht.', { variant: 'success' });
} catch (err) {
if (this._cancelled) return;
notifyError(err);
}
}
render() { render() {
const { status, error, brands } = this.state; const { status, error, brands } = this.state;
@@ -176,24 +73,11 @@ class ArtikelMarkenPage extends PureComponent {
minPageSize={8} minPageSize={8}
minHeight={0} minHeight={0}
items={brands} items={brands}
renderItem={(brand) => ( renderItem={ArtikelMarke}
<ArtikelMarke
brand={brand}
onRename={this.handleRename}
onSearchLogo={this.handleSearchLogo}
onDelete={this.handleDelete}
/>
)}
/> />
<ArtikelMarkeNew rowRef={this.createRowRef} onCreate={this.handleCreate} /> <ArtikelMarkeNew rowRef={this.createRowRef} />
</PanelTile> </PanelTile>
<BrandImageSearchDialog
open={Boolean(this.state.searchBrand)}
brand={this.state.searchBrand}
onClose={() => this.setState({ searchBrand: null })}
/>
</PanelTileGrid> </PanelTileGrid>
); );
} }