fix(Card): updated markup for actionable cards

packages/eslint-plugin-pf-codemods/src/rules/helpers/getChildJSXElementByName.ts

@@ -0,0 +1,41 @@
+import {
+  JSXElement,
+  JSXText,
+  JSXExpressionContainer,
+  JSXSpreadChild,
+  JSXFragment,
+} from "estree-jsx";
+
+function getChildJSXElementCallback(
+  childNode:
+    | JSXElement
+    | JSXText
+    | JSXExpressionContainer
+    | JSXSpreadChild
+    | JSXFragment,
+  name: string
+) {
+  return (
+    childNode.type === "JSXElement" &&
+    childNode.openingElement.name.type === "JSXIdentifier" &&
+    childNode.openingElement.name.name === name
+  );
+}
+
+/** Can be used to run logic if the specific child element exists, or to run logic on the
+ * specified element.
+ */
+export function getChildJSXElementByName(node: JSXElement, name: string) {
+  return node.children?.find((child) =>
+    getChildJSXElementCallback(child, name)
+  ) as JSXElement | undefined;
+}
+
+/** Can be used to run logic if the specific child elements exist, or to run logic on the
+ * specified elements.
+ */
+export function getAllChildJSXElementsByName(node: JSXElement, name: string) {
+  return node.children?.filter((child) =>
+    getChildJSXElementCallback(child, name)
+  ) as JSXElement[];
+}

packages/eslint-plugin-pf-codemods/src/rules/helpers/getLocalComponentName.ts

@@ -1,18 +1,18 @@
-import { ImportSpecifier } from "estree-jsx";
+import { ImportSpecifier, ImportDefaultSpecifier } from "estree-jsx";
+import { getSpecifierFromImports } from "./getSpecifierFromImports";
 
 /** Resolves the local name of an import */
 export function getLocalComponentName(
-  namedImports: ImportSpecifier[],
+  namedImports: (ImportSpecifier | ImportDefaultSpecifier)[],
   importedName: string
 ) {
-  const componentImport = namedImports.find(
-    (name) => name.imported.name === importedName
-  );
-
+  const componentImport = getSpecifierFromImports(namedImports, importedName);
+  const isDefaultImport = componentImport?.type === "ImportDefaultSpecifier";
   const isAlias =
+    !isDefaultImport &&
     componentImport?.imported.name !== componentImport?.local.name;
 
-  if (componentImport && isAlias) {
+  if ((componentImport && isAlias) || isDefaultImport) {
     return componentImport.local.name;
   }
 

packages/eslint-plugin-pf-codemods/src/rules/helpers/getSpecifierFromImports.ts

@@ -0,0 +1,16 @@
+import { ImportSpecifier, ImportDefaultSpecifier } from "estree-jsx";
+
+/** Can be used to extract a specific specifier from an array of imports, such as to only
+ * run logic if X and Y imports are present or to use the specifier properties in other logic. */
+export function getSpecifierFromImports(
+  imports: (ImportSpecifier | ImportDefaultSpecifier)[],
+  importedName: string
+) {
+  const importSpecifier = imports.find((imp) =>
+    imp.type === "ImportDefaultSpecifier"
+      ? imp.local.name === importedName
+      : imp.imported.name === importedName
+  );
+
+  return importSpecifier;
+}

packages/eslint-plugin-pf-codemods/src/rules/helpers/index.ts

@@ -2,6 +2,7 @@ export * from "./contextReports";
 export * from "./findAncestor";
 export * from "./fixers";
 export * from "./getAttributeName";
+export * from "./getChildJSXElementByName";
 export * from "./getCodeModDataTag";
 export * from "./getComponentImportName";
 export * from "./getDefaultDeclarationString";
@@ -10,14 +11,15 @@ export * from "./getFromPackage";
 export * from "./getImportedName";
 export * from "./getLocalComponentName";
 export * from "./getNodeName";
+export * from "./getSpecifierFromImports";
 export * from "./getText";
 export * from "./hasCodemodDataTag";
 export * from "./helpers";
 export * from "./importAndExport";
 export * from "./includesImport";
 export * from "./interfaces";
 export * from "./JSXAttributes";
-export * from "./JSXElements";
+export * from "./nodeIsComponentNamed";
 export * from "./nodeMatches";
 export * from "./pfPackageMatches";
 export * from "./removeElement";

packages/eslint-plugin-pf-codemods/src/rules/helpers/nodeIsComponentNamed.ts

@@ -0,0 +1,9 @@
+import { JSXElement } from "estree-jsx";
+
+export function nodeIsComponentNamed(node: JSXElement, componentName: string) {
+  if (node.openingElement.name.type === "JSXIdentifier") {
+    return node.openingElement.name.name === componentName;
+  }
+
+  return false;
+}

packages/eslint-plugin-pf-codemods/src/rules/v6/emptyStateHeaderMoveIntoEmptyState/emptyStateHeader-move-into-emptyState.ts

@@ -10,7 +10,7 @@ import {
   getAttribute,
   getAttributeText,
   getAttributeValueText,
-  getChildElementByName,
+  getChildJSXElementByName,
   getDefaultImportsFromPackage,
   getExpression,
   getFromPackage,
@@ -159,7 +159,7 @@ module.exports = {
           return;
         }
 
-        const header = getChildElementByName(node, "EmptyStateHeader");
+        const header = getChildJSXElementByName(node, "EmptyStateHeader");
         const emptyStateTitleTextAttribute = getAttribute(node, "titleText");
 
         if (!header && emptyStateTitleTextAttribute) {
@@ -168,7 +168,7 @@ module.exports = {
           return;
         }
 
-        const titleChild = getChildElementByName(node, "Title");
+        const titleChild = getChildJSXElementByName(node, "Title");
 
         if (
           (!header || header.type !== "JSXElement") &&
@@ -194,7 +194,7 @@ module.exports = {
           removeElements.push(titleChild);
         }
 
-        const emptyStateIconChild = getChildElementByName(
+        const emptyStateIconChild = getChildJSXElementByName(
           node,
           "EmptyStateIcon"
         );

packages/eslint-plugin-pf-codemods/src/rules/v6/mastheadStructureChanges/masthead-structure-changes.ts

@@ -3,7 +3,7 @@ import { ImportSpecifier } from "estree-jsx";
 import { JSXOpeningElementWithParent } from "../../helpers";
 import {
   getAllImportsFromPackage,
-  getChildElementByName,
+  getChildJSXElementByName,
   getImportedName,
   getLocalComponentName,
   hasCodeModDataTag,
@@ -21,7 +21,7 @@ function moveNodeIntoMastheadMain(
   }
 
   const localMastheadMain = getLocalComponentName(namedImports, "MastheadMain");
-  const mastheadMain = getChildElementByName(
+  const mastheadMain = getChildJSXElementByName(
     node.parent.parent,
     localMastheadMain
   );

packages/eslint-plugin-pf-codemods/src/rules/v6/wizardFooterWarnUpdateMarkup/wizardFooter-warn-update-markup.ts

@@ -3,7 +3,7 @@ import { JSXElement } from "estree-jsx";
 import {
   getFromPackage,
   getAttribute,
-  getAllChildElementsByName,
+  getAllChildJSXElementsByName,
 } from "../../helpers";
 
 // https://github.com/patternfly/patternfly-react/pull/10378
@@ -29,10 +29,15 @@ module.exports = {
             ) {
               const wizardFooterProp = getAttribute(node, "footer");
               const wizardSteps = wizardStepImport
-                ? getAllChildElementsByName(node, wizardStepImport.local.name)
+                ? getAllChildJSXElementsByName(
+                    node,
+                    wizardStepImport.local.name
+                  )
                 : undefined;
               const allWizardStepsHaveFooter = wizardSteps
-                ? wizardSteps.every((step) => getAttribute(step, "footer"))
+                ? (wizardSteps as JSXElement[]).every((step) =>
+                    getAttribute(step, "footer")
+                  )
                 : false;
 
               if (wizardFooterProp || allWizardStepsHaveFooter) {