From 7a6588b87ec03ead43ae92ef04452e8ca21b6726 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Mon, 6 Mar 2023 09:51:46 -0500
Subject: [PATCH 1/2] fix(DataListCheck): reordered onChange params

---
 packages/eslint-plugin-pf-codemods/index.js   |  1 +
 .../v5/dataListCheck-warn-updated-callback.js | 27 ++++++++++++++
 .../v5/dataListCheck-warn-updated-callback.js | 36 +++++++++++++++++++
 packages/pf-codemods/README.md                |  6 ++++
 test/test.tsx                                 |  2 ++
 5 files changed, 72 insertions(+)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index 5230d3ccd..22f8f51cf 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -21,6 +21,7 @@ const warningRules = [
   "applicationLauncher-warn-input",
   "card-warn-component",
   "charts-tooltip-warning",
+  "dataListCheck-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/dataListCheck-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
new file mode 100644
index 000000000..02d8cc684
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
@@ -0,0 +1,27 @@
+const { getPackageImports } = require("../../helpers");
+
+// https://github.com/patternfly/patternfly-react/pull/8735
+module.exports = {
+  meta: {},
+  create: function (context) {
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => specifier.imported.name === "DataListCheck"
+    );
+
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            if (
+              imports.map((imp) => imp.local.name).includes(node.name.name) &&
+              node.attributes.find((attr) => attr.name.name === "onChange")
+            ) {
+              context.report({
+                node,
+                message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" handlers may require an update.`,
+              });
+            }
+          },
+        };
+  },
+};
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js
new file mode 100644
index 000000000..7d913027d
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js
@@ -0,0 +1,36 @@
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/dataListCheck-warn-updated-callback");
+
+ruleTester.run("dataListCheck-warn-updated-callback", rule, {
+  valid: [
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck />;`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<DataListCheck onChange />;`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange />;`,
+      output: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange />;`,
+      output: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/pf-codemods/README.md b/packages/pf-codemods/README.md
index 49181c800..1e17c0b9d 100644
--- a/packages/pf-codemods/README.md
+++ b/packages/pf-codemods/README.md
@@ -359,6 +359,12 @@ function toggle2(_event, id) {};
 <DataList onSelectDataListItem={toggle2}>
 ```
 
+### dataListCheck-warn-updated-callback [(#8735)](https://github.com/patternfly/patternfly-react/pull/8735)
+
+We've updated the `onChange` prop for DataListCheck so that the `event` parameter is the 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.
diff --git a/test/test.tsx b/test/test.tsx
index e20d07f1e..6b31cc5eb 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -15,6 +15,7 @@ import {
   Button,
   Card,
   DataList,
+  DataListCheck,
   DatePicker,
   DropdownItem,
   DropdownToggle,
@@ -56,6 +57,7 @@ const newTheme = getCustomTheme("1", "2", "3");
   <Button isSmall />
   <Chart themeVariant />
   <DataList onSelectDataListItem />
+  <DataListCheck onChange />
   <DatePicker />
   <DropdownItem isHovered={true} />
   <DropdownToggle isPrimary onToggle={} />

From fd2cae57b97e023da4fad34d862e8b73458adc05 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 7 Mar 2023 16:39:22 -0500
Subject: [PATCH 2/2] Refactored to use new helper

---
 packages/eslint-plugin-pf-codemods/index.js   |   1 -
 .../eslint-plugin-pf-codemods/lib/helpers.js  | 317 ++++++++++--------
 .../v5/dataListCheck-updated-callback.js      |   7 +
 .../v5/dataListCheck-warn-updated-callback.js |  27 --
 .../rules/v5/dataList-updated-callback.js     |  12 +-
 .../v5/dataListCheck-updated-callback.js      |  75 +++++
 .../v5/dataListCheck-warn-updated-callback.js |  36 --
 .../rules/v5/onToggle-updated-paramaters.js   |  10 +-
 packages/pf-codemods/README.md                |  27 +-
 9 files changed, 302 insertions(+), 210 deletions(-)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-updated-callback.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-updated-callback.js
 delete mode 100644 packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index 22f8f51cf..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",
-  "dataListCheck-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/helpers.js b/packages/eslint-plugin-pf-codemods/lib/helpers.js
index eca3b7494..44fa3f56d 100644
--- a/packages/eslint-plugin-pf-codemods/lib/helpers.js
+++ b/packages/eslint-plugin-pf-codemods/lib/helpers.js
@@ -1,158 +1,205 @@
 function getPackageImports(context, packageName) {
-  return context.getSourceCode().ast.body
-    .filter(node => node.type === 'ImportDeclaration')
-    .filter(node => node.source.value === packageName)
-    .map(node => node.specifiers)
+  return context
+    .getSourceCode()
+    .ast.body.filter((node) => node.type === "ImportDeclaration")
+    .filter((node) => node.source.value === packageName)
+    .map((node) => node.specifiers)
     .reduce((acc, val) => acc.concat(val), []);
 }
 
 function renameProps0(context, imports, node, renames) {
-  if (imports.map(imp => imp.local.name).includes(node.name.name)) {
-    const renamedProps = renames[node.name.name] || renames[
-      imports.find(imp => imp.local?.name === node.name.name)?.imported?.name
-    ];
+  if (imports.map((imp) => imp.local.name).includes(node.name.name)) {
+    const renamedProps =
+      renames[node.name.name] ||
+      renames[
+        imports.find((imp) => imp.local?.name === node.name.name)?.imported
+          ?.name
+      ];
     node.attributes
-      .filter(attribute => attribute.name && renamedProps.hasOwnProperty(attribute.name.name))
-      .forEach(attribute => {
-        if (renamedProps[attribute.name.name] === '') {
+      .filter(
+        (attribute) =>
+          attribute.name && renamedProps.hasOwnProperty(attribute.name.name)
+      )
+      .forEach((attribute) => {
+        if (renamedProps[attribute.name.name] === "") {
           context.report({
             node,
             message: `${attribute.name.name} prop for ${node.name.name} has been removed`,
             fix(fixer) {
-              return fixer.replaceText(attribute, '');
-            }
+              return fixer.replaceText(attribute, "");
+            },
           });
-        }
-        else {
+        } else {
           context.report({
             node,
-            message: `${attribute.name.name} prop for ${node.name.name} has been renamed to ${renamedProps[attribute.name.name]}`,
+            message: `${attribute.name.name} prop for ${
+              node.name.name
+            } has been renamed to ${renamedProps[attribute.name.name]}`,
             fix(fixer) {
-              return fixer.replaceText(attribute.name, renamedProps[attribute.name.name]);
-            }
+              return fixer.replaceText(
+                attribute.name,
+                renamedProps[attribute.name.name]
+              );
+            },
           });
         }
       });
   }
 }
 
-function renameProps(renames, packageName='@patternfly/react-core') {
-  return function(context) {
-    const imports = getPackageImports(context, packageName)
-      .filter(specifier => Object.keys(renames).includes(specifier.imported.name));
-      
-    return imports.length === 0 ? {} : {
-      JSXOpeningElement(node) {
-        renameProps0(context, imports, node, renames);
-      }
-    };
-  }
+function renameProps(renames, packageName = "@patternfly/react-core") {
+  return function (context) {
+    const imports = getPackageImports(context, packageName).filter(
+      (specifier) => Object.keys(renames).includes(specifier.imported.name)
+    );
+
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            renameProps0(context, imports, node, renames);
+          },
+        };
+  };
 }
 
-function renameProp(components, propMap, message, replaceAttribute, leaveComment = true) {
-  if (typeof components === 'string') {
-    components = [ components ];
+function renameProp(
+  components,
+  propMap,
+  message,
+  replaceAttribute,
+  leaveComment = true
+) {
+  if (typeof components === "string") {
+    components = [components];
   }
-  return function(context) {
-    const imports = getPackageImports(context, '@patternfly/react-core')
-      .filter(specifier => components.includes(specifier.imported.name));
-    return imports.length === 0 ? {} : {
-      JSXOpeningElement(node) {
-        if (imports.find(imp => imp.local.name === node.name.name)) {
-          const namedAttributes = node.attributes.filter(attr => attr.name);
+  return function (context) {
+    const imports = getPackageImports(context, "@patternfly/react-core").filter(
+      (specifier) => components.includes(specifier.imported.name)
+    );
+    return imports.length === 0
+      ? {}
+      : {
+          JSXOpeningElement(node) {
+            if (imports.find((imp) => imp.local.name === node.name.name)) {
+              const namedAttributes = node.attributes.filter(
+                (attr) => attr.name
+              );
 
-          namedAttributes.filter(attr => Object.keys(propMap).includes(attr.name.name))
-            .forEach(attribute => {
-              const newName = propMap[attribute.name.name];
-              context.report({
-                node,
-                message: message(node, attribute, newName),
-                fix(fixer) {
-                  // Delete entire prop if newName is empty
-                  if (!newName || replaceAttribute) {
-                    /** 
-                     * (dallas)
-                     * TODO: remove extra space? the following works but issues arise when attempting to remove multiple props.
-                     * i assume the ranges become invalid in the forEach loop? even though it seems to track attr correctly
-                     * (see datalist-remove-ondrags for example)
-                     * 
-                     * const tokenBefore = context.getSourceCode().getTokenBefore(attribute);
-                     * return fixer.replaceTextRange([tokenBefore.range[1], attribute.range[1]], '');
-                     * 
-                     * or
-                     * 
-                     * return fixer.replaceTextRange([attribute.range[0] - 1, attribute.range[1]], '');
-                     */
-                    return fixer.replaceText(attribute, newName);
-                  }
-                  const newNameAttrName = newName.split('=')[0];
-                  // Leave a comment if there's an existing prop with this name
-                  if (namedAttributes.find(attr => attr.name.name === newNameAttrName)) {
-                    return fixer.replaceText(attribute, leaveComment ? `/* ${newName} */` : '');
-                  }
-                  return fixer.replaceText(
-                    attribute.name,
-                    newName
-                  );
-                }
-              })
-            });
-        }
-      }
-    };
-  }
+              namedAttributes
+                .filter((attr) => Object.keys(propMap).includes(attr.name.name))
+                .forEach((attribute) => {
+                  const newName = propMap[attribute.name.name];
+                  context.report({
+                    node,
+                    message: message(node, attribute, newName),
+                    fix(fixer) {
+                      // Delete entire prop if newName is empty
+                      if (!newName || replaceAttribute) {
+                        /**
+                         * (dallas)
+                         * TODO: remove extra space? the following works but issues arise when attempting to remove multiple props.
+                         * i assume the ranges become invalid in the forEach loop? even though it seems to track attr correctly
+                         * (see datalist-remove-ondrags for example)
+                         *
+                         * const tokenBefore = context.getSourceCode().getTokenBefore(attribute);
+                         * return fixer.replaceTextRange([tokenBefore.range[1], attribute.range[1]], '');
+                         *
+                         * or
+                         *
+                         * return fixer.replaceTextRange([attribute.range[0] - 1, attribute.range[1]], '');
+                         */
+                        return fixer.replaceText(attribute, newName);
+                      }
+                      const newNameAttrName = newName.split("=")[0];
+                      // Leave a comment if there's an existing prop with this name
+                      if (
+                        namedAttributes.find(
+                          (attr) => attr.name.name === newNameAttrName
+                        )
+                      ) {
+                        return fixer.replaceText(
+                          attribute,
+                          leaveComment ? `/* ${newName} */` : ""
+                        );
+                      }
+                      return fixer.replaceText(attribute.name, newName);
+                    },
+                  });
+                });
+            }
+          },
+        };
+  };
 }
 
 function renameComponents(
   componentMap,
   condition = (_context, _package) => true,
-  message = (prevName, newName) => `${prevName} has been replaced with ${newName}`,
-  package = '@patternfly/react-core'
+  message = (prevName, newName) =>
+    `${prevName} has been replaced with ${newName}`,
+  package = "@patternfly/react-core"
 ) {
-  return function(context) {
-    const imports = getPackageImports(context, package)
-      .filter(specifier => Object.keys(componentMap).includes(specifier.imported.name));
-    
-    return imports.length === 0 || !condition(context, package) ? {} : {
-      ImportDeclaration(node) {
-        ensureImports(context, node, package, Object.values(componentMap));
-      },
-      JSXIdentifier(node) {
-        const nodeName = node.name;
-        const importedNode = imports.find(imp => imp.local.name === nodeName);
-        if (
-          imports.find(imp => imp.imported.name === nodeName) &&
-          importedNode.imported.name === importedNode.local.name // don't rename an aliased component
-        ) {
-          // if data-codemods attribute, do nothing
-          const parentNode = node.parent;
-          const isOpeningTag = parentNode.type === 'JSXOpeningElement';
-          const openingTagAttributes = isOpeningTag ? parentNode.attributes : parentNode.parent.openingElement.attributes;
-          const hasDataAttr = openingTagAttributes && openingTagAttributes.filter(attr => attr.name?.name === 'data-codemods').length;
-          if (hasDataAttr) {
-            return;
-          }
-          // if no data-codemods && opening tag, add attribute & rename
-          // if no data-codemods && closing tag, rename
-          const newName = componentMap[nodeName];
-          const updateTagName = node => context.getSourceCode().getText(node).replace(nodeName, newName);
-          const addDataAttr = jsxStr => `${jsxStr.slice(0, -1)} data-codemods="true">`;
-          const newOpeningParentTag = newName.includes('Toolbar')
-            ? addDataAttr(updateTagName(parentNode))
-            : updateTagName(parentNode);
-          context.report({
-            node,
-            message: message(nodeName, newName),
-            fix(fixer) {
-              return isOpeningTag
-                ? fixer.replaceText(parentNode, newOpeningParentTag)
-                : fixer.replaceText(node, updateTagName(node));
+  return function (context) {
+    const imports = getPackageImports(context, package).filter((specifier) =>
+      Object.keys(componentMap).includes(specifier.imported.name)
+    );
+
+    return imports.length === 0 || !condition(context, package)
+      ? {}
+      : {
+          ImportDeclaration(node) {
+            ensureImports(context, node, package, Object.values(componentMap));
+          },
+          JSXIdentifier(node) {
+            const nodeName = node.name;
+            const importedNode = imports.find(
+              (imp) => imp.local.name === nodeName
+            );
+            if (
+              imports.find((imp) => imp.imported.name === nodeName) &&
+              importedNode.imported.name === importedNode.local.name // don't rename an aliased component
+            ) {
+              // if data-codemods attribute, do nothing
+              const parentNode = node.parent;
+              const isOpeningTag = parentNode.type === "JSXOpeningElement";
+              const openingTagAttributes = isOpeningTag
+                ? parentNode.attributes
+                : parentNode.parent.openingElement.attributes;
+              const hasDataAttr =
+                openingTagAttributes &&
+                openingTagAttributes.filter(
+                  (attr) => attr.name?.name === "data-codemods"
+                ).length;
+              if (hasDataAttr) {
+                return;
+              }
+              // if no data-codemods && opening tag, add attribute & rename
+              // if no data-codemods && closing tag, rename
+              const newName = componentMap[nodeName];
+              const updateTagName = (node) =>
+                context
+                  .getSourceCode()
+                  .getText(node)
+                  .replace(nodeName, newName);
+              const addDataAttr = (jsxStr) =>
+                `${jsxStr.slice(0, -1)} data-codemods="true">`;
+              const newOpeningParentTag = newName.includes("Toolbar")
+                ? addDataAttr(updateTagName(parentNode))
+                : updateTagName(parentNode);
+              context.report({
+                node,
+                message: message(nodeName, newName),
+                fix(fixer) {
+                  return isOpeningTag
+                    ? fixer.replaceText(parentNode, newOpeningParentTag)
+                    : fixer.replaceText(node, updateTagName(node));
+                },
+              });
             }
-          });
-        }
-      }
-    };
-  }
+          },
+        };
+  };
 }
 
 function ensureImports(context, node, package, imports) {
@@ -160,12 +207,14 @@ function ensureImports(context, node, package, imports) {
     return;
   }
   const patternflyImports = getPackageImports(context, package);
-  const patternflyImportNames = patternflyImports.map(imp => imp.imported.name);
-  const myImports = node.specifiers.map(imp => imp.imported.name);
+  const patternflyImportNames = patternflyImports.map(
+    (imp) => imp.imported.name
+  );
+  const myImports = node.specifiers.map((imp) => imp.imported.name);
   const missingImports = imports
-    .filter(imp => !patternflyImportNames.includes(imp)) // not added by consumer
-    .filter(imp => !myImports.includes(imp)) // not added by this rule
-    .join(', ');
+    .filter((imp) => !patternflyImportNames.includes(imp)) // not added by consumer
+    .filter((imp) => !myImports.includes(imp)) // not added by this rule
+    .join(", ");
   if (missingImports) {
     const lastSpecifier = node.specifiers[node.specifiers.length - 1];
     context.report({
@@ -173,7 +222,7 @@ function ensureImports(context, node, package, imports) {
       message: `add missing imports ${missingImports} from ${node.source.value}`,
       fix(fixer) {
         return fixer.insertTextAfter(lastSpecifier, `, ${missingImports}`);
-      }
+      },
     });
   }
 }
@@ -220,13 +269,13 @@ function addCallbackParam(componentsArray, propMap) {
                 const { type, params } = propProperties;
 
                 if (
-                  (params?.length === 1 &&
+                  (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.`,
+                    message: `The "${attribute.name.name}" prop for ${node.name.name} has been updated so that the "${newParam}" parameter is the first parameter. "${attribute.name.name}" handlers may require an update.`,
                     fix(fixer) {
                       const fixes = [];
                       const createReplacerFix = (functionParam) => {
@@ -269,5 +318,5 @@ module.exports = {
   renameProps0,
   renameProps,
   renameComponents,
-  addCallbackParam
-}
+  addCallbackParam,
+};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-updated-callback.js
new file mode 100644
index 000000000..da70cfd98
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-updated-callback.js
@@ -0,0 +1,7 @@
+const { addCallbackParam } = require("../../helpers");
+
+// https://github.com/patternfly/patternfly-react/pull/8735
+module.exports = {
+  meta: { fixable: "code" },
+  create: addCallbackParam(["DataListCheck"], { onChange: "_event" }),
+};
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
deleted file mode 100644
index 02d8cc684..000000000
--- a/packages/eslint-plugin-pf-codemods/lib/rules/v5/dataListCheck-warn-updated-callback.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const { getPackageImports } = require("../../helpers");
-
-// https://github.com/patternfly/patternfly-react/pull/8735
-module.exports = {
-  meta: {},
-  create: function (context) {
-    const imports = getPackageImports(context, "@patternfly/react-core").filter(
-      (specifier) => specifier.imported.name === "DataListCheck"
-    );
-
-    return imports.length === 0
-      ? {}
-      : {
-          JSXOpeningElement(node) {
-            if (
-              imports.map((imp) => imp.local.name).includes(node.name.name) &&
-              node.attributes.find((attr) => attr.name.name === "onChange")
-            ) {
-              context.report({
-                node,
-                message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" handlers may require an update.`,
-              });
-            }
-          },
-        };
-  },
-};
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 3498e05f7..cd2e57ce9 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the first parameter. "onSelectDataListItem" handlers may require an update.`,
           type: "JSXOpeningElement",
         },
       ],
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-updated-callback.js
new file mode 100644
index 000000000..5b54a83f5
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-updated-callback.js
@@ -0,0 +1,75 @@
+const ruleTester = require("../../ruletester");
+const rule = require("../../../lib/rules/v5/dataListCheck-updated-callback");
+
+ruleTester.run("dataListCheck-updated-callback", rule, {
+  valid: [
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck />;`,
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange={() => onChange()} />;`,
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; const onChange = () => {}; <DataListCheck onChange={onChange} />;`,
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; function onChange() {}; <DataListCheck onChange={onChange} />;`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<DataListCheck onChange />;`,
+    },
+  ],
+  invalid: [
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange={(checked) => onChange()} />;`,
+      output: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange={(_event, checked) => onChange()} />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the "_event" parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; const onChange = (checked) => {}; <DataListCheck onChange={onChange} />;`,
+      output: `import { DataListCheck } from '@patternfly/react-core'; const onChange = (_event, checked) => {}; <DataListCheck onChange={onChange} />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the "_event" parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; function onChange (checked) {}; <DataListCheck onChange={onChange} />;`,
+      output: `import { DataListCheck } from '@patternfly/react-core'; function onChange (_event, checked) {}; <DataListCheck onChange={onChange} />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the "_event" parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange={(checked, event) => onChange()} />;`,
+      output: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange={(checked, event) => onChange()} />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for DataListCheck has been updated so that the "_event" parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+    {
+      code: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange={(checked) => onChange()} />;`,
+      output: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange={(_event, checked) => onChange()} />;`,
+      errors: [
+        {
+          message: `The "onChange" prop for PFdlc has been updated so that the "_event" parameter is the first parameter. "onChange" handlers may require an update.`,
+          type: "JSXOpeningElement",
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js b/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js
deleted file mode 100644
index 7d913027d..000000000
--- a/packages/eslint-plugin-pf-codemods/test/rules/v5/dataListCheck-warn-updated-callback.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const ruleTester = require("../../ruletester");
-const rule = require("../../../lib/rules/v5/dataListCheck-warn-updated-callback");
-
-ruleTester.run("dataListCheck-warn-updated-callback", rule, {
-  valid: [
-    {
-      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck />;`,
-    },
-    {
-      // No @patternfly/react-core import
-      code: `<DataListCheck onChange />;`,
-    },
-  ],
-  invalid: [
-    {
-      code: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange />;`,
-      output: `import { DataListCheck } from '@patternfly/react-core'; <DataListCheck onChange />;`,
-      errors: [
-        {
-          message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" handlers may require an update.`,
-          type: "JSXOpeningElement",
-        },
-      ],
-    },
-    {
-      code: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange />;`,
-      output: `import { DataListCheck as PFdlc } from '@patternfly/react-core'; <PFdlc onChange />;`,
-      errors: [
-        {
-          message: `The "onChange" prop for DataListCheck has been updated so that the event parameter is the first parameter. "onChange" 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 9b829056b..05fad267e 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 so that the "_event" parameter is the 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 1e17c0b9d..e1a6086c8 100644
--- a/packages/pf-codemods/README.md
+++ b/packages/pf-codemods/README.md
@@ -363,7 +363,32 @@ function toggle2(_event, id) {};
 
 We've updated the `onChange` prop for DataListCheck so that the `event` parameter is the first parameter. Handlers may require an update.
 
-This rule will raise a warning, but will not make any changes.
+#### Examples
+
+In:
+
+```jsx
+<DataListCheck onChange={(checked) => onChange(checked)} />
+
+const onChange1 = (checked) => {};
+<DataListCheck onChange={onChange1}>
+
+function onChange2(checked) {};
+<DataListCheck onChange={onChange2}>
+```
+
+Out:
+
+```jsx
+<DataListCheck onChange={(_event, checked) => onChange(checked)} />
+
+const onChange1 = (_event, checked) => {};
+<DataListCheck onChange={onChange1}>
+
+function onChange2(_event, checked) {};
+<DataListCheck onChange={onChange2}>
+```
+
 
 ### datePicker-warn-appendTo-default-value-changed [(#8636)](https://github.com/patternfly/patternfly-react/pull/8636)