Merge pull request #4107 from dlabrecq/capitalization2

Fix cost explorer capitalization
project-koku · Nov 8, 2024 · 5df8545 · 5df8545
2 parents 0f80441 + a6e64df
commit 5df8545
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/locales/data.json b/locales/data.json
@@ -4148,7 +4148,7 @@
     "explorerChartAriaTitle": [
       {
         "type": 0,
-        "value": "Cost explorer chart"
+        "value": "Cost Explorer chart"
       }
     ],
     "explorerChartTitle": [
@@ -4320,13 +4320,13 @@
     "explorerTableAriaLabel": [
       {
         "type": 0,
-        "value": "Cost explorer table"
+        "value": "Cost Explorer table"
       }
     ],
     "explorerTitle": [
       {
         "type": 0,
-        "value": "Cost explorer"
+        "value": "Cost Explorer"
       }
     ],
     "exportAggregateType": [
@@ -11632,7 +11632,7 @@
     "pageTitleExplorer": [
       {
         "type": 0,
-        "value": "Cost explorer - Cost management | OpenShift"
+        "value": "Cost Explorer - Cost management | OpenShift"
       }
     ],
     "pageTitleGcp": [

diff --git a/locales/translations.json b/locales/translations.json
@@ -306,11 +306,11 @@
   "excludeLabel": "Excludes: {value}",
   "excludeValues": "{value, select, excludes {excludes} includes {includes} other {}}",
   "expiresOn": "Expires on",
-  "explorerChartAriaTitle": "Cost explorer chart",
+  "explorerChartAriaTitle": "Cost Explorer chart",
   "explorerChartTitle": "{value, select, aws {Amazon Web Services - Top 5 Costliest} aws_ocp {Amazon Web Services filtered by OpenShift - Top 5 Costliest} azure {Microsoft Azure - Top 5 Costliest} oci {Oracle Cloud Infrastructure - Top 5 Costliest} azure_ocp {Microsoft Azure filtered by OpenShift - Top 5 Costliest} gcp {Google Cloud Platform - Top 5 Costliest} gcp_ocp {Google Cloud Platform filtered by OpenShift - Top 5 Costliest} ibm {IBM Cloud - Top 5 Costliest} ibm_ocp {IBM Cloud filtered by OpenShift - Top 5 Costliest} ocp {All OpenShift - Top 5 Costliest} ocp_cloud {All cloud filtered by OpenShift - Top 5 Costliest} other {}}",
   "explorerDateRange": "{value, select, custom {Custom}current_month_to_date {Month to date} last_ninety_days {Last 90 days} last_sixty_days {Last 60 days} last_thirty_days {Last 30 days} previous_month {Previous month} previous_month_to_date {Previous month and month to date} other {}}",
-  "explorerTableAriaLabel": "Cost explorer table",
-  "explorerTitle": "Cost explorer",
+  "explorerTableAriaLabel": "Cost Explorer table",
+  "explorerTitle": "Cost Explorer",
   "exportAggregateType": "Aggregate type",
   "exportAll": "Export all",
   "exportDesc": "The active selections from the table plus the values here will be used to generate an export file. When the file is available, download it from the {value} view.",
@@ -516,7 +516,7 @@
   "pageTitleAzure": "Microsoft Azure - Cost management | OpenShift",
   "pageTitleCostModels": "Cost models - Cost management | OpenShift",
   "pageTitleDefault": "Cost management | OpenShift",
-  "pageTitleExplorer": "Cost explorer - Cost management | OpenShift",
+  "pageTitleExplorer": "Cost Explorer - Cost management | OpenShift",
   "pageTitleGcp": "Google Cloud Platform - Cost management | OpenShift",
   "pageTitleIbm": "IBM Cloud - Cost management | OpenShift",
   "pageTitleOci": "Oracle Cloud Infrastructure - Cost management | OpenShift",

diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -1787,8 +1787,8 @@ export default defineMessages({
     id: 'expiresOn',
   },
   explorerChartAriaTitle: {
-    defaultMessage: 'Cost explorer chart',
-    description: 'Cost explorer chart',
+    defaultMessage: 'Cost Explorer chart',
+    description: 'Cost Explorer chart',
     id: 'explorerChartAriaTitle',
   },
   explorerChartTitle: {
@@ -1806,7 +1806,7 @@ export default defineMessages({
       'ocp {All OpenShift - Top 5 Costliest} ' +
       'ocp_cloud {All cloud filtered by OpenShift - Top 5 Costliest} ' +
       'other {}}',
-    description: 'Cost explorer chart title',
+    description: 'Cost Explorer chart title',
     id: 'explorerChartTitle',
   },
   explorerDateRange: {
@@ -1824,13 +1824,13 @@ export default defineMessages({
     id: 'explorerDateRange',
   },
   explorerTableAriaLabel: {
-    defaultMessage: 'Cost explorer table',
-    description: 'Cost explorer table',
+    defaultMessage: 'Cost Explorer table',
+    description: 'Cost Explorer table',
     id: 'explorerTableAriaLabel',
   },
   explorerTitle: {
-    defaultMessage: 'Cost explorer',
-    description: 'Cost explorer title',
+    defaultMessage: 'Cost Explorer',
+    description: 'Cost Explorer title',
     id: 'explorerTitle',
   },
   exportAggregateType: {
@@ -3180,8 +3180,8 @@ export default defineMessages({
     id: 'pageTitleDefault',
   },
   pageTitleExplorer: {
-    defaultMessage: 'Cost explorer - Cost management | OpenShift',
-    description: 'Cost explorer - Cost management | OpenShift',
+    defaultMessage: 'Cost Explorer - Cost management | OpenShift',
+    description: 'Cost Explorer - Cost management | OpenShift',
     id: 'pageTitleExplorer',
   },
   pageTitleGcp: {

diff --git a/src/routes/details/ocpDetails/ocpDetails.tsx b/src/routes/details/ocpDetails/ocpDetails.tsx
@@ -452,14 +452,7 @@ 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