Merge branch 'main' of https://github.com/RolnickLab/ami-platform into 387-add-top-species-chart-to-overview-page

Author: vanessavmac

.dockerignore

@@ -15,3 +15,4 @@ venv
 .env
 .envs
 .envs/*
+node_modules

ami/main/charts.py

@@ -279,6 +279,12 @@ def event_top_taxa(event_pk: int, top_n: int = 10):
     else:
         taxa, counts = [], []
 
+    # Restrict number of top species if too many
+    MAX_SPECIES = 10
+    if len(taxa) > MAX_SPECIES:
+        taxa = taxa[:MAX_SPECIES]
+        counts = counts[:MAX_SPECIES]
+
     return {
         "title": "Top species",
         "data": {"x": counts, "y": taxa},

ami/templates/base.html

@@ -61,9 +61,6 @@
               <li class="nav-item active">
                 <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
               </li>
-              <li class="nav-item">
-                <a class="nav-link" href="{% url 'about' %}">About</a>
-              </li>
             </ul>
           </div>
         </div>

compose/local/ui/Dockerfile

@@ -1,8 +1,31 @@
 # Node version should always match the version in `ui/.nvmrc`
 FROM node:18
+
+# Set the working directory in the container
 WORKDIR /app
+
+# Copy package.json and yarn.lock
 COPY package.json yarn.lock ./
+
+# Install dependencies
+# RUN yarn install --frozen-lockfile
 RUN yarn install
-RUN ["git", "config", "--global", "--add", "safe.directory", "/app"]
+
+# Copy the rest of the application code
+# Don't need this in the local env, we're mounting the code in the compose file
+# COPY . .
+
+# Verify that node_modules exists and has content
+RUN ls -la /app/node_modules
+
+# Configure git to trust the /app directory
+RUN git config --global --add safe.directory /app
+
+# Don't try to open a browser
 ENV BROWSER=none
-CMD ["yarn", "start", "--host", "0.0.0.0" , "--port", "4000"]
+
+# Expose the port the app runs on
+EXPOSE 4000
+
+# Define the command to run the app
+CMD ["yarn", "start", "--host", "0.0.0.0", "--port", "4000"]

docker-compose.yml

@@ -8,6 +8,7 @@ volumes:
       o: bind
   minio_data:
     driver: local
+  node_modules:
 
 services:
   django: &django
@@ -53,6 +54,7 @@ services:
     volumes:
       - ./.git:/app/.git:ro
       - ./ui:/app
+      - node_modules:/app/node_modules
     depends_on:
       - django
     environment:

ui/src/design-system/components/plot/plot.tsx

@@ -34,7 +34,13 @@ const Plot = ({
           marker: {
             color: markerColor,
           },
-          hovertemplate,
+          hovertemplate:
+            type === 'bar' && orientation === 'h'
+              ? '%{x}'
+              : type === 'bar'
+              ? '%{y}'
+              : '<b>%{x}</b>: %{y}',
+          name: '', // Remove ‘trace 0’ next to hover
         },
       ]}
       config={{