This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/sdk-facade-migration in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
commit 6fc5ccae702521c0231729d3db80a6002ce16a0c Author: yasithdev <[email protected]> AuthorDate: Wed Apr 8 01:13:43 2026 -0500 build: clean up legacy configs, add npm workspace, simplify build scripts - Delete .prettierrc, vetur.config.js, build_js.bat, stale .eslintrc.js files - Remove unused django-webpack-loader dependency from pyproject.toml - Remove stale requirements-dev.txt (replaced by docs/requirements.txt) - Pin .nvmrc to Node 22, update .readthedocs.yaml to Python 3.12 - Add root package.json with yarn workspaces for all frontend apps - Simplify build_js.sh, lint_js.sh, test_js.sh to delegate to yarn workspaces --- airavata-django-portal/.nvmrc | 2 +- airavata-django-portal/.prettierrc | 3 -- airavata-django-portal/.readthedocs.yaml | 8 ++--- airavata-django-portal/build_js.bat | 40 --------------------- airavata-django-portal/build_js.sh | 21 +++-------- .../static/django_airavata_api/tests/.eslintrc.js | 5 --- .../django_airavata_workspace/tests/.eslintrc.js | 5 --- airavata-django-portal/docs/requirements.txt | 2 ++ airavata-django-portal/lint_js.sh | 22 +++--------- airavata-django-portal/package.json | 22 ++++++++++++ airavata-django-portal/pyproject.toml | 1 - airavata-django-portal/requirements-dev.txt | Bin 1142 -> 0 bytes airavata-django-portal/test_js.sh | 17 +++------ airavata-django-portal/vetur.config.js | 11 ------ 14 files changed, 42 insertions(+), 117 deletions(-) diff --git a/airavata-django-portal/.nvmrc b/airavata-django-portal/.nvmrc index b009dfb9d..2bd5a0a98 100644 --- a/airavata-django-portal/.nvmrc +++ b/airavata-django-portal/.nvmrc @@ -1 +1 @@ -lts/* +22 diff --git a/airavata-django-portal/.prettierrc b/airavata-django-portal/.prettierrc deleted file mode 100644 index 5b5bd9933..000000000 --- a/airavata-django-portal/.prettierrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "proseWrap": "always" -} diff --git a/airavata-django-portal/.readthedocs.yaml b/airavata-django-portal/.readthedocs.yaml index 8045d85c7..b60bb04da 100644 --- a/airavata-django-portal/.readthedocs.yaml +++ b/airavata-django-portal/.readthedocs.yaml @@ -9,14 +9,12 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.12" mkdocs: configuration: mkdocs.yml -# Optionally declare the Python requirements required to build your docs +# Install only what's needed for docs python: install: - - requirements: requirements-dev.txt - - method: pip - path: . + - requirements: docs/requirements.txt diff --git a/airavata-django-portal/build_js.bat b/airavata-django-portal/build_js.bat deleted file mode 100644 index b1a29a97b..000000000 --- a/airavata-django-portal/build_js.bat +++ /dev/null @@ -1,40 +0,0 @@ - -echo Running production JS builds - -set cwd=%cd% - -cd %cwd%\django_airavata\apps\api -call yarn -call yarn run build - -cd %cwd%\django_airavata\static\common -call yarn -call yarn run build - -cd %cwd%\django_airavata\static\auth -call yarn -call yarn run build - -cd %cwd%\django_airavata\apps\admin -call yarn -call yarn run build - -cd %cwd%\django_airavata\apps\groups -call yarn -call yarn run build - -cd %cwd%\django_airavata\apps\workspace\django-airavata-workspace-plugin-api -call yarn -call yarn run build - -cd %cwd%\django_airavata\apps\workspace -call yarn -call yarn run build - -cd %cwd%\django_airavata\apps\dataparsers -call yarn -call yarn run build - -cd %cwd% - -echo All builds finished successfully! diff --git a/airavata-django-portal/build_js.sh b/airavata-django-portal/build_js.sh index 1ede0d518..f2b840a8c 100755 --- a/airavata-django-portal/build_js.sh +++ b/airavata-django-portal/build_js.sh @@ -1,18 +1,5 @@ #!/bin/bash - -# Get the directory that this script is in -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -echo -e "Running production JS builds" -(cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/workspace && yarn && yarn run build) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/dataparsers && yarn && yarn run build) || exit 1 - -echo -e "All builds finished successfully!" - -exit 0 +set -e +echo "Running production JS builds" +yarn workspaces run build +echo "All builds finished successfully!" diff --git a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/tests/.eslintrc.js b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/tests/.eslintrc.js deleted file mode 100644 index 6052da089..000000000 --- a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/tests/.eslintrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - env: { - jest: true, - }, -}; diff --git a/airavata-django-portal/django_airavata/apps/workspace/static/django_airavata_workspace/tests/.eslintrc.js b/airavata-django-portal/django_airavata/apps/workspace/static/django_airavata_workspace/tests/.eslintrc.js deleted file mode 100644 index 6052da089..000000000 --- a/airavata-django-portal/django_airavata/apps/workspace/static/django_airavata_workspace/tests/.eslintrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - env: { - jest: true, - }, -}; diff --git a/airavata-django-portal/docs/requirements.txt b/airavata-django-portal/docs/requirements.txt new file mode 100644 index 000000000..2d0d5aa90 --- /dev/null +++ b/airavata-django-portal/docs/requirements.txt @@ -0,0 +1,2 @@ +mkdocs +pymdown-extensions diff --git a/airavata-django-portal/lint_js.sh b/airavata-django-portal/lint_js.sh index ab82d5cb0..98f9d81d9 100755 --- a/airavata-django-portal/lint_js.sh +++ b/airavata-django-portal/lint_js.sh @@ -1,17 +1,5 @@ - -# Get the directory that this script is in -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -echo -e "Linting JS" -(cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/static/common && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/auth && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/groups && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/workspace/django-airavata-workspace-plugin-api && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/workspace && yarn && yarn run lint) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/dataparsers && yarn && yarn run lint) || exit 1 - -echo -e "All linting finished successfully!" - -exit 0 +#!/bin/bash +set -e +echo "Linting JS" +yarn workspaces run lint +echo "All linting finished successfully!" diff --git a/airavata-django-portal/package.json b/airavata-django-portal/package.json new file mode 100644 index 000000000..365f8a095 --- /dev/null +++ b/airavata-django-portal/package.json @@ -0,0 +1,22 @@ +{ + "private": true, + "workspaces": [ + "django_airavata/static/common", + "django_airavata/apps/admin", + "django_airavata/apps/api", + "django_airavata/apps/auth", + "django_airavata/apps/dataparsers", + "django_airavata/apps/groups", + "django_airavata/apps/workspace", + "django_airavata/apps/workspace/django-airavata-workspace-plugin-api" + ], + "scripts": { + "build": "yarn workspaces run build", + "dev": "echo 'Use tilt up for dev servers'", + "lint": "yarn workspaces run lint", + "test": "yarn workspaces run test" + }, + "engines": { + "node": ">=22" + } +} diff --git a/airavata-django-portal/pyproject.toml b/airavata-django-portal/pyproject.toml index f0f7bdc26..53e1eba92 100644 --- a/airavata-django-portal/pyproject.toml +++ b/airavata-django-portal/pyproject.toml @@ -31,7 +31,6 @@ dependencies = [ "djangorestframework>=3.15,<4", "requests>=2.32", "requests-oauthlib>=1.4", - "django-webpack-loader>=3.1", "logging-formatter-anticrlf>=1.2", "wagtail>=6.3,<7", "papermill>=2.6", diff --git a/airavata-django-portal/requirements-dev.txt b/airavata-django-portal/requirements-dev.txt deleted file mode 100644 index b6f1a5f0a..000000000 Binary files a/airavata-django-portal/requirements-dev.txt and /dev/null differ diff --git a/airavata-django-portal/test_js.sh b/airavata-django-portal/test_js.sh index a646eac76..77e9fff44 100755 --- a/airavata-django-portal/test_js.sh +++ b/airavata-django-portal/test_js.sh @@ -1,12 +1,5 @@ - -# Get the directory that this script is in -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -echo -e "Testing JS" -(cd $SCRIPT_DIR/django_airavata/apps/api && yarn && yarn run test) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/workspace && yarn && yarn run test) || exit 1 -(cd $SCRIPT_DIR/django_airavata/apps/admin && yarn && yarn run test) || exit 1 - -echo -e "All testing finished successfully!" - -exit 0 +#!/bin/bash +set -e +echo "Testing JS" +yarn workspaces run test +echo "All testing finished successfully!" diff --git a/airavata-django-portal/vetur.config.js b/airavata-django-portal/vetur.config.js deleted file mode 100644 index 348f66265..000000000 --- a/airavata-django-portal/vetur.config.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - projects: [ - "./django_airavata/static/common", - "./django_airavata/apps/admin", - "./django_airavata/apps/auth", - "./django_airavata/apps/dataparsers", - "./django_airavata/apps/groups", - "./django_airavata/apps/workspace", - "./django_airavata/apps/workspace/django-airavata-workspace-plugin-api", - ], -};
