no redux

src/api/StorageManager.js

@@ -1,13 +1,12 @@
 import { requireArray, requireDefined, requireObject } from '../utils/apiShape';
 import { notifyError } from '../utils/notify';
-import { parseCategoryTreeResponse } from '../utils/categoryUtils';
 import { ApiClient } from './ApiClient';
 import artikelAutomat from '../automats/artikelAutomat';
 import companyAutomat from '../automats/companyAutomat';
 import brandAutomat from '../automats/brandAutomat';
 import unitAutomat from '../automats/unitAutomat';
 import authAutomat from '../automats/authAutomat';
-import categoryAutomat from '../automats/categoryAutomat';
+import categoryAutomat, { invalidateAllCategoryViews } from '../automats/categoryAutomat';
 import posterminalAutomat from '../automats/posterminalAutomat';
 
 
@@ -175,24 +174,10 @@ export class StorageManager extends ApiClient {
   }
 
   /**
-   * Parsed category map + root id from settled caches, or null if any piece missing.
-   * @returns {{ categories: object, rootCategoryId: unknown } | null}
+   * Parsed category map + root id from categoryAutomat, or null if not yet loaded.
+   * @returns {{ categories: Record<string, object>, rootCategoryId: unknown } | null}
    */
   getCategoryState() {
-    const company = this.company;
-    if (company == null) return null;
-
-    const treeData = this.categoryTree;
-    if (treeData != null) {
-      // Legacy: tree was loaded via the old cache mechanism
-      const parsed = parseCategoryTreeResponse(treeData, company.rootCategoryId);
-      return {
-        categories: parsed.categories,
-        rootCategoryId: parsed.rootCategoryId,
-      };
-    }
-
-    // New path: use categoryAutomat state directly
     const catState = categoryAutomat.state;
     if (catState.categories == null || catState.treeStatus !== 'succeeded') return null;
     return {
@@ -413,12 +398,6 @@ export class StorageManager extends ApiClient {
     );
     const articleIndexCache = this.#articleIndexCache;
 
-    // category tree: deferred, reloaded via categoryAutomat
-    const categoryTreeCache = this.#createDeferredCache(
-      'GET /category/tree',
-      () => this.#loadCategoryTree(),
-    );
-
     Object.defineProperties(this, {
       authMePromise: { get: () => authMeCache.promise },
       updateAuthMe: { value: authMeCache.update },
@@ -499,11 +478,22 @@ export class StorageManager extends ApiClient {
       // Return a single-element array so .find() still works.
       companies: { get: () => companyAutomat.state.current ? [companyAutomat.state.current] : [] },
 
-      // ── Category tree bridge ─────────────────────────────────────────────────
-      categoryTreePromise: { get: () => categoryTreeCache.promise },
-      updateCategoryTree: { value: categoryTreeCache.update },
-      /** Settled GET /category/tree body, or undefined. */
-      categoryTree: { get: () => categoryTreeCache.value },
+      // ── Category tree bridge (delegated to categoryAutomat) ──────────────────
+      /** Category tree promise resolving when categoryAutomat tree is loaded. */
+      categoryTreePromise: {
+        get: () => categoryAutomat.state.treeStatus === 'succeeded'
+          ? Promise.resolve(categoryAutomat.state.categories)
+          : new Promise((resolve, reject) => {
+              const unsub = categoryAutomat.subscribe((s) => {
+                if (s.treeStatus === 'succeeded') { unsub(); resolve(s.categories); }
+                else if (s.treeStatus === 'failed') { unsub(); reject(new Error(s.error)); }
+              });
+            }),
+      },
+      /** Reload category tree via categoryAutomat. */
+      updateCategoryTree: { value: () => categoryAutomat.actions.loadTree() },
+      /** Current categories map from categoryAutomat, or null. */
+      categoryTree: { get: () => categoryAutomat.state.categories },
 
       // ── Deferred caches (auth-gated) ─────────────────────────────────────────
       deliveryPromise: { get: () => deliveryCache.promise },
@@ -556,7 +546,6 @@ export class StorageManager extends ApiClient {
         // Unauthenticated or logged out
         this.#disconnectEvents();
         articleIndexCache.clear();
-        categoryTreeCache.clear();
         deliveryCache.clear();
         customergroupCache.clear();
         entityCache.clear();
@@ -568,7 +557,6 @@ export class StorageManager extends ApiClient {
         // Company established or switched
         if (prevCompanyId) {
           articleIndexCache.clear();
-          categoryTreeCache.clear();
           deliveryCache.clear();
           customergroupCache.clear();
           entityCache.clear();
@@ -678,11 +666,13 @@ export class StorageManager extends ApiClient {
     this.#disconnectEvents();
     const es = new EventSource(this.urlFor('/api/events'), { withCredentials: true });
     es.addEventListener('category', () => {
-      void this.updateCategoryTree().catch((err) => {
-        console.error('[storageMgr] category SSE refresh failed', err);
+      void categoryAutomat.actions.loadTree().catch((err) => {
+        console.error('[storageMgr] category tree SSE refresh failed', err);
       });
+      invalidateAllCategoryViews();
     });
     es.addEventListener('articles', () => {
+      invalidateAllCategoryViews();
       void this.updateArticleIndex().catch((err) => {
         console.error('[storageMgr] articles SSE refresh failed', err);
       });
@@ -753,15 +743,6 @@ export class StorageManager extends ApiClient {
     }));
   }
 
-  async #loadCategoryTree() {
-    const data = await this.category.tree();
-    requireObject(data, 'GET /api/category/tree');
-    requireArray(data.tree, 'category/tree.tree');
-    requireArray(data.articles, 'category/tree.articles');
-    requireDefined(data.languageId, 'category/tree.languageId');
-    return data;
-  }
-
   async #loadDeliveries() {
     const data = await this.delivery.list();
     requireObject(data, 'GET /api/delivery');