fix(fe-bookmarks-delete): when delete from bookmarks search results f…

…orce page reload Not optimal but not that of an usual use case...
CodeverDotDev · Jul 7, 2021 · eb44c04 · eb44c04
1 parent 3cfa53b
commit eb44c04
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/frontend/src/app/search-results/search-results.component.html b/frontend/src/app/search-results/search-results.component.html
@@ -34,6 +34,7 @@
                                  [bookmarks$]="searchResults$"
                                  [queryText]="searchText"
                                  [userData$]="userData$"
+                                 [isSearchResultsPage]="true"
                                  [showFilterBox]="false">
         </app-async-bookmark-list>
       </div>
@@ -71,6 +72,7 @@
                                  [bookmarks$]="searchResults$"
                                  [queryText]="searchText"
                                  [userData$]="userData$"
+                                 [isSearchResultsPage]="true"
                                  [showFilterBox]="false">
         </app-async-bookmark-list>
       </ng-template>

diff --git a/frontend/src/app/shared/async-bookmark-list/async-bookmark-list.component.html b/frontend/src/app/shared/async-bookmark-list/async-bookmark-list.component.html
@@ -10,6 +10,7 @@
       [userData$]="userData$"
       [queryText]="queryText"
       [filterText]="filterText"
+      [isSearchResultsPage]="isSearchResultsPage"
     >
     </app-bookmark-list-element>
   </div>

diff --git a/frontend/src/app/shared/async-bookmark-list/async-bookmark-list.component.ts b/frontend/src/app/shared/async-bookmark-list/async-bookmark-list.component.ts
@@ -34,6 +34,9 @@ export class AsyncBookmarkListComponent extends TagFollowingBaseComponent implem
   @Input()
   showPagination = true;
 
+  @Input()
+  isSearchResultsPage = false;
+
   @Output()
   bookmarkDeleted = new EventEmitter<boolean>();
 

diff --git a/frontend/src/app/shared/bookmark-list-element/bookmark-list-element.component.ts b/frontend/src/app/shared/bookmark-list-element/bookmark-list-element.component.ts
@@ -51,6 +51,9 @@ export class BookmarkListElementComponent extends TagFollowingBaseComponent impl
   @Input()
   isDetailsPage = false;
 
+  @Input()
+  isSearchResultsPage = false;
+
   @Input()
   filterText = '';
 
@@ -77,7 +80,7 @@ export class BookmarkListElementComponent extends TagFollowingBaseComponent impl
     super(loginDialog, userDataWatchedTagsStore);
 
     // START force reload on same root - solution taken from https://github.com/angular/angular/issues/13831
-    this.router.routeReuseStrategy.shouldReuseRoute = function(){
+    this.router.routeReuseStrategy.shouldReuseRoute = function () {
       return false;
     }
 
@@ -198,16 +201,23 @@ export class BookmarkListElementComponent extends TagFollowingBaseComponent impl
         this.bookmarkDeleted.emit(true);
         this.publicBookmarksStore.removeBookmarkFromPublicStore(bookmark);
         this.feedStore.removeFromFeedBookmarks(bookmark);
+        if (this.isSearchResultsPage) {
+          location.reload();
+        }
       });
     } else {
       this.personalBookmarksService.deleteBookmark(bookmark).subscribe(() => {
-        this.bookmarkDeleted.emit(true);
-        this.publicBookmarksStore.removeBookmarkFromPublicStore(bookmark);
-        this.userDataStore.removeFromStoresAtDeletion(bookmark);
-        this.myBookmarksStore.removeFromStoresAtDeletion(bookmark);
-        this.feedStore.removeFromFeedBookmarks(bookmark);
-        if (this.isDetailsPage) {
-          this.navigateToHomePage();
+        if (this.isSearchResultsPage) {
+          location.reload();
+        } else {
+          this.bookmarkDeleted.emit(true);
+          this.publicBookmarksStore.removeBookmarkFromPublicStore(bookmark);
+          this.userDataStore.removeFromStoresAtDeletion(bookmark);
+          this.myBookmarksStore.removeFromStoresAtDeletion(bookmark);
+          this.feedStore.removeFromFeedBookmarks(bookmark);
+          if (this.isDetailsPage) {
+            this.navigateToHomePage();
+          }
         }
       });
     }