Merge branch 'main' into react-dashboard

Author: jarosenb

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Fetch base and install Poetry
       run: |
         git fetch origin ${{github.base_ref}}
-        pipx install poetry
+        pipx install poetry==2.1.1
 
     - name: Setup Python
       uses: actions/setup-python@v4
@@ -31,7 +31,7 @@ jobs:
         cp --force designsafe/templates/base.j2 designsafe/templates/base.html
 
     - run: |
-        poetry install
+        poetry sync
 
     - name: Run Server-side unit tests and generate coverage report
       run: |
@@ -45,7 +45,7 @@ jobs:
     - name: Fetch base and install Poetry
       run: |
         git fetch origin ${{github.base_ref}}
-        pipx install poetry
+        pipx install poetry==2.1.1
 
     - name: Setup Python
       uses: actions/setup-python@v4
@@ -55,7 +55,7 @@ jobs:
 
     - name: Install Python Packages
       run:  |
-        poetry install
+        poetry sync
 
     - name: Run Server-side linting with pytest
       # Only run on new files for now-- for all changes, filter is ACMRTUXB

.gitignore

@@ -96,8 +96,8 @@ docs/_build/
 .docs/build
 target/
 venv/
+.venv/
 metrics/
-.python-version
 
 # ignore Google Drive API secrets
 *secrets.json

Makefile

@@ -12,6 +12,14 @@ build:
 build-dev:
 	docker compose -f ./conf/docker/docker-compose-dev.yml build
 
+.PHONY: python-install
+python-install:
+	pyenv local 3.11 && POETRY_VIRTUALENVS_IN_PROJECT=true poetry sync || echo \
+	'Command failed. Do you have Poetry (https://python-poetry.org/docs/#installation) \
+	and pyenv (https://github.com/pyenv/pyenv?tab=readme-ov-file#a-getting-pyenv) installed? \
+	You may also need to run "pyenv install 3.11".'
+
+
 .PHONY: start
 start:
 	docker compose --env-file $(NGROK_ENV_FILE) -f ./conf/docker/docker-compose-dev.all.debug.yml up

client/modules/datafiles/src/projects/ProjectCitation/ProjectCitation.tsx

@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { Popover } from 'antd';
 import {
   useDataciteMetrics,
   useProjectDetail,
@@ -170,11 +171,26 @@ export const DownloadCitation: React.FC<{
           </a>
           <div>
             <span className={styles['yellow-highlight']}>
-              {dataciteMetrics?.data.attributes.downloadCount ?? '--'} Downloads
+              <Popover
+                overlayStyle={{ maxWidth: '400px' }}
+                title="Unique Requests"
+                content="User sessions in which one or more files are downloaded or previewed."
+              >
+                {dataciteMetrics?.data.attributes.downloadCount ?? '--'} Unique
+                Requests
+              </Popover>
             </span>
             &nbsp;&nbsp;&nbsp;&nbsp;
             <span className={styles['yellow-highlight']}>
-              {dataciteMetrics?.data.attributes.viewCount ?? '--'} Views
+              <Popover
+                overlayStyle={{ maxWidth: '400px' }}
+                title="Unique Investigations"
+                content="User sessions in which any project or publication metadata is viewed,
+                          or one or more files is downloaded or previewed"
+              >
+                {dataciteMetrics?.data.attributes.viewCount ?? '--'} Unique
+                Investigations
+              </Popover>
             </span>
             &nbsp;&nbsp;&nbsp;&nbsp;
             <span className={styles['yellow-highlight']}>

client/modules/datafiles/src/projects/ProjectPreview/ProjectPreview.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import {
   apiClient,
   DoiContextProvider,
@@ -25,7 +25,7 @@ import {
   FileTypeIcon,
   TFileListingColumns,
 } from '@client/common-components';
-import { Link, useParams } from 'react-router-dom';
+import { Link, useLocation, useParams } from 'react-router-dom';
 import { PublishedEntityDetails } from '../PublishedEntityDetails';
 import { PreviewModalBody } from '../../DatafilesModal/PreviewModal';
 import { SubEntityDetails } from '../SubEntityDetails';
@@ -225,6 +225,14 @@ export const PublishedEntityDisplay: React.FC<{
       : '';
   const { data: citationMetrics } = useDataciteMetrics(dois, !preview);
 
+  const publishedRef = useRef<HTMLElement>(null);
+  const location = useLocation();
+  useEffect(() => {
+    if (location.hash === `#detail-${treeData.uuid}`) {
+      publishedRef.current?.scrollIntoView();
+    }
+  }, [publishedRef, location, treeData.uuid]);
+
   useEffect(() => {
     if (active && !preview) {
       const identifier = dois ?? treeData.uuid;
@@ -237,7 +245,11 @@ export const PublishedEntityDisplay: React.FC<{
   }, [active, preview, dois, projectId, treeData.name, treeData.uuid]);
 
   return (
-    <section>
+    <section
+      id={`#detail-${treeData.uuid}`}
+      ref={publishedRef}
+      style={{ scrollMargin: '70px' }}
+    >
       <div
         className={styles['pub-show-button']}
         style={{
@@ -399,6 +411,8 @@ export const PublicationView: React.FC<{
   const { children } = data?.tree ?? {};
 
   const { selectedVersion } = usePublicationVersions(projectId);
+  const { hash } = useLocation();
+  const openUuid = hash.split('#detail-').slice(-1)[0];
 
   const sortedChildren = useMemo(
     () => [...(children ?? [])].sort((a, b) => (a.order ?? 0) - (b.order ?? 0)),
@@ -420,7 +434,10 @@ export const PublicationView: React.FC<{
               license={data.baseProject.license}
               projectId={projectId}
               treeData={child}
-              defaultOpen={idx === 0 && sortedChildren.length === 1}
+              defaultOpen={
+                (idx === 0 && sortedChildren.length === 1) ||
+                child.uuid === openUuid
+              }
               key={child.id}
             />
           </DoiContextProvider>

client/modules/datafiles/src/publications/modals/DownloadDatasetModal.tsx

@@ -287,7 +287,7 @@ export const DownloadDatasetModal: React.FC<{
                 </a>{' '}
                 and follow the
                 <a
-                  href="/user-guide/managingdata/#data-transfer-guides"
+                  href="/user-guide/managingdata/datatransfer/"
                   target="_blank"
                   aria-describedby="msg-open-new-window"
                 >

conf/docker/Dockerfile

@@ -34,49 +34,43 @@ ENV LC_ALL en_US.utf-8
 ENV LANG en_US.utf-8
 
 # https://python-poetry.org/docs/configuration/#using-environment-variables
-ENV POETRY_VERSION=1.8.2 \
-    POETRY_HOME="/opt/poetry" \
+ENV POETRY_VERSION=2.1.1 \
     POETRY_VIRTUALENVS_IN_PROJECT=true \
     PYSETUP_PATH="/opt/pysetup" \
-    VENV_PATH="/opt/pysetup/.venv"
+    VENV_PATH="/opt/pysetup/.venv" \
+    PIPX_ROOT_PATH="/root/.local/bin"
 
-# Prepend venv and poetry to path
-ENV PATH="$VENV_PATH/bin:$POETRY_HOME/bin:$PATH"
+# Install pipx and poetry
+RUN python3 -m pip install --user pipx && python3 -m pipx ensurepath
+ENV PATH="${PIPX_ROOT_PATH}:${VENV_PATH}/bin:$PATH"
+RUN pipx install poetry==2.1.1
 
 RUN groupadd --gid 816877 G-816877 && \
     useradd --uid 458981 --gid G-816877 -m --shell /bin/bash tg458981 -d /home/tg458981
 
-# Install poetry version $POETRY_VERSION to $POETRY_HOME
-RUN pip3 install --no-cache-dir --upgrade pip setuptools wheel \
-    && python3 -m venv "$POETRY_HOME" \
-    && "$POETRY_HOME/bin/pip" install --no-cache-dir poetry=="$POETRY_VERSION"
-
 # Copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
-COPY poetry.lock pyproject.toml ./
+COPY pyproject.toml poetry.lock ./
 
 ##############
 # `development` image target is used for local development
 FROM python-base as development
 
-RUN "$POETRY_HOME/bin/poetry" install
+RUN poetry sync
 
 # Copy in base project directory without built client assets for local development
 COPY --chown=tg458981:G-816877 . /srv/www/designsafe
 
 USER tg458981
 
-# Install dev dependencies
-RUN "$POETRY_HOME/bin/poetry" install --with dev
-
 WORKDIR /srv/www/designsafe
 
 ##############
 # `production` image target is used for deployed runtime environments
 FROM python-base as production
 
 # Install runtime dependencies
-RUN "$POETRY_HOME/bin/poetry" install --without dev
+RUN poetry sync --without=dev
 
 # Copy in built client assets
 COPY --from=node_build --chown=tg458981:G-816877 /designsafe/ /srv/www/designsafe

conf/nginx/nginx.debug.conf

@@ -43,7 +43,8 @@ http {
     }
 
     server {
-        listen       443 ssl http2;
+        listen       443 ssl;
+        http2        on;
         server_name  designsafe.dev;
 
         charset utf-8;

designsafe/apps/nco/templates/designsafe/apps/nco/ttc_grants.j2

@@ -2,7 +2,7 @@
 {% load cms_tags static sekizai_tags%}
 
 {% block title %}
-NHERI Facilities Scheduling Dashbaord
+NHERI Grant Research
 {% endblock %}
 {% block head_extra %}
     <base href="{% url 'nco:ttc_grants' %}">