From daaf657d47844e0383a4c0429d6a839f06b6e25b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:36:08 -0800
Subject: [PATCH] build(deps-dev): bump @types/jest from 26.0.24 to 29.5.12 in
 /superset-frontend/plugins/plugin-chart-handlebars (#26973)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Maxime Beauchemin <maximebeauchemin@gmail.com>
Co-authored-by: GitHub-Actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../workflows/update-monorepo-lockfiles.yml   | 13 ++++++----
 superset-frontend/package-lock.json           | 24 +++++++++++++++++--
 .../plugin-chart-handlebars/package.json      |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update-monorepo-lockfiles.yml b/.github/workflows/update-monorepo-lockfiles.yml
index d8c380ea7d2ed..2ecabdfd39cd9 100644
--- a/.github/workflows/update-monorepo-lockfiles.yml
+++ b/.github/workflows/update-monorepo-lockfiles.yml
@@ -5,18 +5,21 @@ on:
     paths:
       - 'superset-frontend/packages/**/package.json'
       - 'superset-frontend/plugins/**/package.json'
-    # Trigger this workflow when Dependabot creates a pull request
     types: [opened, synchronize, reopened]
+  issue_comment:
+    types: [created]
 
 # cancel previous workflow jobs for PRs
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.issue.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
   update-lock-file:
     runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]' # Ensure it only runs for Dependabot PRs
+    if: >
+      (github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]') ||
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@supersetbot trigger-dependabot-lockfile') && github.event.issue.pull_request)
     defaults:
       run:
         working-directory: superset-frontend
@@ -24,7 +27,7 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref }} # Checkout the branch that made the PR
+          ref: ${{ github.event.pull_request.head.ref || github.head_ref }} # Checkout the branch that made the PR or the comment's PR branch
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -41,4 +44,4 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add package-lock.json
           # Push the changes back to the branch if they exist, and pass if there are no changes
-          git diff --staged --quiet || (git commit -m "Update lock file for Dependabot PR" -a && git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} ${{github.head_ref}})
+          git diff --staged --quiet || (git commit -m "Update lock file for Dependabot PR" -a && git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} ${{ github.event.pull_request.head.ref || github.head_ref }})
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 01f8ff3d0a593..ce8a0e346952f 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -68450,7 +68450,7 @@
         "just-handlebars-helpers": "^1.0.19"
       },
       "devDependencies": {
-        "@types/jest": "^26.0.0",
+        "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.202",
         "jest": "^29.7.0"
       },
@@ -68733,6 +68733,16 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "plugins/plugin-chart-handlebars/node_modules/@types/jest": {
+      "version": "29.5.12",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
+      }
+    },
     "plugins/plugin-chart-handlebars/node_modules/@types/lodash": {
       "version": "4.14.202",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
@@ -85324,7 +85334,7 @@
     "@superset-ui/plugin-chart-handlebars": {
       "version": "file:plugins/plugin-chart-handlebars",
       "requires": {
-        "@types/jest": "^26.0.0",
+        "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.202",
         "handlebars": "^4.7.7",
         "jest": "^29.7.0",
@@ -85550,6 +85560,16 @@
             "@types/istanbul-lib-report": "*"
           }
         },
+        "@types/jest": {
+          "version": "29.5.12",
+          "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
+          "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+          "dev": true,
+          "requires": {
+            "expect": "^29.0.0",
+            "pretty-format": "^29.0.0"
+          }
+        },
         "@types/lodash": {
           "version": "4.14.202",
           "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
diff --git a/superset-frontend/plugins/plugin-chart-handlebars/package.json b/superset-frontend/plugins/plugin-chart-handlebars/package.json
index 0dd9f458e1593..90b6359eaeaa1 100644
--- a/superset-frontend/plugins/plugin-chart-handlebars/package.json
+++ b/superset-frontend/plugins/plugin-chart-handlebars/package.json
@@ -41,7 +41,7 @@
     "react-dom": "^16.13.1"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.202",
     "jest": "^29.7.0"
   }