Merge branch 'develop' of github.com:NREL/alfalfa into bump_version_1

Author: TShapinsky

.env

@@ -2,18 +2,20 @@ AWS_ACCESS_KEY_ID=user
 AWS_SECRET_ACCESS_KEY=password
 GF_SECURITY_ADMIN_PASSWORD=password
 GF_SECURITY_ADMIN_USER=admin
-INFLUXDB_ADMIN_PASSWORD=password
-INFLUXDB_ADMIN_USER=admin
+INFLUXDB_PASSWORD=password
+INFLUXDB_USERNAME=admin
 INFLUXDB_DB=alfalfa
 INFLUXDB_HOST=influxdb
 INFLUXDB_HTTP_AUTH_ENABLED=true
 JOB_QUEUE=Alfalfa Job Queue
 LOGGING=false
-MONGO_DB_NAME=alfalfa
-MONGO_URL=mongodb://mongo:27017
+MONGO_INITDB_ROOT_USERNAME=admin
+MONGO_INITDB_ROOT_PASSWORD=password
+MONGO_INITDB_DATABASE=alfalfa
+MONGO_URL=mongodb://admin:password@mongo:27017/alfalfa?authSource=admin
 NODE_ENV=production
-REDIS_HOST=redis
-REGION=us-west-1
+REDIS_URL=redis://redis:6379/0
+S3_REGION=us-west-1
 S3_BUCKET=alfalfa
 S3_URL=http://minio:9000
 S3_URL_EXTERNAL=http://localhost:9000

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Run pre-commit
         uses: pre-commit/[email protected]
@@ -39,7 +39,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Install poetry
         uses: abatilo/actions-poetry@v3
@@ -76,7 +76,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           files: docker-compose.yml, docker-compose.dev.yml
           set: |
@@ -92,7 +92,7 @@ jobs:
           GIT_COMMIT: ${{ github.sha }}
         run: |
           printenv
-          docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d worker mongo redis minio mc goaws
+          docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d worker mongo redis minio mc
 
       - name: Dump docker logs before tests
         uses: jwalton/gh-docker-logs@v2
@@ -117,7 +117,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Install poetry
         uses: abatilo/actions-poetry@v3
@@ -128,7 +128,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           files: docker-compose.yml
           set: |
@@ -185,7 +185,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: Install poetry
         uses: abatilo/actions-poetry@v3
@@ -196,10 +196,10 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           load: true
-          files: docker-compose.yml, docker-compose.dev.yml, docker-compose.historian.yml
+          files: docker-compose.yml, docker-compose.historian.yml
           set: |
             web.cache-from=type=gha,scope=web:${{ github.ref_name }}
             web.output=type=docker
@@ -247,6 +247,10 @@ jobs:
         uses: jwalton/gh-docker-logs@v2
 
   publish:
+    permissions:
+      contents: read
+      packages: write
+    name: Build and publish Docker images
     needs: [pre-commit, unit-tests, simulation-tests, integration-tests, integration-tests-historian]
     runs-on: ubuntu-latest
     if: github.actor != 'dependabot[bot]'
@@ -280,9 +284,6 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
             type=edge
 
-      - name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v3
-
       - name: Build Push
         run: |
           /usr/bin/docker buildx bake \

.pre-commit-config.yaml

@@ -26,8 +26,8 @@ repos:
       - id: requirements-txt-fixer
       - id: mixed-line-ending
         args: ["--fix=auto"]
-  - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v2.0.1
+  - repo: https://github.com/hhatto/autopep8
+    rev: v2.3.1
     hooks:
       - id: autopep8
         args:

alfalfa_web/.babelrc.js

@@ -14,15 +14,16 @@ const presets = [
   ]
 ];
 
-if (isProd) presets.push(["minify", { builtIns: false }]);
+// Use Webpack's built-in Terser for minification instead of babel-preset-minify
+// which has compatibility issues with newer Babel versions
 
 module.exports = {
   assumptions: {
     noDocumentAll: true,
     noClassCalls: true
   },
   comments: false,
-  plugins: ["@babel/plugin-proposal-class-properties"],
+  plugins: ["@babel/plugin-transform-class-properties"],
   presets,
   sourceMaps: isProd ? false : "inline"
 };

alfalfa_web/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16 AS base
+FROM node:22-slim AS base
 ARG GIT_COMMIT
 ENV GIT_COMMIT=$GIT_COMMIT
 
@@ -15,7 +15,7 @@ COPY alfalfa_web /srv/alfalfa
 
 ARG NODE_ENV
 RUN npm run build
-CMD [ "npm", "start" ]
+CMD [ "node", "build/index.js" ]
 
 # **** Staged build for running in development mode ****
 FROM base AS dev

alfalfa_web/components/app.js

@@ -2,15 +2,17 @@ import React from "react";
 import "@fontsource/material-icons";
 import "@fontsource/roboto";
 import "normalize.css/normalize.css";
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";
 import { App } from "./App/App.js";
 
-ReactDOM.render(
+const container = document.getElementById("root");
+const root = createRoot(container);
+
+root.render(
   <BrowserRouter>
     <React.StrictMode>
       <App />
     </React.StrictMode>
-  </BrowserRouter>,
-  document.getElementById("root")
+  </BrowserRouter>
 );