u

src/routes/lieferung/neu.jsx

@@ -38,8 +38,7 @@ import {
   BookDeliveryDialog,
 } from '../../components/manifest';
 import { loadParties, apiFor, resolveLineSkus, sortSuppliers } from '../../components/manifest/manifestConfig';
-import supplierAutomat from '../../automats/supplierAutomat';
-import warehouseAutomat from '../../automats/warehouseAutomat';
+import companyAutomat, { setViewerPosition } from '../../automats/companyAutomat';
 import { article as articleApi, delivery as deliveryApi } from '../../api';
 import { getCategoryState } from '../../automats/categoryAutomat';
 import { requireArray, requireDefined, requireObject } from '../../utils/apiShape';
@@ -49,7 +48,7 @@ import { generatePdfThumbnail } from '../../utils/pdfThumbnail';
 import { generateTextThumbnail } from '../../utils/textThumbnail';
 import { extractPdfText } from '../../utils/pdfText';
 import { getDeliveryEditorAutomat } from '../../automats/deliveryEditorAutomat';
-import { setLastDeliveryPath, userSettingsAutomat, setViewerPosition } from '../../automats';
+import { setLastDeliveryPath } from '../../automats/navigationAutomat';
 import chatAutomat from '../../automats/chatAutomat';
 
 import { fetchDeliveryLedgerSummary } from '../../utils/deliveryLedger';
@@ -110,10 +109,10 @@ class LieferungNeuPage extends PureComponent {
     this.cfg = manifestConfig('delivery');
     this.automat = getDeliveryEditorAutomat(props.docId);
     if (
-      supplierAutomat.state.status === 'ready' &&
+      companyAutomat.state.suppliersStatus === 'ready' &&
       (!this.automat.state.deliveryEntities || this.automat.state.deliveryEntities.length === 0)
     ) {
-      this.automat.actions.setDeliveryEntities(sortSuppliers(supplierAutomat.state.suppliers));
+      this.automat.actions.setDeliveryEntities(sortSuppliers(companyAutomat.state.suppliers));
     }
     const initialDate = this.automat.state.date || (props.docId == null ? todayInputValue() : null);
     if (props.docId == null && !this.automat.state.date) {
@@ -129,7 +128,7 @@ class LieferungNeuPage extends PureComponent {
       pdfUploading: false,
       textEditorOpen: false,
       textEditorAttachment: null,
-      viewerPosition: userSettingsAutomat.state.viewerPosition,
+      viewerPosition: companyAutomat.state.viewerPosition,
       pdfViewerOpen: false,
       pdfViewerAttachment: null,
       articleSearchDialogOpen: false,
@@ -139,7 +138,7 @@ class LieferungNeuPage extends PureComponent {
       bookDeliveryDialogOpen: false,
       bookDeliveryPrefillLineId: null,
       pdfCreating: false,
-      warehouses: warehouseAutomat.state.warehouses || [],
+      warehouses: companyAutomat.state.warehouses || [],
     };
     this._cancelled = false;
     this.handleRetry = this.handleRetry.bind(this);
@@ -183,18 +182,16 @@ class LieferungNeuPage extends PureComponent {
 
   componentDidMount() {
     this.unsubscribe = this.automat.subscribe(this);
-    this._settingsUnsub = userSettingsAutomat.subscribe(this, (state) => ({
-      viewerPosition: state.viewerPosition,
-    }));
-    this._warehouseUnsub = warehouseAutomat.subscribe(this, (state) => ({
-      warehouses: state.warehouses,
-    }));
-    this._supplierUnsub = supplierAutomat.subscribe(this, (state) => {
-      if (state.status === 'ready' && Array.isArray(state.suppliers)) {
+    this._companyUnsub = companyAutomat.subscribe(this, (state) => {
+      if (state.suppliersStatus === 'ready' && Array.isArray(state.suppliers)) {
         this.automat.actions.setDeliveryEntities(sortSuppliers(state.suppliers));
       }
+      return {
+        viewerPosition: state.viewerPosition,
+        warehouses: state.warehouses,
+      };
     });
-    void warehouseAutomat.actions.load().catch(() => { });
+    void companyAutomat.actions.loadWarehouses().catch(() => { });
     this._cancelled = false;
     if (this.props.docId != null) {
       setLastDeliveryPath(`/lieferung/${this.props.docId}`);
@@ -237,9 +234,7 @@ class LieferungNeuPage extends PureComponent {
       this._skuDebounceTimers = null;
     }
     this.unsubscribe?.();
-    this._settingsUnsub?.();
-    this._warehouseUnsub?.();
-    this._supplierUnsub?.();
+    this._companyUnsub?.();
   }
 
   async loadPartiesOnly() {