chore: add filter descendants to gitignore and remove from git tree (#…

…7013)

Co-authored-by: Timmy Huang <tihuan@users.noreply.github.com>

frontend/.gitignore

@@ -87,18 +87,8 @@ loginState.json
 public/sitemap*
 public/robots.txt
 
-# Cell Guide
-src/views/CellGuide/common/fixtures/allCellTypeDescriptions.json
-src/views/CellGuide/common/fixtures/allCellTypeDescriptionsSEO.json
-src/views/CellGuide/common/fixtures/allCellTypeMarkerGenes.json
-src/views/CellGuide/common/fixtures/allCellTypeOwlDescriptions.json
-src/views/CellGuide/common/fixtures/allCellTypes.json
-src/views/CellGuide/common/fixtures/allEnrichedGenes/
-src/views/CellGuide/common/fixtures/allSourceData.json
-src/views/CellGuide/common/fixtures/allTissueDescriptions.json
-src/views/CellGuide/common/fixtures/allTissues.json
-src/views/CellGuide/common/fixtures/ontologyTree.json
-src/views/CellGuide/common/fixtures/ontologyTreeStatePerCellType.json
-src/views/CellGuide/common/fixtures/ontologyTreeStatePerTissue.json
-
-certificates
+# Filter descendants
+src/components/common/Filter/descendant_mappings/cell_type_descendants.json
+src/components/common/Filter/descendant_mappings/tissue_descendants.json
+
+certificates

frontend/Dockerfile

@@ -18,14 +18,25 @@ RUN apt-get update && apt-get install -y make wget \
     lsb-release xdg-utils nano vim procps moreutils ripgrep \
     && rm -rf /var/lib/apt/lists/*
 
+# Create the directory `make retrieve-descendants` expects before running npm ci, which runs `make retrieve-descendants`
+# as a preinstall script
+RUN mkdir -p src/components/common/Filter/descendant_mappings
+
+COPY Makefile ./
 COPY package*.json ./
 RUN npm ci --verbose --no-optional && npm cache clean --force
+
 ENV PATH /opt/node_app/node_modules/.bin:$PATH
 
 # -- TODO, we should try turning this back on later.
 # ADD --chown=node . /corpora-frontend
 ADD . /corpora-frontend
+
+# Explicitly copy the JSON files from the earlier steps
+RUN cp -r /opt/node_app/src/components/common/Filter/descendant_mappings/* /corpora-frontend/src/components/common/Filter/descendant_mappings/
+
 WORKDIR /corpora-frontend
+
 ADD ./src/configs/build.js src/configs/configs.js
 RUN mkdir -p node_modules
 RUN ln -sf /opt/node_app/node_modules/* /opt/node_app/node_modules/.bin ./node_modules/.

frontend/package.json

@@ -118,8 +118,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "predev": "make retrieve-descendants",
-    "prebuild": "make retrieve-descendants",
+    "preinstall": "make retrieve-descendants",
     "dev": "next dev --experimental-https",
     "build": "NODE_OPTIONS=\"--max_old_space_size=2048\" next build",
     "start": "next start",

frontend/src/global.d.ts

@@ -20,3 +20,13 @@ namespace HubSpotFormAPI {
 }
 
 declare const hbspt: HubSpotFormAPI.HubSpot;
+
+declare module "src/components/common/Filter/descendant_mappings/cell_type_descendants.json" {
+  const value: { [key: string]: string[] };
+  export default value;
+}
+
+declare module "src/components/common/Filter/descendant_mappings/tissue_descendants.json" {
+  const value: { [key: string]: string[] };
+  export default value;
+}