Merge branch 'develop' of github.com:CanDIG/candig-data-portal into b…

…ugfix/sidebar-width

.prettierignore

@@ -1 +1,2 @@
 .github/workflows/candig-dispatch.yml
+**/*.md

package.json

@@ -21,9 +21,9 @@
         "@testing-library/jest-dom": "^6.2.0",
         "@testing-library/react": "^14.1.2",
         "@testing-library/user-event": "^14.5.2",
-        "apexcharts": "^3.45.1",
         "babel-loader": "^9.1.3",
         "clsx": "^2.1.0",
+        "eslint-config-react-app": "^7.0.1",
         "formik": "^2.4.5",
         "framer-motion": "^10.17.9",
         "highcharts": "^11.2.0",
@@ -35,7 +35,6 @@
         "papaparse": "^5.4.1",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
-        "react-apexcharts": "^1.4.1",
         "react-device-detect": "^2.2.3",
         "react-dom": "^18.2.0",
         "react-loader-spinner": "^6.1.6",

src/views/clinicalGenomic/widgets/clinicalData.js

@@ -139,7 +139,11 @@ function ClinicalView() {
 
     const HandlePageChange = (newModel) => {
         if (newModel.page !== queryReader.query?.page) {
-            writerContext((old) => ({ ...old, query: { ...old.query, page: newModel.page, page_size: newModel.pageSize } }));
+            writerContext((old) => ({
+                ...old,
+                query: { ...old.query, page: newModel.page, page_size: newModel.pageSize },
+                reqNum: old.reqNum + 1
+            }));
         }
     };
 

src/views/clinicalGenomic/widgets/searchExplainer.js

@@ -35,8 +35,9 @@ function SearchExplainer() {
 
     // Decompose the query into its roots: what are we searching on?
     if (query !== undefined) {
+        const ignoredKeys = ['page', 'page_size']; // These are never included in the explanation
         Object.keys(query).forEach((key) => {
-            if (key !== undefined && query[key] !== undefined) {
+            if (key !== undefined && query[key] !== undefined && !ignoredKeys.includes(key)) {
                 const onDelete = () => {
                     writer((old) => ({ ...old, clear: key }));
                 };