From 1194c4dc6678e169269342a2691d0fb8f9c35ad7 Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jschuler@redhat.com>
Date: Tue, 26 May 2020 10:03:17 -0400
Subject: [PATCH 1/6] add tabtitletext

---
 packages/eslint-plugin-pf-codemods/index.js   |  3 +-
 .../lib/rules/tab-title-text.js               | 51 +++++++++++++++++++
 .../test/rules/tab-title-text.js              | 24 +++++++++
 test/test.tsx                                 | 21 +++++++-
 4 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
 create mode 100644 packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index 85fd5ccf9..7a3b0c261 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -11,9 +11,10 @@ const rules = {
   "select-rename-isExpanded": require('./lib/rules/select-rename-isExpanded'),
   "title-require-heading-level": require('./lib/rules/title-require-heading-level'),
   "title-size": require('./lib/rules/title-size'),
-  "wizard-text": require('./lib/rules/wizard-text'),
+  "wizard-text": require('./lib/rules/wizard-rename-text'),
   "wizard-rename-hasBodyPadding": require('./lib/rules/wizard-rename-hasBodyPadding'),
   "wizard-remove-props": require('./lib/rules/wizard-remove-props'),
+  "tab-title-text": require('./lib/rules/tab-title-text'),
 };
 
 module.exports = {
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
new file mode 100644
index 000000000..5d7ce7d2e
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
@@ -0,0 +1,51 @@
+const { getPackageImports } = require('../helpers');
+
+// https://github.com/patternfly/patternfly-react/pull/4146
+module.exports = {
+  create: function(context) {
+    const imports = getPackageImports(context, '@patternfly/react-core')
+      .filter(specifier => specifier.imported.name === 'Tab');
+    const pfImport = context.getSourceCode().ast.body
+      .filter(node => node.type === 'ImportDeclaration' && node.source.value === '@patternfly/react-core');
+    pfImport.forEach(imp => console.log(imp.type));
+      
+    return !imports ? {} : {
+      JSXOpeningElement(node) {
+        if (imports.map(imp => imp.local.name).includes(node.name.name)) {
+          const attribute = node.attributes.find(node => node.name.name === 'title');
+          if (attribute) {
+            const { value } = attribute;
+            let replacement;
+            if (value.type === 'Literal') {
+              // i.e. title="Title"
+              replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.value}</TabTitleText>}`);
+            } else if (value.type === 'JSXExpressionContainer') {
+              if (value.expression.type === 'Literal') {
+                // i.e. title={'Title'} or title={100}
+                replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.expression.value}</TabTitleText>}`);
+              } else if (value.expression.type === 'Identifier') {
+                // i.e. title={myVariable}
+                replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>{${attribute.value.expression.name}}</TabTitleText>}`);
+              } else if (value.expression.type === 'JSXElement' && value.expression.openingElement.name.name !== 'TabTitleText') {
+                // i.e. title={<Mycomp2 />}
+                replacement = fixer => [
+                  fixer.insertTextBefore(attribute.value.expression, `<TabTitleText>`),
+                  fixer.insertTextAfter(attribute.value.expression, `</TabTitleText>`)
+                ];
+              }
+            }
+            if (replacement) {
+              context.report({
+                node,
+                message: `title needs to be wrapped with the TabTitleText and/or TabTitleIcon component`,
+                fix(fixer) {
+                  return replacement(fixer);
+                }
+              });
+            }
+          }
+        }
+      }
+    };
+  }
+};
diff --git a/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js b/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js
new file mode 100644
index 000000000..e570a51c8
--- /dev/null
+++ b/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js
@@ -0,0 +1,24 @@
+const ruleTester = require('./ruletester');
+const rule = require('../../lib/rules/tab-title-text');
+
+ruleTester.run("tab-title-text", rule, {
+  valid: [
+    {
+      code: `import { Tab } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
+    },
+    {
+      // No @patternfly/react-core import
+      code: `<Tab title="Non-PF component">Content</Tab>`,
+    }
+  ],
+  invalid: [
+    {
+      code:   `import { Tab } from '@patternfly/react-core'; <Tab title="Title">Content</Tab>`,
+      output: `import { Tab } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
+      errors: [{
+        message: `title needs to be wrapped with the TabTitleText and/or TabTitleIcon component`,
+        type: "JSXOpeningElement",
+      }]
+    },
+  ]
+});
diff --git a/test/test.tsx b/test/test.tsx
index f2ccec006..730d934a0 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -1,7 +1,7 @@
 import { Title, Title as MyTitle } from '@patternfly/react-core';
 
-export const Thing1 = () => <MyTitle size="md">Title</MyTitle>;
-export const Thing2 = () => <Title size="md">Title</Title>;
+export const Thing1 = () => <MyTitle headingLevel="h2" size="md">Title</MyTitle>;
+export const Thing2 = () => <Title headingLevel="h2" size="md">Title</Title>;
 
 import { List, ListVariant } from '@patternfly/react-core';
 
@@ -24,3 +24,20 @@ export const MyButtonWithCustomEnum = (
   <Button variant={MyPfEnums.plain} />
 )
 
+import { Tab } from '@patternfly/react-core';
+const mycomp = <TabTitleText>After</TabTitleText>;
+const Mycomp2 = () => <TabTitleText>After</TabTitleText>;
+
+export const TestTab = <Tab title="Title">Content</Tab>;
+
+export const TestTab2 = <Tab title={<TabTitleText>After</TabTitleText>}>Content</Tab>;
+
+export const TestTab3 = <Tab title={'hello'}>Content</Tab>;
+
+export const TestTab3a = <Tab title={5}>Content</Tab>;
+
+export const TestTab4 = <Tab title={mycomp}>Content</Tab>;
+
+export const TestTab5 = <Tab title={<Mycomp2 />}>Content</Tab>;
+
+export const TestTab6 = <Tab title="Hallo">Content</Tab>;
\ No newline at end of file

From e537d64dc23cb8d62017a12b6c168af0b3a0c40d Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jschuler@redhat.com>
Date: Tue, 26 May 2020 11:29:38 -0400
Subject: [PATCH 2/6] tab title

---
 packages/eslint-plugin-pf-codemods/index.js   |  2 +-
 .../lib/rules/tab-title-text.js               | 38 +++++++++++++------
 test/test.tsx                                 | 21 ++++------
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index a0f424bf9..fa3c751d9 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -23,7 +23,7 @@ const rules = {
   "chipgroup-remove-chipbutton": require('./lib/rules/chipgroup-remove-chipbutton'),
   "chipgroup-remove-chipbutton": require('./lib/rules/chipgroup-remove-chipbutton'),
   "chipgroup-remove-chipgrouptoolbaritem": require('./lib/rules/chipgroup-remove-chipgrouptoolbaritem'),
-  "dropdown-rename-icon": require('./lib/rules/dropdown-rename-icon'),
+  // "dropdown-rename-icon": require('./lib/rules/dropdown-rename-icon'),
   "dropdown-toggle-rename-iconComponent": require('./lib/rules/dropdown-toggle-rename-iconComponent'),
   "empty-state-icon-removed-props": require('./lib/rules/empty-state-icon-removed-props'),
   "tab-title-text": require('./lib/rules/tab-title-text'),
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
index 5d7ce7d2e..37c977720 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
@@ -3,29 +3,43 @@ const { getPackageImports } = require('../helpers');
 // https://github.com/patternfly/patternfly-react/pull/4146
 module.exports = {
   create: function(context) {
-    const imports = getPackageImports(context, '@patternfly/react-core')
+    const tabImport = getPackageImports(context, '@patternfly/react-core')
       .filter(specifier => specifier.imported.name === 'Tab');
-    const pfImport = context.getSourceCode().ast.body
-      .filter(node => node.type === 'ImportDeclaration' && node.source.value === '@patternfly/react-core');
-    pfImport.forEach(imp => console.log(imp.type));
-      
-    return !imports ? {} : {
+    
+    const addImportIfNeeded = fixer => {
+      const tabTitleTextImport = getPackageImports(context, '@patternfly/react-core')
+        .filter(specifier => specifier.imported.name === 'TabTitleText');
+      if (tabTitleTextImport.length) {
+        return [];
+      }
+      const pfImports = context.getSourceCode().ast.body
+        .filter(node => node.type === 'ImportDeclaration' && node.source.value === '@patternfly/react-core');
+      return fixer.insertTextAfter(pfImports[pfImports.length - 1].specifiers[pfImports[pfImports.length - 1].specifiers.length - 1], ', TabTitleText');
+    }
+
+    return tabImport.length ? {
       JSXOpeningElement(node) {
-        if (imports.map(imp => imp.local.name).includes(node.name.name)) {
+        if (tabImport.map(imp => imp.local.name).includes(node.name.name)) {
           const attribute = node.attributes.find(node => node.name.name === 'title');
           if (attribute) {
             const { value } = attribute;
             let replacement;
             if (value.type === 'Literal') {
               // i.e. title="Title"
-              replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.value}</TabTitleText>}`);
+              replacement = fixer => [
+                fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.value}</TabTitleText>}`)
+              ];
             } else if (value.type === 'JSXExpressionContainer') {
               if (value.expression.type === 'Literal') {
                 // i.e. title={'Title'} or title={100}
-                replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.expression.value}</TabTitleText>}`);
+                replacement = fixer => [
+                  fixer.replaceText(attribute.value, `{<TabTitleText>${attribute.value.expression.value}</TabTitleText>}`)
+                ];
               } else if (value.expression.type === 'Identifier') {
                 // i.e. title={myVariable}
-                replacement = fixer => fixer.replaceText(attribute.value, `{<TabTitleText>{${attribute.value.expression.name}}</TabTitleText>}`);
+                replacement = fixer => [
+                  fixer.replaceText(attribute.value, `{<TabTitleText>{${attribute.value.expression.name}}</TabTitleText>}`)
+                ];
               } else if (value.expression.type === 'JSXElement' && value.expression.openingElement.name.name !== 'TabTitleText') {
                 // i.e. title={<Mycomp2 />}
                 replacement = fixer => [
@@ -39,13 +53,13 @@ module.exports = {
                 node,
                 message: `title needs to be wrapped with the TabTitleText and/or TabTitleIcon component`,
                 fix(fixer) {
-                  return replacement(fixer);
+                  return replacement(fixer).concat(addImportIfNeeded(fixer));
                 }
               });
             }
           }
         }
       }
-    };
+    } : {};
   }
 };
diff --git a/test/test.tsx b/test/test.tsx
index 730d934a0..fee8f60ab 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -25,19 +25,12 @@ export const MyButtonWithCustomEnum = (
 )
 
 import { Tab } from '@patternfly/react-core';
-const mycomp = <TabTitleText>After</TabTitleText>;
-const Mycomp2 = () => <TabTitleText>After</TabTitleText>;
-
-export const TestTab = <Tab title="Title">Content</Tab>;
-
-export const TestTab2 = <Tab title={<TabTitleText>After</TabTitleText>}>Content</Tab>;
-
+const tabText = <TabTitleText>After</TabTitleText>;
+const TabTextComp = () => <TabTitleText>After</TabTitleText>;
+export const TestTab = <Tab title="hello">Content</Tab>;
+export const TestTab2 = <Tab title={<TabTitleText>hello</TabTitleText>}>Content</Tab>;
 export const TestTab3 = <Tab title={'hello'}>Content</Tab>;
-
 export const TestTab3a = <Tab title={5}>Content</Tab>;
-
-export const TestTab4 = <Tab title={mycomp}>Content</Tab>;
-
-export const TestTab5 = <Tab title={<Mycomp2 />}>Content</Tab>;
-
-export const TestTab6 = <Tab title="Hallo">Content</Tab>;
\ No newline at end of file
+export const TestTab4 = <Tab title={tabText}>Content</Tab>;
+export const TestTab5 = <Tab title={<TabTextComp />}>Content</Tab>;
+export const TestTab6 = <Tab title={<div>hello</div>}>Content</Tab>;

From 118513673c0dff9eb5472ff83f743b05e8840bd0 Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jschuler@redhat.com>
Date: Tue, 26 May 2020 11:32:55 -0400
Subject: [PATCH 3/6] add back in commented out rule

---
 packages/eslint-plugin-pf-codemods/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index fa3c751d9..a0f424bf9 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -23,7 +23,7 @@ const rules = {
   "chipgroup-remove-chipbutton": require('./lib/rules/chipgroup-remove-chipbutton'),
   "chipgroup-remove-chipbutton": require('./lib/rules/chipgroup-remove-chipbutton'),
   "chipgroup-remove-chipgrouptoolbaritem": require('./lib/rules/chipgroup-remove-chipgrouptoolbaritem'),
-  // "dropdown-rename-icon": require('./lib/rules/dropdown-rename-icon'),
+  "dropdown-rename-icon": require('./lib/rules/dropdown-rename-icon'),
   "dropdown-toggle-rename-iconComponent": require('./lib/rules/dropdown-toggle-rename-iconComponent'),
   "empty-state-icon-removed-props": require('./lib/rules/empty-state-icon-removed-props'),
   "tab-title-text": require('./lib/rules/tab-title-text'),

From c112c7b40caef9d515e09b47486239691e65727d Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jschuler@redhat.com>
Date: Tue, 26 May 2020 11:34:28 -0400
Subject: [PATCH 4/6] undo test fix to Title

---
 test/test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test.tsx b/test/test.tsx
index fee8f60ab..5132a1bdf 100644
--- a/test/test.tsx
+++ b/test/test.tsx
@@ -1,7 +1,7 @@
 import { Title, Title as MyTitle } from '@patternfly/react-core';
 
-export const Thing1 = () => <MyTitle headingLevel="h2" size="md">Title</MyTitle>;
-export const Thing2 = () => <Title headingLevel="h2" size="md">Title</Title>;
+export const Thing1 = () => <MyTitle size="md">Title</MyTitle>;
+export const Thing2 = () => <Title size="md">Title</Title>;
 
 import { List, ListVariant } from '@patternfly/react-core';
 

From 5076f77f74208c4df81b0fee50c48844a9302955 Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jschuler@redhat.com>
Date: Tue, 26 May 2020 11:43:48 -0400
Subject: [PATCH 5/6] rule test

---
 .../eslint-plugin-pf-codemods/test/rules/tab-title-text.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js b/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js
index e570a51c8..9199ddfe2 100644
--- a/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js
+++ b/packages/eslint-plugin-pf-codemods/test/rules/tab-title-text.js
@@ -4,7 +4,7 @@ const rule = require('../../lib/rules/tab-title-text');
 ruleTester.run("tab-title-text", rule, {
   valid: [
     {
-      code: `import { Tab } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
+      code: `import { Tab, TabTitleText } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
     },
     {
       // No @patternfly/react-core import
@@ -14,7 +14,7 @@ ruleTester.run("tab-title-text", rule, {
   invalid: [
     {
       code:   `import { Tab } from '@patternfly/react-core'; <Tab title="Title">Content</Tab>`,
-      output: `import { Tab } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
+      output: `import { Tab, TabTitleText } from '@patternfly/react-core'; <Tab title={<TabTitleText>Title</TabTitleText>}>Content</Tab>`,
       errors: [{
         message: `title needs to be wrapped with the TabTitleText and/or TabTitleIcon component`,
         type: "JSXOpeningElement",

From a6cd784ef99423d67094243dbafcf7a93e6946bb Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 26 May 2020 14:57:19 -0400
Subject: [PATCH 6/6] move addImport to helpers

---
 packages/eslint-plugin-pf-codemods/index.js     |  2 +-
 .../eslint-plugin-pf-codemods/lib/helpers.js    | 15 ++++++++++++++-
 .../lib/rules/tab-title-text.js                 | 17 ++++-------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/eslint-plugin-pf-codemods/index.js b/packages/eslint-plugin-pf-codemods/index.js
index a3a192ae6..b1f34dc20 100644
--- a/packages/eslint-plugin-pf-codemods/index.js
+++ b/packages/eslint-plugin-pf-codemods/index.js
@@ -11,7 +11,7 @@ const rules = {
   "select-rename-isExpanded": require('./lib/rules/select-rename-isExpanded'),
   "title-require-heading-level": require('./lib/rules/title-require-heading-level'),
   "title-size": require('./lib/rules/title-size'),
-  "wizard-text": require('./lib/rules/wizard-rename-text'),
+  "wizard-rename-text": require('./lib/rules/wizard-rename-text'),
   "wizard-rename-hasBodyPadding": require('./lib/rules/wizard-rename-hasBodyPadding'),
   "wizard-remove-props": require('./lib/rules/wizard-remove-props'),
   "background-image-src-enum": require('./lib/rules/background-image-src-enum'),
diff --git a/packages/eslint-plugin-pf-codemods/lib/helpers.js b/packages/eslint-plugin-pf-codemods/lib/helpers.js
index c6f432e02..b3316d114 100644
--- a/packages/eslint-plugin-pf-codemods/lib/helpers.js
+++ b/packages/eslint-plugin-pf-codemods/lib/helpers.js
@@ -98,9 +98,22 @@ function renameComponent(componentMap, message) {
   }
 }
 
+function addImport(context, fixer, package, currentImport, newImport) {
+  const specifierToAddTo = getPackageImports(context, package)
+    .filter(specifier => !currentImport || specifier.imported.name === currentImport)
+    .pop();
+  
+  if (!specifierToAddTo) {
+    return [];
+  }
+
+  return fixer.insertTextAfter(specifierToAddTo, `, ${newImport}`);
+}
+
 module.exports = {
   getPackageImports,
   renameProp,
   renameProps,
-  renameComponent
+  renameComponent,
+  addImport
 }
\ No newline at end of file
diff --git a/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
index 37c977720..69e58b9d2 100644
--- a/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
+++ b/packages/eslint-plugin-pf-codemods/lib/rules/tab-title-text.js
@@ -1,4 +1,4 @@
-const { getPackageImports } = require('../helpers');
+const { getPackageImports, addImport } = require('../helpers');
 
 // https://github.com/patternfly/patternfly-react/pull/4146
 module.exports = {
@@ -6,17 +6,6 @@ module.exports = {
     const tabImport = getPackageImports(context, '@patternfly/react-core')
       .filter(specifier => specifier.imported.name === 'Tab');
     
-    const addImportIfNeeded = fixer => {
-      const tabTitleTextImport = getPackageImports(context, '@patternfly/react-core')
-        .filter(specifier => specifier.imported.name === 'TabTitleText');
-      if (tabTitleTextImport.length) {
-        return [];
-      }
-      const pfImports = context.getSourceCode().ast.body
-        .filter(node => node.type === 'ImportDeclaration' && node.source.value === '@patternfly/react-core');
-      return fixer.insertTextAfter(pfImports[pfImports.length - 1].specifiers[pfImports[pfImports.length - 1].specifiers.length - 1], ', TabTitleText');
-    }
-
     return tabImport.length ? {
       JSXOpeningElement(node) {
         if (tabImport.map(imp => imp.local.name).includes(node.name.name)) {
@@ -53,7 +42,9 @@ module.exports = {
                 node,
                 message: `title needs to be wrapped with the TabTitleText and/or TabTitleIcon component`,
                 fix(fixer) {
-                  return replacement(fixer).concat(addImportIfNeeded(fixer));
+                  return replacement(fixer).concat(
+                    addImport(context, fixer, '@patternfly/react-core', 'Tab', 'TabTitleText')
+                  );
                 }
               });
             }