Merge pull request #4105 from dlabrecq/capitalization

Fix component capitalization
project-koku · Nov 8, 2024 · 0f80441 · 0f80441
2 parents 223d8fc + 9be12cc
commit 0f80441
Show file tree

Hide file tree

Showing 8 changed files with 297 additions and 290 deletions.
diff --git a/locales/data.json b/locales/data.json
diff --git a/locales/translations.json b/locales/translations.json
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
diff --git a/src/routes/components/page/noProviders/noProviders.tsx b/src/routes/components/page/noProviders/noProviders.tsx
@@ -99,7 +99,7 @@ const NoProviders = () => {
         <div style={styles.headerDesc}>
           {intl.formatMessage(messages.noProvidersDesc, {
             ocp: <b>{intl.formatMessage(messages.ocp)}</b>,
-            aws: <b>{intl.formatMessage(messages.aws)}</b>,
+            aws: <b>{intl.formatMessage(messages.awsAlt)}</b>,
             gcp: <b>{intl.formatMessage(messages.gcp)}</b>,
             oci: <b>{intl.formatMessage(messages.oci)}</b>,
             azure: <b>{intl.formatMessage(messages.azure)}</b>,

diff --git a/src/routes/details/ocpDetails/ocpDetails.tsx b/src/routes/details/ocpDetails/ocpDetails.tsx
@@ -452,7 +452,14 @@ class OcpDetails extends React.Component<OcpDetailsProps, OcpDetailsState> {
         );
       }
     }
-
+    const test = true;
+    if (test) {
+      return isProviderEmptyStateToggleEnabled ? (
+        <NoProviders />
+      ) : (
+        <NoProvidersOld providerType={ProviderType.ocp} title={title} />
+      );
+    }
     return (
       <div style={styles.ocpDetails}>
         <DetailsHeader

diff --git a/src/routes/settings/costModels/components/addPriceList.test.tsx b/src/routes/settings/costModels/components/addPriceList.test.tsx
@@ -127,12 +127,12 @@ describe('add-a-new-rate', () => {
     await user.type(screen.getByLabelText('Description'), 'regular rate test');
 
     // select first option for metric
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
     // select first option for measurement
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -142,7 +142,7 @@ describe('add-a-new-rate', () => {
     // selecting a different measurement does not reset cost type to default
     await user.click(screen.getByLabelText(qr.supplradio));
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
@@ -151,13 +151,13 @@ describe('add-a-new-rate', () => {
     // selecting metric will reset both measurement and cost type
     await user.click(screen.getByLabelText(qr.infraradio));
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(screen.getByText(regExp(messages.costModelsRequiredField))).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -198,11 +198,11 @@ describe('add-a-new-rate', () => {
 
     await user.type(screen.getByLabelText('Description'), 'tag rate test');
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -269,11 +269,11 @@ describe('add-a-new-rate', () => {
 
     render(<RenderFormDataUI submit={submit} cancel={cancel} />);
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]); // Previous select options are not being removed from page
 
@@ -291,13 +291,13 @@ describe('add-a-new-rate', () => {
     await user.type(tagKeyInput, '{backspace}');
     expect(screen.getByText(regExp(messages.priceListDuplicate))).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(screen.queryByText(regExp(messages.priceListDuplicate))).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[3]);
 
@@ -312,11 +312,11 @@ describe('add-a-new-rate', () => {
 
     await render(<RenderFormDataUI submit={submit} cancel={cancel} />);
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[2]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
     expect(screen.queryAllByLabelText(regExp(messages.costModelsEnterTagRate))).toHaveLength(0);

diff --git a/src/routes/settings/costModels/costModel/updateRateModel.test.tsx b/src/routes/settings/costModels/costModel/updateRateModel.test.tsx
@@ -283,41 +283,41 @@ describe('update-rate', () => {
     expect(saveButton.getAttribute('disabled')).not.toBeNull();
   });
 
-  test('Select Measurement', async () => {
+  test('Select measurement', async () => {
     const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
     let options = null;
 
     render(<RenderFormDataUI index={0} />);
 
     const saveButton = screen.getByText(regExp(messages.save));
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
     expect(saveButton.getAttribute('disabled')).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
     expect(saveButton.getAttribute('disabled')).not.toBeNull();
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[5]); // Previous select options are not being removed from page
 
     expect(saveButton.getAttribute('disabled')).toBeNull();
 
-    await user.click(screen.getByLabelText('Select Metric'));
+    await user.click(screen.getByLabelText('Select metric'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[0]);
 
@@ -393,7 +393,7 @@ describe('update-rate', () => {
     let options = null;
     render(<RenderFormDataUI index={0} />);
 
-    await user.click(screen.getByLabelText('Select Measurement'));
+    await user.click(screen.getByLabelText('Select measurement'));
     options = await screen.findAllByRole('option');
     await user.click(options[1]);
 

diff --git a/src/routes/settings/costModels/costModelWizard/generalInformation.tsx b/src/routes/settings/costModels/costModelWizard/generalInformation.tsx
@@ -49,7 +49,7 @@ class GeneralInformation extends React.Component<GeneralInformationProps, any> {
     const { intl } = this.props;
     const sourceTypeOptions = [
       {
-        label: messages.costModelsWizardOnboardAws,
+        label: messages.awsAlt,
         value: 'AWS',
       },
       {