Merge pull request #3770 from project-koku/release_prod-stable.4311

Deployment commit for prod-stable
project-koku · Apr 9, 2024 · c5675c0 · c5675c0
2 parents fd02704 + b53d230
commit c5675c0
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 91 deletions.
diff --git a/fec.config.js b/fec.config.js
@@ -59,6 +59,7 @@ module.exports = {
      * Package can be re-enabled for sharing once chrome starts providing global routing package to all applications
      */
     // exclude: ['react-router-dom'],
+    exclude: ['axios'], // Setting the base URL affects Cost Management APIs in OCM, when navigating between apps
     exposes: {
       './RootApp': path.resolve(__dirname, './src/appEntry.tsx'),
     },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@redhat-cloud-services/frontend-components": "^4.2.5",
     "@redhat-cloud-services/frontend-components-notifications": "^4.1.0",
     "@redhat-cloud-services/frontend-components-translations": "^3.2.7",
-    "@redhat-cloud-services/frontend-components-utilities": "^4.0.9",
+    "@redhat-cloud-services/frontend-components-utilities": "^4.0.10",
     "@redhat-cloud-services/rbac-client": "^1.3.3",
     "@reduxjs/toolkit": "^2.2.3",
     "@unleash/proxy-client-react": "^4.2.2",
@@ -71,7 +71,7 @@
     "qs": "^6.12.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-intl": "^6.6.4",
+    "react-intl": "^6.6.5",
     "react-redux": "^9.1.0",
     "react-router-dom": "^6.22.3",
     "redux": "^5.0.1",
@@ -90,20 +90,20 @@
     "@swc/core": "1.3.105",
     "@swc/jest": "^0.2.36",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^14.2.2",
+    "@testing-library/react": "^14.3.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
     "@types/qs": "^6.9.14",
-    "@types/react": "^18.2.74",
+    "@types/react": "^18.2.75",
     "@types/react-dom": "^18.2.24",
     "@types/react-redux": "^7.1.33",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/parser": "^7.6.0",
     "aphrodite": "^2.4.0",
     "copy-webpack-plugin": "^12.0.2",
     "eslint": "^8.57.0",
-    "eslint-plugin-formatjs": "^4.12.2",
+    "eslint-plugin-formatjs": "^4.13.0",
     "eslint-plugin-jest-dom": "^5.2.0",
     "eslint-plugin-jsdoc": "^48.2.3",
     "eslint-plugin-markdown": "^4.0.1",

diff --git a/src/routes/details/components/breakdown/breakdownHeader.tsx b/src/routes/details/components/breakdown/breakdownHeader.tsx
@@ -166,14 +166,15 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
         <Flex justifyContent={{ default: 'justifyContentSpaceBetween' }} style={styles.perspectiveContainer}>
           <FlexItem>
             <Flex direction={{ default: 'column' }}>
-              {description && (
-                <FlexItem style={styles.description}>
-                  {description}
-                  {clusterInfoComponent && isClusterInfoToggleEnabled ? (
-                    <span style={!description ? styles.clusterInfoContainer : undefined}>{clusterInfoComponent}</span>
-                  ) : null}
-                </FlexItem>
-              )}
+              {description ||
+                (clusterInfoComponent && isClusterInfoToggleEnabled && (
+                  <FlexItem style={styles.description}>
+                    {description}
+                    {clusterInfoComponent && isClusterInfoToggleEnabled ? (
+                      <span style={!description ? styles.clusterInfoContainer : undefined}>{clusterInfoComponent}</span>
+                    ) : null}
+                  </FlexItem>
+                ))}
               {dataDetailsComponent && isClusterInfoToggleEnabled ? <FlexItem>{dataDetailsComponent}</FlexItem> : null}
               {showCostDistribution && (
                 <FlexItem style={styles.costDistribution}>