chore(sync) Syncing changes from dev to alpha

.github/workflows/lighthouse.yml

@@ -14,6 +14,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
+      - name: setup dotnet ef
+        run: dotnet tool install --tool-path .\.dotnet-tools dotnet-ef --version 8.0.6
       - name: setup node
         uses: actions/setup-node@v4
         with:
@@ -35,7 +37,7 @@ jobs:
         with:
           install: localdb
       - name: migrate
-        run: dotnet ef database update --project web/web.csproj
+        run: .\.dotnet-tools\dotnet-ef database update --project web/web.csproj
       - name: run Lighthouse CI
         run: |
           npm install -g @lhci/[email protected]

.github/workflows/release.yaml

@@ -16,13 +16,18 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+      - name: install node deps
+        run: npm install --ignore-scripts --no-audit --no-fund
       - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v3
+        uses: cycjimmy/semantic-release-action@b12c8f6015dc215fe37bc154d4ad456dd3833c90
         with:
-          semantic_version: 18
-          extra_plugins: |
-            @semantic-release/changelog@6
-            @semantic-release/exec
-            @semantic-release/git@10
+          semantic_version: 24
         env:
+          NPM_CONFIG_LEGACY_PEER_DEPS: true
+          NPM_CONFIG_AUDIT: false
+          NPM_CONFIG_FUND: false
           GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}

.github/workflows/test.yaml

@@ -20,7 +20,7 @@ jobs:
           node-version: '18.x'
 
       - name: install node deps
-        run: npm install
+        run: npm install --ignore-scripts --no-audit --no-fund
 
       - name: lint
         run: npm run lint
@@ -38,12 +38,14 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
+      - name: setup dotnet ef
+        run: dotnet tool install --tool-path .\.dotnet-tools dotnet-ef --version 8.0.6
       - name: setup node
         uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: install node deps
-        run: npm install
+        run: npm install --ignore-scripts --no-audit --no-fund
       - name: node build
         run: npm run build
       - name: create settings file
@@ -59,7 +61,7 @@ jobs:
         with:
           install: localdb
       - name: migrate
-        run: dotnet ef database update --project web/web.csproj
+        run: .\.dotnet-tools\dotnet-ef database update --project web/web.csproj
 
   integration_tests:
     name: 'integration tests'
@@ -85,7 +87,7 @@ jobs:
           distribution: 'microsoft'
           java-version: '17'
       - name: install node deps
-        run: npm install
+        run: npm install --ignore-scripts --no-audit --no-fund
       - name: node build
         run: npm run build
       - name: install dotnet deps
@@ -203,7 +205,7 @@ jobs:
           distribution: 'microsoft'
           java-version: '17'
       - name: install node deps
-        run: npm install
+        run: npm install --ignore-scripts --no-audit --no-fund
       - name: node build
         run: npm run build
       - name: install dotnet deps

.github/workflows/update.yaml

@@ -18,7 +18,7 @@ jobs:
           git fetch origin ${{github.ref_name}}:${{github.ref_name}}
           git reset --hard ${{github.ref_name}}
       - name: Create Pull Request
-        uses: peter-evans/[email protected].0
+        uses: peter-evans/[email protected].5
         with:
           labels: automated pr
           branch: ${{github.ref_name}}
@@ -36,7 +36,7 @@ jobs:
           git fetch origin ${{github.ref_name}}:${{github.ref_name}}
           git reset --hard ${{github.ref_name}}
       - name: Create Pull Request
-        uses: peter-evans/[email protected].0
+        uses: peter-evans/[email protected].5
         with:
           labels: automated pr
           branch: ${{github.ref_name}}

Dockerfile

@@ -34,13 +34,6 @@ ARG USER \
 # create config
 RUN echo "{\"Demo\": true, \"solr\": {\"atlas_address\": \"$SOLR/solr/atlas\", \"atlas_lookups_address\": \"$SOLR/solr/atlas_lookups\"},\"ConnectionStrings\": {\"AtlasDatabase\": \"Server=$HOST;Database=atlas;User Id=$USER; Password=$PASSWORD; MultipleActiveResultSets=true;TrustServerCertificate=YES\"},  \"footer\": {\"links\":{\"Status\": {\"Status\": \"https://status.atlas.bi/status/atlas\", \"Documentation\": \"https://atlas.bi\", \"Source Code\": \"https://github.com/atlas-bi/atlas-bi-library\" }},\"subtitle\": \"Atlas was created by the Riverside Healthcare Analytics team.\"}}" > appsettings.cust.json
 
-# migrate
-RUN dotnet tool install --global dotnet-ef \
-  && export PATH="$PATH:/root/.dotnet/tools" \
-  && dotnet tool restore
-
-RUN  export PATH="$PATH:/root/.dotnet/tools" && dotnet ef database update --project web.csproj -v
-
 RUN dotnet publish -c Release -o out web.csproj
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine

package.json

@@ -9,59 +9,59 @@
     "@fontsource/source-code-pro": "^5.0.0",
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^25.0.2",
+    "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-multi-entry": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-terser": "^0.4.3",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "11.1.0",
-    "@semantic-release/exec": "6.0.3",
+    "@semantic-release/commit-analyzer": "13.0.0",
+    "@semantic-release/exec": "7.1.0",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/github": "^9.0.0",
-    "@semantic-release/npm": "^11.0.0",
-    "@semantic-release/release-notes-generator": "12.1.0",
+    "@semantic-release/github": "^11.0.0",
+    "@semantic-release/npm": "^12.0.0",
+    "@semantic-release/release-notes-generator": "14.0.0",
     "@toycode/markdown-it-class": "1.2.4",
-    "bulma": "0.9.4",
+    "bulma": "1.0.1",
     "bulma-checkradio": "2.1.3",
     "bulma-steps-component": "github:atlas-bi/bulma-steps",
     "bulma-switch": "2.0.4",
     "chart.js": "2.9.4",
     "commitizen": "^4.3.0",
     "cz-conventional-changelog": "3.3.0",
-    "date-fns": "^3.0.0",
+    "date-fns": "^4.0.0",
     "dompurify": "3.0.0",
-    "es6-symbol": "3.1.3",
-    "eslint": "^8.43.0",
+    "es6-symbol": "3.1.4",
+    "eslint": "^9.0.0",
     "fancy-log": "2.0.0",
     "focus-within": "3.0.2",
     "fontawesome-subset": "^4.4.0",
-    "gulp": "4.0.2",
+    "gulp": "5.0.0",
     "gulp-autoprefixer": "8.0.0",
     "gulp-concat": "2.6.1",
     "gulp-cssnano": "2.1.3",
     "gulp-postcss": "10.0.0",
-    "gulp-purgecss": "5.0.0",
+    "gulp-purgecss": "7.0.2",
     "gulp-rename": "2.0.0",
     "gulp-replace": "^1.1.4",
-    "gulp-sass": "5.1.0",
+    "gulp-sass": "6.0.0",
     "gulp-uglify": "3.0.2",
     "jsnlog": "2.30.0",
     "lint-staged": "^15.0.0",
-    "markdown-it": "14.0.0",
-    "npm-run-all2": "^6.0.0",
+    "markdown-it": "14.1.0",
+    "npm-run-all2": "^7.0.0",
     "open": "8.4.2",
     "postcss": "^8.4.24",
     "prettier": "^3.0.0",
     "proxy-polyfill": "0.3.2",
     "regenerator-runtime": "^0.14.0",
     "rollup": "^4.0.0",
-    "semantic-release": "^23.0.0",
+    "semantic-release": "^24.0.0",
     "stylelint": "^16.0.2",
     "stylelint-config-prettier-scss": "1.0.0",
-    "stylelint-config-standard-scss": "^13.0.0",
+    "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-scss": "^6.0.0",
-    "xo": "^0.57.0"
+    "xo": "^0.58.0"
   },
   "homepage": "https://demo.atlas.bi",
   "license": "AGPL-3.0-or-later",
@@ -164,7 +164,7 @@
       "unicorn/prefer-at": "warn"
     }
   },
-  "version": "3.15.1",
+  "version": "3.15.26",
   "dependencies": {
     "sass": "^1.63.6"
   }

solr.Dockerfile

@@ -12,52 +12,78 @@
 
 FROM python:3.12-alpine as search
 WORKDIR /app
-ARG USER
-ARG PASSWORD
-ARG HOST
-# copy site
-COPY ["./web/solr", "./"]
 
 # startup search and load data
-RUN apk add --no-cache openjdk11 bash lsof python3-dev curl gcc git py3-pip gcc libc-dev g++ libffi-dev libxml2 unixodbc-dev && \
+RUN apk add --no-cache openjdk11 bash lsof procps python3-dev curl gcc git py3-pip gcc libc-dev g++ libffi-dev libxml2 unixodbc-dev && \
     pip3 install pyodbc pysolr pytz python-dotenv
 
 # install sql server driver
 RUN curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_18.1.1.1-1_amd64.apk && \
     apk add --allow-untrusted msodbcsql18_18.1.1.1-1_amd64.apk
 
-# pull solr etl
-RUN mkdir etl && cd etl && git clone --depth 1 https://github.com/atlas-bi/Solr-Search-ETL.git .
+# Copy site
+COPY ["./web/solr", "./"]
 
-# create settings
-RUN cd etl && echo "SOLRURL = \"http://localhost:8983/solr/atlas\"" > .env && \
-    echo "SOLRLOOKUPURL = \"http://localhost:8983/solr/atlas_lookups\"" >> .env && \
-    echo "ATLASDATABASE = \"DRIVER={ODBC Driver 18 for SQL Server};SERVER=$HOST;DATABASE=atlas;UID=$USER;PWD=$PASSWORD;TrustServerCertificate=YES\"" >> .env
+# Pull solr etl
+RUN mkdir etl && cd etl && git clone --depth 1 https://github.com/atlas-bi/Solr-Search-ETL.git .
 
-# load search
+# Permissions
 RUN chmod -R 777 bin
-RUN bin/solr start -force -noprompt -v && \
- cd etl && \
- python3 -c "import time; time.sleep(30)" && \
- python3 atlas_collections.py && \
- python3 atlas_groups.py && \
- python3 atlas_initiatives.py && \
- python3 atlas_lookups.py && \
- python3 atlas_reports.py && \
- python3 atlas_terms.py && \
- python3 atlas_users.py
-
-FROM alpine:latest
-WORKDIR /app
-RUN apk add --no-cache openjdk11 bash lsof
-COPY --from=search ["/app", "./"]
-
-ARG USER
-ARG PASSWORD
-ARG HOST
 
-# create config
+# Create startup script
+RUN echo '#!/bin/bash' > /start.sh && \
+    echo 'set -e' >> /start.sh && \
+    echo 'echo "Starting startup script..."' >> /start.sh && \
+    echo 'PORT=${PORT:-8983}' >> /start.sh && \
+    echo 'cd /app/etl' >> /start.sh && \
+    echo 'echo "Generating .env..."' >> /start.sh && \
+    echo 'echo "Debug: HOST=$HOST USER=$USER"' >> /start.sh && \
+    echo 'export SOLRURL="http://localhost:$PORT/solr/atlas"' >> /start.sh && \
+    echo 'export SOLRLOOKUPURL="http://localhost:$PORT/solr/atlas_lookups"' >> /start.sh && \
+    echo 'echo "SOLRURL = \"$SOLRURL\"" > .env' >> /start.sh && \
+    echo 'echo "SOLRLOOKUPURL = \"$SOLRLOOKUPURL\"" >> .env' >> /start.sh && \
+    echo 'export ATLASDATABASE="DRIVER={ODBC Driver 18 for SQL Server};SERVER=$HOST;DATABASE=atlas;UID=$USER;PWD=$PASSWORD;TrustServerCertificate=YES;LoginTimeout=60"' >> /start.sh && \
+    echo 'echo "ATLASDATABASE = \"$ATLASDATABASE\"" >> .env' >> /start.sh && \
+    echo 'cd /app' >> /start.sh && \
+    echo 'echo "Starting Solr (foreground mode, managed by container)..."' >> /start.sh && \
+    echo 'bin/solr start -force -noprompt -f -p $PORT & SOLR_PID=$!' >> /start.sh && \
+    echo 'echo "Solr PID: $SOLR_PID"' >> /start.sh && \
+    echo 'echo "Waiting for Solr..."' >> /start.sh && \
+    echo 'sleep 15' >> /start.sh && \
+    echo 'echo "Checking SQL Server connectivity..."' >> /start.sh && \
+    echo 'set +e' >> /start.sh && \
+    echo 'python3 -u -c "import pyodbc, os, time; ' >> /start.sh && \
+    echo 'conn_str = os.environ.get(\"ATLASDATABASE\"); ' >> /start.sh && \
+    echo 'if not conn_str: print(\"Error: ATLASDATABASE env var is missing\"); exit(1); ' >> /start.sh && \
+    echo 'print(f\"Attempting connection to SQL Server...\"); ' >> /start.sh && \
+    echo 'for i in range(30): ' >> /start.sh && \
+    echo '    try: ' >> /start.sh && \
+    echo '        pyodbc.connect(conn_str); ' >> /start.sh && \
+    echo '        print(\"Successfully connected to SQL Server\"); ' >> /start.sh && \
+    echo '        exit(0); ' >> /start.sh && \
+    echo '    except Exception as e: ' >> /start.sh && \
+    echo '        print(f\"Connection attempt {i+1} failed: {e}\"); ' >> /start.sh && \
+    echo '        time.sleep(5); ' >> /start.sh && \
+    echo 'print(\"Could not connect to SQL Server after retries\"); ' >> /start.sh && \
+    echo 'exit(1)"' >> /start.sh && \
+    echo 'DB_CHECK_EXIT=$?' >> /start.sh && \
+    echo 'set -e' >> /start.sh && \
+    echo 'if [ $DB_CHECK_EXIT -eq 0 ]; then' >> /start.sh && \
+    echo '    echo "Running ETL..."' >> /start.sh && \
+    echo '    cd /app/etl' >> /start.sh && \
+    echo '    python3 -u atlas_collections.py || echo "Failed atlas_collections.py"' >> /start.sh && \
+    echo '    python3 -u atlas_groups.py || echo "Failed atlas_groups.py"' >> /start.sh && \
+    echo '    python3 -u atlas_initiatives.py || echo "Failed atlas_initiatives.py"' >> /start.sh && \
+    echo '    python3 -u atlas_lookups.py || echo "Failed atlas_lookups.py"' >> /start.sh && \
+    echo '    python3 -u atlas_reports.py || echo "Failed atlas_reports.py"' >> /start.sh && \
+    echo '    python3 -u atlas_terms.py || echo "Failed atlas_terms.py"' >> /start.sh && \
+    echo '    python3 -u atlas_users.py || echo "Failed atlas_users.py"' >> /start.sh && \
+    echo 'else' >> /start.sh && \
+    echo '    echo "Skipping ETL due to DB connection failure"' >> /start.sh && \
+    echo 'fi' >> /start.sh && \
+    echo 'cd /app' >> /start.sh && \
+    echo 'echo "Solr is running; waiting on PID $SOLR_PID..."' >> /start.sh && \
+    echo 'wait $SOLR_PID' >> /start.sh && \
+    chmod +x /start.sh
 
-RUN chmod -R 777 bin
-# in release 2022.02.2 we need to change the name from atlas_dotnet to atlas_web
-CMD bin/solr start -force -noprompt -f -p $PORT
+CMD ["/start.sh"]

web.Tests/web.Tests.csproj

@@ -13,25 +13,25 @@
   <ItemGroup>
     <PackageReference Include="BrowserStackLocal" Version="2.3.1" />
     <PackageReference Include="MartinCostello.BrowserStack.Automate" Version="4.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="Selenium.WebDriver" Version="4.17.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+    <PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
 
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>