Merge branch 'master' of github.com:informatics-isi-edu/chaise into f…

…acet-within-facet

.eslintrc.js

@@ -53,9 +53,12 @@ module.exports = {
     '@typescript-eslint/no-duplicate-enum-values': 'warn',
     '@typescript-eslint/no-unused-vars': 'warn',
     '@typescript-eslint/no-explicit-any': 'warn',
-    '@typescript-eslint/ban-types': 'warn',
+    '@typescript-eslint/no-unsafe-function-type': 'warn',
     '@typescript-eslint/ban-ts-comment': 'warn',
     '@typescript-eslint/no-inferrable-types': 'warn',
+    '@typescript-eslint/no-require-imports': 'warn',
+    // TODO we should remove the following deprecated rule when we go to version 8:
+    '@typescript-eslint/ban-types': 'warn',
 
     // ------------------ testing ------------------
     '@typescript-eslint/no-floating-promises': 'warn'

.github/dependabot.yml

@@ -5,27 +5,43 @@
 
 version: 2
 updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "@playwright/test"
+    # https://github.com/dependabot/dependabot-core/issues/1778#issuecomment-1988140219
+    target-branch: master
+    assignees:
+      - "jrchudy"
+      - "RFSH"
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 10
     ignore:
+      - dependency-name: "@playwright/test"
       - dependency-name: "moment*"
       - dependency-name: "protractor"
+      - dependency-name: "@typescript-eslint/*"
+      - dependency-name: "eslint-*"
+      - dependency-name: "eslint"
+      - dependency-name: "prettier"
+      - dependency-name: "patch-package"
+      - dependency-name: "uglify-js"
     groups:
       babel:
         patterns:
           - "@babel/*"
           - "babel-loader"
+          - "css-loader"
+          - "sass-loader"
       bootstrap:
         patterns:
           - "react-bootstrap"
           - "bootstrap"
-      eslint:
-        patterns:
-          - "@typescript-eslint/*"
-          - "eslint-*"
-          - "eslint"
       react:
         patterns:
           - "@types/react"

.github/workflows/e2e.yml

@@ -1,20 +1,14 @@
 
 name: Chaise end-to-end tests
 
-on:
-  push:
-    branches:
-      - 'master'
-      - 'facet-within-facet'
-  pull_request:
-    branches:
-      - 'master'
-
-concurrency: chaise_env
+on: [push]
 
 jobs:
   install-and-test:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        node-version: ["18.18", "20.0.0"]
     env:
       SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
       SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -23,12 +17,16 @@ jobs:
       HEADLESS: false
       PYTHONWARNINGS: ignore:Unverified HTTPS request
       NODE_TLS_REJECT_UNAUTHORIZED: '0'
-    timeout-minutes: 150
+    timeout-minutes: 60
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v4
         with:
           path: chaise
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
       - name: Setup the system
         run: |
           echo "node version:"
@@ -65,10 +63,6 @@ jobs:
           sudo pip3 uninstall crypto
           sudo pip3 uninstall pycrypto
           sudo pip3 install pycryptodome
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       - name: Install webauthn
         run: |
           sudo useradd -m -r webauthn
@@ -156,43 +150,6 @@ jobs:
         run: |
           cd chaise
           make testdeleteprohibited
-      - name: Setup and connect to saucelabs
-        timeout-minutes: 2
-        run: |
-          curl https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz -o saucelabs.tar.gz
-          tar -xzf saucelabs.tar.gz
-          cd sc-*
-          bin/sc -u ${{secrets.SAUCE_USERNAME}} -k ${{secrets.SAUCE_ACCESS_KEY}} -i ${{github.run_id}} -f /tmp/sc_ready --no-ssl-bump-domains=127.0.0.1,localhost --pidfile=/tmp/sc_client.pid &
-      - name: Check sauce connect
-        run: |
-          while [ ! -f /tmp/sc_ready ]; do
-            echo "Waiting for Sauce Connect..."
-            sleep 5;
-          done;
-      - name: Run all features test spec  (protractor)
-        id: test-protractor-all-features
-        continue-on-error: true
-        run: |
-          cd chaise
-          make testallfeatures-protractor
-      - name: Run all features confirmation test spec (protractor)
-        id: test-protractor-all-features-confirmation
-        continue-on-error: true
-        run: |
-          cd chaise
-          make testallfeaturesconfirmation-protractor
-      - name: Run default config test spec  (protractor)
-        id: test-protractor-default-config
-        continue-on-error: true
-        run: |
-          cd chaise
-          make testdefaultconfig-protractor
-      - name: Run delete prohibited test spec  (protractor)
-        id: test-protractor-delete-prohibited
-        continue-on-error: true
-        run: |
-          cd chaise
-          make testdeleteprohibited-protractor
       - name: Check on all features test spec
         if: always() && steps.test-all-features.outcome != 'success'
         run: exit 1
@@ -205,22 +162,10 @@ jobs:
       - name: Check on delete prohibited test spec
         if: always() && steps.test-delete-prohibited.outcome != 'success'
         run: exit 1
-      - name: Check on all features test spec (protractor)
-        if: always() && steps.test-protractor-all-features.outcome != 'success'
-        run: exit 1
-      - name: Check on all features confirmation test spec (protractor)
-        if: always() && steps.test-protractor-all-features-confirmation.outcome != 'success'
-        run: exit 1
-      - name: Check on default config test spec (protractor)
-        if: always() && steps.test-protractor-default-config.outcome != 'success'
-        run: exit 1
-      - name: Check on delete prohibited test spec (protractor)
-        if: always() && steps.test-protractor-delete-prohibited.outcome != 'success'
-        run: exit 1
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: playwright-report
+          name: playwright-report-${{ matrix.node-version }}
           path: chaise/playwright-report/
           retention-days: 30
       - name: Diagnosis after failure

.gitignore

@@ -46,4 +46,4 @@ config/*-config.js
 # old config files (should be removed when we deprecated these locations
 /chaise-config.js
 /google-dataset-config.js
-viewer/viewer-config.js
+viewer/viewer-config.js