Fix SCT-3123 - 20 second chrome freeze

CHANGELOG.md

@@ -5,11 +5,12 @@ All notable changes to this project are be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased] - 2021-09-13
+## [Unreleased] - 2021-09-23
 
 ### Added
 
 - SCT-3129: add GHA workflow which supports test and build for all scenarios - feature and fix branches, pull requests, merges to master, and releases - and pushes to GHCR. Also names the resulting image/package `navigator`, the new canonical name for this repo/product.
+- SCT-3123: Added testing-library support
 
 ### Changed
 
@@ -32,7 +33,8 @@ none
 - add "-n" to entr, otherwise broken
 - Fix broken tests
 - Fixed Typescript usage (errors reported by latest TS)
+- SCT-3123: Fix duplicate auth calls up on app startup; significant refactoring to enable this.
 
 ### Security
 
-none
+- all NPM dependencies updated; resolving outstanding security alerts

Makefile

@@ -1,8 +1,22 @@
 serve:
-	docker-compose down
-	sh dev/start_server.sh
+	cd dev; \
+	sh start_server.sh
+
+serve-stop:
+	cd dev; sh stop_server.sh
+
+watch:
+	yarn watch
 
 reset:
-	docker-compose down --rmi all --remove-orphans --volumes
-	docker-compose build --no-cache
-	docker-compose up
+	cd dev; \
+	docker compose down --rmi all --remove-orphans --volumes; \
+	docker compose build --no-cache; \
+	sh start_server.sh
+
+serve-prod:
+	docker compose --project-name navigator-prod up --build; \
+	docker compose  --project-name navigator-prod rm -f
+
+serve-prod-stop:
+	docker compose --project-name navigator-prod stop

dev/docker-compose.yaml

@@ -0,0 +1,39 @@
+version: '3'
+networks:
+  kbase-dev:
+    name: kbase-dev
+services:
+  navigator:
+    hostname: navigator
+    build:
+      context: ..
+      dockerfile: Dockerfile
+      args:
+        DEVELOPMENT: 1
+    environment:
+      - PYTHONUNBUFFERED=1
+      - DEVELOPMENT=1
+      # KBASE_ENDPOINT defaults to the ci_proxy for development; used for KBase service endpoint urls
+      - KBASE_ENDPOINT=${KBASE_ENDPOINT:-http://localhost:5011/services}
+      # KBASE_ROOT defaults to the CI origin for development; used for KBase user interface urls
+      - KBASE_ROOT=${KBASE_ROOT:-https://ci.kbase.us}
+      # URL_PREFIX defaults to an empty string for development; set to "narratives" for deployments, including
+      # development with the kbase-ui proxy
+      - URL_PREFIX
+      - WORKERS=2
+    networks:
+      - kbase-dev
+    ports:
+      - '127.0.0.1:5000:5000'
+    volumes:
+      - ${PWD}/..:/app
+
+  # Proxy requests from localhost:5011 to ci.kbase.us
+  # (for getting around CORS restrictions)
+  ci_proxy:
+    hostname: navigator_ci_proxy
+    image: nginx:alpine
+    ports:
+      - '127.0.0.1:5011:5011'
+    volumes:
+      - ./nginx-default.conf:/etc/nginx/conf.d/default.conf

dev/nginx-default.conf

@@ -2,9 +2,6 @@ server {
     listen       5011;
     server_name  localhost;
 
-    #charset koi8-r;
-    #access_log  /var/log/nginx/log/host.access.log  main;
-
     location / {
          if ($request_method = 'OPTIONS') {
             add_header 'Access-Control-Allow-Origin' '*';
@@ -25,8 +22,6 @@ server {
          proxy_pass https://ci.kbase.us;
     }
 
-    #error_page  404              /404.html;
-
     # redirect server error pages to the static page /50x.html
     #
     error_page   500 502 503 504  /50x.html;

dev/start_server.sh

@@ -1,8 +1,22 @@
 #!/bin/sh
 
-# Start the development servers
-
 set -e
 
 export DEVELOPMENT=1
-docker-compose up --build
+if docker network create kbase-dev; then
+  echo "Docker network 'kbase-dev' created"
+else
+  echo "Docker network 'kbase-dev' already exists"
+fi
+
+if docker compose --project-name navigator-dev up --build ; then
+  echo "Docker Compose - exited normally"
+else
+  echo "Docker Compose - exited with error"
+fi
+
+if docker compose --project-name navigator-dev rm -f; then
+  echo "Docker Compose - containers removed normally"
+else
+  echo "Docker Compose - containers removed with error"
+fi

dev/stop_server.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+export DEVELOPMENT=1
+
+if docker compose --project-name navigator-dev stop; then
+  echo "Docker Compose - containers stopped normally"
+else
+  echo "Docker Compose - containers stopped with error"
+fi

docker-compose.yaml

@@ -1,27 +1,27 @@
+# To be used to closely approximate production in development.
+# See /dev for support for local development iterative workflow.
 version: '3'
-
+networks:
+  kbase-dev:
+    name: kbase-dev
 services:
-  web:
+  navigator:
+    hostname: navigator
     build:
       context: .
-      dockerfile: dev/Dockerfile-python
-      args:
-        DEVELOPMENT: 1
+      dockerfile: Dockerfile
     environment:
       - PYTHONUNBUFFERED=1
       - DEVELOPMENT=1
-      - KBASE_ENDPOINT=http://localhost:5011/services
+      # KBASE_ENDPOINT defaults to the ci_proxy for development; used for KBase service endpoint urls
+      - KBASE_ENDPOINT=${KBASE_ENDPOINT:-http://localhost:5011/services}
+      # KBASE_ROOT defaults to the CI origin for development; used for KBase user interface urls
+      - KBASE_ROOT=${KBASE_ROOT:-https://ci.kbase.us}
+      # URL_PREFIX defaults to an empty string for development; set to "narratives" for deployments, including
+      # development with the kbase-ui proxy
+      - URL_PREFIX
       - WORKERS=2
+    networks:
+      - kbase-dev
     ports:
-      - "127.0.0.1:5000:5000"
-    volumes:
-      - ${PWD}:/app
-
-  # Proxy requests from localhost:5011 to ci.kbase.us
-  # (for getting around CORS restrictions)
-  ci_proxy:
-    image: nginx:alpine
-    ports:
-      - "127.0.0.1:5011:5011"
-    volumes:
-      - ./dev/nginx-default.conf:/etc/nginx/conf.d/default.conf
+      - '127.0.0.1:5000:5000'

docs/deployment.md

@@ -36,7 +36,9 @@ This takes a little extra work than the above.
 2. Set the following environment variables:
 
    - `URL_PREFIX` - this is the prefix for any path that the "service" (the server that comes along with this module) generates. I.e., it's the path that to the entrypoint. On narrative-dev, it's `/narratives`, so the URL of the main page is `https://narrative-dev.kbase.us/narratives`
+
    - `KBASE_ROOT` - this is the root URL for the environment. `https://ci.kbase.us`, `https://narrative-dev.kbase.us`, etc. This is used to craft most external link URLs.
+
    - `KBASE_ENDPOINT` - this is the root endpoint for all services. `https://kbase.us/services` for production, `https://ci.kbase.us/services` for CI, etc. This is used to call individual data providers.
 
 3. Everything else should be default.