Merge pull request #380 from NREL/develop

Merge 0.4.1 into Main
NREL · Nov 14, 2022 · 055e493 · 055e493
2 parents c90d064 + cef1282
commit 055e493
Show file tree

Hide file tree

Showing 37 changed files with 646 additions and 503 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-  # Reenable pull_request if we start receiving 3rd party contributions.
-  # Otherwise all pull_requests will also be push test and we are enforcing
-  # that code must be up to date with parent in the PRs.
+  # Re-enable pull_request if we start receiving 3rd party contributions.
+  # Otherwise, all pull_requests will also be push test and we are enforcing
+  # that code must be up-to-date with parent in the PRs.
   #pull_request:
 
 jobs:
@@ -76,6 +76,8 @@ jobs:
       # the webpack calling on the web container for .dev.yml can take some
       # time.
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           printenv
           docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build -d worker
@@ -90,11 +92,11 @@ jobs:
 
       - name: Run modelica job tests in Docker worker container
         run: |
-          docker exec alfalfa_worker bash -c "cd /alfalfa && pytest -m docker tests/jobs/modelica -o log_cli=true -o log_level=info"
+          docker exec alfalfa_worker_1 bash -c "cd /alfalfa && pytest -m docker tests/jobs/modelica -o log_cli=true -o log_level=info"
 
       - name: Run openstudio job tests in Docker worker container
         run: |
-          docker exec alfalfa_worker bash -c "cd /alfalfa && pytest -m docker tests/jobs/openstudio -o log_cli=true -o log_level=info"
+          docker exec alfalfa_worker_1 bash -c "cd /alfalfa && pytest -m docker tests/jobs/openstudio -o log_cli=true -o log_level=info"
 
       - name: Dump docker logs on failure
         if: failure()
@@ -122,6 +124,8 @@ jobs:
           poetry-version: 1.2.1
 
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           printenv
           docker-compose up --build -d
@@ -173,6 +177,8 @@ jobs:
           poetry-version: 1.2.1
 
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           export HISTORIAN_ENABLE=true
           printenv

diff --git a/alfalfa_web/Dockerfile b/alfalfa_web/Dockerfile
@@ -1,4 +1,6 @@
 FROM node:16 AS base
+ARG GIT_COMMIT
+ENV GIT_COMMIT=$GIT_COMMIT
 
 RUN apt-get update && apt-get install -y \
     ca-certificates \

diff --git a/alfalfa_web/components/Sims/Sims.js b/alfalfa_web/components/Sims/Sims.js
@@ -66,25 +66,23 @@ class Sims extends React.Component {
     selected: []
   };
 
-  isSelected = (simRef) => {
-    return this.state.selected.indexOf(simRef) !== -1;
+  isSelected = (id) => {
+    return this.state.selected.indexOf(id) !== -1;
   };
 
   selectedSims = () => {
     return this.props.data.viewer.sims.filter((sim) => {
-      return this.state.selected.some((simRef) => {
-        return simRef === sim.simRef;
-      });
+      return this.state.selected.some((id) => id === sim.siteRef);
     });
   };
 
-  handleRowClick = (event, simRef) => {
+  handleRowClick = (event, id) => {
     const { selected } = this.state;
-    const selectedIndex = selected.indexOf(simRef);
+    const selectedIndex = selected.indexOf(id);
     let newSelected = [];
 
     if (selectedIndex === -1) {
-      newSelected = newSelected.concat(selected, simRef);
+      newSelected = newSelected.concat(selected, id);
     } else if (selectedIndex === 0) {
       newSelected = newSelected.concat(selected.slice(1));
     } else if (selectedIndex === selected.length - 1) {
@@ -156,12 +154,12 @@ class Sims extends React.Component {
               </TableHead>
               <TableBody>
                 {sims.map((sim) => {
-                  const isSelected = this.isSelected(sim.simRef);
+                  const isSelected = this.isSelected(sim.siteRef);
                   return (
                     <TableRow
-                      key={sim.simRef}
+                      key={sim.siteRef}
                       style={{ cursor: "default" }}
-                      onClick={(event) => this.handleRowClick(event, sim.simRef)}>
+                      onClick={(event) => this.handleRowClick(event, sim.siteRef)}>
                       <TableCell padding="checkbox">
                         <Checkbox checked={isSelected} />
                       </TableCell>
@@ -214,7 +212,6 @@ const simsQL = gql`
   query SimsQuery {
     viewer {
       sims {
-        simRef
         name
         simStatus
         siteRef

diff --git a/alfalfa_web/components/Sites/Sites.js b/alfalfa_web/components/Sites/Sites.js
@@ -113,8 +113,8 @@ class Sites extends React.Component {
   };
 
   handleRemoveSite = () => {
-    this.selectedSites().map((item) => {
-      this.props.removeSiteProp(item.siteRef);
+    this.selectedSites().map(({ siteRef }) => {
+      this.props.removeSiteProp(siteRef);
     });
   };
 

diff --git a/alfalfa_web/generate-docs.js b/alfalfa_web/generate-docs.js
@@ -38,13 +38,21 @@ const openapiSpecification = swaggerJsdoc({
     ],
     components: {
       schemas: {
-        Model: {
+        Error: {
+          type: "object",
+          properties: {
+            error: {
+              type: "string"
+            }
+          }
+        },
+        Site: {
           type: "object",
           properties: {
             id: {
               type: "string"
             },
-            description: {
+            name: {
               type: "string"
             },
             uploadTimestamp: {