Merge branch 'parcels-investigations' into 'master'

Fetch parcel investigations by IDs

See merge request !446

src/components/Parcels/MyParcelsSummary.js

@@ -6,8 +6,8 @@ import { beamlineFormatter, dateFormatter } from '../Investigation/utils';
 import ParcelTable from './ParcelTable';
 import styles from './MyParcelsSummary.module.css';
 import { itemsFormatter } from '../../helpers';
-import { useAllInvestigations } from '../../helpers/hooks';
 import ParcelCondensedView from './ParcelCondensedView';
+import InvestigationResource from '../../resources/investigation';
 
 function getColumns(investigations) {
   return [
@@ -159,7 +159,11 @@ function getColumns(investigations) {
 
 function MyParcelsSummary() {
   const parcels = useResource(ParcelResource.listShape(), {});
-  const { investigations } = useAllInvestigations();
+
+  const investigationIds = parcels.map((p) => p.investigationId);
+  const investigations = useResource(InvestigationResource.listShape(), {
+    ids: investigationIds,
+  });
 
   return (
     <ParcelTable

src/helpers/hooks.js

 import { useLocation } from 'react-router';
-import { useSelector } from 'react-redux';
 
 export function useQuery() {
   return new URLSearchParams(useLocation().search);
 }
-
-export function useAllInvestigations() {
-  return useSelector(() => {
-    // const {
-    //   scientistInstrumentInvestigations,
-    //   myInvestigations,
-    //   releasedInvestigations,
-    //   investigations,
-    // } = state;
-
-    return {
-      investigations: [
-        // ...scientistInstrumentInvestigations.data,
-        // ...myInvestigations.data,
-        // ...releasedInvestigations.data,
-        // ...investigations.data,
-      ],
-      fetching: false,
-      // scientistInstrumentInvestigations.fetching ||
-      // myInvestigations.fetching ||
-      // releasedInvestigations.fetching ||
-      // investigations.fetching,
-    };
-  });
-}