Revert "Merge branch 'master' into LIBSEARCH-901-priority-figure-out-…

…what-is-going-on-with-authentication-and-get-this"

This reverts commit 3811567, reversing
changes made to ca90abf.

src/modules/affiliation/reducer/index.js

@@ -14,12 +14,12 @@ const affiliationReducer = (state = initialState, action) => {
     case actions.SET_DEFAULT_AFFILIATION:
       return {
         ...state,
-        defaultAffiliation: action.payload || initialAffiliationState.defaultAffiliation
+        defaultAffiliation: action.payload
       };
     case actions.SET_ACTIVE_AFFILIATION:
       return {
         ...state,
-        active: action.payload || initialAffiliationState.active
+        active: action.payload
       };
     default:
       return state;

src/modules/datastores/index.js

@@ -2,7 +2,6 @@ import DatastoreNavigation from './components/DatastoreNavigation';
 import Landing from './components/Landing';
 import DatastoreInfo from './components/DatastoreInfo';
 import DatastoreAlerts from './components/DatastoreAlerts';
-import FlintAlerts from './components/FlintAlerts';
 import datastoresReducer from './reducer/';
 
 import { addDatastore, changeActiveDatastore } from './actions';
@@ -14,6 +13,5 @@ export {
   changeActiveDatastore,
   Landing,
   DatastoreInfo,
-  DatastoreAlerts,
-  FlintAlerts
+  DatastoreAlerts
 };

src/modules/flint/components/FlintAlerts/index.js

@@ -0,0 +1,60 @@
+import React from 'react';
+import { Alert, Button } from '../../../reusable';
+import { connect } from 'react-redux';
+import { UserIsFlintAffiliated } from '../../../flint';
+import PropTypes from 'prop-types';
+
+class FlintAlerts extends React.Component {
+  state = {
+    closed: false
+  };
+
+  handleCloseButtonClick = () => {
+    this.setState({ closed: true });
+  };
+
+  render () {
+    const { datastore } = this.props;
+
+    const alertMessages = {
+      primo: 'U-M Flint users: You may not be able to access U-M Ann Arbor resources. For the best results use <a href="https://umich.primo.exlibrisgroup.com/discovery/search?vid=01UMICH_INST:FLINT">Thompson Library’s Search All</a> to search for articles.',
+      databases: 'We noticed you are affiliated with U-M Flint. For the best results use the <a href="https://libguides.umflint.edu/az.php?a=all">Thompson Library’s database listing</a>.',
+      onlinejournals: 'We noticed you are affiliated with U-M Flint. For the best results use the <a href="https://umich.primo.exlibrisgroup.com/discovery/jsearch?vid=01UMICH_INST:FLINT">Thompson Library’s Search All</a> to search for articles.',
+      website: 'We noticed you are affiliated with U-M Flint. For the best results use the <a href="https://libguides.umflint.edu/library">Thompson Library website</a>.'
+    };
+
+    if (this.state.closed || !Object.keys(alertMessages).includes(datastore)) {
+      return null;
+    }
+
+    return (
+      <UserIsFlintAffiliated>
+        <Alert type='warning'>
+          <span dangerouslySetInnerHTML={{ __html: alertMessages[datastore] }} />
+          <Button
+            kind='secondary'
+            small
+            onClick={() => {
+              return this.handleCloseButtonClick();
+            }}
+          >
+            Dismiss
+          </Button>
+        </Alert>
+      </UserIsFlintAffiliated>
+    );
+  }
+}
+
+FlintAlerts.propTypes = {
+  datastore: PropTypes.string
+};
+
+function mapStateToProps (state) {
+  return {
+    query: state.search.query,
+    datastore: state.datastores.active
+  };
+}
+
+export default connect(mapStateToProps)(FlintAlerts);

src/modules/flint/components/UserIsFlintAffiliated/index.js

@@ -0,0 +1,30 @@
+import _ from 'underscore';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+
+const UserIsFlintAffiliated = ({
+  isFlintAffiliated,
+  children
+}) => {
+  if (isFlintAffiliated) {
+    return children;
+  } else {
+    return null;
+  }
+};
+
+UserIsFlintAffiliated.propTypes = {
+  isFlintAffiliated: PropTypes.bool,
+  children: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.node),
+    PropTypes.node
+  ])
+};
+
+function mapStateToProps (state) {
+  return {
+    isFlintAffiliated: _.contains(state.profile.institutions, 'Flint')
+  };
+}
+
+export default connect(mapStateToProps)(UserIsFlintAffiliated);

src/modules/flint/index.js

@@ -0,0 +1,7 @@
+import FlintAlerts from './components/FlintAlerts';
+import UserIsFlintAffiliated from './components/UserIsFlintAffiliated';
+
+export {
+  FlintAlerts,
+  UserIsFlintAffiliated
+};

src/modules/pages/components/DatastorePage/container.js

@@ -9,7 +9,6 @@ import { AdvancedSearch } from '../../../advanced';
 import {
   DatastoreNavigation,
   DatastoreInfo,
-  FlintAlerts,
   Landing
 } from '../../../datastores';
 import { Filters } from '../../../filters';
@@ -25,6 +24,7 @@ import { switchPrideToDatastore } from '../../../pride';
 import { InstitutionSelect, InstitutionWrapper } from '../../../institution';
 import { List } from '../../../lists';
 import { setDocumentTitle } from '../../../a11y';
+import { FlintAlerts } from '../../../flint';
 import PropTypes from 'prop-types';
 import { Icon } from '../../../reusable';
 
@@ -101,7 +101,20 @@ class DatastorePageContainer extends React.Component {
                 <>
                   <SearchBox />
                   <DatastoreNavigation />
-                  <FlintAlerts />
+                  <div
+                    css={{
+                      marginTop: '-0.75rem',
+                      '.alert-inner': {
+                        display: 'flex',
+                        justifyContent: 'center'
+                      },
+                      ':empty': {
+                        display: 'none'
+                      }
+                    }}
+                  >
+                    <FlintAlerts />
+                  </div>
                   <ConnectedSwitch>
                     <Route
                       path={match.url + '/record/:recordUid/get-this/:barcode'}