@equinor/fusion-framework-module-bookmark 1.0.2 → 1.0.4-next.0

package/dist/types/client/bookmarkActions.d.ts

@@ -8,6 +8,12 @@ export declare const actions: {
     delete: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[id: string], string, "delete::request", never, never> & {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[id: string], string, "delete::success", never, never>;
     };
+    addFavorite: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[bookmark: Bookmark<unknown>], Bookmark<unknown>, "addFavorite::request", never, never> & {
+        success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[bookmark: Bookmark<unknown>], Bookmark<unknown>, "addFavorite::success", never, never>;
+    };
+    removeFavorite: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[id: string], string, "removeFavorite::request", never, never> & {
+        success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[id: string], string, "removeFavorite::success", never, never>;
+    };
     update: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[bookmark: PatchBookmark<unknown>], PatchBookmark<unknown>, "update::request", never, never> & {
         success: import("@equinor/fusion-observable").ActionCreatorWithPreparedPayload<[bookmark: Bookmark<unknown>], Bookmark<unknown>, "update::success", never, never>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/fusion-framework-module-bookmark",
-    "version": "1.0.2",
+    "version": "1.0.4-next.0",
     "description": "",
     "main": "./dist/esm/index.js",
     "exports": {
@@ -37,12 +37,12 @@
     "devDependencies": {
         "@equinor/fusion-framework-module": "^3.0.0",
         "@equinor/fusion-framework-module-event": "^3.0.0",
-        "@equinor/fusion-framework-module-services": "^3.0.2",
+        "@equinor/fusion-framework-module-services": "^3.1.0-next.0",
         "rxjs": "^7.5.7"
     },
     "peerDependencies": {
         "@equinor/fusion-framework-module": ">=1.2.5",
         "rxjs": "^7.5.7"
     },
-    "gitHead": "994188bbc727bc10a924eeb4d8178763a4c27ac7"
+    "gitHead": "3a5344ee1e18a35158681004cb154b2522e659ed"
 }

package/src/bookmark-provider.ts

@@ -229,7 +229,11 @@ export class BookmarkModuleProvider implements IBookmarkModuleProvider {
         }
 
         if (options?.updatePayload) {
-            bookmark.payload = (await this.#createPayload()) as T;
+            const payload = (await this.#createPayload()) as T;
+            bookmark = {
+                ...bookmark,
+                payload,
+            };
         }
         return this._bookmarkClient.updateBookmarkAsync<T>(bookmark);
     }

package/src/client/bookmarkActions.ts

@@ -14,6 +14,16 @@ export const actions = {
         (id: string) => ({ payload: id }),
         (id: string) => ({ payload: id })
     ),
+    addFavorite: createAsyncAction(
+        'addFavorite',
+        (bookmark: Bookmark) => ({ payload: bookmark }),
+        (bookmark: Bookmark) => ({ payload: bookmark })
+    ),
+    removeFavorite: createAsyncAction(
+        'removeFavorite',
+        (id: string) => ({ payload: id }),
+        (id: string) => ({ payload: id })
+    ),
     update: createAsyncAction(
         'update',
         (bookmark: PatchBookmark) => ({ payload: bookmark }),

package/src/client/bookmarkClient.ts

@@ -155,6 +155,11 @@ export class BookmarkClient {
                 this.#state.subject.addEffect('getAll::success', (action) => {
                     subscriber.next(action.payload);
                     subscriber.complete();
+
+                    this.#event?.dispatchEvent('onBookmarksChanged', {
+                        detail: action.payload,
+                        source: this,
+                    });
                 })
             );
         });
@@ -228,11 +233,17 @@ export class BookmarkClient {
     }
 
     public async addBookmarkFavoriteAsync(bookmarkId: string): Promise<void> {
-        this.#bookmarkAPiClient.addFavorite('v1', { bookmarkId });
+        const response = await this.#bookmarkAPiClient.addFavorite('v1', { bookmarkId });
+        if (response.ok && this.#currentBookmark$.value) {
+            this.#state.dispatch.addFavorite(this.#currentBookmark$.value);
+        }
     }
 
     public async removeBookmarkFavoriteAsync(bookmarkId: string): Promise<void> {
-        this.#bookmarkAPiClient.removeFavorite('v1', { bookmarkId });
+        const response = await this.#bookmarkAPiClient.removeFavorite('v1', { bookmarkId });
+        if (response.ok) {
+            this.#state.dispatch.removeFavorite(bookmarkId);
+        }
     }
 
     public async verifyBookmarkFavoriteAsync(bookmarkId: string): Promise<boolean> {
@@ -247,6 +258,7 @@ export class BookmarkClient {
 
     #addStateEffects() {
         this.#state.subject.addEffect('create::success', (action) => {
+            this.#queryAllBookmarks.cache.invalidate('all-bookmarks');
             this.#currentBookmark$.next(action.payload);
             this.#event?.dispatchEvent('onBookmarkCreated', {
                 detail: action.payload,
@@ -255,6 +267,8 @@ export class BookmarkClient {
             });
         });
         this.#state.subject.addEffect('delete::success', (action) => {
+            console.log('here');
+            this.#queryAllBookmarks.cache.invalidate('all-bookmarks');
             this.#event?.dispatchEvent('onBookmarkDeleted', {
                 detail: action.payload,
                 canBubble: true,
@@ -262,12 +276,20 @@ export class BookmarkClient {
             });
         });
         this.#state.subject.addEffect('update::success', (action) => {
+            this.#queryAllBookmarks.cache.invalidate('all-bookmarks');
             this.#event?.dispatchEvent('onBookmarkUpdated', {
                 detail: action.payload,
                 canBubble: true,
                 source: this,
             });
         });
+        this.#state.subject.addEffect('addFavorite::request', () => {
+            this.#queryAllBookmarks.cache.invalidate('all-bookmarks');
+        });
+
+        this.#state.subject.addEffect('removeFavorite::request', () => {
+            this.#queryAllBookmarks.cache.invalidate('all-bookmarks');
+        });
     }
 
     #addSubjectFlows() {

package/src/client/bookmarkFlows.ts

@@ -3,7 +3,7 @@ import { BookmarksApiClient } from '@equinor/fusion-framework-module-services/bo
 import { Observable } from '@equinor/fusion-observable';
 import { filterAction } from '@equinor/fusion-observable/operators';
 import { Query } from '@equinor/fusion-query';
-import { switchMap, map, catchError, EMPTY } from 'rxjs';
+import { switchMap, map, catchError, EMPTY, last } from 'rxjs';
 import { GetAllBookmarksParameters, Bookmark } from '../types';
 import { actions, Actions } from './bookmarkActions';
 
@@ -17,6 +17,7 @@ export const handleBookmarkGetAll =
             filterAction(actions.getAll.type),
             switchMap((action) => {
                 return queryAllBookmarks.query({ isValid: action.payload }).pipe(
+                    last(),
                     map((bookmarks) =>
                         actions.getAll.success(
                             bookmarks.value.filter(

package/src/client/bookmarkReducer.ts

@@ -23,6 +23,12 @@ export const reducer = createReducer<State>(initialState, (builder) => {
         .addCase(actions.delete.success, (state, { payload }) => {
             delete state.bookmarks[payload];
         })
+        .addCase(actions.removeFavorite, (state, { payload }) => {
+            delete state.bookmarks[payload];
+        })
+        .addCase(actions.addFavorite, (state, { payload }) => {
+            state.bookmarks[payload.id] = payload;
+        })
         .addCase(actions.update.success, (state, { payload }) => {
             state.bookmarks[payload.id] = payload;
         });