.babelrc

@@ -1,11 +1,11 @@
 {
-    "presets": [
-        "@babel/preset-env",
-        "@babel/preset-react",
-        "@babel/preset-typescript",
-    ],
-    "plugins": [
-        "@babel/plugin-transform-runtime",
-        "babel-plugin-macros",
-    ]
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ],
+  "plugins": [
+    "@babel/plugin-transform-runtime",
+    "babel-plugin-macros"
+  ]
 }

.github/workflows/automerge.yml

@@ -13,10 +13,10 @@ jobs:
     - name: "Checkout ansible-hub-ui (${{ github.ref }})"
       uses: actions/checkout@v4
 
-    - name: "Install node 18"
+    - name: "Install node 20"
       uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
 
     - name: "Check automerge conditions"
       working-directory: ".github/workflows"

.github/workflows/cypress.yml

@@ -23,7 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         test:
-        - 'screenshots'
         - 'approval'
         - 'approval_modal'
         - 'collections'
@@ -34,6 +33,7 @@ jobs:
         - 'misc'
         - 'namespaces'
         - 'repo'
+        - 'screenshots'
 
     steps:
 
@@ -61,11 +61,6 @@ jobs:
         UI_COMMIT_BASE=`curl -s https://api.github.com/repos/ansible/ansible-hub-ui/branches/${SHORT_BRANCH} | jq -r .commit.sha`
         echo "UI_COMMIT_BASE=${UI_COMMIT_BASE}" >> $GITHUB_ENV
 
-        COMPARE_SCREENSHOTS=${{ github.event_name == 'pull_request' }}
-        echo 'compare screenshots:'
-        echo $COMPARE_SCREENSHOTS
-        echo "COMPARE_SCREENSHOTS=${COMPARE_SCREENSHOTS}" >> $GITHUB_ENV
-
     - name: "Checkout ansible-hub-ui (${{ github.ref }})"
       uses: actions/checkout@v4
       with:
@@ -89,11 +84,18 @@ jobs:
       run: |
         pip install --editable ./client/
         # merge common, profile-specific and test matrix specific config
-        cat ../ansible-hub-ui/.github/workflows/cypress/compose.env.common \
-          ../ansible-hub-ui/.github/workflows/cypress/compose.env.standalone \
+        cat ../ansible-hub-ui/.github/workflows/cypress/compose.env \
           ../ansible-hub-ui/test/cypress/e2e/"${{ matrix.test }}"/compose.env \
           | sed 's/^\s\+//' | tee compose.env || [ -s compose.env ]
 
+    # oci-env compose build: FileNotFoundError: [Errno 2] No such file or directory: 'docker-compose'
+    - name: "Provide docker-compose"
+      run: |
+        mkdir -p /home/runner/.local/bin/
+        cd /home/runner/.local/bin/
+        ( echo '#!/bin/sh' ; echo 'docker compose "$@"' ) > docker-compose
+        chmod +x docker-compose
+
     - name: "oci-env compose build"
       working-directory: 'oci_env'
       run: 'oci-env compose build'
@@ -102,10 +104,10 @@ jobs:
       working-directory: 'oci_env'
       run: 'oci-env compose up &'
 
-    - name: "Install node 18"
+    - name: "Install node 20"
       uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
 
     - name: "Cache ~/.npm & ~/.cache/Cypress"
       uses: actions/cache@v4
@@ -164,22 +166,22 @@ jobs:
     - name: "Configure Cypress"
       working-directory: 'ansible-hub-ui/test'
       run: |
-        cp -aiv ../.github/workflows/cypress/cypress.env.json.standalone cypress.env.json
+        cp -aiv ../.github/workflows/cypress/cypress.env.json cypress.env.json
 
     - name: "Ensure index.html uses the new js"
       run: |
         echo 'expecting /static/galaxy_ng/js/App.'"$BUILD_HASH"'.js'
         curl http://localhost:8002/static/galaxy_ng/index.html | tee /dev/stderr | grep '/static/galaxy_ng/js/App.'"$BUILD_HASH"'.js'
 
-    - name: "Ensure galaxykit can connect to API (standalone)"
+    - name: "Ensure galaxykit can connect to API"
       run: |
         galaxykit -s http://localhost:8002/api/galaxy/ -u admin -p admin collection list
 
-    - name: "Check initial feature flags (standalone)"
+    - name: "Check initial feature flags"
       run: |
         curl -s http://localhost:5001/api/galaxy/_ui/v1/feature-flags/ | jq
 
-    - name: "Check component versions & settings (standalone)"
+    - name: "Check component versions & settings"
       run: |
         HUB_TOKEN=`curl -s -u admin:admin -d '' http://localhost:5001/api/galaxy/v3/auth/token/ | jq -r .token`
         curl -s -H "Authorization: Token $HUB_TOKEN" http://localhost:5001/api/galaxy/ | jq
@@ -200,7 +202,7 @@ jobs:
           screenshots-${{env.SHORT_BRANCH}}-
 
     - name: "List cached screenshots"
-      if: ${{ matrix.test == 'screenshots' && env.COMPARE_SCREENSHOTS == 'true' }}
+      if: ${{ matrix.test == 'screenshots' && github.event_name == 'pull_request' }}
       run: |
         ls ansible-hub-ui/test/screenshots-base/
 
@@ -222,32 +224,32 @@ jobs:
         ls ansible-hub-ui/test/cypress/screenshots/screenshots/screenshots.js/
 
     - name: "Compare screenshots"
-      if: ${{ matrix.test == 'screenshots' && env.COMPARE_SCREENSHOTS == 'true' }}
+      if: ${{ matrix.test == 'screenshots' && github.event_name == 'pull_request' }}
       working-directory: 'ansible-hub-ui/test'
       run: |
         changed=false
 
         for orig in screenshots-base/*; do
-          echo $orig
-          new=cypress/screenshots/screenshots/screenshots.js/"$(basename "$orig")"
-          diff=cypress/screenshots/screenshots/diff--"$(basename "$orig")"
+          name=`basename "$orig"`
+          new="cypress/screenshots/screenshots/screenshots.js/$name"
+          diff="cypress/screenshots/screenshots/diff--$name"
 
-          num=$(compare -metric RMSE "$orig" "$new" "$diff" 2>&1 | awk '{ print $1 }')
-          echo $num
+          num=$(compare -metric RMSE -fuzz 5% "$orig" "$new" "$diff" 2>&1 | awk '{ print $1 }')
           num=${num%.*}
-          if [ "$num" -gt 10 ]; then
-            echo "screenshot $orig changed: $num" 1>&2
+          if [ "$num" -gt 64 ]; then
+            echo "screenshot $name changed: $num" 1>&2
             changed=true
           fi
         done
 
         if [ "$changed" = true ]; then
-          echo "Process failed because change occured"
+          cp -a screenshots-base cypress/screenshots/screenshots/0-before
+          mv cypress/screenshots/screenshots/{screenshots.js,1-after}
           exit 1
         fi
 
-    - name: "Move cached screenshots"
-      if: ${{ matrix.test == 'screenshots' && env.COMPARE_SCREENSHOTS == 'false' }}
+    - name: "Move screenshots to cache"
+      if: ${{ matrix.test == 'screenshots' && github.event_name != 'pull_request' }}
       working-directory: 'ansible-hub-ui/test'
       run: |
         rm -rf screenshots-base/

.github/workflows/cypress/compose.env.common → .github/workflows/cypress/compose.env

@@ -1,5 +1,6 @@
 API_PORT=5001
 COMPOSE_BINARY=docker
+COMPOSE_PROFILE=galaxy_ng/base
 DEV_SOURCE_PATH=galaxy_ng
 DJANGO_SUPERUSER_PASSWORD=admin
 DJANGO_SUPERUSER_USERNAME=admin

.github/workflows/pr-checks.yml

@@ -13,12 +13,17 @@ jobs:
     - name: "Checkout ansible-hub-ui (${{ github.ref }})"
       uses: actions/checkout@v4
 
-    - name: "Install node 18"
+    - name: "Install node 20"
       uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
         cache: 'npm'
 
+    - name: "Install python 3.11"
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
     - name: "Checks"
       run: |
         # fail if npm install had to change package-lock.json
@@ -88,42 +93,44 @@ jobs:
       with:
         path: 'pr'
 
-    - name: "Install node 18"
+    - name: "Install node 20"
       uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
         cache: 'npm'
         cache-dependency-path: |
           base/package-lock.json
           pr/package-lock.json
 
+    - name: 'npm install (base)'
+      working-directory: 'base'
+      run: 'npm install'
+
+    - name: 'npm install (pr)'
+      working-directory: 'pr'
+      run: 'npm install'
+
     - name: "Diff configs"
       run: |
         mkdir ~/webpack-config/
 
+        # eliminate differences caused by branch name based logic in f-c-config
+        export BRANCH="${{ github.base_ref }}"
+
         for version in base pr; do
           mkdir ~/webpack-config/$version/
           pushd $version/config/
-          npm install
-
-          for file in *.js; do
-            # FIXME: that's what TARGET_ENVIRONMENT is for
-            NODE_ENV=
-            if grep -q prod <<< "$file"; then
-              NODE_ENV=production
-            fi
-            export NODE_ENV
 
-            # eliminate differences caused by branch name based logic in f-c-config
-            export BRANCH="${{ github.base_ref }}"
+          for file in *.webpack.config.js; do
+            export NODE_ENV=`grep -q '\.prod\.' <<< "$file" && echo production || echo development`
 
             node -e 'console.log(JSON.stringify(require("./'"$file"'"), null, 2))' |
               sed -e 's/\/home\/.*\/\(base\|pr\)\//\/DIR\//g' \
                 -e 's/"UI_COMMIT_HASH": ".*"/"UI_COMMIT_HASH": "HASH"/' |
               perl -ne 'print unless /^[0-9a-f]{64,64}$/d' |
               grep -v '^Current branch:' |
               grep -v '^Waiting for ' |
-              grep -v '^Root folder:' > ~/webpack-config/"$version"/"$file".json
+              grep -v 'Root folder:' > ~/webpack-config/"$version"/"$file".json
           done
 
           popd

.github/workflows/stable-release.yml

@@ -4,9 +4,10 @@ name: "Stable release"
 on:
   push:
     tags:
-    - '[0-9]+.[0-9]+.**'
-    - '!dev'
-    - '!**cloud**'
+    - '[0-9]+.[0-9]+.*'
+    - '!dev*'
+    - '!cloud-*'
+    - '!crc-*'
 
 concurrency:
   group: stable-release-${{ github.ref }}
@@ -28,10 +29,10 @@ jobs:
         RELEASE_TAG=`sed 's/^refs\/tags\///' <<< $GITHUB_REF`
         echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV
 
-    - name: "Install node 18"
+    - name: "Install node 20"
       uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: '20'
 
     - name: "Cache ~/.npm"
       uses: actions/cache@v4

.ls-lint.yml

@@ -1,13 +1,7 @@
 ls:
-  .travis:
-    .js: snake_case
-
   config:
     .js: point.case | kebab-case
 
-  src/loaders/insights:
-    .js: kebab-case | PascalCase
-
   src/utilities:
     .js: camelCase | snake_case
 

.prettierignore

@@ -1,14 +1,13 @@
-src/index.html
 *.json
-.*.sw[po]
-*.xml
-*.sh
-Dockerfile
-.DS_Store
 *.md
-*.png
 *.mp4
+*.png
 *.po
+*.sh
+*.xml
+.*.sw[po]
+.DS_Store
+Dockerfile
 test/cypress.env.json.template
-test/cypress/fixtures/
 test/cypress/e2e/*/compose.env
+test/cypress/fixtures/

.prettierrc.yaml

@@ -6,6 +6,7 @@ importOrder:
   - '^[.][.]/app.scss'
   - '<THIRD_PARTY_MODULES>'
   - "^src/"
+  - "^static/"
   - "^[./]"
 importOrderSortSpecifiers: true
 plugins: