Fix: canAddToCart corrected

- must not be historic
- must not be unavailable
- institute must allow requests

src/accession/AccessionDetailsPage.tsx

@@ -5,7 +5,7 @@ import { AccessionService } from '@genesys/client/service';
 import { Property } from 'ui/common/Property';
 import AccessionDetails from '@genesys/client/model/accession/AccessionDetails';
 import { WithTranslation, withTranslation } from 'react-i18next';
-import { LocalStorageCart } from 'utilities';
+import { canAddToCart, LocalStorageCart } from 'utilities';
 import { WithConfig } from 'config/config';
 import { CountryName } from 'ui/common/CountryName';
 import GrinSpecies from 'ui/common/GrinSpecies';
@@ -81,7 +81,7 @@ class AccessionDetailsPage extends React.Component<IAccessionDetailsPage & WithT
     const { accession } = this.state;
     const { t } = this.props;
 
-    const canAddToCart = !(accession.details.historic === true || accession.details.available === false || accession.details.institute.allowMaterialRequests === true);
+    const canAdd = canAddToCart(accession.details);
 
     return <button
       type="button"
@@ -91,7 +91,7 @@ class AccessionDetailsPage extends React.Component<IAccessionDetailsPage & WithT
       className="btn btn-primary"
       onClick={ this.addToCart }
     >
-      { canAddToCart ? t('cart.addToCart') : t('list.notAvailable') }
+      { canAdd ? t('cart.addToCart') : t('list.notAvailable') }
     </button>
   }
 

src/accession/AccessionListPage.tsx

@@ -10,7 +10,7 @@ import FilteredPage, { IPageRequest } from '@genesys/client/model/FilteredPage';
 import Pagination from 'ui/common/Pagination';
 import { AccessionFilters } from './AccessionFilters';
 import { withTranslation, WithTranslation } from 'react-i18next';
-import { LocalStorageCart } from 'utilities';
+import { canAddToCart, LocalStorageCart } from 'utilities';
 import { WithConfig } from 'config/config';
 import Loading from 'ui/common/Loading';
 import PageTitle from 'ui/common/PageTitle';
@@ -126,14 +126,10 @@ class AccessionListPage extends React.Component<IAccessionListPageProps & WithTr
     this.setState( { cartItems: LocalStorageCart.getCartItemsLS() } )
   }
 
-  private canAddToCart = (accession) => {
-    return !(accession.historic === true || accession.available === false || accession.institute.allowMaterialRequests === true);
-  }
-
   private renderCartButton = (accession, i) => {
     const { t } = this.props;
     const { cartItems } = this.state;
-    if (!this.canAddToCart(accession)) {
+    if (!canAddToCart(accession)) {
       return <span>{t('list.notAvailable')}</span>
     }
     if ( cartItems.includes(accession.uuid)) {
@@ -161,7 +157,7 @@ class AccessionListPage extends React.Component<IAccessionListPageProps & WithTr
   private onToggleAll = () => {
     this.setState((prevState) => ({
       isAllSelected: !prevState.isAllSelected,
-      selected: !prevState.isAllSelected ? prevState.accessions.content.map((acc) => this.canAddToCart(acc) && acc.uuid) : [],
+      selected: !prevState.isAllSelected ? prevState.accessions.content.map((acc) => canAddToCart(acc) && acc.uuid) : [],
     }));
   };
 
@@ -220,7 +216,7 @@ class AccessionListPage extends React.Component<IAccessionListPageProps & WithTr
                   <tr key={ a.id } className={ selectedUUIDs.has(a.uuid) ? 'table-primary' : '' }>
                     { shoppingCart.enabled && (
                       <td>
-                        { this.canAddToCart(a) &&
+                        { canAddToCart(a) &&
                           <input
                             type="checkbox"
                             name={ `checkbox-${a.uuid}-${i}` }

src/utilities/index.ts

@@ -2,6 +2,7 @@ import * as cookies from 'es-cookie';
 import { LoginService, reconfigureServiceAxios } from '@genesys/client/service';
 import { clearCookies, saveCookies } from '@genesys/client/utilities';
 import { log } from '@genesys/client/utilities/debug';
+import Accession from '@genesys/client/model/accession/Accession';
 
 
 export function checkAccessTokens(apiUrl: string, clientId: string, clientSecret: string) {
@@ -76,3 +77,7 @@ export class LocalStorageCart {
     localStorage.setItem(LocalStorageCart.LS_KEY, JSON.stringify(updatedCartItems));
   }
 }
+
+export const canAddToCart = (accession: Accession) => {
+  return accession.historic !== true && accession.available !== false && accession.institute.allowMaterialRequests === true;
+}