Merge pull request #3661 from project-koku/release_stage-stable.98938

Deployment commit for stage-stable

locales/translations.json

@@ -31,7 +31,6 @@
   "breakdownTotalCostDate": "{value} total cost ({dateRange})",
   "calculationType": "Calculation type",
   "cancel": "Cancel",
-  "change": "Change",
   "chartCostForecastConeLegendLabel": "Cost confidence ({dateRange})",
   "chartCostForecastConeLegendNoDataLabel": "Cost confidence (no data)",
   "chartCostForecastConeLegendTooltip": "Cost confidence ({month})",
@@ -60,12 +59,11 @@
   "chooseKeyPlaceholder": "Choose key",
   "chooseValuePlaceholder": "Choose value",
   "close": "Close",
+  "cloudIntegration": "Cloud integration",
   "cluster": "Cluster",
   "clusterId": "Cluster id",
   "clusterInfo": "Cluster information",
   "clusters": "Clusters",
-  "copyToClipboard": "Copy to clipboard",
-  "copyToClipboardSuccessfull": "Successfully copied to clipboard!",
   "cost": "Cost",
   "costBreakdownAriaDesc": "Breakdown of markup, raw, and usage costs",
   "costBreakdownAriaLabel": "A description of markup, raw cost and usage cost",
@@ -191,8 +189,6 @@
   "currencyDesc": "Select the preferred currency view for your organization",
   "currencyOptions": "{units, select, AUD {AUD (A$) - Australian Dollar}CAD {CAD (CA$) - Canadian Dollar}CHF {CHF (CHF) - Swiss Franc}CNY {CNY (CN¥) - Chinese Yuan}DKK {DKK (DKK) - Danish Krone}EUR {EUR (€) - Euro}GBP {GBP (£) - British Pound}HKD {HKD (HK$) - Hong Kong Dollar}JPY {JPY (¥) - Japanese Yen}NOK {NOK (NOK) - Norwegian Krone}NZD {NZD (NZ$) - New Zealand Dollar}SEK {SEK (SEK) - Swedish Krona}SGD {SGD (SGD) - Singapore Dollar}USD {USD ($) - United States Dollar} ZAR {ZAR (ZAR) - South African Rand}other {}}",
   "currencyUnits": "{units, select, AUD {A$}CAD {CA$}CHF {CHF}CNY {CN¥}DKK {DKK}EUR {€}GBP {£}HKD {HK$}JPY {¥}NOK {NOK}NZD {NZ$}SEK {SEK}SGD {SGD}USD {$} ZAR {ZAR}other {}}",
-  "current": "Current",
-  "currentConfiguration": "Current configuration",
   "dashboardCumulativeCostComparison": "Cumulative cost comparison ({units})",
   "dashboardDailyUsageComparison": "Daily usage comparison ({units})",
   "dashboardDatabaseTitle": "Database services cost",
@@ -343,7 +339,6 @@
   "infrastructure": "Infrastructure",
   "lastProcessed": "Last processed",
   "learnMore": "Learn more",
-  "limits": "Limits",
   "loadingStateDesc": "Searching for your integrations. Do not refresh the browser",
   "loadingStateTitle": "Looking for integrations...",
   "maintenanceEmptyStateDesc": "Cost Management is currently undergoing scheduled maintenance and will be unavailable from 13:00 - 19:00 UTC (09:00 AM - 03:00 PM EDT).",
@@ -404,7 +399,6 @@
   "notAuthorizedStateOptimizations": "Optimizations in Cost Management",
   "notAuthorizedStateRhel": "RHEL in Cost Management",
   "notAuthorizedStateSettings": "Settings in Cost Management",
-  "notificationsAlertTitle": "Duration based notifications",
   "oci": "Oracle Cloud Infrastructure",
   "ociComputeTitle": "Virtual machines usage",
   "ociCostTrendTitle": "Oracle Cloud Infrastructure cumulative cost comparison ({units})",
@@ -428,29 +422,12 @@
   "ocpDetailsSupplementaryCostDesc": "All costs not directly attributed to the infrastructure. These costs are determined by applying a price list within a cost model to OpenShift cluster metrics.",
   "ocpDetailsTitle": "OpenShift Details",
   "ocpMemoryUsageAndRequests": "Memory usage and requests",
-  "ocpSource": "OpenShift source:",
   "ocpVolumeUsageAndRequests": "Volume usage and requests",
   "openShift": "OpenShift",
   "openShiftCloudInfrastructure": "OpenShift cloud infrastructure",
   "openShiftCloudInfrastructureDesc": "Infrastructure cost attributed to OpenShift Container Platform, based on a subset of cloud cost data.",
   "openShiftDesc": "Total cost for OpenShift Container Platform, comprising the infrastructure cost and cost calculated from metrics.",
   "optimizations": "Optimizations",
-  "optimizationsDetails": "{count, plural, =0 {No optimizations} =1 {{count} optimization} other {{count} optimizations}}",
-  "optimizationsInfo": "Assess and monitor your usage so you can optimize your OpenShift resources.",
-  "optimizationsInfoArialLabel": "A description of optimizations",
-  "optimizationsInfoButtonArialLabel": "A dialog with a description of optimizations",
-  "optimizationsLoadingStateDesc": "Searching for your optimizations. Do not refresh the browser",
-  "optimizationsLoadingStateTitle": "Looking for optimizations...",
-  "optimizationsLongTerm": "Last 15 days",
-  "optimizationsMediumTerm": "Last 7 days",
-  "optimizationsNames": "{value, select, cluster {Cluster names} container {Container names} last_reported {Last reported} project {Project names} workload {Workload names} workload_type {Workload types} other {}}",
-  "optimizationsPerspective": "View optimizations based on",
-  "optimizationsShortTerm": "Last 24 hrs",
-  "optimizationsTableAriaLabel": "Optimizations table",
-  "optimizationsValue": "{value}{units}",
-  "optimizationsValues": "{value, select, cluster {Cluster name} container {Container name} last_reported {Last reported} project {Project name} workload {Workload name} workload_type {Workload type} other {}}",
-  "optimizationsViewAll": "View all optimizations for this project",
-  "optimizationsViewAllDisabled": "This project has not reported data this month.",
   "overhead": "Overhead",
   "overheadDesc": "Includes distributed costs",
   "overviewInfoArialLabel": "A description of perspectives",
@@ -472,7 +449,6 @@
   "paginationTitle": "{placement, select, top {{title} top pagination} bottom {{title} bottom pagination} other {{title} pagination}}",
   "percent": "{value} %",
   "percentOfCost": "{value} % of cost",
-  "percentPlus": "{count, plural, one {+{value}%} other {{value}%}}",
   "percentSymbol": "%",
   "percentTotalCost": "{value} {units} ({percent} %)",
   "perspective": "Perspective",
@@ -500,8 +476,6 @@
   "rbacErrorTitle": "Failed to get RBAC information",
   "readOnly": "Read only",
   "readOnlyPermissions": "You have read only permissions",
-  "recommended": "Recommended",
-  "recommendedConfiguration": "Recommended configuration",
   "redHatIntegration": "Red Hat integration",
   "redHatStatusUrl": "https://status.redhat.com",
   "remove": "Remove",
@@ -545,6 +519,7 @@
   "settingsTagsErrorTitle": "You can not enable more than {value} tags total",
   "settingsTitle": "Cost Management Settings",
   "sinceDate": "{dateRange}",
+  "source": "{value, select, aws {Amazon Web Services source:} azure {Microsoft Azure source:} oci {Oracle Cloud Infrastructure source:} gcp {Google Cloud Platform source:} ocp {OpenShift source:} other {}}",
   "sourceType": "Integration",
   "sourceTypes": "{value, select, aws {Amazon Web Services} azure {Microsoft Azure} oci {Oracle Cloud Infrastructure} gcp {Google Cloud Platform} ibm {IBM Cloud} ocp {OpenShift} other {}}",
   "sources": "Integrations",

src/api/providers.ts

@@ -73,9 +73,11 @@ export const enum ProviderType {
   rhel = 'ocp', // Todo: Update to use rhel when APIs are available
   // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
   ros = 'ocp', // Todo: Update to use rhel when APIs are available
+  uuid = 'uuid',
 }
 
-export function fetchProviders(query: string) {
-  const queryString = query ? `?${query}` : '';
+export function fetchProviders(query: string, reportType: ProviderType = undefined) {
+  const separator = reportType === ProviderType.uuid ? '' : '?';
+  const queryString = query ? `${separator}${query}` : '';
   return axios.get<Providers>(`sources/${queryString}`);
 }

src/components/permissions/permissions.tsx

@@ -72,7 +72,7 @@ const PermissionsBase: React.FC<PermissionsProps> = ({
     switch (pathname) {
       case formatPath(routes.explorer.path):
       case formatPath(routes.overview.path):
-        return aws || azure || costModel || gcp || ibm || ocp || oci;
+        return aws || azure || gcp || ibm || ocp || oci;
       case formatPath(routes.awsBreakdown.path):
       case formatPath(routes.awsDetails.path):
         return aws;

src/locales/messages.ts

@@ -205,11 +205,6 @@ export default defineMessages({
     description: 'Cancel',
     id: 'cancel',
   },
-  change: {
-    defaultMessage: 'Change',
-    description: 'Change',
-    id: 'change',
-  },
   chartCostForecastConeLegendLabel: {
     defaultMessage: 'Cost confidence ({dateRange})',
     description: 'Cost confidence (Jan 1-31)',
@@ -350,6 +345,11 @@ export default defineMessages({
     description: 'Close',
     id: 'close',
   },
+  cloudIntegration: {
+    defaultMessage: 'Cloud integration',
+    description: 'Cloud integration',
+    id: 'cloudIntegration',
+  },
   cluster: {
     defaultMessage: 'Cluster',
     description: 'Cluster',
@@ -370,16 +370,6 @@ export default defineMessages({
     description: 'Clusters',
     id: 'clusters',
   },
-  copyToClipboard: {
-    defaultMessage: 'Copy to clipboard',
-    description: 'Copy to clipboard',
-    id: 'copyToClipboard',
-  },
-  copyToClipboardSuccessfull: {
-    defaultMessage: 'Successfully copied to clipboard!',
-    description: 'Successfully copied to clipboard!',
-    id: 'copyToClipboardSuccessfull',
-  },
   cost: {
     defaultMessage: 'Cost',
     description: 'Cost',
@@ -1086,16 +1076,6 @@ export default defineMessages({
     description: 'return the proper unit label based on key: "units"',
     id: 'currencyUnits',
   },
-  current: {
-    defaultMessage: 'Current',
-    description: 'Current',
-    id: 'current',
-  },
-  currentConfiguration: {
-    defaultMessage: 'Current configuration',
-    description: 'Current configuration',
-    id: 'currentConfiguration',
-  },
   dashboardCumulativeCostComparison: {
     defaultMessage: 'Cumulative cost comparison ({units})',
     description: 'Cumulative cost comparison ({units})',
@@ -2229,11 +2209,6 @@ export default defineMessages({
     description: 'Learn more',
     id: 'learnMore',
   },
-  limits: {
-    defaultMessage: 'Limits',
-    description: 'Limits',
-    id: 'limits',
-  },
   loadingStateDesc: {
     defaultMessage: 'Searching for your integrations. Do not refresh the browser',
     description: 'Searching for your integrations. Do not refresh the browser',
@@ -2580,11 +2555,6 @@ export default defineMessages({
     description: 'Settings in Cost Management',
     id: 'notAuthorizedStateSettings',
   },
-  notificationsAlertTitle: {
-    defaultMessage: 'Duration based notifications',
-    description: 'Duration based notifications',
-    id: 'notificationsAlertTitle',
-  },
   oci: {
     defaultMessage: 'Oracle Cloud Infrastructure',
     description: 'Oracle Cloud Infrastructure',
@@ -2702,11 +2672,6 @@ export default defineMessages({
     description: 'Memory usage and requests',
     id: 'ocpMemoryUsageAndRequests',
   },
-  ocpSource: {
-    defaultMessage: 'OpenShift source:',
-    description: 'OpenShift source',
-    id: 'ocpSource',
-  },
   ocpVolumeUsageAndRequests: {
     defaultMessage: 'Volume usage and requests',
     description: 'Volume usage and requests',
@@ -2741,102 +2706,6 @@ export default defineMessages({
     description: 'Optimizations',
     id: 'optimizations',
   },
-  optimizationsDetails: {
-    defaultMessage: '{count, plural, =0 {No optimizations} =1 {{count} optimization} other {{count} optimizations}}',
-    description: 'Recommendation details',
-    id: 'optimizationsDetails',
-  },
-  optimizationsInfo: {
-    defaultMessage: 'Assess and monitor your usage so you can optimize your OpenShift resources.',
-    description: 'Assess and monitor your usage so you can optimize your OpenShift resources.',
-    id: 'optimizationsInfo',
-  },
-  optimizationsInfoArialLabel: {
-    defaultMessage: 'A description of optimizations',
-    description: 'A description of optimizations',
-    id: 'optimizationsInfoArialLabel',
-  },
-  optimizationsInfoButtonArialLabel: {
-    defaultMessage: 'A dialog with a description of optimizations',
-    description: 'A dialog with a description of optimizations',
-    id: 'optimizationsInfoButtonArialLabel',
-  },
-  optimizationsLoadingStateDesc: {
-    defaultMessage: 'Searching for your optimizations. Do not refresh the browser',
-    description: 'Searching for your optimizations. Do not refresh the browser',
-    id: 'optimizationsLoadingStateDesc',
-  },
-  optimizationsLoadingStateTitle: {
-    defaultMessage: 'Looking for optimizations...',
-    description: 'Looking for optimizations',
-    id: 'optimizationsLoadingStateTitle',
-  },
-  optimizationsLongTerm: {
-    defaultMessage: 'Last 15 days',
-    description: 'Last 15 days',
-    id: 'optimizationsLongTerm',
-  },
-  optimizationsMediumTerm: {
-    defaultMessage: 'Last 7 days',
-    description: 'Last 7 days',
-    id: 'optimizationsMediumTerm',
-  },
-  optimizationsNames: {
-    defaultMessage:
-      '{value, select, ' +
-      'cluster {Cluster names} ' +
-      'container {Container names} ' +
-      'last_reported {Last reported} ' +
-      'project {Project names} ' +
-      'workload {Workload names} ' +
-      'workload_type {Workload types} ' +
-      'other {}}',
-    description: 'Selected items for export',
-    id: 'optimizationsNames',
-  },
-  optimizationsPerspective: {
-    defaultMessage: 'View optimizations based on',
-    description: 'View optimizations based on',
-    id: 'optimizationsPerspective',
-  },
-  optimizationsShortTerm: {
-    defaultMessage: 'Last 24 hrs',
-    description: 'Last 24 hrs',
-    id: 'optimizationsShortTerm',
-  },
-  optimizationsTableAriaLabel: {
-    defaultMessage: 'Optimizations table',
-    description: 'Optimizations table',
-    id: 'optimizationsTableAriaLabel',
-  },
-  optimizationsValue: {
-    defaultMessage: '{value}{units}',
-    description: '2 GiB',
-    id: 'optimizationsValue',
-  },
-  optimizationsValues: {
-    defaultMessage:
-      '{value, select, ' +
-      'cluster {Cluster name} ' +
-      'container {Container name} ' +
-      'last_reported {Last reported} ' +
-      'project {Project name} ' +
-      'workload {Workload name} ' +
-      'workload_type {Workload type} ' +
-      'other {}}',
-    description: 'Selected items for export',
-    id: 'optimizationsValues',
-  },
-  optimizationsViewAll: {
-    defaultMessage: 'View all optimizations for this project',
-    description: 'View all optimizations for this project',
-    id: 'optimizationsViewAll',
-  },
-  optimizationsViewAllDisabled: {
-    defaultMessage: 'This project has not reported data this month.',
-    description: 'This project has not reported data this month.',
-    id: 'optimizationsViewAllDisabled',
-  },
   overhead: {
     defaultMessage: 'Overhead',
     description: 'Overhead',
@@ -2946,11 +2815,6 @@ export default defineMessages({
     description: '{value} % of cost',
     id: 'percentOfCost',
   },
-  percentPlus: {
-    defaultMessage: '{count, plural, one {+{value}%} other {{value}%}}',
-    description: 'Percent value with plus symbol',
-    id: 'percentPlus',
-  },
   percentSymbol: {
     defaultMessage: '%',
     description: 'Percent symbol',
@@ -3105,16 +2969,6 @@ export default defineMessages({
     description: 'You have read only permissions',
     id: 'readOnlyPermissions',
   },
-  recommended: {
-    defaultMessage: 'Recommended',
-    description: 'Recommended',
-    id: 'recommended',
-  },
-  recommendedConfiguration: {
-    defaultMessage: 'Recommended configuration',
-    description: 'Recommended configuration',
-    id: 'recommendedConfiguration',
-  },
   redHatIntegration: {
     defaultMessage: 'Red Hat integration',
     description: 'Red Hat integration',
@@ -3344,6 +3198,18 @@ export default defineMessages({
     description: 'Jan 1-31',
     id: 'sinceDate',
   },
+  source: {
+    defaultMessage:
+      '{value, select, ' +
+      'aws {Amazon Web Services source:} ' +
+      'azure {Microsoft Azure source:} ' +
+      'oci {Oracle Cloud Infrastructure source:} ' +
+      'gcp {Google Cloud Platform source:} ' +
+      'ocp {OpenShift source:} ' +
+      'other {}}',
+    description: 'Select from the following {value} integrations:',
+    id: 'source',
+  },
   sourceType: {
     defaultMessage: 'Integration',
     description: 'Integration',

src/routes.tsx

@@ -47,10 +47,9 @@ export const routes = {
     path: '/azure',
   },
   costModel: {
-    // Note: Order matters here (i.e., dynamic segment must be defined after costModelsDetails)
     basePath: `/settings/cost-model`,
     element: userAccess(CostModel),
-    path: `/settings/cost-model/:uuid`,
+    path: `/settings/cost-model/:uuid`, // Note: Order matters (i.e., dynamic segment must be defined after costModelsDetails)
   },
   explorer: {
     element: userAccess(Explorer),