Add establishment search results page

lib/app.js

@@ -11,7 +11,6 @@ const {
 } = pages;
 
 const dashboard = require('../pages/dashboard');
-const establishmentList = require('../pages/establishment-list');
 const search = require('../pages/search');
 
 const urls = require('./urls');
@@ -51,12 +50,6 @@ module.exports = settings => {
 
   app.use(urls.account.menu, user());
   app.use(urls.feedback, feedback(settings));
-  app.use(urls.establishment.list, establishmentList());
-
-  app.use(urls.establishment.list, (req, res, next) => {
-    req.breadcrumb('establishment.list');
-    next();
-  });
 
   app.use(urls.establishment.dashboard, (req, res, next) => {
     req.breadcrumb('establishment.dashboard');

lib/urls.js

@@ -6,7 +6,6 @@ module.exports = {
     edit: '/profile/edit'
   },
   establishment: {
-    list: '/establishments',
     dashboard: '/establishments/:establishmentId',
     read: '/establishments/:establishmentId/details'
   },

pages/components/search-panel/content.js

@@ -5,7 +5,7 @@ module.exports = {
     placeholder: 'Search by name',
     viewAll: 'View all establishments'
   },
-  people: {
+  profiles: {
     label: 'People',
     placeholder: 'Search by name or licence number',
     viewAll: 'View all people'

pages/components/search-panel/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Link, Search, Snippet } from '@asl/components';
+import { Search, Snippet } from '@asl/components';
 
 class SearchPanel extends Component {
   render() {
@@ -27,24 +27,9 @@ class SearchPanel extends Component {
 
           <div className="govuk-grid-column-one-third">
             <div className="view-all-link">
-              { searchType === 'establishments' &&
-                <Link
-                  page="establishment.list"
-                  label={<Snippet>searchPanel.establishments.viewAll</Snippet>}
-                />
-              }
-              { searchType === 'people' &&
-                <Link
-                  page="profile.list"
-                  label={<Snippet>searchPanel.people.viewAll</Snippet>}
-                />
-              }
-              { searchType === 'projects' &&
-                <Link
-                  page="project.list"
-                  label={<Snippet>searchPanel.projects.viewAll</Snippet>}
-                />
-              }
+              <a href={`/search/${searchType}`}>
+                <Snippet>{`searchPanel.${searchType}.viewAll`}</Snippet>
+              </a>
             </div>
           </div>
         </div>
@@ -54,11 +39,7 @@ class SearchPanel extends Component {
 }
 
 SearchPanel.defaultProps = {
-  searchableModels: [
-    'establishments',
-    'people',
-    'projects'
-  ]
+  searchableModels: ['establishments', 'profiles', 'projects']
 };
 
 export default SearchPanel;

pages/search/content/establishments.js

@@ -0,0 +1,8 @@
+module.exports = {
+  name: {
+    label: 'Name'
+  },
+  status: {
+    label: 'Status'
+  }
+};

pages/search/content/index.js

@@ -1,19 +1,18 @@
 const searchPanel = require('../../components/search-panel/content');
+const establishments = require('./establishments');
+const profiles = require('./profiles');
+const projects = require('./projects');
 
-module.exports = {
+const fields = {
+  establishments,
+  profiles,
+  projects
+};
+
+module.exports = (searchType) => ({
   breadcrumbs: {
     search: 'Search'
   },
   searchPanel,
-  fields: {
-    lastName: {
-      label: 'Name'
-    },
-    email: {
-      label: 'Email'
-    },
-    establishments: {
-      label: 'Establishments'
-    }
-  }
-};
+  fields: fields[searchType]
+});

pages/search/content/profiles.js

@@ -0,0 +1,11 @@
+module.exports = {
+  lastName: {
+    label: 'Name'
+  },
+  email: {
+    label: 'Email'
+  },
+  establishments: {
+    label: 'Establishments'
+  }
+};

pages/search/content/projects.js

@@ -0,0 +1,2 @@
+module.exports = {
+};

pages/search/index.js

@@ -1,9 +1,11 @@
+const { merge } = require('lodash');
 const { page } = require('@asl/service/ui');
 const datatable = require('@asl/pages/pages/common/routers/datatable');
 const schemas = require('./schema');
 const NotFoundError = require('../../lib/errors/not-found');
+const content = require('./content');
 
-const searchableModels = ['establishments', 'people', 'projects'];
+const searchableModels = ['establishments', 'profiles', 'projects'];
 
 module.exports = settings => {
   const app = page({
@@ -15,6 +17,7 @@ module.exports = settings => {
     req.breadcrumb('search');
     req.searchType = req.params.searchType || searchableModels[0];
 
+    merge(res.locals.static.content, content(req.searchType));
     res.locals.static.profile = req.user.profile;
     res.locals.static.searchType = req.searchType;
     res.locals.static.searchableModels = req.query.searchableModels;
@@ -24,27 +27,15 @@ module.exports = settings => {
   app.use('/', datatable({
     configure: (req, res, next) => {
       const searchType = req.searchType;
-      req.datatable.searchType = searchType;
-      req.datatable.schema = schemas[searchType];
-      req.datatable.disable = !req.query.filters;
 
       if (searchType && !searchableModels.includes(searchType)) {
         return next(new NotFoundError());
       }
 
-      switch (searchType) {
-        case 'people':
-          req.datatable.apiPath = `/search/profiles`;
-          break;
-
-        case 'projects':
-          req.datatable.apiPath = `/search/projects`;
-          break;
+      req.datatable.searchType = searchType;
+      req.datatable.schema = schemas[searchType];
+      req.datatable.apiPath = `/search/${searchType}`;
 
-        default:
-          req.datatable.apiPath = `/search/establishments`;
-          break;
-      }
       next();
     }
   })());

pages/search/schema/establishments.js

@@ -1 +1,11 @@
-module.exports = {};
+module.exports = {
+  id: {
+    filter: false
+  },
+  name: {
+    show: true
+  },
+  status: {
+    show: true
+  }
+};

pages/search/schema/index.js

@@ -1,5 +1,5 @@
 module.exports = {
   establishments: require('./establishments'),
-  people: require('./people'),
+  profiles: require('./profiles'),
   projects: require('./projects')
 };

pages/search/views/index.jsx

@@ -1,15 +1,23 @@
 import React, { Fragment } from 'react';
 import { connect } from 'react-redux';
-import { Datatable, FilterSummary, Header, Snippet } from '@asl/components';
+import { Datatable, FilterSummary, Header, Link, Snippet } from '@asl/components';
 import SearchPanel from '../../components/search-panel';
 
 const formatters = {
-  lastName: {
-    format: (lastName, profile) => `${profile.firstName} ${lastName}`
-  },
   establishments: {
-    format: establishments => establishments.map(establishment => establishment.name).join(', ')
-  }
+    name: {
+      format: (name, establishment) => <Link page="establishment.read" establishmentId={establishment.id} label={name} />
+    }
+  },
+  profiles: {
+    lastName: {
+      format: (lastName, profile) => `${profile.firstName} ${lastName}`
+    },
+    establishments: {
+      format: establishments => establishments.map(establishment => establishment.name).join(', ')
+    }
+  },
+  projects: {}
 };
 
 const Index = ({ profile, searchType, searchableModels, filters }) => {
@@ -20,14 +28,8 @@ const Index = ({ profile, searchType, searchableModels, filters }) => {
       <div className="govuk-grid-row">
         <div className="govuk-grid-column-full">
           <SearchPanel searchType={searchType} searchableModels={searchableModels} />
-
-          { filters.active['*'] &&
-            <Fragment>
-              <FilterSummary />
-              <Datatable formatters={formatters} />
-            </Fragment>
-          }
-
+          <FilterSummary />
+          <Datatable formatters={formatters[searchType]} />
         </div>
       </div>