u

src/components/CompanySettingsDialog.jsx

@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import Alert from '@mui/material/Alert';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
-import CircularProgress from '@mui/material/CircularProgress';
 import Dialog from '@mui/material/Dialog';
 import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
@@ -28,18 +27,15 @@ import { enqueueSnackbar } from 'notistack';
 import BackendError from './BackendError';
 import SingleLineTextEdit from './SingleLineTextEdit';
 import { StorageManagerContext } from '../api/storageManager';
-import {
+import { selectAuthUser } from '../store/authSlice';
-  loadCurrentCompany,
+import { updateCompany as updateCompanyThunk } from '../store/companySlice';
-  selectCompanyStatus,
-  selectCurrentCompany,
-  updateCompany as updateCompanyThunk,
-} from '../store/companySlice';
 import {
   createPosterminal,
   deletePosterminal,
   enableAllTerminalCategories,
 } from '../store/posterminalSlice';
 import { loadCategoryTree } from '../store/categorySlice';
+import { requireDefined } from '../utils/apiShape';
 import { ISO639_OPTIONS, parseTaxRate } from '../utils/companyForm';
 import { backendErrorFrom, isBackendFailure } from '../utils/backendError';
 import { notifyError } from '../utils/notify';
@@ -65,34 +61,45 @@ class CompanySettingsDialog extends Component {
     this.syncFormFromCompany = this.syncFormFromCompany.bind(this);
     this.handleCreateTerminal = this.handleCreateTerminal.bind(this);
     this.handleDeleteTerminal = this.handleDeleteTerminal.bind(this);
+    this.loadCompany = this.loadCompany.bind(this);
     this.loadTerminals = this.loadTerminals.bind(this);
   }
 
   componentDidUpdate(prevProps) {
-    const { open, company, companyStatus } = this.props;
+    const { open } = this.props;
     if (open && !prevProps.open) {
       this.setState({ error: null });
-      if (company) {
+      void this.loadCompany();
-        this.syncFormFromCompany(company);
-      } else if (companyStatus !== 'loading') {
-        void this.props.loadCurrentCompany();
-      }
       void this.loadTerminals();
     }
-    if (open && company && company !== prevProps.company) {
-      this.syncFormFromCompany(company);
-    }
   }
 
   syncFormFromCompany(company) {
     this.setState({
-      name: company.name ?? '',
+      name: company.name,
       iso639: company.iso639,
       taxrate: company.taxrate != null ? String(company.taxrate) : '',
       reducedtaxrate: company.reducedtaxrate != null ? String(company.reducedtaxrate) : '',
     });
   }
 
+  async loadCompany() {
+    try {
+      const companyId = requireDefined(
+        this.props.selectedCompanyId,
+        'selectedCompanyId',
+      );
+      const companies = await this.context.companyPromise;
+      const company = requireDefined(
+        companies.find((c) => c.id === companyId),
+        'company',
+      );
+      this.syncFormFromCompany(company);
+    } catch (err) {
+      notifyError(err);
+    }
+  }
+
   async loadTerminals() {
     try {
       const terminals = await this.context.posterminalPromise;
@@ -156,13 +163,14 @@ class CompanySettingsDialog extends Component {
     this.setState({ busy: true, error: null });
     try {
       await this.props
-        .updateCompany({
+        .saveCompany({
           name: name.trim(),
           iso639,
           taxrate: parsedTaxrate,
           reducedtaxrate: parsedReducedtaxrate,
         })
         .unwrap();
+      await this.context.updateCompany();
       enqueueSnackbar('Unternehmen gespeichert.', { variant: 'success' });
       onClose();
     } catch (err) {
@@ -173,9 +181,8 @@ class CompanySettingsDialog extends Component {
   }
 
   render() {
-    const { open, onClose, companyStatus } = this.props;
+    const { open, onClose } = this.props;
     const { busy, error, name, iso639, taxrate, reducedtaxrate } = this.state;
-    const loading = companyStatus === 'loading' && !busy;
     const parsedTaxrate = parseTaxRate(taxrate);
     const parsedReducedtaxrate = parseTaxRate(reducedtaxrate);
     const canSave =
@@ -199,11 +206,6 @@ class CompanySettingsDialog extends Component {
               )
             ) : null}
 
-            {loading ? (
-              <Box sx={{ display: 'flex', justifyContent: 'center', py: 4 }}>
-                <CircularProgress />
-              </Box>
-            ) : (
             <Stack spacing={2}>
               <SingleLineTextEdit
                 required
@@ -334,13 +336,12 @@ class CompanySettingsDialog extends Component {
                 </Box>
               </Box>
             </Stack>
-            )}
           </DialogContent>
           <DialogActions sx={{ px: 3, pb: 2 }}>
             <Button onClick={onClose} disabled={busy}>
               Abbrechen
             </Button>
-            <Button type="submit" variant="contained" disabled={busy || loading || !canSave}>
+            <Button type="submit" variant="contained" disabled={busy || !canSave}>
               Speichern
             </Button>
           </DialogActions>
@@ -351,13 +352,11 @@ class CompanySettingsDialog extends Component {
 }
 
 const mapStateToProps = (state) => ({
-  company: selectCurrentCompany(state),
+  selectedCompanyId: selectAuthUser(state)?.selectedCompanyId,
-  companyStatus: selectCompanyStatus(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  loadCurrentCompany: () => dispatch(loadCurrentCompany()),
+  saveCompany: (payload) => dispatch(updateCompanyThunk(payload)),
-  updateCompany: (payload) => dispatch(updateCompanyThunk(payload)),
   createPosterminal: (payload) => dispatch(createPosterminal(payload)),
   deletePosterminal: (payload) => dispatch(deletePosterminal(payload)),
   enableAllTerminalCategories: (payload) => dispatch(enableAllTerminalCategories(payload)),