seb/dashfront
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
seb
2026-11-03 06:46:36 +01:00
parent 9841002398
commit 863422df8e
20 changed files with 300 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/carrier/CarrierItem.jsx
View File

@@ -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;

2
src/components/kunde/KundeGruppe.jsx
View File

@@ -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;

17
src/components/settings/BackupSettingsPanel.jsx
View File

@@ -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'}

18
src/components/settings/CompanySettingsPanel.jsx
View File

@@ -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

18
src/components/settings/ImportExportSettingsPanel.jsx
View File

@@ -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'}

13
src/components/settings/NumberSettingsPanel.jsx
View File

@@ -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" />

30
src/components/settings/PosTerminalSettingsPanel.jsx
View File

@@ -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)}
/> />
} }

27
src/components/settings/PrinterAgentSettingsPanel.jsx
View File

@@ -215,6 +215,7 @@ 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
: [], : [],
@@ -254,6 +255,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
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 : [], agentprinters: Array.isArray(state.agentprinters) ? state.agentprinters : [],
livePrinters: Array.isArray(state.livePrinters) ? state.livePrinters : [], livePrinters: Array.isArray(state.livePrinters) ? state.livePrinters : [],
@@ -279,6 +281,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
} }
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;
@@ -497,6 +500,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
render() { render() {
const { const {
isAdmin,
error, error,
printeragents, printeragents,
agentprinters, agentprinters,
@@ -572,7 +576,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: {
@@ -594,7 +598,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>
@@ -716,7 +720,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<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 }} />
@@ -764,7 +768,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<Switch <Switch
size="small" size="small"
checked={isEnabled} checked={isEnabled}
disabled={isPatching || isDeleting} disabled={!isAdmin || isPatching || isDeleting}
onChange={(e) => void this.handleToggleAgentEnabled(agent, e.target.checked)} onChange={(e) => void this.handleToggleAgentEnabled(agent, e.target.checked)}
color="success" color="success"
/> />
@@ -788,7 +792,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
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" />
@@ -904,7 +908,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<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 }}
> >
@@ -914,7 +918,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<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 }}
> >
@@ -924,7 +928,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<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)}
@@ -1078,6 +1082,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<Switch <Switch
size="small" size="small"
checked={pEnabled} checked={pEnabled}
disabled={!isAdmin}
onChange={(e) => onChange={(e) =>
void this.handleTogglePrinterEnabled(p, e.target.checked) void this.handleTogglePrinterEnabled(p, e.target.checked)
} }
@@ -1099,7 +1104,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<span> <span>
<IconButton <IconButton
size="small" size="small"
disabled={pIdx === 0} disabled={!isAdmin || pIdx === 0}
onClick={() => void this.handleMovePrinter(p, 'up')} onClick={() => void this.handleMovePrinter(p, 'up')}
sx={{ p: 0.25 }} sx={{ p: 0.25 }}
> >
@@ -1110,7 +1115,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<span> <span>
<IconButton <IconButton
size="small" size="small"
disabled={pIdx === agentprinters.length - 1} disabled={!isAdmin || pIdx === agentprinters.length - 1}
onClick={() => void this.handleMovePrinter(p, 'down')} onClick={() => void this.handleMovePrinter(p, 'down')}
sx={{ p: 0.25 }} sx={{ p: 0.25 }}
> >
@@ -1124,7 +1129,7 @@ export default class PrinterAgentSettingsPanel extends PureComponent {
<IconButton <IconButton
size="small" size="small"
color="error" color="error"
disabled={isOnline} disabled={!isAdmin || isOnline}
onClick={() => void this.handleDeletePrinter(p)} onClick={() => void this.handleDeletePrinter(p)}
sx={{ p: 0.5 }} sx={{ p: 0.5 }}
> >

26
src/components/settings/PrinterSettingsPanel.jsx
View File

@@ -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 ? (

15
src/components/settings/SettingsKeysPanel.jsx
View File

@@ -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" />

14
src/components/vfs/VfsEditorPanel.jsx
View File

@@ -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}

37
src/components/vfs/VfsFileExplorer.jsx
View File

@@ -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}

29
src/components/vfs/VfsNewFileDialog.jsx
View File

@@ -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'}

30
src/components/vfs/VfsRenameDialog.jsx
View File

@@ -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'}

25
src/components/vfs/VfsTextEditor.jsx
View File

@@ -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}

22
src/components/vfs/vfsUtils.js
View File

@@ -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

3
src/components/warehouse/ArtikelLager.jsx
View File

@@ -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;

17
src/routes/artikel/lager.jsx
View File

@@ -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}
/> />
)) ))
)} )}

17
src/routes/auftrag/versandarten.jsx
View File

@@ -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}
/> />
)) ))
)} )}

17
src/routes/kunde/gruppen.jsx
View File

@@ -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}
/> />
)) ))
)} )}