@fluid-topics/ft-app-context 1.3.39 → 1.3.41

package/build/redux-stores/FtUserAssetsStore.d.ts

@@ -1,4 +1,4 @@
-import { FtBookmark, FtMySearch, FtUserAssetCount, FtUserAssetLabel, FtUserAssetType } from "@fluid-topics/public-api";
+import { FtBookmark, FtCollection, FtMySearch, FtUserAssetCount, FtUserAssetLabel, FtUserAssetType } from "@fluid-topics/public-api";
 import { FtReduxStore, Optional } from "@fluid-topics/ft-wc-utils";
 import { UserAssetsCountService } from "../services/user-assets/UserAssetCountService";
 import { UserAssetLabelsService } from "../services/user-assets/UserAssetLabelsService";
@@ -15,6 +15,7 @@ export interface FtUserAssetsState {
     assetCounts: AssetCounts;
     assetLabels: Array<FtUserAssetLabel>;
 }
+type FtUserAsset = FtBookmark | FtMySearch | FtCollection;
 declare const reducers: {
     setAssetCount: (state: FtUserAssetsState, action: {
         payload: {
@@ -34,11 +35,18 @@ declare const reducers: {
     addAsset: (state: FtUserAssetsState, action: {
         payload: {
             assetType: FtUserAssetType;
-            asset: FtBookmark | FtMySearch;
+            asset: FtUserAsset;
             mapId?: string | undefined;
         };
         type: string;
     }) => void;
+    editAsset: (state: FtUserAssetsState, action: {
+        payload: {
+            assetType: FtUserAssetType;
+            asset: FtUserAsset;
+        };
+        type: string;
+    }) => void;
     removeAsset: (state: FtUserAssetsState, action: {
         payload: {
             assetType: FtUserAssetType;

package/build/redux-stores/FtUserAssetsStore.js

@@ -25,58 +25,60 @@ const reducers = {
     },
     addAsset: (state, action) => {
         const { assetType, mapId, asset } = action.payload;
-        switch (assetType) {
-            case FtUserAssetType.BOOKMARKS:
-                if (state.bookmarks) {
-                    state.bookmarks.push(asset);
-                }
-                else {
-                    state.bookmarks = [asset];
-                }
-                break;
-            case FtUserAssetType.SEARCHES:
-                if (state.savedSearches) {
-                    state.savedSearches.push(asset);
-                }
-                else {
-                    state.savedSearches = [asset];
-                }
-                break;
-        }
-        const currentCount = state.assetCounts.allAsset[assetType];
-        if (currentCount !== undefined) {
-            state.assetCounts.allAsset[assetType] = currentCount + 1;
-        }
-        if (assetType === FtUserAssetType.BOOKMARKS && mapId !== undefined) {
-            const currentMapCount = state.assetCounts.bookmarkByMap[mapId];
-            if (currentMapCount !== undefined) {
-                state.assetCounts.bookmarkByMap[mapId] = currentMapCount + 1;
-            }
-        }
+        updateAssetsByType(state, assetType, [...getAssetsByType(state, assetType), asset]);
+        updateAssetCount(state, assetType, +1, mapId);
+        updateAssetLabels(state, asset);
+    },
+    editAsset: (state, action) => {
+        const { assetType, asset } = action.payload;
+        updateAssetsByType(state, assetType, getAssetsByType(state, assetType).map((a) => a.id === asset.id ? asset : a));
+        updateAssetLabels(state, asset);
     },
     removeAsset: (state, action) => {
-        var _a, _b;
         const { assetType, mapId, assetId } = action.payload;
-        switch (assetType) {
-            case FtUserAssetType.BOOKMARKS:
-                state.bookmarks = (_a = state.bookmarks) === null || _a === void 0 ? void 0 : _a.filter((b) => b.id !== assetId);
-                break;
-            case FtUserAssetType.SEARCHES:
-                state.savedSearches = (_b = state.savedSearches) === null || _b === void 0 ? void 0 : _b.filter((s) => s.id !== assetId);
-                break;
-        }
-        const currentCount = state.assetCounts.allAsset[assetType];
-        if (currentCount !== undefined && currentCount > 0) {
-            state.assetCounts.allAsset[assetType] = currentCount - 1;
-        }
-        if (assetType === FtUserAssetType.BOOKMARKS && mapId !== undefined) {
-            const currentMapCount = state.assetCounts.bookmarkByMap[mapId];
-            if (currentMapCount !== undefined && currentMapCount > 0) {
-                state.assetCounts.bookmarkByMap[mapId] = currentMapCount - 1;
-            }
-        }
+        updateAssetsByType(state, assetType, getAssetsByType(state, assetType).filter((a) => a.id !== assetId));
+        updateAssetCount(state, assetType, -1, mapId);
     },
 };
+const assetTypeToStateKey = {
+    // Refactor Optional<UserAssetsKey> to UserAssetsKey as soon as all asset arrays are present in store
+    [FtUserAssetType.SEARCHES]: "savedSearches",
+    [FtUserAssetType.BOOKMARKS]: "bookmarks",
+    [FtUserAssetType.BOOKS]: undefined,
+    [FtUserAssetType.COLLECTIONS]: undefined,
+};
+const getAssetsByType = (state, assetType) => {
+    var _a;
+    const stateKey = assetTypeToStateKey[assetType];
+    return stateKey
+        ? (_a = state[stateKey]) !== null && _a !== void 0 ? _a : []
+        : [];
+};
+const updateAssetsByType = (state, assetType, assets) => {
+    const stateKey = assetTypeToStateKey[assetType];
+    if (stateKey) {
+        state[stateKey] = assets;
+    }
+};
+const updateAssetCount = (state, assetType, delta, mapId) => {
+    const currentCount = state.assetCounts.allAsset[assetType];
+    if (currentCount === undefined) {
+        return;
+    }
+    // We use the Math.max to ensure we don’t go under 0 whether we increment or decrement
+    state.assetCounts.allAsset[assetType] = Math.max(0, currentCount + delta);
+    if (assetType === FtUserAssetType.BOOKMARKS && mapId) {
+        const currentMapCount = state.assetCounts.bookmarkByMap[mapId];
+        state.assetCounts.bookmarkByMap[mapId] = Math.max(0, currentMapCount + delta);
+    }
+};
+const updateAssetLabels = (state, asset) => {
+    const existingLabels = state.assetLabels.map((l) => l.title);
+    const newLabels = asset.labels
+        .filter((l) => !existingLabels.includes(l))
+        .map((l) => ({ title: l }));
+    state.assetLabels.push(...newLabels);
+};
 export const ftUserAssetsStore = FtReduxStore.get({
     name: FtUserAssetsStoreName,
     reducers: reducers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-app-context",
-  "version": "1.3.39",
+  "version": "1.3.41",
   "description": "Global application context for Fluid Topics integrations",
   "keywords": [
     "Lit"
@@ -19,11 +19,11 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-wc-utils": "1.3.39",
+    "@fluid-topics/ft-wc-utils": "1.3.41",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.107"
+    "@fluid-topics/public-api": "1.0.108"
   },
-  "gitHead": "a8e8e4b1852a7e32bc2c197ee75925b2b8a64306"
+  "gitHead": "befd5a39e849a1ef18dc1cf85da953e419ce520f"
 }