From 099b4ecc560dfd53a6b0ac48806e0143f4b760d1 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Mon, 7 Jun 2021 15:09:06 +1000
Subject: [PATCH] Fix marker display mode (#1487)

---
 ui/v2.5/src/hooks/ListHook.tsx           | 14 ++++++++++++--
 ui/v2.5/src/models/list-filter/filter.ts |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index 18141336c..03e74ce16 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -451,8 +451,13 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
   const persistanceKey = options.persistanceKey ?? options.filterMode;
 
   const defaultSort = options.defaultSort ?? filterOptions.defaultSortBy;
+  const defaultDisplayMode = filterOptions.displayModeOptions[0];
   const [filter, setFilter] = useState<ListFilterModel>(
-    new ListFilterModel(queryString.parse(location.search), defaultSort)
+    new ListFilterModel(
+      queryString.parse(location.search),
+      defaultSort,
+      defaultDisplayMode
+    )
   );
 
   const updateInterfaceConfig = useCallback(
@@ -513,7 +518,11 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
         }
       : activeFilter;
 
-    const newFilter = new ListFilterModel(query, defaultSort);
+    const newFilter = new ListFilterModel(
+      query,
+      defaultSort,
+      defaultDisplayMode
+    );
 
     // Compare constructed filter with current filter.
     // If different it's the result of navigation, and we update the filter.
@@ -530,6 +539,7 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
     }
   }, [
     defaultSort,
+    defaultDisplayMode,
     filter,
     interfaceState.data,
     interfaceState.loading,
diff --git a/ui/v2.5/src/models/list-filter/filter.ts b/ui/v2.5/src/models/list-filter/filter.ts
index f1f9fb56d..a90c1c973 100644
--- a/ui/v2.5/src/models/list-filter/filter.ts
+++ b/ui/v2.5/src/models/list-filter/filter.ts
@@ -32,9 +32,14 @@ export class ListFilterModel {
   public criteria: Array<Criterion<CriterionValue>> = [];
   public randomSeed = -1;
 
-  public constructor(rawParms?: ParsedQuery<string>, defaultSort?: string) {
+  public constructor(
+    rawParms?: ParsedQuery<string>,
+    defaultSort?: string,
+    defaultDisplayMode?: DisplayMode
+  ) {
     const params = rawParms as IQueryParameters;
     this.sortBy = defaultSort;
+    if (defaultDisplayMode !== undefined) this.displayMode = defaultDisplayMode;
     if (params) this.configureFromQueryParameters(params);
   }