From 280c11c82442057caca9423c35c2273c9ac27725 Mon Sep 17 00:00:00 2001
From: lucasgarfield <lucas@redhat.com>
Date: Tue, 3 Jan 2023 09:54:01 +0100
Subject: [PATCH] Wizard: Change '3rd party repositories' to 'Custom
 repositories'

All instances of '3rd party repositories' (and its variations) have been
changed to 'Custom repositories'. This is in better agreement with the
content sources app on consoledot, which generally is called either
'Custom Repositories' or 'Repositories'. Additionally, it is possible to
add and manage Red Hat repositories via content sources, which makes
'3rd party' confusing.
---
 .../CreateImageWizard/CreateImageWizard.js       | 16 +++++++---------
 .../CreateImageWizard/formComponents/Packages.js |  2 +-
 .../formComponents/Repositories.js               | 14 ++++++--------
 .../steps/packagesContentSources.js              |  2 +-
 .../CreateImageWizard/steps/repositories.js      | 14 +++++++-------
 .../steps/repositoriesStepMapper.js              |  6 ++----
 .../CreateImageWizard.stage.test.js              | 10 +++++-----
 7 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/Components/CreateImageWizard/CreateImageWizard.js b/src/Components/CreateImageWizard/CreateImageWizard.js
index e4984cea..bd7dc2e3 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.js
+++ b/src/Components/CreateImageWizard/CreateImageWizard.js
@@ -45,10 +45,8 @@ const onSave = (values) => {
     packages: values['selected-packages']?.map((p) => p.name),
   };
 
-  if (values['third-party-repositories']?.length > 0) {
-    customizations['payload_repositories'] = [
-      ...values['third-party-repositories'],
-    ];
+  if (values['custom-repositories']?.length > 0) {
+    customizations['payload_repositories'] = [...values['custom-repositories']];
   }
 
   if (values['register-system'] === 'register-now-insights') {
@@ -365,9 +363,9 @@ const requestToState = (composeRequest) => {
     // the table in the repositories table
     formState['payload-repositories'] =
       composeRequest?.customizations?.payload_repositories;
-    // 'third-party-repositories' is mutable and is used to generate the request
+    // 'custom-repositories' is mutable and is used to generate the request
     // sent to image-builder
-    formState['third-party-repositories'] =
+    formState['custom-repositories'] =
       composeRequest?.customizations?.payload_repositories;
 
     // filesystem
@@ -439,9 +437,9 @@ const formStepHistory = (composeRequest) => {
     if (!insights.chrome.isProd() && insights.chrome.isBeta()) {
       steps.push('File system configuration', 'packages', 'repositories');
 
-      const thirdPartyRepositories =
+      const customRepositories =
         composeRequest.customizations?.payload_repositories;
-      if (thirdPartyRepositories) {
+      if (customRepositories) {
         steps.push('packages-content-sources');
       }
     } else {
@@ -546,7 +544,7 @@ const CreateImageWizard = () => {
             crossroads: [
               'target-environment',
               'release',
-              'third-party-repositories',
+              'custom-repositories',
             ],
             description: (
               <>
diff --git a/src/Components/CreateImageWizard/formComponents/Packages.js b/src/Components/CreateImageWizard/formComponents/Packages.js
index c0584125..4b367b1b 100644
--- a/src/Components/CreateImageWizard/formComponents/Packages.js
+++ b/src/Components/CreateImageWizard/formComponents/Packages.js
@@ -61,7 +61,7 @@ export const ContentSourcesPackages = () => {
   const { getState } = useFormApi();
 
   const getAllPackages = async (packagesSearchName) => {
-    const repos = getState()?.values?.['third-party-repositories'];
+    const repos = getState()?.values?.['custom-repositories'];
     const repoUrls = repos?.map((repo) => repo.baseurl);
     return await api.getPackagesContentSources(repoUrls, packagesSearchName);
   };
diff --git a/src/Components/CreateImageWizard/formComponents/Repositories.js b/src/Components/CreateImageWizard/formComponents/Repositories.js
index 927e17fb..566303af 100644
--- a/src/Components/CreateImageWizard/formComponents/Repositories.js
+++ b/src/Components/CreateImageWizard/formComponents/Repositories.js
@@ -166,10 +166,8 @@ const Repositories = (props) => {
   const [perPage, setPerPage] = useState(10);
   const [page, setPage] = useState(1);
   const [selected, setSelected] = useState(
-    getState()?.values?.['third-party-repositories']
-      ? getState().values['third-party-repositories'].map(
-          (repo) => repo.baseurl
-        )
+    getState()?.values?.['custom-repositories']
+      ? getState().values['custom-repositories'].map((repo) => repo.baseurl)
       : []
   );
 
@@ -264,12 +262,12 @@ const Repositories = (props) => {
         <EmptyState variant={EmptyStateVariant.large} data-testid="empty-state">
           <EmptyStateIcon icon={RepositoryIcon} />
           <Title headingLevel="h4" size="lg">
-            No Third Party Repositories
+            No Custom Repositories
           </Title>
           <EmptyStateBody>
-            Third party repositories managed via the Red Hat Insights
-            Repositories app will be available here to select and use to search
-            for additional packages.
+            Custom repositories managed via the Red Hat Insights Repositories
+            app will be available here to select and use to search for
+            additional packages.
           </EmptyStateBody>
           <Button
             variant="primary"
diff --git a/src/Components/CreateImageWizard/steps/packagesContentSources.js b/src/Components/CreateImageWizard/steps/packagesContentSources.js
index 9e33fd45..78be0456 100644
--- a/src/Components/CreateImageWizard/steps/packagesContentSources.js
+++ b/src/Components/CreateImageWizard/steps/packagesContentSources.js
@@ -8,7 +8,7 @@ import StepTemplate from './stepTemplate';
 export default {
   StepTemplate,
   id: 'wizard-systemconfiguration-content-sources-packages',
-  title: 'Additional 3rd Party Packages',
+  title: 'Additional custom packages',
   name: 'packages-content-sources',
   substepOf: 'Content',
   nextStep: 'image-name',
diff --git a/src/Components/CreateImageWizard/steps/repositories.js b/src/Components/CreateImageWizard/steps/repositories.js
index 69ef82b0..dee83b7e 100644
--- a/src/Components/CreateImageWizard/steps/repositories.js
+++ b/src/Components/CreateImageWizard/steps/repositories.js
@@ -9,7 +9,7 @@ import StepTemplate from './stepTemplate';
 export default {
   StepTemplate,
   id: 'wizard-repositories',
-  title: '3rd party repositories',
+  title: 'Custom repositories',
   name: 'repositories',
   substepOf: 'Content',
   nextStep: ({ values }) => nextStepMapper(values),
@@ -19,18 +19,18 @@ export default {
       name: 'packages-text-component',
       label: (
         <Text>
-          Select third party repositories from which to search and add packages
-          to this image.
+          Select custom repositories from which to search and add packages to
+          this image.
           <br />
-          Third party repositories can be managed using the Repositories app on
-          Red Hat Insights.
+          Custom repositories can be managed using the Repositories app on Red
+          Hat Insights.
         </Text>
       ),
     },
     {
       component: 'repositories-table',
-      name: 'third-party-repositories',
-      label: 'Third party repositories',
+      name: 'custom-repositories',
+      label: 'Custom repositories',
     },
   ],
 };
diff --git a/src/Components/CreateImageWizard/steps/repositoriesStepMapper.js b/src/Components/CreateImageWizard/steps/repositoriesStepMapper.js
index c0c47ded..741dae30 100644
--- a/src/Components/CreateImageWizard/steps/repositoriesStepMapper.js
+++ b/src/Components/CreateImageWizard/steps/repositoriesStepMapper.js
@@ -1,7 +1,5 @@
-export default ({
-  'third-party-repositories': thirdPartyRepositories,
-} = {}) => {
-  if (thirdPartyRepositories?.length > 0) {
+export default ({ 'custom-repositories': customRepositories } = {}) => {
+  if (customRepositories?.length > 0) {
     return 'packages-content-sources';
   }
 
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.stage.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.stage.test.js
index 4ff2cc46..2b5d1362 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.stage.test.js
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.stage.test.js
@@ -584,7 +584,7 @@ describe('Create Image Wizard', () => {
     screen.getByRole('button', { name: 'File system configuration' });
     screen.getByRole('button', { name: 'Content' });
     screen.getByRole('button', { name: 'Additional Red Hat packages' });
-    screen.getByRole('button', { name: '3rd party repositories' });
+    screen.getByRole('button', { name: 'Custom repositories' });
     screen.getByRole('button', { name: 'Name image' });
     screen.getByRole('button', { name: 'Review' });
   });
@@ -715,7 +715,7 @@ describe('Step Packages', () => {
     // remove a single package
     screen.getByTestId('selected-pkgs-lib-test').click();
     screen.getByRole('button', { name: /Remove selected/ }).click();
-    // skip 3rd party repositories page
+    // skip Custom repositories page
     screen.getByRole('button', { name: /Next/ }).click();
 
     // skip name page
@@ -868,7 +868,7 @@ describe('Step Packages', () => {
   });
 });
 
-describe('Step 3rd party repositories', () => {
+describe('Step Custom repositories', () => {
   const setUp = async () => {
     history = renderWithReduxRouter(<CreateImageWizard />).history;
 
@@ -1172,12 +1172,12 @@ describe('Click through all steps', () => {
     screen.getByRole('button', { name: /Add selected/ }).click();
     getNextButton().click();
 
-    // 3rd party repositories
+    // Custom repositories
     userEvent.click(screen.getByRole('checkbox', { name: /select row 0/i }));
     userEvent.click(screen.getByRole('checkbox', { name: /select row 1/i }));
     getNextButton().click();
 
-    // 3rd party packages
+    // Custom packages
     getNextButton().click();
 
     // Enter image name