From 2d897fb8593c6f4418434b85d6584a41b5110d9a Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Mon, 6 Mar 2023 09:33:11 -0500
Subject: [PATCH 1/7] feat(DataList): added event param to callback

---
 packages/eslint-plugin-pf-codemods/index.js   |   7 +-
 .../v5/dataList-warn-updated-callback.js      |  31 +++++
 .../lib/rules/v5/onToggle-warn-event.js       |  44 +++---
 .../rules/v5/dataList-warn-updated-callback   |  36 +++++
 .../test/rules/v5/onToggle-warn-event.js      | 130 ++++--------------
 packages/pf-codemods/README.md                |   8 ++
 test/test.tsx                                 |  15 +-
 7 files changed, 148 insertions(+), 123 deletions(-)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index be6d68e80..e495f31ac 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -1,7 +1,11 @@
 const createListOfRules = (version) => {
   const rules = {};
   require("glob")
-    .sync(require.resolve('@patternfly/eslint-plugin-pf-codemods').replace('index.js', `lib/rules/v${version}/*.js`))
+    .sync(
+      require
+        .resolve("@patternfly/eslint-plugin-pf-codemods")
+        .replace("index.js", `lib/rules/v${version}/*.js`)
+    )
     .forEach(function (file) {
       const ruleName = /.*\/([^.]+)/.exec(file)[1];
       rules[ruleName] = require(`./lib/rules/v${version}/${ruleName}`);
@@ -17,6 +21,7 @@ const warningRules = [
   "applicationLauncher-warn-input",
   "card-warn-component",
   "charts-tooltip-warning",
+  "dataList-warn-updated-callback",
   "datePicker-warn-appendTo-default-value-changed",
   "horizontalSubnav-ariaLabel",
   "onToggle-warn-event",
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
new file mode 100644
index 000000000..817273ce5
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
@@ -0,0 +1,31 @@
+const { getPackageImports } = require("../../helpers");
+
+// https://github.com/patternfly/patternfly-react/pull/8723
+module.exports = {
+  meta: {},
+  create: function (context) {
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => specifier.imported.name === "DataList"
+    );
+
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            if (
+              imports
+                .map((imp) => imp.imported.name)
+                .includes(node.name.name) &&
+              node.attributes.find(
+                (attr) => attr.name.name === "onSelectDataListItem"
+              )
+            ) {
+              context.report({
+                node,
+                message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+              });
+            }
+          },
+        };
+  },
+};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
index 8b73f0b73..6115a64fc 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
@@ -3,27 +3,33 @@ const { getPackageImports } = require("../../helpers");
 // https://github.com/patternfly/patternfly-react/pull/8667
 module.exports = {
   create: function (context) {
-    const onToggleAPIUpdateList = ['ApplicationLauncher', 'BadgeToggle', 'DropdownToggle', 'KebabToggle', 'Toggle', 'Select', 'SelectToggle'];
-    const imports = getPackageImports(
-      context,
-      "@patternfly/react-core"
-    ).filter((specifier) => onToggleAPIUpdateList.includes(specifier.imported.name));
+    const onToggleAPIUpdateList = [
+      "ApplicationLauncher",
+      "BadgeToggle",
+      "DropdownToggle",
+      "KebabToggle",
+      "Toggle",
+      "Select",
+      "SelectToggle",
+    ];
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => onToggleAPIUpdateList.includes(specifier.imported.name)
+    );
 
-    return imports.length === 0 
+    return imports.length === 0
       ? {}
       : {
-        JSXOpeningElement(node) {
-          if (
-            imports
-              .map((imp) => imp.local.name)
-              .includes(node.name.name)
-          ) {
-            context.report({
-              node,
-              message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-            });
-          }
-        },
-      };
+          JSXOpeningElement(node) {
+            if (
+              imports.map((imp) => imp.local.name).includes(node.name.name) &&
+              node.attributes.find((attr) => attr.name.name === "onToggle")
+            ) {
+              context.report({
+                node,
+                message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+              });
+            }
+          },
+        };
   },
 };
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback
new file mode 100644
index 000000000..be2b1b4ab3
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback
@@ -0,0 +1,36 @@
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/dataList-warn-updated-callback");
+
+ruleTester.run("dataList-warn-updated-callback", rule, {
+  valid: [
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList />;`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<DataList onSelectDataListItem />;`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem />;`,
+      output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataList as PFdl } from '@patternfly/react-core'; <PFdl onSelectDataListItem />;`,
+      output: `import { DataList as PFdl } from '@patternfly/react-core'; <PFdl onSelectDataListItem />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js
index afcb1ac74..63c589d9f 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js
@@ -1,107 +1,35 @@
-const ruleTester = require('../../ruletester');
-const rule = require('../../../lib/rules/v5/onToggle-warn-event');
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/onToggle-warn-event");
+const onToggleAPIUpdateList = [
+  "ApplicationLauncher",
+  "BadgeToggle",
+  "DropdownToggle",
+  "KebabToggle",
+  "Toggle",
+  "Select",
+  "SelectToggle",
+];
 
 ruleTester.run("onToggle-warn-event", rule, {
   valid: [
-    {
-      code: `<ApplicationLauncher />`,
-    },
-    {
-      code: `<BadgeToggle />`,
-    },
-    {
-      code: `<DropdownToggle />`,
-    },
-    {
-      code: `<KebabToggle />`,
-    },
-    {
-      code: `<Toggle />`,
-    },
-    {
-      code: `<Select />`,
-    },
-    {
-      code: `<SelectToggle />`,
-    },
-    {
-      code: `import { ApplicationLauncher } from '@foo/bar'; <ApplicationLauncher />`,
-    },
-    {
-      code: `import { BadgeToggle } from '@foo/bar'; <BadgeToggle />`,
-    },
-    {
-      code: `import { DropdownToggle } from '@foo/bar'; <DropdownToggle />`,
-    },
-    {
-      code: `import { KebabToggle } from '@foo/bar'; <KebabToggle />`,
-    },
-    {
-      code: `import { Toggle } from '@foo/bar'; <Toggle />`,
-    },
-    {
-      code: `import { Select } from '@foo/bar'; <Select />`,
-    },
-    {
-      code: `import { SelectToggle } from '@foo/bar'; <SelectToggle />`,
-    }
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} />;`,
+    })),
+    // No @patternfly/react-core import
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `<${component} onToggle />;`,
+    })),
   ],
   invalid: [
-    {
-      code:   `import { ApplicationLauncher } from '@patternfly/react-core'; <ApplicationLauncher />;`,
-      output: `import { ApplicationLauncher } from '@patternfly/react-core'; <ApplicationLauncher />;`,
-      errors: [{
-        message: `ApplicationLauncher onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { BadgeToggle } from '@patternfly/react-core'; <BadgeToggle />;`,
-      output: `import { BadgeToggle } from '@patternfly/react-core'; <BadgeToggle />;`,
-      errors: [{
-        message: `BadgeToggle onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { DropdownToggle } from '@patternfly/react-core'; <DropdownToggle />;`,
-      output: `import { DropdownToggle } from '@patternfly/react-core'; <DropdownToggle />;`,
-      errors: [{
-        message: `DropdownToggle onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { KebabToggle } from '@patternfly/react-core'; <KebabToggle />;`,
-      output: `import { KebabToggle } from '@patternfly/react-core'; <KebabToggle />;`,
-      errors: [{
-        message: `KebabToggle onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { Toggle } from '@patternfly/react-core'; <Toggle />;`,
-      output: `import { Toggle } from '@patternfly/react-core'; <Toggle />;`,
-      errors: [{
-        message: `Toggle onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { Select } from '@patternfly/react-core'; <Select />;`,
-      output: `import { Select } from '@patternfly/react-core'; <Select />;`,
-      errors: [{
-        message: `Select onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-    {
-      code:   `import { SelectToggle } from '@patternfly/react-core'; <SelectToggle />;`,
-      output: `import { SelectToggle } from '@patternfly/react-core'; <SelectToggle />;`,
-      errors: [{
-        message: `SelectToggle onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-        type: "JSXOpeningElement",
-      }]
-    },
-  ]
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+  ],
 });
diff --git a/packages/pf-codemods/README.md b/packages/pf-codemods/README.md
index ed64f9c4a..65d0cebe7 100644
--- a/packages/pf-codemods/README.md
+++ b/packages/pf-codemods/README.md
@@ -329,6 +329,12 @@ Out:
 <DataList  />
 ```
 
+### dataList-warn-updated-callback [(#8723)](https://github.com/patternfly/patternfly-react/pull/8723)
+
+We've updated the `onSelectDataListItem` prop for DataList to include the `event` as its first parameter. Handlers may require an update.
+
+This rule will raise a warning, but will not make any changes.
+
 ### datePicker-warn-appendTo-default-value-changed [(#8636)](https://github.com/patternfly/patternfly-react/pull/8636)
 
 The default value of the `appendTo` prop on DatePicker has been updated, which may cause markup changes that require updating selectors in tests. This rule will raise a warning, but will not make any changes.
@@ -543,6 +549,8 @@ Out:
 
 We've updated the `onToggle` function to include the `event` as its first parameter for the following components: `ApplicationLauncher`, `BadgeToggle`, `DropdownToggle`, `KebabToggle`, `Toggle`, `Select`, and `SelectToggle`. Handlers for these components may require an update.
 
+This rule will raise a warning, but will not make any changes.
+
 ### pageheader-update-logoComponent [(#8655)](https://github.com/patternfly/patternfly-react/pull/8655)
 
 We've updated `PageHeader`'s logo to only be an anchor if an `href` is specified, otherwise it will be a `span`. Explicitly declared `logoComponent` properties will remain unchanged, but if it is not specified a default will be added.
diff --git a/test/test.tsx b/test/test.tsx
index 69e80b573..3f70f8456 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -11,12 +11,15 @@ import {
   AccordionExpandableContent,
   Alert,
   ApplicationLauncher,
+  BadgeToggle,
   Button,
   Card,
+  DataList,
   DatePicker,
   DropdownItem,
   DropdownToggle,
   FileUpload,
+  KebabToggle,
   KEY_CODES,
   MenuItem,
   MenuItemAction,
@@ -26,6 +29,8 @@ import {
   NumberInput,
   Pagination,
   Popover,
+  Select,
+  SelectToggle,
   Spinner,
   Tabs,
   Toggle,
@@ -45,12 +50,16 @@ const newTheme = getCustomTheme("1", "2", "3");
 <>
   <Alert aria-label='tester' />
   <Alert titleHeadingLevel={"h4"}/>
+  <ApplicationLauncher onToggle />
+  <BadgeToggle onToggle />
   <Button isLarge />
   <Button isSmall />
   <Chart themeVariant />
+  <DataList onSelectDataListItem />
   <DatePicker />
   <DropdownItem isHovered={true} />
-  <DropdownToggle isPrimary />
+  <DropdownToggle isPrimary onToggle />
+  <KebabToggle onToggle />
   <MenuItem hasCheck />
   <MenuItemAction />
   <Nav flyout={"menu"} />
@@ -69,8 +78,10 @@ const newTheme = getCustomTheme("1", "2", "3");
     optionsToggle: "test"
   }} />
   <Popover />
+  <Select onToggle />
   <SelectOption hasCheck />
+  <SelectToggle onToggle />
   <Spinner isSVG />
-  <Toggle isPrimary />
+  <Toggle isPrimary onToggle />
   <TreeView hasCheck />
 </>;

From 218ac9efb80011d2b9834fa942572592cd1d0a68 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Mon, 6 Mar 2023 10:13:02 -0500
Subject: [PATCH 2/7] Fixed test not running

---
 .../lib/rules/v5/dataList-warn-updated-callback.js            | 4 +---
 ...arn-updated-callback => dataList-warn-updated-callback.js} | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename packages/eslint-plugin-pf-codemods/test/rules/v5/{dataList-warn-updated-callback => dataList-warn-updated-callback.js} (83%)

diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
index 817273ce5..0571cdae7 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
@@ -13,9 +13,7 @@ module.exports = {
       : {
           JSXOpeningElement(node) {
             if (
-              imports
-                .map((imp) => imp.imported.name)
-                .includes(node.name.name) &&
+              imports.map((imp) => imp.local.name).includes(node.name.name) &&
               node.attributes.find(
                 (attr) => attr.name.name === "onSelectDataListItem"
               )
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js
similarity index 83%
rename from packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback
rename to packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js
index be2b1b4ab3..fa981b231 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js
@@ -23,8 +23,8 @@ ruleTester.run("dataList-warn-updated-callback", rule, {
       ],
     },
     {
-      code: `import { DataList as PFdl } from '@patternfly/react-core'; <PFdl onSelectDataListItem />;`,
-      output: `import { DataList as PFdl } from '@patternfly/react-core'; <PFdl onSelectDataListItem />;`,
+      code: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem />;`,
+      output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem />;`,
       errors: [
         {
           message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,

From 493e02e86a6dbbf63b69411689839639c91533ff Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Mon, 6 Mar 2023 14:52:13 -0500
Subject: [PATCH 3/7] Added fix for onToggle codemod

---
 packages/eslint-plugin-pf-codemods/index.js   |  1 -
 .../rules/v5/onToggle-updated-paramaters.js   | 97 +++++++++++++++++++
 .../lib/rules/v5/onToggle-warn-event.js       | 35 -------
 .../rules/v5/onToggle-updated-paramaters.js   | 95 ++++++++++++++++++
 .../test/rules/v5/onToggle-warn-event.js      | 35 -------
 test/test.tsx                                 | 14 +--
 6 files changed, 199 insertions(+), 78 deletions(-)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index e495f31ac..b46ae89ac 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -24,7 +24,6 @@ const warningRules = [
   "dataList-warn-updated-callback",
   "datePicker-warn-appendTo-default-value-changed",
   "horizontalSubnav-ariaLabel",
-  "onToggle-warn-event",
   "nav-warn-flyouts-now-inline",
   "popover-appendTo-default",
   "react-dropzone-warn-upgrade",
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
new file mode 100644
index 000000000..e7d28d67d
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
@@ -0,0 +1,97 @@
+const { getPackageImports } = require("../../helpers");
+
+// https://github.com/patternfly/patternfly-react/pull/8667
+module.exports = {
+  meta: { fixable: "code" },
+  create: function (context) {
+    const onToggleAPIUpdateList = [
+      "ApplicationLauncher",
+      "BadgeToggle",
+      "DropdownToggle",
+      "KebabToggle",
+      "Toggle",
+      "Select",
+      "SelectToggle",
+    ];
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => onToggleAPIUpdateList.includes(specifier.imported.name)
+    );
+
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            const onToggleProp = node.attributes.find(
+              (attr) => attr.name.name === "onToggle"
+            );
+            if (
+              imports.map((imp) => imp.local.name).includes(node.name.name) &&
+              onToggleProp
+            ) {
+              context.report({
+                node,
+                message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+                fix(fixer) {
+                  const { type, params, name } = onToggleProp.value?.expression;
+                  const fixes = [];
+                  const createReplacerFix = (functionParam) => {
+                    const hasParenthesis =
+                      context.getTokenAfter(functionParam).value === ")";
+                    const replacementParams = `_event, ${functionParam.name}`;
+
+                    return fixer.replaceText(
+                      functionParam,
+                      hasParenthesis
+                        ? replacementParams
+                        : `(${replacementParams})`
+                    );
+                  };
+
+                  if (
+                    type === "ArrowFunctionExpression" &&
+                    params.length === 1
+                  ) {
+                    fixes.push(createReplacerFix(params[0]));
+                  }
+
+                  if (type === "Identifier") {
+                    const variablesAndFunctions = context
+                      .getAncestors()
+                      .find((ancestor) => ancestor.type === "Program")
+                      .body.filter((bodyItem) =>
+                        ["VariableDeclaration", "FunctionDeclaration"].includes(
+                          bodyItem.type
+                        )
+                      );
+
+                    const matchingDeclaration = variablesAndFunctions.find(
+                      (varOrFunc) => {
+                        if (varOrFunc.declarations) {
+                          return varOrFunc.declarations.find(
+                            (declaration) => declaration.id.name === name
+                          );
+                        }
+
+                        return varOrFunc.id.name === name;
+                      }
+                    );
+
+                    const currentParams = matchingDeclaration.declarations
+                      ? matchingDeclaration.declarations.find(
+                          (declaration) => declaration.id.name === name
+                        ).init.params
+                      : matchingDeclaration.params;
+
+                    if (currentParams.length === 1) {
+                      fixes.push(createReplacerFix(currentParams[0]));
+                    }
+                  }
+
+                  return fixes;
+                },
+              });
+            }
+          },
+        };
+  },
+};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
deleted file mode 100644
index 6115a64fc..000000000
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-warn-event.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const { getPackageImports } = require("../../helpers");
-
-// https://github.com/patternfly/patternfly-react/pull/8667
-module.exports = {
-  create: function (context) {
-    const onToggleAPIUpdateList = [
-      "ApplicationLauncher",
-      "BadgeToggle",
-      "DropdownToggle",
-      "KebabToggle",
-      "Toggle",
-      "Select",
-      "SelectToggle",
-    ];
-    const imports = getPackageImports(context, "@patternfly/react-core").filter(
-      (specifier) => onToggleAPIUpdateList.includes(specifier.imported.name)
-    );
-
-    return imports.length === 0
-      ? {}
-      : {
-          JSXOpeningElement(node) {
-            if (
-              imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              node.attributes.find((attr) => attr.name.name === "onToggle")
-            ) {
-              context.report({
-                node,
-                message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-              });
-            }
-          },
-        };
-  },
-};
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
new file mode 100644
index 000000000..b1110a5e7
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
@@ -0,0 +1,95 @@
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/onToggle-updated-paramaters");
+const onToggleAPIUpdateList = [
+  "ApplicationLauncher",
+  "BadgeToggle",
+  "DropdownToggle",
+  "KebabToggle",
+  "Toggle",
+  "Select",
+  "SelectToggle",
+];
+
+ruleTester.run("onToggle-updated-paramaters", rule, {
+  valid: [
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} />;`,
+    })),
+    // No @patternfly/react-core import
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `<${component} onToggle />;`,
+    })),
+  ],
+  invalid: [
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(isOpen) => onToggle()} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle()} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={isOpen => onToggle()} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle()} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; const onToggle = () => {}; <${component} onToggle={onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; const onToggle = () => {}; <${component} onToggle={onToggle} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; const onToggle = (isOpen) => {}; <${component} onToggle={onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; const onToggle = (_event, isOpen) => {}; <${component} onToggle={onToggle} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; function onToggle() {}; <${component} onToggle={onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; function onToggle() {}; <${component} onToggle={onToggle} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; function onToggle(isOpen) {}; <${component} onToggle={onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; function onToggle(_event, isOpen) {}; <${component} onToggle={onToggle} />;`,
+      errors: [
+        {
+          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    })),
+  ],
+});
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js
deleted file mode 100644
index 63c589d9f..000000000
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-warn-event.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const ruleTester = require("../../ruletester");
-const rule = require("../../../lib/rules/v5/onToggle-warn-event");
-const onToggleAPIUpdateList = [
-  "ApplicationLauncher",
-  "BadgeToggle",
-  "DropdownToggle",
-  "KebabToggle",
-  "Toggle",
-  "Select",
-  "SelectToggle",
-];
-
-ruleTester.run("onToggle-warn-event", rule, {
-  valid: [
-    ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; <${component} />;`,
-    })),
-    // No @patternfly/react-core import
-    ...onToggleAPIUpdateList.map((component) => ({
-      code: `<${component} onToggle />;`,
-    })),
-  ],
-  invalid: [
-    ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle />;`,
-      errors: [
-        {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    })),
-  ],
-});
diff --git a/test/test.tsx b/test/test.tsx
index 3f70f8456..e20d07f1e 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -50,16 +50,16 @@ const newTheme = getCustomTheme("1", "2", "3");
 <>
   <Alert aria-label='tester' />
   <Alert titleHeadingLevel={"h4"}/>
-  <ApplicationLauncher onToggle />
-  <BadgeToggle onToggle />
+  <ApplicationLauncher onToggle={} />
+  <BadgeToggle onToggle={} />
   <Button isLarge />
   <Button isSmall />
   <Chart themeVariant />
   <DataList onSelectDataListItem />
   <DatePicker />
   <DropdownItem isHovered={true} />
-  <DropdownToggle isPrimary onToggle />
-  <KebabToggle onToggle />
+  <DropdownToggle isPrimary onToggle={} />
+  <KebabToggle onToggle={} />
   <MenuItem hasCheck />
   <MenuItemAction />
   <Nav flyout={"menu"} />
@@ -78,10 +78,10 @@ const newTheme = getCustomTheme("1", "2", "3");
     optionsToggle: "test"
   }} />
   <Popover />
-  <Select onToggle />
+  <Select onToggle={} />
   <SelectOption hasCheck />
-  <SelectToggle onToggle />
+  <SelectToggle onToggle={} />
   <Spinner isSVG />
-  <Toggle isPrimary onToggle />
+  <Toggle isPrimary onToggle={} />
   <TreeView hasCheck />
 </>;

From 8931890c1a0e45b7e5dcc7fd17953b95641c6a05 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Mon, 6 Mar 2023 18:22:07 -0500
Subject: [PATCH 4/7] Added logic to update identifiers for props

---
 packages/eslint-plugin-pf-codemods/index.js   |  1 -
 .../lib/rules/v5/dataList-updated-callback.js | 78 +++++++++++++++++++
 .../v5/dataList-warn-updated-callback.js      | 29 -------
 .../rules/v5/onToggle-updated-paramaters.js   | 46 +++++------
 .../rules/v5/dataList-updated-callback.js     | 69 ++++++++++++++++
 .../v5/dataList-warn-updated-callback.js      | 36 ---------
 .../rules/v5/onToggle-updated-paramaters.js   | 21 ++---
 packages/pf-codemods/README.md                | 56 ++++++++++++-
 8 files changed, 224 insertions(+), 112 deletions(-)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index b46ae89ac..5230d3ccd 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -21,7 +21,6 @@ const warningRules = [
   "applicationLauncher-warn-input",
   "card-warn-component",
   "charts-tooltip-warning",
-  "dataList-warn-updated-callback",
   "datePicker-warn-appendTo-default-value-changed",
   "horizontalSubnav-ariaLabel",
   "nav-warn-flyouts-now-inline",
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
new file mode 100644
index 000000000..28a7ede53
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
@@ -0,0 +1,78 @@
+const { getPackageImports } = require("../../helpers");
+
+// https://github.com/patternfly/patternfly-react/pull/8723
+module.exports = {
+  meta: { fixable: "code" },
+  create: function (context) {
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => specifier.imported.name === "DataList"
+    );
+
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            const onSelectDataListItemProp = node.attributes.find(
+              (attr) => attr.name.name === "onSelectDataListItem"
+            );
+
+            const { type, params, name } =
+              onSelectDataListItemProp?.value?.expression || {};
+
+            if (
+              imports.map((imp) => imp.local.name).includes(node.name.name) &&
+              ((type === "ArrowFunctionExpression" && params?.length === 1) ||
+                type === "Identifier")
+            ) {
+              context.report({
+                node,
+                message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+                fix(fixer) {
+                  const fixes = [];
+                  const createReplacerFix = (functionParam) => {
+                    const hasParenthesis =
+                      context.getTokenAfter(functionParam).value === ")";
+                    const replacementParams = `_event, ${functionParam.name}`;
+
+                    return fixer.replaceText(
+                      functionParam,
+                      hasParenthesis
+                        ? replacementParams
+                        : `(${replacementParams})`
+                    );
+                  };
+
+                  if (
+                    type === "ArrowFunctionExpression" &&
+                    params.length === 1
+                  ) {
+                    fixes.push(createReplacerFix(params[0]));
+                  }
+
+                  if (type === "Identifier") {
+                    const currentScope = context.getScope();
+                    const matchingVariables = currentScope.variables.find(
+                      (variable) => variable.name === name
+                    );
+                    const matchingDefinition = matchingVariables.defs.find(
+                      (def) => def.name.name === name
+                    );
+
+                    const definitionParams =
+                      matchingDefinition.type === "FunctionName"
+                        ? matchingDefinition.node.params
+                        : matchingDefinition.node.init.params;
+
+                    if (definitionParams.length === 1) {
+                      fixes.push(createReplacerFix(definitionParams[0]));
+                    }
+                  }
+
+                  return fixes;
+                },
+              });
+            }
+          },
+        };
+  },
+};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
deleted file mode 100644
index 0571cdae7..000000000
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-warn-updated-callback.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const { getPackageImports } = require("../../helpers");
-
-// https://github.com/patternfly/patternfly-react/pull/8723
-module.exports = {
-  meta: {},
-  create: function (context) {
-    const imports = getPackageImports(context, "@patternfly/react-core").filter(
-      (specifier) => specifier.imported.name === "DataList"
-    );
-
-    return imports.length === 0
-      ? {}
-      : {
-          JSXOpeningElement(node) {
-            if (
-              imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              node.attributes.find(
-                (attr) => attr.name.name === "onSelectDataListItem"
-              )
-            ) {
-              context.report({
-                node,
-                message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
-              });
-            }
-          },
-        };
-  },
-};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
index e7d28d67d..55294b130 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
@@ -24,15 +24,19 @@ module.exports = {
             const onToggleProp = node.attributes.find(
               (attr) => attr.name.name === "onToggle"
             );
+
+            const { type, params, name } =
+              onToggleProp?.value?.expression || {};
+
             if (
               imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              onToggleProp
+              ((type === "ArrowFunctionExpression" && params?.length === 1) ||
+                type === "Identifier")
             ) {
               context.report({
                 node,
                 message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
                 fix(fixer) {
-                  const { type, params, name } = onToggleProp.value?.expression;
                   const fixes = [];
                   const createReplacerFix = (functionParam) => {
                     const hasParenthesis =
@@ -55,35 +59,21 @@ module.exports = {
                   }
 
                   if (type === "Identifier") {
-                    const variablesAndFunctions = context
-                      .getAncestors()
-                      .find((ancestor) => ancestor.type === "Program")
-                      .body.filter((bodyItem) =>
-                        ["VariableDeclaration", "FunctionDeclaration"].includes(
-                          bodyItem.type
-                        )
-                      );
-
-                    const matchingDeclaration = variablesAndFunctions.find(
-                      (varOrFunc) => {
-                        if (varOrFunc.declarations) {
-                          return varOrFunc.declarations.find(
-                            (declaration) => declaration.id.name === name
-                          );
-                        }
-
-                        return varOrFunc.id.name === name;
-                      }
+                    const currentScope = context.getScope();
+                    const matchingVariables = currentScope.variables.find(
+                      (variable) => variable.name === name
+                    );
+                    const matchingDefinition = matchingVariables.defs.find(
+                      (def) => def.name.name === name
                     );
 
-                    const currentParams = matchingDeclaration.declarations
-                      ? matchingDeclaration.declarations.find(
-                          (declaration) => declaration.id.name === name
-                        ).init.params
-                      : matchingDeclaration.params;
+                    const definitionParams =
+                      matchingDefinition.type === "FunctionName"
+                        ? matchingDefinition.node.params
+                        : matchingDefinition.node.init.params;
 
-                    if (currentParams.length === 1) {
-                      fixes.push(createReplacerFix(currentParams[0]));
+                    if (definitionParams.length === 1) {
+                      fixes.push(createReplacerFix(definitionParams[0]));
                     }
                   }
 
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
new file mode 100644
index 000000000..7db23cc7d
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
@@ -0,0 +1,69 @@
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/dataList-updated-callback");
+
+ruleTester.run("dataList-updated-callback", rule, {
+  valid: [
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList />;`,
+    },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={() => onSelect()} />;`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<DataList onSelectDataListItem />;`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(id) => onSelect(id)} />;`,
+      output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={id => onSelect(id)} />;`,
+      output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; const onSelect = (id) => {}; <DataList onSelectDataListItem={onSelect} />;`,
+      output: `import { DataList } from '@patternfly/react-core'; const onSelect = (_event, id) => {}; <DataList onSelectDataListItem={onSelect} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; function onSelect(id) {}; <DataList onSelectDataListItem={onSelect} />;`,
+      output: `import { DataList } from '@patternfly/react-core'; function onSelect(_event, id) {}; <DataList onSelectDataListItem={onSelect} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(id) => onSelect(id)} />;`,
+      output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js
deleted file mode 100644
index fa981b231..000000000
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-warn-updated-callback.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const ruleTester = require("../../ruletester");
-const rule = require("../../../lib/rules/v5/dataList-warn-updated-callback");
-
-ruleTester.run("dataList-warn-updated-callback", rule, {
-  valid: [
-    {
-      code: `import { DataList } from '@patternfly/react-core'; <DataList />;`,
-    },
-    {
-      // No @patternfly/react-core import
-      code: `<DataList onSelectDataListItem />;`,
-    },
-  ],
-  invalid: [
-    {
-      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem />;`,
-      output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem />;`,
-      errors: [
-        {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    },
-    {
-      code: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem />;`,
-      output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem />;`,
-      errors: [
-        {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    },
-  ],
-});
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
index b1110a5e7..8d9d0459b 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
@@ -15,6 +15,9 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
     ...onToggleAPIUpdateList.map((component) => ({
       code: `import { ${component} } from '@patternfly/react-core'; <${component} />;`,
     })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
+    })),
     // No @patternfly/react-core import
     ...onToggleAPIUpdateList.map((component) => ({
       code: `<${component} onToggle />;`,
@@ -22,18 +25,8 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
   ],
   invalid: [
     ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
-      errors: [
-        {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    })),
-    ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(isOpen) => onToggle()} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle()} />;`,
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(isOpen) => onToggle(isOpen)} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
           message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
@@ -42,8 +35,8 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       ],
     })),
     ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={isOpen => onToggle()} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle()} />;`,
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={isOpen => onToggle(isOpen)} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
           message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
diff --git a/packages/pf-codemods/README.md b/packages/pf-codemods/README.md
index 65d0cebe7..49181c800 100644
--- a/packages/pf-codemods/README.md
+++ b/packages/pf-codemods/README.md
@@ -329,11 +329,35 @@ Out:
 <DataList  />
 ```
 
-### dataList-warn-updated-callback [(#8723)](https://github.com/patternfly/patternfly-react/pull/8723)
+### dataList-updated-callback [(#8723)](https://github.com/patternfly/patternfly-react/pull/8723)
 
 We've updated the `onSelectDataListItem` prop for DataList to include the `event` as its first parameter. Handlers may require an update.
 
-This rule will raise a warning, but will not make any changes.
+#### Examples
+
+In:
+
+```jsx
+<DataList onSelectDataListItem={(id) => onSelect(id)} />
+
+const toggle1 = (id) => {};
+<DataList onSelectDataListItem={toggle1}>
+
+function toggle2(id) {};
+<DataList onSelectDataListItem={toggle2}>
+```
+
+Out:
+
+```jsx
+<DataList onSelectDataListItem={(_event, id) => onSelect(id)} />
+
+const toggle1 = (_event, id) => {};
+<DataList onSelectDataListItem={toggle1}>
+
+function toggle2(_event, id) {};
+<DataList onSelectDataListItem={toggle2}>
+```
 
 ### datePicker-warn-appendTo-default-value-changed [(#8636)](https://github.com/patternfly/patternfly-react/pull/8636)
 
@@ -545,11 +569,35 @@ Out:
 <NumberInput  />
 ```
 
-### onToggle-warn-event [(#8667)](https://github.com/patternfly/patternfly-react/pull/8667)
+### onToggle-updated-parameters [(#8667)](https://github.com/patternfly/patternfly-react/pull/8667)
 
 We've updated the `onToggle` function to include the `event` as its first parameter for the following components: `ApplicationLauncher`, `BadgeToggle`, `DropdownToggle`, `KebabToggle`, `Toggle`, `Select`, and `SelectToggle`. Handlers for these components may require an update.
 
-This rule will raise a warning, but will not make any changes.
+#### Examples
+
+In:
+
+```jsx
+<Toggle onToggle={(isOpen) => onToggle(isOpen)} />
+
+const toggleBadge = (isOpen) => {};
+<BadgeToggle onToggle={toggleBadge}>
+
+function toggleDropdown(isOpen) {};
+<DropdownToggle onToggle={toggleDropdown}>
+```
+
+Out:
+
+```jsx
+<Toggle onToggle={(_event, isOpen) => onToggle(isOpen)} />
+
+const toggleBadge = (_event, isOpen) => {};
+<BadgeToggle onToggle={toggleBadge}>
+
+function toggleDropdown(_event, isOpen) {};
+<DropdownToggle onToggle={toggleDropdown}>
+```
 
 ### pageheader-update-logoComponent [(#8655)](https://github.com/patternfly/patternfly-react/pull/8655)
 

From f64acbf70b26cf1cd9fe8722176e731d9737143e Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 7 Mar 2023 13:56:43 -0500
Subject: [PATCH 5/7] Refactored logic: account for class functions, no-param
 identifiers are valid

---
 .../lib/rules/v5/dataList-updated-callback.js | 62 ++++++++++---------
 .../rules/v5/onToggle-updated-paramaters.js   | 50 ++++++++-------
 .../rules/v5/dataList-updated-callback.js     | 16 +++++
 .../rules/v5/onToggle-updated-paramaters.js   | 24 +++----
 4 files changed, 85 insertions(+), 67 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
index 28a7ede53..d0f4466e2 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
@@ -4,11 +4,12 @@ const { getPackageImports } = require("../../helpers");
 module.exports = {
   meta: { fixable: "code" },
   create: function (context) {
-    const imports = getPackageImports(context, "@patternfly/react-core").filter(
-      (specifier) => specifier.imported.name === "DataList"
-    );
+    const dataListImport = getPackageImports(
+      context,
+      "@patternfly/react-core"
+    ).find((specifier) => specifier.imported.name === "DataList");
 
-    return imports.length === 0
+    return !dataListImport
       ? {}
       : {
           JSXOpeningElement(node) {
@@ -16,13 +17,35 @@ module.exports = {
               (attr) => attr.name.name === "onSelectDataListItem"
             );
 
-            const { type, params, name } =
-              onSelectDataListItemProp?.value?.expression || {};
+            const propProperties = {
+              type: onSelectDataListItemProp?.value?.expression?.type,
+              name: onSelectDataListItemProp?.value?.expression?.name,
+            };
+
+            if (propProperties.type === "ArrowFunctionExpression") {
+              propProperties.params =
+                onSelectDataListItemProp?.value?.expression?.params;
+            } else if (propProperties.type === "Identifier") {
+              const currentScope = context.getScope();
+              const matchingVariable = currentScope.variables.find(
+                (variable) => variable.name === propProperties.name
+              );
+              const matchingDefinition = matchingVariable.defs.find(
+                (def) => def.name.name === propProperties.name
+              );
+
+              propProperties.params =
+                matchingDefinition.type === "FunctionName"
+                  ? matchingDefinition.node.params
+                  : matchingDefinition.node.init.params;
+            }
+            const { type, params } = propProperties;
 
             if (
-              imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              ((type === "ArrowFunctionExpression" && params?.length === 1) ||
-                type === "Identifier")
+              dataListImport.local.name === node.name.name &&
+              ((params?.length === 1 &&
+                ["ArrowFunctionExpression", "Identifier"].includes(type)) ||
+                type === "MemberExpression")
             ) {
               context.report({
                 node,
@@ -43,31 +66,12 @@ module.exports = {
                   };
 
                   if (
-                    type === "ArrowFunctionExpression" &&
+                    ["ArrowFunctionExpression", "Identifier"].includes(type) &&
                     params.length === 1
                   ) {
                     fixes.push(createReplacerFix(params[0]));
                   }
 
-                  if (type === "Identifier") {
-                    const currentScope = context.getScope();
-                    const matchingVariables = currentScope.variables.find(
-                      (variable) => variable.name === name
-                    );
-                    const matchingDefinition = matchingVariables.defs.find(
-                      (def) => def.name.name === name
-                    );
-
-                    const definitionParams =
-                      matchingDefinition.type === "FunctionName"
-                        ? matchingDefinition.node.params
-                        : matchingDefinition.node.init.params;
-
-                    if (definitionParams.length === 1) {
-                      fixes.push(createReplacerFix(definitionParams[0]));
-                    }
-                  }
-
                   return fixes;
                 },
               });
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
index 55294b130..2a9362bb5 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
@@ -25,13 +25,34 @@ module.exports = {
               (attr) => attr.name.name === "onToggle"
             );
 
-            const { type, params, name } =
-              onToggleProp?.value?.expression || {};
+            const propProperties = {
+              type: onToggleProp?.value?.expression?.type,
+              name: onToggleProp?.value?.expression?.name,
+            };
+
+            if (propProperties.type === "ArrowFunctionExpression") {
+              propProperties.params = onToggleProp?.value?.expression?.params;
+            } else if (propProperties.type === "Identifier") {
+              const currentScope = context.getScope();
+              const matchingVariable = currentScope.variables.find(
+                (variable) => variable.name === propProperties.name
+              );
+              const matchingDefinition = matchingVariable.defs.find(
+                (def) => def.name.name === propProperties.name
+              );
+
+              propProperties.params =
+                matchingDefinition.type === "FunctionName"
+                  ? matchingDefinition.node.params
+                  : matchingDefinition.node.init.params;
+            }
+            const { type, params } = propProperties;
 
             if (
               imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              ((type === "ArrowFunctionExpression" && params?.length === 1) ||
-                type === "Identifier")
+              ((params?.length === 1 &&
+                ["ArrowFunctionExpression", "Identifier"].includes(type)) ||
+                type === "MemberExpression")
             ) {
               context.report({
                 node,
@@ -52,31 +73,12 @@ module.exports = {
                   };
 
                   if (
-                    type === "ArrowFunctionExpression" &&
+                    ["ArrowFunctionExpression", "Identifier"].includes(type) &&
                     params.length === 1
                   ) {
                     fixes.push(createReplacerFix(params[0]));
                   }
 
-                  if (type === "Identifier") {
-                    const currentScope = context.getScope();
-                    const matchingVariables = currentScope.variables.find(
-                      (variable) => variable.name === name
-                    );
-                    const matchingDefinition = matchingVariables.defs.find(
-                      (def) => def.name.name === name
-                    );
-
-                    const definitionParams =
-                      matchingDefinition.type === "FunctionName"
-                        ? matchingDefinition.node.params
-                        : matchingDefinition.node.init.params;
-
-                    if (definitionParams.length === 1) {
-                      fixes.push(createReplacerFix(definitionParams[0]));
-                    }
-                  }
-
                   return fixes;
                 },
               });
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
index 7db23cc7d..ec5b1c97b 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
@@ -9,6 +9,12 @@ ruleTester.run("dataList-updated-callback", rule, {
     {
       code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={() => onSelect()} />;`,
     },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; const onSelect = () => {}; <DataList onSelectDataListItem={onSelect} />;`,
+    },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; function onSelect() {}; <DataList onSelectDataListItem={onSelect} />;`,
+    },
     {
       // No @patternfly/react-core import
       code: `<DataList onSelectDataListItem />;`,
@@ -55,6 +61,16 @@ ruleTester.run("dataList-updated-callback", rule, {
         },
       ],
     },
+    {
+      code: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={this.onSelect} />;`,
+      output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={this.onSelect} />;`,
+      errors: [
+        {
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
     {
       code: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(id) => onSelect(id)} />;`,
       output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
index 8d9d0459b..51c682bd5 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
@@ -18,6 +18,12 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
     ...onToggleAPIUpdateList.map((component) => ({
       code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={() => onToggle} />;`,
     })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; const onToggle = () => {}; <${component} onToggle={onToggle} />;`,
+    })),
+    ...onToggleAPIUpdateList.map((component) => ({
+      code: `import { ${component} } from '@patternfly/react-core'; function onToggle() {}; <${component} onToggle={onToggle} />;`,
+    })),
     // No @patternfly/react-core import
     ...onToggleAPIUpdateList.map((component) => ({
       code: `<${component} onToggle />;`,
@@ -44,16 +50,6 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
         },
       ],
     })),
-    ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; const onToggle = () => {}; <${component} onToggle={onToggle} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; const onToggle = () => {}; <${component} onToggle={onToggle} />;`,
-      errors: [
-        {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    })),
     ...onToggleAPIUpdateList.map((component) => ({
       code: `import { ${component} } from '@patternfly/react-core'; const onToggle = (isOpen) => {}; <${component} onToggle={onToggle} />;`,
       output: `import { ${component} } from '@patternfly/react-core'; const onToggle = (_event, isOpen) => {}; <${component} onToggle={onToggle} />;`,
@@ -65,8 +61,8 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       ],
     })),
     ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; function onToggle() {}; <${component} onToggle={onToggle} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; function onToggle() {}; <${component} onToggle={onToggle} />;`,
+      code: `import { ${component} } from '@patternfly/react-core'; function onToggle(isOpen) {}; <${component} onToggle={onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; function onToggle(_event, isOpen) {}; <${component} onToggle={onToggle} />;`,
       errors: [
         {
           message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
@@ -75,8 +71,8 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       ],
     })),
     ...onToggleAPIUpdateList.map((component) => ({
-      code: `import { ${component} } from '@patternfly/react-core'; function onToggle(isOpen) {}; <${component} onToggle={onToggle} />;`,
-      output: `import { ${component} } from '@patternfly/react-core'; function onToggle(_event, isOpen) {}; <${component} onToggle={onToggle} />;`,
+      code: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={this.onToggle} />;`,
+      output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={this.onToggle} />;`,
       errors: [
         {
           message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,

From 69e198c8fa0168e7fe6849b95bc71f30c4be840a Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 7 Mar 2023 14:34:43 -0500
Subject: [PATCH 6/7] Refactored code as a helper

---
 .../eslint-plugin-pf-codemods/lib/helpers.js  | 85 ++++++++++++++++
 .../lib/rules/v5/dataList-updated-callback.js | 79 +--------------
 .../rules/v5/onToggle-updated-paramaters.js   | 96 +++----------------
 .../rules/v5/dataList-updated-callback.js     | 12 +--
 .../rules/v5/onToggle-updated-paramaters.js   | 10 +-
 5 files changed, 109 insertions(+), 173 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/lib/helpers.js b/packages/eslint-plugin-pf-codemods/lib/helpers.js
index 787c01d85..d2543c921 100644
--- a/packages/eslint-plugin-pf-codemods/lib/helpers.js
+++ b/packages/eslint-plugin-pf-codemods/lib/helpers.js
@@ -178,6 +178,90 @@ function ensureImports(context, node, package, imports) {
   }
 }
 
+function addCallbackParam(componentsArray, propMap) {
+  return function (context) {
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => componentsArray.includes(specifier.imported.name)
+    );
+
+    return !imports.length
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            if (imports.map((imp) => imp.local.name).includes(node.name.name)) {
+              const namedAttributes = node.attributes.filter((attr) =>
+                Object.keys(propMap).includes(attr.name?.name)
+              );
+
+              namedAttributes.forEach((attribute) => {
+                const newParam = propMap[attribute.name.name];
+
+                const propProperties = {
+                  type: attribute.value?.expression?.type,
+                  name: attribute.value?.expression?.name,
+                };
+
+                if (propProperties.type === "ArrowFunctionExpression") {
+                  propProperties.params = attribute.value?.expression?.params;
+                } else if (propProperties.type === "Identifier") {
+                  const currentScope = context.getScope();
+                  const matchingVariable = currentScope.variables.find(
+                    (variable) => variable.name === propProperties.name
+                  );
+                  const matchingDefinition = matchingVariable.defs.find(
+                    (def) => def.name.name === propProperties.name
+                  );
+
+                  propProperties.params =
+                    matchingDefinition.type === "FunctionName"
+                      ? matchingDefinition.node.params
+                      : matchingDefinition.node.init.params;
+                }
+                const { type, params } = propProperties;
+
+                if (
+                  (params?.length === 1 &&
+                    ["ArrowFunctionExpression", "Identifier"].includes(type)) ||
+                  type === "MemberExpression"
+                ) {
+                  context.report({
+                    node,
+                    message: `The "${attribute.name.name}" prop for ${node.name.name} has been updated to include the "${newParam}" parameter as its first parameter. "${attribute.name.name}" handlers may require an update.`,
+                    fix(fixer) {
+                      const fixes = [];
+                      const createReplacerFix = (functionParam) => {
+                        const hasParenthesis =
+                          context.getTokenAfter(functionParam).value === ")";
+                        const replacementParams = `_${newParam}, ${functionParam.name}`;
+
+                        return fixer.replaceText(
+                          functionParam,
+                          hasParenthesis
+                            ? replacementParams
+                            : `(${replacementParams})`
+                        );
+                      };
+
+                      if (
+                        ["ArrowFunctionExpression", "Identifier"].includes(
+                          type
+                        ) &&
+                        params.length === 1
+                      ) {
+                        fixes.push(createReplacerFix(params[0]));
+                      }
+
+                      return fixes;
+                    },
+                  });
+                }
+              });
+            }
+          },
+        };
+  };
+}
+
 module.exports = {
   ensureImports,
   getPackageImports,
@@ -185,4 +269,5 @@ module.exports = {
   renameProps0,
   renameProps,
   renameComponents,
+  addCallbackParam
 }
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
index d0f4466e2..cf93c6240 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
@@ -1,82 +1,7 @@
-const { getPackageImports } = require("../../helpers");
+const { addCallbackParam } = require("../../helpers");
 
 // https://github.com/patternfly/patternfly-react/pull/8723
 module.exports = {
   meta: { fixable: "code" },
-  create: function (context) {
-    const dataListImport = getPackageImports(
-      context,
-      "@patternfly/react-core"
-    ).find((specifier) => specifier.imported.name === "DataList");
-
-    return !dataListImport
-      ? {}
-      : {
-          JSXOpeningElement(node) {
-            const onSelectDataListItemProp = node.attributes.find(
-              (attr) => attr.name.name === "onSelectDataListItem"
-            );
-
-            const propProperties = {
-              type: onSelectDataListItemProp?.value?.expression?.type,
-              name: onSelectDataListItemProp?.value?.expression?.name,
-            };
-
-            if (propProperties.type === "ArrowFunctionExpression") {
-              propProperties.params =
-                onSelectDataListItemProp?.value?.expression?.params;
-            } else if (propProperties.type === "Identifier") {
-              const currentScope = context.getScope();
-              const matchingVariable = currentScope.variables.find(
-                (variable) => variable.name === propProperties.name
-              );
-              const matchingDefinition = matchingVariable.defs.find(
-                (def) => def.name.name === propProperties.name
-              );
-
-              propProperties.params =
-                matchingDefinition.type === "FunctionName"
-                  ? matchingDefinition.node.params
-                  : matchingDefinition.node.init.params;
-            }
-            const { type, params } = propProperties;
-
-            if (
-              dataListImport.local.name === node.name.name &&
-              ((params?.length === 1 &&
-                ["ArrowFunctionExpression", "Identifier"].includes(type)) ||
-                type === "MemberExpression")
-            ) {
-              context.report({
-                node,
-                message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
-                fix(fixer) {
-                  const fixes = [];
-                  const createReplacerFix = (functionParam) => {
-                    const hasParenthesis =
-                      context.getTokenAfter(functionParam).value === ")";
-                    const replacementParams = `_event, ${functionParam.name}`;
-
-                    return fixer.replaceText(
-                      functionParam,
-                      hasParenthesis
-                        ? replacementParams
-                        : `(${replacementParams})`
-                    );
-                  };
-
-                  if (
-                    ["ArrowFunctionExpression", "Identifier"].includes(type) &&
-                    params.length === 1
-                  ) {
-                    fixes.push(createReplacerFix(params[0]));
-                  }
-
-                  return fixes;
-                },
-              });
-            }
-          },
-        };
-  },
+  create: addCallbackParam(["DataList"], { onSelectDataListItem: "event" }),
 };
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
index 2a9362bb5..aa7e2bb18 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
@@ -1,89 +1,15 @@
-const { getPackageImports } = require("../../helpers");
-
+const { addCallbackParam } = require("../../helpers");
+const onToggleAPIUpdateList = [
+  "ApplicationLauncher",
+  "BadgeToggle",
+  "DropdownToggle",
+  "KebabToggle",
+  "Toggle",
+  "Select",
+  "SelectToggle",
+];
 // https://github.com/patternfly/patternfly-react/pull/8667
 module.exports = {
   meta: { fixable: "code" },
-  create: function (context) {
-    const onToggleAPIUpdateList = [
-      "ApplicationLauncher",
-      "BadgeToggle",
-      "DropdownToggle",
-      "KebabToggle",
-      "Toggle",
-      "Select",
-      "SelectToggle",
-    ];
-    const imports = getPackageImports(context, "@patternfly/react-core").filter(
-      (specifier) => onToggleAPIUpdateList.includes(specifier.imported.name)
-    );
-
-    return imports.length === 0
-      ? {}
-      : {
-          JSXOpeningElement(node) {
-            const onToggleProp = node.attributes.find(
-              (attr) => attr.name.name === "onToggle"
-            );
-
-            const propProperties = {
-              type: onToggleProp?.value?.expression?.type,
-              name: onToggleProp?.value?.expression?.name,
-            };
-
-            if (propProperties.type === "ArrowFunctionExpression") {
-              propProperties.params = onToggleProp?.value?.expression?.params;
-            } else if (propProperties.type === "Identifier") {
-              const currentScope = context.getScope();
-              const matchingVariable = currentScope.variables.find(
-                (variable) => variable.name === propProperties.name
-              );
-              const matchingDefinition = matchingVariable.defs.find(
-                (def) => def.name.name === propProperties.name
-              );
-
-              propProperties.params =
-                matchingDefinition.type === "FunctionName"
-                  ? matchingDefinition.node.params
-                  : matchingDefinition.node.init.params;
-            }
-            const { type, params } = propProperties;
-
-            if (
-              imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              ((params?.length === 1 &&
-                ["ArrowFunctionExpression", "Identifier"].includes(type)) ||
-                type === "MemberExpression")
-            ) {
-              context.report({
-                node,
-                message: `${node.name.name} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
-                fix(fixer) {
-                  const fixes = [];
-                  const createReplacerFix = (functionParam) => {
-                    const hasParenthesis =
-                      context.getTokenAfter(functionParam).value === ")";
-                    const replacementParams = `_event, ${functionParam.name}`;
-
-                    return fixer.replaceText(
-                      functionParam,
-                      hasParenthesis
-                        ? replacementParams
-                        : `(${replacementParams})`
-                    );
-                  };
-
-                  if (
-                    ["ArrowFunctionExpression", "Identifier"].includes(type) &&
-                    params.length === 1
-                  ) {
-                    fixes.push(createReplacerFix(params[0]));
-                  }
-
-                  return fixes;
-                },
-              });
-            }
-          },
-        };
-  },
+  create: addCallbackParam(onToggleAPIUpdateList, { onToggle: "event" }),
 };
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
index ec5b1c97b..478f73f9f 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
@@ -26,7 +26,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -36,7 +36,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -46,7 +46,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; const onSelect = (_event, id) => {}; <DataList onSelectDataListItem={onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -56,7 +56,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; function onSelect(_event, id) {}; <DataList onSelectDataListItem={onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -66,7 +66,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={this.onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -76,7 +76,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the event parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for PFDataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
index 51c682bd5..5939c4b6e 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
@@ -35,7 +35,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -45,7 +45,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -55,7 +55,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; const onToggle = (_event, isOpen) => {}; <${component} onToggle={onToggle} />;`,
       errors: [
         {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -65,7 +65,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; function onToggle(_event, isOpen) {}; <${component} onToggle={onToggle} />;`,
       errors: [
         {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -75,7 +75,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={this.onToggle} />;`,
       errors: [
         {
-          message: `${component} onToggle prop has been updated to include the event parameter as its first parameter. onToggle handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],

From cfadf69876867e8e4f925130a2e29486a4e8e338 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 7 Mar 2023 14:44:58 -0500
Subject: [PATCH 7/7] Removed underscore from helper

---
 packages/eslint-plugin-pf-codemods/lib/helpers.js    |  2 +-
 .../lib/rules/v5/dataList-updated-callback.js        |  2 +-
 .../lib/rules/v5/onToggle-updated-paramaters.js      |  2 +-
 .../test/rules/v5/dataList-updated-callback.js       | 12 ++++++------
 .../test/rules/v5/onToggle-updated-paramaters.js     | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/lib/helpers.js b/packages/eslint-plugin-pf-codemods/lib/helpers.js
index d2543c921..eca3b7494 100644
--- a/packages/eslint-plugin-pf-codemods/lib/helpers.js
+++ b/packages/eslint-plugin-pf-codemods/lib/helpers.js
@@ -232,7 +232,7 @@ function addCallbackParam(componentsArray, propMap) {
                       const createReplacerFix = (functionParam) => {
                         const hasParenthesis =
                           context.getTokenAfter(functionParam).value === ")";
-                        const replacementParams = `_${newParam}, ${functionParam.name}`;
+                        const replacementParams = `${newParam}, ${functionParam.name}`;
 
                         return fixer.replaceText(
                           functionParam,
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
index cf93c6240..4be374fdb 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataList-updated-callback.js
@@ -3,5 +3,5 @@ const { addCallbackParam } = require("../../helpers");
 // https://github.com/patternfly/patternfly-react/pull/8723
 module.exports = {
   meta: { fixable: "code" },
-  create: addCallbackParam(["DataList"], { onSelectDataListItem: "event" }),
+  create: addCallbackParam(["DataList"], { onSelectDataListItem: "_event" }),
 };
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
index aa7e2bb18..942ad680b 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/onToggle-updated-paramaters.js
@@ -11,5 +11,5 @@ const onToggleAPIUpdateList = [
 // https://github.com/patternfly/patternfly-react/pull/8667
 module.exports = {
   meta: { fixable: "code" },
-  create: addCallbackParam(onToggleAPIUpdateList, { onToggle: "event" }),
+  create: addCallbackParam(onToggleAPIUpdateList, { onToggle: "_event" }),
 };
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
index 478f73f9f..3498e05f7 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataList-updated-callback.js
@@ -26,7 +26,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -36,7 +36,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -46,7 +46,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; const onSelect = (_event, id) => {}; <DataList onSelectDataListItem={onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -56,7 +56,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; function onSelect(_event, id) {}; <DataList onSelectDataListItem={onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -66,7 +66,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList } from '@patternfly/react-core'; <DataList onSelectDataListItem={this.onSelect} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for DataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -76,7 +76,7 @@ ruleTester.run("dataList-updated-callback", rule, {
       output: `import { DataList as PFDataList } from '@patternfly/react-core'; <PFDataList onSelectDataListItem={(_event, id) => onSelect(id)} />;`,
       errors: [
         {
-          message: `The "onSelectDataListItem" prop for PFDataList has been updated to include the "event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
+          message: `The "onSelectDataListItem" prop for PFDataList has been updated to include the "_event" parameter as its first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
index 5939c4b6e..9b829056b 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/onToggle-updated-paramaters.js
@@ -35,7 +35,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
-          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "_event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -45,7 +45,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={(_event, isOpen) => onToggle(isOpen)} />;`,
       errors: [
         {
-          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "_event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -55,7 +55,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; const onToggle = (_event, isOpen) => {}; <${component} onToggle={onToggle} />;`,
       errors: [
         {
-          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "_event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -65,7 +65,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; function onToggle(_event, isOpen) {}; <${component} onToggle={onToggle} />;`,
       errors: [
         {
-          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "_event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
@@ -75,7 +75,7 @@ ruleTester.run("onToggle-updated-paramaters", rule, {
       output: `import { ${component} } from '@patternfly/react-core'; <${component} onToggle={this.onToggle} />;`,
       errors: [
         {
-          message: `The "onToggle" prop for ${component} has been updated to include the "event" parameter as its first parameter. "onToggle" handlers may require an update.`,
+          message: `The "onToggle" prop for ${component} has been updated to include the "_event" parameter as its first parameter. "onToggle" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],