Merge pull request #559 from SUSE/fix-refresh-maxed-list

Fix application of `maxed` lists following page refresh

Author: richard-cox

.travis.yml

@@ -38,7 +38,8 @@ jobs:
     - name: Backend Lint
       before_script:
         - "./deploy/ci/travis/install-go.sh"
-        - go get -u golang.org/x/lint/golint
+        - export GO111MODULE=on
+        - go get golang.org/x/lint/golint@v0.0.0-20190909230951-414d861bb4ac
       script:
         - golint src/jetstream/...
         - ./deploy/ci/travis/update-go-report-card.sh

src/frontend/packages/core/src/shared/components/list/list.component.ts

@@ -22,6 +22,7 @@ import { Store } from '@ngrx/store';
 import {
   asapScheduler,
   BehaviorSubject,
+  combineLatest,
   combineLatest as observableCombineLatest,
   isObservable,
   Observable,
@@ -39,6 +40,7 @@ import {
   refCount,
   startWith,
   subscribeOn,
+  switchMap,
   takeWhile,
   tap,
   withLatestFrom,
@@ -468,7 +470,13 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     // - Pass any multi filter changes made by the user to the pagination controller and thus the store
     // - If the first multi filter has one value it's not shown, ensure it's automatically selected to ensure other filters are correct
     this.multiFilterWidgetObservables = new Array<Subscription>();
-    this.paginationController.filter$.pipe(
+
+    combineLatest(this.multiFilterManagers.map(mfm => {
+      // Use this instead of filterIsReady$ to ensure the drop downs report as ready even when there's nothing to select
+      return mfm.filterIsInitialised$;
+    })).pipe(
+      filter(firs => firs.every(ready => ready)),
+      switchMap(() => this.paginationController.filter$),
       first(),
       tap(() => {
         Object.values(this.multiFilterManagers).forEach((filterManager: MultiFilterManager<T>, index: number) => {

src/frontend/packages/core/src/shared/components/list/list.component.types.ts

@@ -203,8 +203,18 @@ export interface IGlobalListAction<T> extends IOptionalAction<T> {
   action: () => void;
 }
 
+/**
+ * Class to support a single multi filter entry/drop down
+ */
 export class MultiFilterManager<T> {
+  /**
+   * Supporting dependencies ready and there are items available to select
+   */
   public filterIsReady$: Observable<boolean>;
+  /**
+   * Supporting dependencies ready and the items to select have been fetched (but may be zero)
+   */
+  public filterIsInitialised$: Observable<boolean>;
   public filterItems$: Observable<IListMultiFilterConfigItem[]>;
   public hasItems$: Observable<boolean>;
   public hasOneOrLessItems$: Observable<boolean>;
@@ -225,6 +235,7 @@ export class MultiFilterManager<T> {
     this.hasOneOrLessItems$ = this.filterItems$.pipe(map(items => items.length <= 1));
     this.hasItems$ = this.filterItems$.pipe(map(items => !!items.length));
     this.filterIsReady$ = this.getReadyObservable(multiFilterConfig, dataSource, this.hasItems$);
+    this.filterIsInitialised$ = this.getInitialisedObservable(multiFilterConfig, dataSource, this.filterItems$);
 
     // Also select the first option if configured
     if (multiFilterConfig.autoSelectFirst) {
@@ -251,6 +262,21 @@ export class MultiFilterManager<T> {
     );
   }
 
+  private getInitialisedObservable(
+    multiFilterConfig: IListMultiFilterConfig,
+    dataSource: IListDataSource<T>,
+    filterItems$: Observable<IListMultiFilterConfigItem[]>
+  ) {
+    return combineLatest(
+      dataSource.isLoadingPage$,
+      multiFilterConfig.loading$,
+      filterItems$,
+    ).pipe(
+      map(([fetchingListPage, fetchingFilter, filterItems]) => (!fetchingListPage && !fetchingFilter) && !!filterItems),
+      startWith(false)
+    );
+  }
+
   private getItemObservable(multiFilterConfig: IListMultiFilterConfig) {
     return multiFilterConfig.list$.pipe(
       map(list => list ? list : [])

src/frontend/packages/store/src/helpers/local-storage-service.ts

@@ -173,7 +173,9 @@ export class LocalStorageService {
               params: paginationSection.params,
               clientPagination: paginationSection.clientPagination,
               isListPagination: paginationSection.isListPagination, // We do not persist any that are false
-              forcedLocalPage: paginationSection.forcedLocalPage // Value of the multi-entity filter
+              forcedLocalPage: paginationSection.forcedLocalPage, // Value of the multi-entity filter
+              // Persist this state, so the console knows to set q params on filter change (means user is stuck in max'd view)
+              maxedState: paginationSection.maxedState
             };
             return res2;
           }, {});