Replace AngularJS recon portal with React

.dockerignore

@@ -8,4 +8,8 @@ coverage
 .docs
 .github
 .pytest_cache
-data
+data
+
+client/node_modules
+client/.nx
+client/dist

.docs/source/designsafe.apps.auth.rst

@@ -28,14 +28,6 @@ designsafe.apps.auth.backends module
     :undoc-members:
     :show-inheritance:
 
-designsafe.apps.auth.context_processors module
-----------------------------------------------
-
-.. automodule:: designsafe.apps.auth.context_processors
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 designsafe.apps.auth.middleware module
 --------------------------------------
 

.flake8

@@ -1,7 +1,10 @@
 [flake8]
 # E501: line is too long.
 # H101: Use TODO(NAME)
-ignore = E501, H101
+# W503: line break before binary operator. Ingore as black will break this rule.
+ignore = E501, H101, W503
 exclude = __pycache__,
           tests.py,
           migrations
+
+extend-ignore = W503

.github/workflows/main.yml

@@ -1,10 +1,9 @@
 name: CI
 
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+# Controls when the action will run. Triggers the workflow on pushes to main or on pull request events
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     branches: [ '**' ]
 
@@ -17,7 +16,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Fetch base and install Poetry
-      run: | 
+      run: |
         git fetch origin ${{github.base_ref}}
         pipx install poetry
 
@@ -34,6 +33,30 @@ jobs:
     - run: |
         poetry install
 
+    - name: Run Server-side unit tests and generate coverage report
+      run: |
+        poetry run pytest --cov-config=.coveragerc --cov=designsafe --cov-report=xml -ra designsafe
+
+  Server_Side_Linting:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Fetch base and install Poetry
+      run: |
+        git fetch origin ${{github.base_ref}}
+        pipx install poetry
+
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+        cache: 'poetry'
+
+    - name: Install Python Packages
+      run:  |
+        poetry install
+
     - name: Run Server-side linting with pytest
       # Only run on new files for now-- for all changes, filter is ACMRTUXB
       # Check manage.py to prevent a crash if no files are selected.
@@ -44,16 +67,12 @@ jobs:
       run: |
         poetry run black $(git diff --name-only --diff-filter=A origin/${{github.base_ref}} | grep -E "(.py$)") manage.py --check
 
-    - name: Run Server-side unit tests and generate coverage report
-      run: |
-        poetry run pytest --cov-config=.coveragerc --cov=designsafe --cov-report=xml -ra designsafe
-
   Client_Side_Unit_Tests:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 16.x
         cache: npm
@@ -64,12 +83,12 @@ jobs:
   React_NX_unit_tests:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 20
         cache: npm
@@ -78,14 +97,35 @@ jobs:
       working-directory: client
 
     - uses: nrwl/nx-set-shas@v3
-      # Check linting/formatting of workspace files.
-    - run: npx nx format:check
-      working-directory: client
 
-    # Lint/test/build any apps and libs that have been impacted by the diff.
-    - run: npx nx affected --target=lint --parallel=3
-      working-directory: client
+    # Test/build any apps and libs that have been impacted by the diff.
     - run: npx nx affected --target=test --parallel=3 --ci --code-coverage
       working-directory: client
     - run: npx nx affected --target=build --parallel=3
       working-directory: client
+
+  React_NX_linting:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Setup Node.js for use with actions
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: npm
+
+    - run: npm ci
+      working-directory: client
+
+    - uses: nrwl/nx-set-shas@v3
+
+    # Check linting/formatting of workspace files.
+    - run: npx nx format:check
+      working-directory: client
+
+    # Lint any apps and libs that have been impacted by the diff.
+    - run: npx nx affected --target=lint --parallel=3
+      working-directory: client

.gitignore

@@ -11,6 +11,8 @@ settings.json
 designsafe/apps/rapid/static/designsafe/apps/rapid/build/bundle.*
 designsafe/apps/geo/static/designsafe/apps/geo/build/bundle.*
 designsafe/static/build/
+designsafe/static/react-assets/
+designsafe/templates/react-assets.html
 # designsafe/static/styles/base.*
 /static
 

.pylintrc

@@ -583,7 +583,7 @@ ignored-checks-for-mixins=no-member,
 # List of class names for which member attributes should not be checked (useful
 # for classes with dynamically set attributes). This supports the use of
 # qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace
+ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace,Tapis
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.

Makefile

@@ -1,11 +1,23 @@
 .PHONY: build
 build:
-	docker-compose -f ./conf/docker/docker-compose.yml build
+	docker compose -f ./conf/docker/docker-compose.yml build
+
+.PHONY: build-dev
+build-dev:
+	docker compose -f ./conf/docker/docker-compose-dev.yml build
 
 .PHONY: start
 start:
-	docker-compose -f ./conf/docker/docker-compose-dev.all.debug.yml up
+	docker compose -f ./conf/docker/docker-compose-dev.all.debug.yml up
 
 .PHONY: stop
 stop:
-	docker-compose -f ./conf/docker/docker-compose-dev.all.debug.yml down
+	docker compose -f ./conf/docker/docker-compose-dev.all.debug.yml down
+
+.PHONY: start-m1
+start-m1:
+	docker compose -f ./conf/docker/docker-compose-dev.all.debug.m1.yml up
+
+.PHONY: stop-m1
+stop-m1:
+	docker compose -f ./conf/docker/docker-compose-dev.all.debug.m1.yml down

README.md

@@ -40,34 +40,37 @@ If you are on a Mac or a Windows machine, the recommended method is to install
    - `AGAVE_*`: should be set to enable Agave API integration (authentication, etc.)
    - `RT_*`: should be set to enable ticketing
 
-   Make copies of [rabbitmq.sample.env](conf/env_files/rabbitmq.sample.env) and [mysql.sample.env](conf/env_files/mysql.sample.env),
-   then rename them to `rabbitmq.env` and `mysql.env`.
-
-   Make copies of [mysql.sample.cnf](conf/mysql.sample.cnf), [redis.sample.conf](conf/redis.sample.conf),
-   and [rabbitmq.sample.conf](conf/rabbitmq.sample.conf), then rename them to `mysql.cnf`, `redis.conf`, and `rabbitmq.conf`.
+   Make a copy of [rabbitmq.sample.env](conf/env_files/rabbitmq.sample.env)
+   then rename it to `rabbitmq.env`.
 
    Make a copy of [external_resource_secrets.sample.py](designsafe/settings/external_resource_secrets.sample.py)
    and rename it to `external_resource_secrets.py`.
 
-3. Build the containers and frontend package
+3. Build the containers and frontend packages
 
-   ```
-   $ make build
-   ```
-   or
-   ```
-   $ docker-compose -f conf/docker/docker-compose.yml build
-   ```
+   1. Containers:
+      ```sh
+      make build-dev
+      ```
+      or
+      ```sh
+      docker-compose -f conf/docker/docker-compose-dev.yml build
+      ```
 
-   These lines install the node packages required for DesignSafe,
-   and build the frontend package.
-   ```
-   $ npm ci
-   $ npm run build
-   ```
+   2. Angular Frontend + static assets:
+      ```sh
+      npm ci
+      docker run -v `pwd`:`pwd` -w `pwd` -it node:16  /bin/bash -c "npm run build"
+      ```
 
-   If you are working with the frontend code and want it to automatically update,
-   use `npm run dev` rather than `npm run build` to have it build upon saving the file.
+      **Note:** If you are working with the frontend code and want it to automatically update, use `npm run dev` rather than `npm run build` to have it build upon saving the file.
+
+   3. React Frontend (in another terminal):
+      ```sh
+      cd client
+      npm ci
+      npm run start
+      ```
 
 4. Start local containers
 
@@ -82,7 +85,7 @@ If you are on a Mac or a Windows machine, the recommended method is to install
    ```
    $ docker exec -it des_django bash
    $ ./manage.py migrate
-   $ ./manage.py collectstatic -i demo
+   $ ./manage.py collectstatic --ignore demo --no-input
    $ ./manage.py createsuperuser
    ```
 
@@ -225,8 +228,8 @@ $ docker-compose -f conf/docker/docker-compose-dev.all.debug.yml up
 $ npm run dev
 ```
 
-When using this compose file, your Agave Client should be configured with a `callback_url`
-of `http://$DOCKER_HOST_IP:8000/auth/agave/callback/`.
+When using this compose file, your Tapis Client should be configured with a `callback_url`
+of `http://$DOCKER_HOST_IP:8000/auth/tapis/callback/`.
 
 For developing some services, e.g. Box.com integration, https support is required. To
 enable an Nginx http proxy run using the [`docker-compose-http.yml`](docker-compose-http.yml)
@@ -238,9 +241,6 @@ $ docker-compose -f docker-compose-http.yml build
 $ docker-compose -f docker-compose-http.yml up
 ```
 
-When using this compose file, your Agave Client should be configured with a `callback_url`
-of `https://$DOCKER_HOST_IP/auth/agave/callback/`.
-
 ### Agave filesystem setup
 1. Delete all of the old metadata objects using this command:
 

bin/run-celery-debug.sh

@@ -5,4 +5,4 @@
 #
 celery -A designsafe beat -l info --pidfile= --schedule=/tmp/celerybeat-schedule &
 celery -A designsafe worker -l info --autoscale=15,5 -Q indexing,files -n designsafe_worker01 &
-celery -A designsafe worker -l info --autoscale=10,3 -Q default,api -n designsafe_worker02
+celery -A designsafe worker -l info --autoscale=10,3 -Q default,api,onboarding -n designsafe_worker02

bin/run-celery.sh

@@ -3,4 +3,4 @@
 # Run Celery as the DesignSafe Community Account
 celery -A designsafe beat -l info --pidfile= --schedule=/tmp/celerybeat-schedule &
 celery -A designsafe worker -l info --autoscale=15,5 -Q indexing,files -n designsafe_worker01 &
-celery -A designsafe worker -l info --autoscale=10,3 -Q default,api -n designsafe_worker02
+celery -A designsafe worker -l info --autoscale=10,3 -Q default,api,onboarding -n designsafe_worker02