Merge branch 'issue_226' into 'master'

it fixes #226

Closes #226

See merge request !478

package-lock.json

@@ -3626,6 +3626,15 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bl": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
@@ -7413,6 +7422,12 @@
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz",
       "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "optional": true
+    },
     "filesize": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz",
@@ -9303,7 +9318,11 @@
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         }
       }
     },
@@ -9608,6 +9627,11 @@
         }
       }
     },
+    "js-cookie": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
+      "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
+    },
     "js-sha256": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
@@ -10527,6 +10551,12 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "optional": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -12950,6 +12980,15 @@
         "react-dom": "^16.4.0"
       }
     },
+    "react-cookie-consent": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-cookie-consent/-/react-cookie-consent-6.1.0.tgz",
+      "integrity": "sha512-IQDT6DGESjv7E5v4iCeGSh3NvZP2BhSdg8R9FNuQzWkEuFPXSoQlCTuOxSzbLsH3lzgIgGly415tN9iHFD+lGQ==",
+      "requires": {
+        "js-cookie": "^2.2.1",
+        "prop-types": "^15.7.2"
+      }
+    },
     "react-datetime": {
       "version": "2.16.3",
       "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-2.16.3.tgz",
@@ -16511,7 +16550,11 @@
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -16805,7 +16848,11 @@
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "3.1.0",

package.json

@@ -41,6 +41,7 @@
     "react-color": "^2.14.1",
     "react-combo-search": "^1.1.4",
     "react-combo-select": "^1.3.22",
+    "react-cookie-consent": "^6.1.0",
     "react-datetime": "^2.16.3",
     "react-day-picker": "^7.4.8",
     "react-dom": "^16.8.6",

src/App.js

@@ -31,6 +31,7 @@ import Menu from './components/Menu/Menu';
 import { useQuery } from './helpers/hooks';
 import PageNotFound from './containers/PageNotFound';
 import LoadingBoundary from './components/LoadingBoundary';
+import CookieConsent from 'react-cookie-consent';
 
 function App() {
   const user = useSelector((state) => state.user);
@@ -78,6 +79,10 @@ function App() {
             <LoginPage />
           </div>
           <Footer />
+          <CookieConsent>
+            The ESRF Data portal uses cookies. These cookies are used to enhance
+            the user experience and allow us to remember you.
+          </CookieConsent>
         </Route>
         <Route>
           <Redirect to={{ pathname: '/login', state: { from: location } }} />

src/components/Investigation/InvestigationTable.js

@@ -232,6 +232,14 @@ function InvestigationTable(props) {
       </div>
       <ResponsiveTable
         data={investigations.filter(isInvestigationMatching)}
+        pageOptions={{
+          showTotal: true,
+          sizePerPageList: [
+            { text: '25', value: 25 },
+            { text: '50', value: 50 },
+            { text: '100', value: 100 },
+          ],
+        }}
         columns={getColumns({
           showProposalLinks: withProposalLinks || isAdministrator,
           showInvestigationStats: withInvestigationStats || isAdministrator,

src/components/Parcels/ParcelTable.js

@@ -185,6 +185,7 @@ function ParcelTable(props) {
             rowEvents={{ onClick: (_, parcel) => handleView(parcel) }}
             rowClasses={styles.clickable}
             pageOptions={{
+              showTotal: true,
               sizePerPageList: [
                 { text: '25', value: 25 },
                 { text: '50', value: 50 },

src/components/Table/ResponsiveTable.js

@@ -91,6 +91,7 @@ class ResponsiveTable extends React.Component {
               striped
               hover
               condensed
+              showTotal
               defaultSorted={this.props.defaultSorted}
               selectRow={this.props.selectRow}
               expandRow={this.props.expandRow}