From f4c4a542cd736232a23c03d62a5e284be6e34aa6 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Wed, 12 Jun 2019 18:11:58 +0300
Subject: [PATCH] Apply source filter last

---
 src/client/reducers/manuscriptsFacets.js | 35 ++++++++++++------------
 src/client/reducers/peopleFacets.js      | 34 +++++++++++------------
 src/client/reducers/placesFacets.js      | 34 +++++++++++------------
 src/client/reducers/worksFacets.js       | 32 +++++++++++-----------
 4 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/src/client/reducers/manuscriptsFacets.js b/src/client/reducers/manuscriptsFacets.js
index 31a017c3..c5caa19f 100644
--- a/src/client/reducers/manuscriptsFacets.js
+++ b/src/client/reducers/manuscriptsFacets.js
@@ -33,23 +33,7 @@ export const INITIAL_STATE = {
       filterType: 'textFilter',
       textFilter: null,
     },
-    source: {
-      id: 'source',
-      label: 'Source',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: false,
-      spatialFilterButton: false,
-      isFetching: false,
-      searchField: false,
-      containerClass: 'three',
-      filterType: 'uriFilter',
-      uriFilter: null
-    },
+
     productionPlace: {
       id: 'productionPlace',
       label: 'Production place',
@@ -154,6 +138,23 @@ export const INITIAL_STATE = {
       filterType: 'uriFilter',
       uriFilter: null
     },
+    source: {
+      id: 'source',
+      label: 'Source',
+      // predicate: defined in backend
+      distinctValueCount: 0,
+      values: [],
+      flatValues: [],
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: false,
+      spatialFilterButton: false,
+      isFetching: false,
+      searchField: false,
+      containerClass: 'three',
+      filterType: 'uriFilter',
+      uriFilter: null
+    },
   }
 };
 
diff --git a/src/client/reducers/peopleFacets.js b/src/client/reducers/peopleFacets.js
index 78e1a792..a7700644 100644
--- a/src/client/reducers/peopleFacets.js
+++ b/src/client/reducers/peopleFacets.js
@@ -33,23 +33,6 @@ export const INITIAL_STATE = {
       filterType: 'textFilter',
       textFilter: null,
     },
-    source: {
-      id: 'source',
-      label: 'Source',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: false,
-      spatialFilterButton: false,
-      isFetching: false,
-      searchField: false,
-      containerClass: 'five',
-      filterType: 'uriFilter',
-      uriFilter: null
-    },
     birthPlace: {
       id: 'birthPlace',
       label: 'Place of birth',
@@ -84,6 +67,23 @@ export const INITIAL_STATE = {
       filterType: 'uriFilter',
       uriFilter: null
     },
+    source: {
+      id: 'source',
+      label: 'Source',
+      // predicate: defined in backend
+      distinctValueCount: 0,
+      values: [],
+      flatValues: [],
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: false,
+      spatialFilterButton: false,
+      isFetching: false,
+      searchField: false,
+      containerClass: 'five',
+      filterType: 'uriFilter',
+      uriFilter: null
+    },
   }
 };
 
diff --git a/src/client/reducers/placesFacets.js b/src/client/reducers/placesFacets.js
index dd0f3f3f..d45ec24d 100644
--- a/src/client/reducers/placesFacets.js
+++ b/src/client/reducers/placesFacets.js
@@ -33,23 +33,6 @@ export const INITIAL_STATE = {
       filterType: 'textFilter',
       textFilter: null,
     },
-    source: {
-      id: 'source',
-      label: 'Source',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: false,
-      spatialFilterButton: false,
-      isFetching: false,
-      searchField: false,
-      containerClass: 'five',
-      filterType: 'uriFilter',
-      uriFilter: null
-    },
     area: {
       id: 'area',
       label: 'Area',
@@ -68,6 +51,23 @@ export const INITIAL_STATE = {
       uriFilter: null,
       spatialFilter: null
     },
+    source: {
+      id: 'source',
+      label: 'Source',
+      // predicate: defined in backend
+      distinctValueCount: 0,
+      values: [],
+      flatValues: [],
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: false,
+      spatialFilterButton: false,
+      isFetching: false,
+      searchField: false,
+      containerClass: 'five',
+      filterType: 'uriFilter',
+      uriFilter: null
+    },
   }
 };
 
diff --git a/src/client/reducers/worksFacets.js b/src/client/reducers/worksFacets.js
index 0c724655..f196fded 100644
--- a/src/client/reducers/worksFacets.js
+++ b/src/client/reducers/worksFacets.js
@@ -33,37 +33,37 @@ export const INITIAL_STATE = {
       filterType: 'textFilter',
       textFilter: null,
     },
-    source: {
-      id: 'source',
-      label: 'Source',
+    author: {
+      id: 'author',
+      label: 'Possible author',
       // predicate: defined in backend
       distinctValueCount: 0,
       values: [],
       flatValues: [],
-      sortBy: 'instanceCount',
-      sortDirection: 'desc',
-      sortButton: false,
+      sortBy: 'prefLabel',
+      sortDirection: 'asc',
+      sortButton: true,
       spatialFilterButton: false,
       isFetching: false,
-      searchField: false,
-      containerClass: 'five',
+      searchField: true,
+      containerClass: 'ten',
       filterType: 'uriFilter',
       uriFilter: null
     },
-    author: {
-      id: 'author',
-      label: 'Possible author',
+    source: {
+      id: 'source',
+      label: 'Source',
       // predicate: defined in backend
       distinctValueCount: 0,
       values: [],
       flatValues: [],
-      sortBy: 'prefLabel',
-      sortDirection: 'asc',
-      sortButton: true,
+      sortBy: 'instanceCount',
+      sortDirection: 'desc',
+      sortButton: false,
       spatialFilterButton: false,
       isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
+      searchField: false,
+      containerClass: 'five',
       filterType: 'uriFilter',
       uriFilter: null
     },
-- 
GitLab