From 8bb9a6068c4923c123846eaadbe3d837b4b80aa0 Mon Sep 17 00:00:00 2001
From: Janet Gainer-Dewar <jdewar@broadinstitute.org>
Date: Fri, 3 Dec 2021 16:15:13 -0500
Subject: [PATCH 1/5] Changed to get dev ui docker image building

---
 ui/Dockerfile.dev | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/Dockerfile.dev b/ui/Dockerfile.dev
index baa082e6c..b5deb327f 100644
--- a/ui/Dockerfile.dev
+++ b/ui/Dockerfile.dev
@@ -1,6 +1,8 @@
 # Note: This is the dockerfile for development purposes
 
-FROM node
+FROM node:14
+
+RUN apt-get update && apt-get -y install python
 
 WORKDIR /ui
 ADD package-lock.json package.json /ui/

From cdcf5a9c94f3e7464a2d887bfd3c221e89024ddc Mon Sep 17 00:00:00 2001
From: Janet Gainer-Dewar <jdewar@broadinstitute.org>
Date: Mon, 6 Dec 2021 15:36:16 -0500
Subject: [PATCH 2/5] Create volume for config file to be mounted into

---
 cromwell-instance-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cromwell-instance-compose.yml b/cromwell-instance-compose.yml
index 2851fc196..5590cd3aa 100644
--- a/cromwell-instance-compose.yml
+++ b/cromwell-instance-compose.yml
@@ -10,6 +10,7 @@ services:
       service: jmui
     command: ["npm", "run-script", "ng", "--", "serve", "--host", "jmui"]
     volumes:
+      - /ui/src/assets/environments/
       - ${PWD}/ui/assets/environments/environment.cromwell.instance.json:/ui/src/assets/environments/environment.json
   cromwell:
     build:

From 0371dfe2fa4e312466401f0bb97d12ece7704df2 Mon Sep 17 00:00:00 2001
From: Janet Gainer-Dewar <jdewar@broadinstitute.org>
Date: Mon, 6 Dec 2021 15:46:27 -0500
Subject: [PATCH 3/5] Targeted package upgrades

---
 ui/package-lock.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index b8f2ce2e0..1834651b3 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1826,7 +1826,7 @@
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
-        "js-yaml": "3.7.0",
+        "js-yaml": "3.14.1",
         "minimist": "1.2.0",
         "object-assign": "4.1.1",
         "os-homedir": "1.0.2",
@@ -2740,9 +2740,9 @@
       }
     },
     "esprima": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
       "dev": true
     },
     "esrecurse": {
@@ -5180,7 +5180,7 @@
         "istanbul-lib-report": "1.1.2",
         "istanbul-lib-source-maps": "1.2.2",
         "istanbul-reports": "1.1.3",
-        "js-yaml": "3.7.0",
+        "js-yaml": "3.14.1",
         "mkdirp": "0.5.1",
         "once": "1.4.0"
       }
@@ -5324,13 +5324,13 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
         "argparse": "1.0.9",
-        "esprima": "2.7.3"
+        "esprima": "4.0.0"
       }
     },
     "jsbn": {

From 5abb53b0a1ea22301eae900e2ed675b971f34f8f Mon Sep 17 00:00:00 2001
From: Janet Gainer-Dewar <jdewar@broadinstitute.org>
Date: Mon, 6 Dec 2021 16:39:12 -0500
Subject: [PATCH 4/5] Clarify test doc

---
 ui/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/README.md b/ui/README.md
index 71879c67d..f695b09b8 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -17,7 +17,7 @@ ng generate directive|pipe|service|class|guard|interface|enum|module
 Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
 
 ## Running Tests
-Unit tests are run via [Karma](https://karma-runner.github.io).
+Unit tests are run via [Karma](https://karma-runner.github.io). Tests are typically run in CI after PR creation, not locally.
 ```
 npm test
 ```

From 57b9d396a7c9ff14492d230106727e36af0a7b26 Mon Sep 17 00:00:00 2001
From: Janet Gainer-Dewar <jdewar@broadinstitute.org>
Date: Tue, 7 Dec 2021 10:24:03 -0500
Subject: [PATCH 5/5] PR feedback

---
 ui/Dockerfile.dev | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/Dockerfile.dev b/ui/Dockerfile.dev
index b5deb327f..2dafe4e52 100644
--- a/ui/Dockerfile.dev
+++ b/ui/Dockerfile.dev
@@ -2,6 +2,7 @@
 
 FROM node:14
 
+# Install python 2, needed for npm packages
 RUN apt-get update && apt-get -y install python
 
 WORKDIR /ui