From 95fb0bdde35da07ab4b62ddac52339cda91f72e6 Mon Sep 17 00:00:00 2001
From: Christoph Zwerschke <c.zwerschke@dkfz-heidelberg.de>
Date: Mon, 12 Aug 2024 14:38:15 +0200
Subject: [PATCH] Suppport new version of MASS (#239)

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 src/api/browse.ts                             |  22 +--
 .../datasetAccordion/datasetAccordion.tsx     |  15 +-
 .../boldenedSummaryDetails.tsx                |   2 +-
 .../datasetSummary/datasetSummary.tsx         |  56 ++++---
 src/components/browse/dataset/datasetList.tsx |  32 +++-
 src/components/browse/sidebar/sidebar.tsx     |   2 +-
 .../home/homeMidSection/homeMidSection.tsx    |   2 +-
 src/mocks/data.js                             | 142 ++++++++++++------
 src/mocks/responses.js                        |  45 +++---
 src/models/dataset.ts                         |  14 +-
 12 files changed, 210 insertions(+), 128 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b7fdd51f..65837591 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "data-portal-ui",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "data-portal-ui",
-      "version": "1.2.3",
+      "version": "1.3.0",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "~6.4.2",
         "@fortawesome/free-brands-svg-icons": "~6.4.2",
diff --git a/package.json b/package.json
index 8d6390f7..9b1381f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "data-portal-ui",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "~6.4.2",
diff --git a/src/api/browse.ts b/src/api/browse.ts
index 6820a0f7..1033f672 100644
--- a/src/api/browse.ts
+++ b/src/api/browse.ts
@@ -29,7 +29,7 @@ type getDatasetsSearchRespType = (
  * function with search results, returns nothing.
  * @param callbackFunc - Function takes an argument conforms to the searchResponseModel.
  * @param filterQuery - Filters to be applied, array of objects that conform to the facetFilterModel.
- * @param searchKeyword - String representing the search keyword. Default: "*".
+ * @param searchKeyword - String representing the search keyword. Default: "".
  * @param skip - Number of results to skip in the search results. Default: 0.
  * @param limit - Maximum number of results to be returned by the search. Default: 20.
  * @param documentType - String representing the document type to search. Default: "Dataset".
@@ -43,16 +43,18 @@ export const querySearchService: getDatasetsSearchRespType = async (
   limit = 20,
   documentType = "EmbeddedDataset"
 ) => {
-  let url = new URL("rpc/search", MASS_URL);
-  const payload = {
-    class_name: documentType,
-    query: searchKeyword,
-    filters: filterQuery,
-    skip: skip,
-    limit: limit,
-  };
+  let url = new URL("search", MASS_URL);
+  const params = url.searchParams;
+  params.append("class_name", documentType);
+  if (searchKeyword) params.append("query", searchKeyword);
+  filterQuery.forEach((filter) => {
+    params.append("filter_by", filter.key);
+    params.append("value", filter.value);
+  });
+  if (skip) params.append("skip", skip.toString());
+  params.append("limit", limit.toString());
   try {
-    const response = await fetchJson(url, "POST", payload);
+    const response = await fetchJson(url, "GET");
     const data = await response.json();
     if (response.status !== 200) {
       throw new Error(`Status code ${response.status} in search response`);
diff --git a/src/components/browse/dataset/datasetAccordion/datasetAccordion.tsx b/src/components/browse/dataset/datasetAccordion/datasetAccordion.tsx
index 3ba7f480..76e87184 100644
--- a/src/components/browse/dataset/datasetAccordion/datasetAccordion.tsx
+++ b/src/components/browse/dataset/datasetAccordion/datasetAccordion.tsx
@@ -39,20 +39,20 @@ const DatasetAccordion = (props: DataSetListProps) => {
         {props.dsList.map((hit, index) => (
           <Accordion.Item
             key={index}
-            eventKey={hit.content.accession}
+            eventKey={hit.id_}
             className="mb-3 border border-1 rounded-0"
             title={hit.content.title}
           >
             <Accordion.Button
               className="bg-light align-items-start text-break py-2 px-1 px-lg-2 text-black"
-              onClick={() => getDetails(hit.content.accession)}
+              onClick={() => getDetails(hit.id_)}
             >
               <Col xs={5} sm={4} xl={3}>
-                {hit.content.accession}
-                {hit.content.ega_accession ? (
+                {hit.id_}
+                {hit.content.alias ? (
                   <>
                     <br />
-                    {hit.content.ega_accession}
+                    {hit.content.alias}
                   </>
                 ) : (
                   ""
@@ -74,10 +74,7 @@ const DatasetAccordion = (props: DataSetListProps) => {
               </Col>
             </Accordion.Button>
             <Accordion.Body className="p-2">
-              <DatasetSummary
-                hit={hit}
-                summary={summaryMap.get(hit.content.accession)}
-              />
+              <DatasetSummary hit={hit} summary={summaryMap.get(hit.id_)} />
             </Accordion.Body>
           </Accordion.Item>
         ))}
diff --git a/src/components/browse/dataset/datasetAccordion/datasetSummary/boldenedSummaryDetails/boldenedSummaryDetails.tsx b/src/components/browse/dataset/datasetAccordion/datasetSummary/boldenedSummaryDetails/boldenedSummaryDetails.tsx
index 46011657..36a3cae7 100644
--- a/src/components/browse/dataset/datasetAccordion/datasetSummary/boldenedSummaryDetails/boldenedSummaryDetails.tsx
+++ b/src/components/browse/dataset/datasetAccordion/datasetSummary/boldenedSummaryDetails/boldenedSummaryDetails.tsx
@@ -6,7 +6,7 @@ interface BoldenedProps {
 const BoldenedSummaryDetails = (props: BoldenedProps) => {
   return (
     <div>
-      {props.x.value} <strong>{props.x.count}</strong>
+      {props.x.value.replace(/_/g, " ")} <strong>{props.x.count}</strong>
     </div>
   );
 };
diff --git a/src/components/browse/dataset/datasetAccordion/datasetSummary/datasetSummary.tsx b/src/components/browse/dataset/datasetAccordion/datasetSummary/datasetSummary.tsx
index b6c69e43..4ced34f4 100644
--- a/src/components/browse/dataset/datasetAccordion/datasetSummary/datasetSummary.tsx
+++ b/src/components/browse/dataset/datasetAccordion/datasetSummary/datasetSummary.tsx
@@ -43,12 +43,12 @@ const DatasetSummary = (props: DataSetDetailsProps) => {
         <div className="float-end ps-0 ps-md-4 ms-1">
           {props.summary ? (
             <>
-              {props.hit.content.ega_accession ? (
+              {props.hit.content.alias ? (
                 <Button
                   variant="outline-quinary"
                   href={
                     "https://ega-archive.org/datasets/" +
-                    props.hit.content.ega_accession
+                    props.hit.content.alias
                   }
                   className="mb-3 fs-7 shadow-md-dark d-block"
                   title="EGA Dataset page"
@@ -68,11 +68,11 @@ const DatasetSummary = (props: DataSetDetailsProps) => {
                 <></>
               )}
               <RequestAccessButton
-                accession={props.hit.content.accession}
+                accession={props.hit.id_}
                 handleOpen={handleOpen}
                 classes="d-block"
               />
-              <Link to={props.hit.content.accession}>
+              <Link to={props.hit.id_}>
                 <Button
                   variant="quinary"
                   className="text-white mb-3 fs-7 shadow-md-dark d-block"
@@ -110,12 +110,12 @@ const DatasetSummary = (props: DataSetDetailsProps) => {
         <div className="text-break mb-3">
           <p className={pClass}>
             <strong>Dataset ID:&nbsp;</strong>
-            {props.hit.content.accession}
+            {props.hit.id_}
           </p>
-          {props.hit.content.ega_accession ? (
+          {props.hit.content.alias ? (
             <p className={pClass}>
               <strong>EGA ID:&nbsp;</strong>
-              {props.hit.content.ega_accession}
+              {props.hit.content.alias}
             </p>
           ) : (
             <></>
@@ -124,21 +124,31 @@ const DatasetSummary = (props: DataSetDetailsProps) => {
             <strong>Full title:&nbsp;</strong>
             {props.hit.content.title}
           </p>
-          <p className={pClass}>
-            <strong>Description:&nbsp;</strong>
-            {props.hit.content.description}
-          </p>
-          <p className={pClass}>
-            <strong>Types:&nbsp;</strong>
-            {props.hit.content.types.map((x) => (
-              <Badge
-                className="me-1 bg-white text-black border-primary border px-1 fw-normal"
-                key={x}
-              >
-                {x}
-              </Badge>
-            ))}
-          </p>
+          {props.hit.content.description || props.summary?.description ? (
+            <p className={pClass}>
+              <strong>Description:&nbsp;</strong>
+              {props.hit.content.description || props.summary?.description}
+            </p>
+          ) : (
+            <></>
+          )}
+          {(props.hit.content.types || props.summary?.types || []).length ? (
+            <p className={pClass}>
+              <strong>Types:&nbsp;</strong>
+              {(props.hit.content.types || props.summary?.types || []).map(
+                (x) => (
+                  <Badge
+                    className="me-1 bg-white text-black border-primary border px-1 fw-normal"
+                    key={x}
+                  >
+                    {x}
+                  </Badge>
+                )
+              )}
+            </p>
+          ) : (
+            <></>
+          )}
         </div>
         {props.summary ? (
           <div>
@@ -163,7 +173,7 @@ const DatasetSummary = (props: DataSetDetailsProps) => {
         )}
       </div>
       <DataRequestFormModal
-        accession={props.hit.content.accession}
+        accession={props.hit.id_}
         copyEmail={copyEmail}
         show={show}
         handleClose={handleClose}
diff --git a/src/components/browse/dataset/datasetList.tsx b/src/components/browse/dataset/datasetList.tsx
index 6e23cc97..28f5c1bb 100644
--- a/src/components/browse/dataset/datasetList.tsx
+++ b/src/components/browse/dataset/datasetList.tsx
@@ -94,13 +94,31 @@ const DatasetList = (props: DataSetProps) => {
               <PaginatedDataset />
             </Col>
             <Col xs={4} md={2} className="ps-0 ps-lg-4 pe-0">
-              <Form.Select
-                value={props.limit}
-                onChange={(event) => handleSelect(event)}
-              >
-                <option value="10">10</option>
-                {props.dsCount >= 25 ? <option value="25">25</option> : ""}
-              </Form.Select>
+              {(props.page - 1) * 50 <= props.dsCount ? (
+                <Form.Select
+                  value={props.limit}
+                  onChange={(event) => handleSelect(event)}
+                >
+                  <option value="10">10</option>
+                  <option value="25">25</option>
+                  <option value="50">50</option>
+                </Form.Select>
+              ) : (props.page - 1) * 25 <= props.dsCount ? (
+                <Form.Select
+                  value={props.limit}
+                  onChange={(event) => handleSelect(event)}
+                >
+                  <option value="10">10</option>
+                  <option value="25">25</option>
+                </Form.Select>
+              ) : (
+                <Form.Select
+                  value={props.limit}
+                  onChange={(event) => handleSelect(event)}
+                >
+                  <option value="10">10</option>
+                </Form.Select>
+              )}
             </Col>
           </Row>
         </>
diff --git a/src/components/browse/sidebar/sidebar.tsx b/src/components/browse/sidebar/sidebar.tsx
index 9b67880c..f144c3ba 100644
--- a/src/components/browse/sidebar/sidebar.tsx
+++ b/src/components/browse/sidebar/sidebar.tsx
@@ -54,7 +54,7 @@ const Sidebar = (props: SidebarProps) => {
     querySearchService(
       props.setSearchResults,
       [],
-      "*",
+      "",
       skip,
       props.limit,
       "EmbeddedDataset"
diff --git a/src/components/home/homeMidSection/homeMidSection.tsx b/src/components/home/homeMidSection/homeMidSection.tsx
index 5318e3ea..96d60d46 100644
--- a/src/components/home/homeMidSection/homeMidSection.tsx
+++ b/src/components/home/homeMidSection/homeMidSection.tsx
@@ -114,7 +114,7 @@ const HomeMidSection = () => {
             {protocolTypes.map((x) => (
               <tr key={x.value}>
                 <th className="text-end pe-2">{x.count}</th>
-                <td>{x.value}</td>
+                <td>{x.value.replace(/_/g, " ")}</td>
               </tr>
             ))}
           </tbody>
diff --git a/src/mocks/data.js b/src/mocks/data.js
index b89056dc..d5ce9434 100644
--- a/src/mocks/data.js
+++ b/src/mocks/data.js
@@ -2,7 +2,7 @@ const startDate = new Date();
 const endDate = new Date(startDate);
 endDate.setFullYear(endDate.getFullYear() + 1);
 const access_starts = startDate.toISOString();
-const access_ends = endDate.toISOString();// Static fake data for mocking the backend
+const access_ends = endDate.toISOString(); // Static fake data for mocking the backend
 
 export const user = {
   id: "j.doe@ghga.de",
@@ -11,7 +11,7 @@ export const user = {
   title: "Dr.",
   full_name: "Dr. John Doe",
   email: "j.jdoe@home.org",
-  role: "data_steward"
+  role: "data_steward",
 };
 
 export const allIVAs = [
@@ -22,15 +22,16 @@ export const allIVAs = [
     changed: "2024-01-01T00:00:00",
     state: "CodeRequested",
     user_name: "Prof. Jean Doe",
-    user_email: "j2.jdoe@home.org"
-  }, {
+    user_email: "j2.jdoe@home.org",
+  },
+  {
     id: "783d9682-d5e5-4ce7-9157-9eeb53a1e9ba",
     type: "Phone",
     value: "+441234567890004",
     changed: "2024-02-01T00:00:00",
     state: "Verified",
     user_name: "Dr. John Doe",
-    user_email: "j.jdoe@home.org"
+    user_email: "j.jdoe@home.org",
   },
   {
     id: "32b50c92-489f-4418-ace8-e7552e3cf36d",
@@ -39,7 +40,7 @@ export const allIVAs = [
     changed: "2024-03-01T00:00:00",
     state: "Unverified",
     user_name: "Dr. John Doe",
-    user_email: "j.jdoe@home.org"
+    user_email: "j.jdoe@home.org",
   },
   {
     id: "fc3c0ad8-01a4-4eb1-b8f3-40b04bb4bcb2",
@@ -48,16 +49,18 @@ export const allIVAs = [
     changed: "2024-04-01T00:00:00",
     state: "CodeTransmitted",
     user_name: "Dr. John Doe",
-    user_email: "j.jdoe@home.org"
-  }, {
+    user_email: "j.jdoe@home.org",
+  },
+  {
     id: "347368b5-718e-49ba-80ad-bc128e83b609",
     type: "InPerson",
     value: "Mathematikon",
     changed: "2024-05-01T00:00:00",
     state: "CodeCreated",
     user_name: "Prof. Jean Doe",
-    user_email: "j2.jdoe@home.org"
-  }]
+    user_email: "j2.jdoe@home.org",
+  },
+];
 
 export const accessRequests = [
   {
@@ -119,7 +122,15 @@ export const accessRequests = [
     status: "pending",
     status_changed: "2023-05-19T12:04:02.000Z",
     changed_by: "j.doe@ghga.de",
-  }]
+  },
+];
+
+export const getAccessRequests = (user_id, dataset_id) =>
+  accessRequests.filter(
+    (x) =>
+      (!dataset_id || x.dataset_id === dataset_id) &&
+      (!user_id || x.user_id === user_id)
+  );
 
 export const datasets = [
   {
@@ -138,15 +149,14 @@ export const workPackageToken = {
   token: "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0",
 };
 
-export const embeddedDataset = [{
+export const embeddedDataset = {
   accession: "GHGAD588887987",
   ega_accession: "EGAD588887987",
   types: ["Test Type"],
   title: "Test dataset for details",
   description:
     "Test dataset for Metadata Repository get dataset details call. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vel risus commodo viverra maecenas accumsan lacus vel. Sit amet risus nullam eget felis eget nunc lobortis mattis. Iaculis at erat pellentesque adipiscing commodo. Volutpat consequat mauris nunc congue. At lectus urna duis convallis convallis tellus id interdum velit. Gravida cum sociis natoque penatibus et. Mauris in aliquam sem fringilla ut morbi. Ultrices gravida dictum fusce ut. At consectetur lorem donec massa sapien faucibus et molestie.",
-  study:
-  {
+  study: {
     accession: "GHGAS21215636",
     ega_accession: "EGAS21215636",
     types: ["test_genomics"],
@@ -163,18 +173,18 @@ export const embeddedDataset = [{
         journal: "Test journal",
         year: "2023",
       },
-    ]
+    ],
   },
   data_access_policy: {
     data_access_committee: {
       alias: "Test DAC",
-      email: "test[at]test[dot]de"
+      email: "test[at]test[dot]de",
     },
     policy_text: `Test policy text. Neque volutpat ac tincidunt vitae semper quis. Mi eget mauris pharetra et ultrices neque ornare. Consectetur purus ut faucibus pulvinar elementum. Tortor at risus viverra adipiscing. Aliquam eleifend mi in nulla. Orci ac auctor augue mauris augue neque gravida. Rutrum tellus pellentesque eu tincidunt tortor aliquam nulla. Turpis massa tincidunt dui ut ornare lectus sit amet. Laoreet suspendisse interdum consectetur libero id faucibus nisl tincidunt. Auctor eu augue ut lectus arcu bibendum. Aenean et tortor at risus.\n
       Diam phasellus vestibulum lorem sed risus ultricies tristique nulla aliquet. Tempor orci eu lobortis elementum nibh. Tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Sed nisi lacus sed viverra tellus. Orci dapibus ultrices in iaculis nunc sed augue. Gravida dictum fusce ut placerat orci nulla pellentesque dignissim enim. Facilisi cras fermentum odio eu. Est placerat in egestas erat. At ultrices mi tempus imperdiet nulla malesuada. Tincidunt arcu non sodales neque. Mi bibendum neque egestas congue quisque.\n
       Pharetra vel turpis nunc eget lorem dolor sed. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien et. Vel pretium lectus quam id leo. Ornare suspendisse sed nisi lacus sed viverra. Magna etiam tempor orci eu lobortis elementum. Aliquam nulla facilisi cras fermentum. Rutrum tellus pellentesque eu tincidunt tortor aliquam nulla facilisi cras. Nam at lectus urna duis. Nunc scelerisque viverra mauris in aliquam sem fringilla ut morbi. At elementum eu facilisis sed odio morbi quis commodo odio. Amet nisl purus in mollis nunc sed id. Tristique sollicitudin nibh sit amet. Arcu risus quis varius quam quisque id diam. Nisl tincidunt eget nullam non. Bibendum arcu vitae elementum curabitur vitae. Vitae aliquet nec ullamcorper sit amet risus nullam eget felis.\n
       Cum sociis natoque penatibus et magnis. Quam lacus suspendisse faucibus interdum. Lorem dolor sed viverra ipsum. Non pulvinar neque laoreet suspendisse interdum consectetur. Sit amet consectetur adipiscing elit ut aliquam. Mi ipsum faucibus vitae aliquet nec. Eget egestas purus viverra accumsan in nisl nisi scelerisque eu. Vel orci porta non pulvinar neque laoreet suspendisse interdum consectetur. Justo nec ultrices dui sapien eget mi proin sed. Lacus viverra vitae congue eu consequat. Purus viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Pretium aenean pharetra magna ac placerat vestibulum lectus mauris. Consequat interdum varius sit amet mattis vulputate. Venenatis cras sed felis eget velit. Cursus metus aliquam eleifend mi in nulla posuere sollicitudin aliquam. Tristique senectus et netus et malesuada fames ac. Massa enim nec dui nunc mattis enim ut tellus elementum.`,
-    policy_url: "https://test.com"
+    policy_url: "https://test.com",
   },
   experiments: [
     {
@@ -187,7 +197,7 @@ export const embeddedDataset = [{
         accession: "GHGAEM654513213",
         type: "Experiment Method 1",
         instrument_model: "Experiment Platform 1",
-      }
+      },
     },
   ],
   samples: [
@@ -200,7 +210,7 @@ export const embeddedDataset = [{
       case_control_status: "Test control status",
       individual: {
         sex: "Female",
-        phenotypic_features_terms: ["Test phenotypic feature 1"]
+        phenotypic_features_terms: ["Test phenotypic feature 1"],
       },
       biospecimen_type: "Test biospeciment type 1",
       biospecimen_tissue_term: "Test tissue",
@@ -216,10 +226,17 @@ export const embeddedDataset = [{
   ],
   sample_files: [],
   sequencing_process_files: [],
-  analysis_process_output_files: []
-}];
+  analysis_process_output_files: [],
+};
+
+// get embedded datasets with arbitrary accessions
+export const getEmbeddedDataset = (accession) => ({
+  ...embeddedDataset,
+  accession: accession,
+  ega_accession: accession.replace("GHGA", "EGA"),
+});
 
-export const datasetSummary = [{
+export const datasetSummary = {
   accession: "GHGAD588887987",
   description:
     "Test dataset for Metadata Repository get dataset details call. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vel risus commodo viverra maecenas accumsan lacus vel. Sit amet risus nullam eget felis eget nunc lobortis mattis. Iaculis at erat pellentesque adipiscing commodo. Volutpat consequat mauris nunc congue. At lectus urna duis convallis convallis tellus id interdum velit. Gravida cum sociis natoque penatibus et. Mauris in aliquam sem fringilla ut morbi. Ultrices gravida dictum fusce ut. At consectetur lorem donec massa sapien faucibus et molestie.",
@@ -229,9 +246,18 @@ export const datasetSummary = [{
   samples_summary: {
     count: 3,
     stats: {
-      sex: [{ value: "Female", count: 1 }, { value: "Male", count: 1 }],
-      tissues: [{ value: "metastasis", count: 1 }, { value: "tumor", count: 2 }],
-      phenotypic_features: [{ value: "Test Phenotype 1", count: 2 }, { value: "Test Phenotype 2", count: 1 }],
+      sex: [
+        { value: "Female", count: 1 },
+        { value: "Male", count: 1 },
+      ],
+      tissues: [
+        { value: "metastasis", count: 1 },
+        { value: "tumor", count: 2 },
+      ],
+      phenotypic_features: [
+        { value: "Test Phenotype 1", count: 2 },
+        { value: "Test Phenotype 2", count: 1 },
+      ],
     },
   },
   studies_summary: {
@@ -244,51 +270,73 @@ export const datasetSummary = [{
   experiments_summary: {
     count: 14,
     stats: {
-      experiment_methods: [{
-        value: "Ilumina test", count: 10
-      },
-      { value: "HiSeq test", count: 4 }],
+      experiment_methods: [
+        {
+          value: "Ilumina_test",
+          count: 10,
+        },
+        { value: "HiSeq_test", count: 4 },
+      ],
     },
   },
   files_summary: {
     count: 27,
     stats: {
-      format: [{ value: "fastq", count: 22 }, { value: "bam", count: 5 }],
+      format: [
+        { value: "FASTQ", count: 22 },
+        { value: "BAM", count: 5 },
+      ],
       size: 434543980,
     },
   },
-}];
+};
+
+// get dataset dummaries with arbitrary accessions
+export const getDatasetSummary = (accession) => ({
+  ...datasetSummary,
+  accession: accession,
+});
 
 export const metadataSummary = {
   resource_stats: {
     SequencingProcessFile: {
       count: 532,
       stats: {
-        format: [{ value: "fastq", count: 124 }, { value: "bam", count: 408 }]
+        format: [
+          { value: "fastq", count: 124 },
+          { value: "bam", count: 408 },
+        ],
       },
     },
     Individual: {
       count: 5432,
       stats: {
-        sex: [{ value: "Female", count: 1935 }, { value: "Male", count: 2358 }],
+        sex: [
+          { value: "Female", count: 1935 },
+          { value: "Male", count: 2358 },
+        ],
       },
     },
     ExperimentMethod: {
       count: 1400,
       stats: {
-        instrument_model: [{
-          value: "Ilumina test", count: 700
-        },
-        {
-          value: "HiSeq test", count: 700,
-        }],
+        instrument_model: [
+          {
+            value: "Ilumina_test",
+            count: 700,
+          },
+          {
+            value: "HiSeq_test",
+            count: 700,
+          },
+        ],
       },
     },
     Dataset: {
       count: 252,
       stats: {},
     },
-  }
+  },
 };
 
 export const searchResults = {
@@ -310,7 +358,7 @@ export const searchResults = {
       ],
     },
   ],
-  count: 25,
+  count: 25, // just to test the paginator
   hits: [
     {
       content: {
@@ -320,8 +368,9 @@ export const searchResults = {
         description:
           "Test dataset for Metadata Repository get dataset details call. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vel risus commodo viverra maecenas accumsan lacus vel. Sit amet risus nullam eget felis eget nunc lobortis mattis. Iaculis at erat pellentesque adipiscing commodo. Volutpat consequat mauris nunc congue. At lectus urna duis convallis convallis tellus id interdum velit. Gravida cum sociis natoque penatibus et. Mauris in aliquam sem fringilla ut morbi. Ultrices gravida dictum fusce ut. At consectetur lorem donec massa sapien faucibus et molestie.",
         types: ["Test dataset type 1"],
-      }
-    }, {
+      },
+    },
+    {
       content: {
         accession: "GHGAD588887988",
         ega_accession: "EGAD588887988",
@@ -329,8 +378,9 @@ export const searchResults = {
         description:
           "Test dataset for Metadata Repository get dataset details call. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vel risus commodo viverra maecenas accumsan lacus vel. Sit amet risus nullam eget felis eget nunc lobortis mattis. Iaculis at erat pellentesque adipiscing commodo. Volutpat consequat mauris nunc congue. At lectus urna duis convallis convallis tellus id interdum velit. Gravida cum sociis natoque penatibus et. Mauris in aliquam sem fringilla ut morbi. Ultrices gravida dictum fusce ut. At consectetur lorem donec massa sapien faucibus et molestie.",
         types: ["Test dataset type 1"],
-      }
-    }, {
+      },
+    },
+    {
       content: {
         accession: "GHGAD588887989",
         ega_accession: "EGAD588887989",
@@ -338,7 +388,7 @@ export const searchResults = {
         description:
           "Test dataset for Metadata Repository get dataset details call. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vel risus commodo viverra maecenas accumsan lacus vel. Sit amet risus nullam eget felis eget nunc lobortis mattis. Iaculis at erat pellentesque adipiscing commodo. Volutpat consequat mauris nunc congue. At lectus urna duis convallis convallis tellus id interdum velit. Gravida cum sociis natoque penatibus et. Mauris in aliquam sem fringilla ut morbi. Ultrices gravida dictum fusce ut. At consectetur lorem donec massa sapien faucibus et molestie.",
         types: ["Test dataset type 1"],
-      }
+      },
     },
   ],
 };
diff --git a/src/mocks/responses.js b/src/mocks/responses.js
index 515731c5..21ea8213 100644
--- a/src/mocks/responses.js
+++ b/src/mocks/responses.js
@@ -1,8 +1,8 @@
 import {
-  accessRequests,
+  getAccessRequests,
   datasets,
-  datasetSummary,
-  embeddedDataset,
+  getDatasetSummary,
+  getEmbeddedDataset,
   metadataSummary,
   workPackageToken,
   searchResults,
@@ -19,7 +19,9 @@ import {
 
 export const responses = {
   // Change context information
-  "POST /api/auth/totp-token": { uri: "otpauth://totp/GHGA:John%20Doe?secret=TESTTOTPTOKEN&issuer=GHGA" },
+  "POST /api/auth/totp-token": {
+    uri: "otpauth://totp/GHGA:John%20Doe?secret=TESTTOTPTOKEN&issuer=GHGA",
+  },
 
   // Datasets requested by j.doe@ghga.de user
   "GET /api/wps/users/j.doe@ghga.de/datasets": datasets,
@@ -37,7 +39,9 @@ export const responses = {
   "POST /api/auth/rpc/ivas/*/request-code": 204,
 
   // Create IVA verification code
-  "POST /api/auth/rpc/ivas/*/create-code": { verification_code: "TEST1234566789" },
+  "POST /api/auth/rpc/ivas/*/create-code": {
+    verification_code: "TEST1234566789",
+  },
 
   // Request IVA verification
   "POST /api/auth/rpc/ivas/*/code-transmitted": 204,
@@ -59,13 +63,16 @@ export const responses = {
   "POST /api/wps/work-packages": workPackageToken,
 
   // Specific dataset and user access requests
-  "GET /api/ars/access-requests?dataset_id=GHGAD588887987&*": accessRequests.filter((x) => x.dataset_id === "GHGAD588887987" && x.user_id === "j.doe@ghga.de"),
+  "GET /api/ars/access-requests?dataset_id=GHGAD588887987&*": getAccessRequests(
+    "j.doe@ghga.de",
+    "GHGAD588887987"
+  ),
 
   // Specific dataset and user access requests
-  "GET /api/ars/access-requests?*": accessRequests.filter((x) => x.user_id === "j.doe@ghga.de"),
+  "GET /api/ars/access-requests?*": getAccessRequests("j.doe@ghga.de"),
 
   // All access requests
-  "GET /api/ars/access-requests": accessRequests,
+  "GET /api/ars/access-requests": getAccessRequests(),
 
   // All access requests
   "POST /api/ars/access-requests": 204,
@@ -77,24 +84,28 @@ export const responses = {
   "GET /static/*": undefined,
 
   // Get Dataset details (embedded) Metadata Repository Service
-  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887987": embeddedDataset[0],
-  // Get Dataset details (embedded) Metadata Repository Service
-  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887988": embeddedDataset.map((x) => { return ({ ...x, accession: "GHGAD588887988", ega_accession: "EGAD588887988" }) })[0],
-  // Get Dataset details (embedded) Metadata Repository Service
-  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887989": embeddedDataset.map((x) => { return ({ ...x, accession: "GHGAD588887989", ega_accession: "EGAD588887989" }) })[0],
+  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887987":
+    getEmbeddedDataset("GHGAD588887987"),
+  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887988":
+    getEmbeddedDataset("GHGAD588887988"),
+  "GET /api/metldata/artifacts/embedded_public/classes/EmbeddedDataset/resources/GHGAD588887989":
+    getEmbeddedDataset("GHGAD588887989"),
 
   // Get summary data from a single dataset
-  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887987": datasetSummary[0],
+  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887987":
+    getDatasetSummary("GHGAD588887987"),
   // Get summary data from a single dataset
-  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887988": datasetSummary.map((x) => { return ({ ...x, accession: "GHGAD588887988", ega_accession: "EGAD588887988" }) })[0],
+  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887988":
+    getDatasetSummary("GHGAD588887988"),
   // Get summary data from a single dataset
-  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887989": datasetSummary.map((x) => { return ({ ...x, accession: "GHGAD588887989", ega_accession: "EGAD588887989" }) })[0],
+  "GET /api/metldata/artifacts/stats_public/classes/DatasetStats/resources/GHGAD588887989":
+    getDatasetSummary("GHGAD588887989"),
 
   // Get summary data from entire metadata database
   "GET /api/metldata/stats": metadataSummary,
 
   // Metadata Search Service
-  "POST /api/mass/rpc/search*": {
+  "GET /api/mass/search*": {
     facets: searchResults.facets,
     count: searchResults.count,
     hits: searchResults.hits,
diff --git a/src/models/dataset.ts b/src/models/dataset.ts
index 4767b13f..28466603 100644
--- a/src/models/dataset.ts
+++ b/src/models/dataset.ts
@@ -107,20 +107,14 @@ export interface DatasetEmbeddedModel {
 }
 
 export interface HitContentModel {
-  accession: string;
-  ega_accession: string;
   title: string;
-  description: string;
-  types: string[];
-  study_files: string[];
-  study: StudyEmbeddedModel;
-  samples: string[];
-  sequencing_experiments: string[];
+  alias: string;
+  description?: string;
+  types?: string[];
 }
 
 export interface HitModel {
-  document_type: string;
-  context: string | null;
+  id_: string;
   content: HitContentModel;
 }