Merge pull request #3513 from project-koku/release_prod-stable.76422

Deployment commit for prod-stable
project-koku · Nov 16, 2023 · 2806e09 · 2806e09
2 parents 5b438d7 + 1004a48
commit 2806e09
Show file tree

Hide file tree

Showing 22 changed files with 298 additions and 281 deletions.
diff --git a/deploy/frontend.yaml b/deploy/frontend.yaml
@@ -25,6 +25,9 @@ objects:
             - appId: 'cost-management'
               title: Overview
               href: "/openshift/cost-management"
+            - appId: 'cost-management'
+              title: 'Optimizations'
+              href: '/openshift/cost-management/optimizations'
             - appId: 'cost-management'
               title: 'OpenShift'
               href: '/openshift/cost-management/ocp'
@@ -43,12 +46,12 @@ objects:
             - appId: 'cost-management'
               title: 'Oracle Cloud Infrastructure'
               href: '/openshift/cost-management/oci'
-            - appId: 'cost-management'
-              title: 'Cost models'
-              href: '/openshift/cost-management/cost-models'
             - appId: 'cost-management'
               title: 'Cost Explorer'
               href: '/openshift/cost-management/explorer'
+            - appId: 'cost-management'
+              title: 'Settings'
+              href: '/openshift/cost-management/settings'
       module:
         manifestLocation: "/apps/cost-management/fed-mods.json"
         modules:

diff --git a/locales/data.json b/locales/data.json
@@ -1477,7 +1477,7 @@
       },
       {
         "type": 1,
-        "value": "integration"
+        "value": "source"
       },
       {
         "type": 0,

diff --git a/locales/translations.json b/locales/translations.json
@@ -124,7 +124,7 @@
   "costModelsSelectMetric": "Select Metric",
   "costModelsSourceDelete": "Unassign",
   "costModelsSourceDeleteSource": "Unassign integration",
-  "costModelsSourceDeleteSourceDesc": "This will remove the assignment of {integration} from the {costModel} cost model. You can then assign the cost model to a new integration.",
+  "costModelsSourceDeleteSourceDesc": "This will remove the assignment of {source} from the {costModel} cost model. You can then assign the cost model to a new integration.",
   "costModelsSourceEmptyStateDesc": "Select the integrations you want to apply this cost model to.",
   "costModelsSourceEmptyStateTitle": "No integrations are assigned",
   "costModelsSourceTableAriaLabel": "Integrations table",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,67 +56,69 @@
     "@patternfly/react-icons": "^5.1.1",
     "@patternfly/react-table": "^5.1.1",
     "@patternfly/react-tokens": "^5.1.1",
-    "@redhat-cloud-services/frontend-components": "^4.0.14",
-    "@redhat-cloud-services/frontend-components-notifications": "^4.0.4",
+    "@redhat-cloud-services/frontend-components": "^4.1.0",
+    "@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.2",
     "@redhat-cloud-services/rbac-client": "^1.2.12",
-    "@unleash/proxy-client-react": "^4.0.3",
-    "axios": "^1.6.0",
+    "@unleash/proxy-client-react": "^4.1.0",
+    "axios": "^1.6.1",
     "date-fns": "^2.30.0",
     "js-file-download": "^0.4.12",
     "lodash": "^4.17.21",
     "qs": "^6.11.2",
     "react": "^18.2.0",
     "react-bootstrap": "^2.9.1",
     "react-dom": "^18.2.0",
-    "react-intl": "^6.5.1",
+    "react-intl": "^6.5.4",
     "react-redux": "^8.1.3",
     "react-router-dom": "^6.18.0",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
     "typesafe-actions": "^5.1.0",
-    "unleash-proxy-client": "^3.1.1",
+    "unleash-proxy-client": "^3.2.0",
     "victory-core": "^36.6.12",
     "xstate": "^4.38.3",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@formatjs/cli": "^6.2.1",
+    "@formatjs/cli": "^6.2.3",
+    "@formatjs/ecma402-abstract": "^1.17.4",
+    "@formatjs/icu-messageformat-parser": "^2.7.2",
     "@redhat-cloud-services/eslint-config-redhat-cloud-services": "^2.0.3",
     "@redhat-cloud-services/frontend-components-config": "^6.0.5",
     "@redhat-cloud-services/tsc-transform-imports": "^1.0.4",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^14.1.0",
     "@testing-library/user-event": "^14.5.1",
-    "@types/jest": "^29.5.7",
-    "@types/qs": "^6.9.9",
-    "@types/react": "^18.2.36",
-    "@types/react-dom": "^18.2.14",
-    "@types/react-redux": "^7.1.28",
+    "@types/jest": "^29.5.8",
+    "@types/qs": "^6.9.10",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@types/react-redux": "^7.1.30",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "@xstate/test": "^0.5.1",
     "aphrodite": "^2.4.0",
     "copy-webpack-plugin": "^11.0.0",
     "eslint": "^8.53.0",
-    "eslint-plugin-formatjs": "^4.11.0",
+    "eslint-plugin-formatjs": "^4.11.2",
     "eslint-plugin-jest-dom": "^5.1.0",
-    "eslint-plugin-jsdoc": "^46.8.2",
+    "eslint-plugin-jsdoc": "^46.9.0",
     "eslint-plugin-markdown": "^3.0.1",
     "eslint-plugin-patternfly-react": "^5.1.1",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "eslint-plugin-testing-library": "^6.1.0",
+    "eslint-plugin-testing-library": "^6.1.2",
     "git-revision-webpack-plugin": "^5.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-mock-axios": "^4.7.3",
     "jws": "^4.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
     "ts-patch": "^3.0.2",
     "typescript": "^5.2.2",

diff --git a/src/locales/messages.ts b/src/locales/messages.ts
@@ -688,9 +688,9 @@ export default defineMessages({
   },
   costModelsSourceDeleteSourceDesc: {
     defaultMessage:
-      'This will remove the assignment of {integration} from the {costModel} cost model. You can then assign the cost model to a new integration.',
+      'This will remove the assignment of {source} from the {costModel} cost model. You can then assign the cost model to a new integration.',
     description:
-      'This will remove the assignment of {integration} from the {costModel} cost model. You can then assign the cost model to a new integration.',
+      'This will remove the assignment of {source} from the {costModel} cost model. You can then assign the cost model to a new integration.',
     id: 'costModelsSourceDeleteSourceDesc',
   },
   costModelsSourceEmptyStateDesc: {

diff --git a/src/routes/components/charts/dailyTrendChart/dailyTrendChart.tsx b/src/routes/components/charts/dailyTrendChart/dailyTrendChart.tsx
@@ -110,20 +110,20 @@ class DailyTrendChartBase extends React.Component<DailyTrendChartProps, State> {
     const key = showUsageLegendLabel
       ? messages.chartUsageLegendLabel
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendLabel
-      : messages.chartCostLegendLabel;
+        ? messages.chartCostSupplementaryLegendLabel
+        : messages.chartCostLegendLabel;
 
     const tooltipKey = showUsageLegendLabel
       ? messages.chartUsageLegendTooltip
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendTooltip
-      : messages.chartCostLegendTooltip;
+        ? messages.chartCostSupplementaryLegendTooltip
+        : messages.chartCostLegendTooltip;
 
     const noDataKey = showUsageLegendLabel
       ? messages.chartUsageLegendNoDataLabel
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendNoDataLabel
-      : messages.chartCostLegendNoDataLabel;
+        ? messages.chartCostSupplementaryLegendNoDataLabel
+        : messages.chartCostLegendNoDataLabel;
 
     // Show all legends, regardless of length -- https://github.com/project-koku/koku-ui/issues/248
 

diff --git a/src/routes/components/charts/trendChart/trendChart.tsx b/src/routes/components/charts/trendChart/trendChart.tsx
@@ -107,20 +107,20 @@ class TrendChartBase extends React.Component<TrendChartProps, State> {
     const key = showUsageLegendLabel
       ? messages.chartUsageLegendLabel
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendLabel
-      : messages.chartCostLegendLabel;
+        ? messages.chartCostSupplementaryLegendLabel
+        : messages.chartCostLegendLabel;
 
     const tooltipKey = showUsageLegendLabel
       ? messages.chartUsageLegendTooltip
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendTooltip
-      : messages.chartCostLegendTooltip;
+        ? messages.chartCostSupplementaryLegendTooltip
+        : messages.chartCostLegendTooltip;
 
     const noDataKey = showUsageLegendLabel
       ? messages.chartUsageLegendNoDataLabel
       : showSupplementaryLabel
-      ? messages.chartCostSupplementaryLegendNoDataLabel
-      : messages.chartCostLegendNoDataLabel;
+        ? messages.chartCostSupplementaryLegendNoDataLabel
+        : messages.chartCostLegendNoDataLabel;
 
     // Show all legends, regardless of length -- https://github.com/project-koku/koku-ui/issues/248
 

diff --git a/src/routes/components/dataToolbar/utils/category.tsx b/src/routes/components/dataToolbar/utils/category.tsx
@@ -149,8 +149,8 @@ export const onCategoryInput = ({
         newFilters && newFilters.find(item => item.value === val)
           ? newFilters
           : newFilters
-          ? [...newFilters, filter]
-          : [filter],
+            ? [...newFilters, filter]
+            : [filter],
     },
   };
 };
@@ -185,8 +185,8 @@ export const onCategoryInputSelect = ({
         newFilters && newFilters.find(item => item.value === val)
           ? newFilters
           : newFilters
-          ? [...newFilters, filter]
-          : [filter],
+            ? [...newFilters, filter]
+            : [filter],
     },
   };
 };

diff --git a/src/routes/components/dataToolbar/utils/common.ts b/src/routes/components/dataToolbar/utils/common.ts
@@ -82,8 +82,8 @@ export const getChips = (filters: Filter[]): string[] => {
         node: label
           ? label
           : item.isExcludes
-          ? intl.formatMessage(messages.excludeLabel, { value: item.value })
-          : item.value,
+            ? intl.formatMessage(messages.excludeLabel, { value: item.value })
+            : item.value,
       });
     });
   }

diff --git a/src/routes/details/awsDetails/awsDetails.tsx b/src/routes/details/awsDetails/awsDetails.tsx
@@ -170,8 +170,8 @@ class AwsDetails extends React.Component<AwsDetailsProps, AwsDetailsState> {
           groupByCostCategory
             ? `${awsCategoryPrefix}${groupByCostCategory}`
             : groupByTagKey
-            ? `${tagPrefix}${groupByTagKey}`
-            : groupById
+              ? `${tagPrefix}${groupByTagKey}`
+              : groupById
         }
         isOpen={isExportModalOpen}
         items={items}
@@ -229,8 +229,8 @@ class AwsDetails extends React.Component<AwsDetailsProps, AwsDetailsState> {
           groupByCostCategory
             ? `${awsCategoryPrefix}${groupByCostCategory}`
             : groupByTagKey
-            ? `${tagPrefix}${groupByTagKey}`
-            : groupById
+              ? `${tagPrefix}${groupByTagKey}`
+              : groupById
         }
         groupByCostCategory={groupByCostCategory}
         groupByTagKey={groupByTagKey}
@@ -264,8 +264,8 @@ class AwsDetails extends React.Component<AwsDetailsProps, AwsDetailsState> {
           groupByCostCategory
             ? `${awsCategoryPrefix}${groupByCostCategory}`
             : groupByTagKey
-            ? `${tagPrefix}${groupByTagKey}`
-            : groupById
+              ? `${tagPrefix}${groupByTagKey}`
+              : groupById
         }
         isAllSelected={isAllSelected}
         isDisabled={isDisabled}

diff --git a/src/routes/details/awsDetails/detailsTable.tsx b/src/routes/details/awsDetails/detailsTable.tsx
@@ -94,10 +94,10 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
       idKey: (groupByCostCategory
         ? groupByCostCategory
         : groupByTagKey
-        ? groupByTagKey
-        : groupByOrg
-        ? 'org_entities'
-        : groupBy) as any,
+          ? groupByTagKey
+          : groupByOrg
+            ? 'org_entities'
+            : groupBy) as any,
     });
 
     const columns =
@@ -110,8 +110,8 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
               name: groupByCostCategory
                 ? intl.formatMessage(messages.costCategoryNames)
                 : groupByOrg
-                ? intl.formatMessage(messages.names, { count: 2 })
-                : intl.formatMessage(messages.tagNames),
+                  ? intl.formatMessage(messages.names, { count: 2 })
+                  : intl.formatMessage(messages.tagNames),
             },
             {
               name: intl.formatMessage(messages.monthOverMonthChange),

diff --git a/src/routes/details/components/breakdown/breakdownHeader.tsx b/src/routes/details/components/breakdown/breakdownHeader.tsx
@@ -123,12 +123,12 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
     const groupByKey = filterByAccount
       ? 'account'
       : groupByCostCategory
-      ? awsCategoryKey
-      : groupByTag
-      ? tagKey
-      : groupByOrg
-      ? orgUnitIdKey
-      : groupBy;
+        ? awsCategoryKey
+        : groupByTag
+          ? tagKey
+          : groupByOrg
+            ? orgUnitIdKey
+            : groupBy;
 
     return (
       <header style={styles.header}>

diff --git a/src/routes/explorer/explorer.tsx b/src/routes/explorer/explorer.tsx
@@ -169,10 +169,10 @@ class Explorer extends React.Component<ExplorerProps, ExplorerState> {
       idKey: groupByCostCategory
         ? groupByCostCategory
         : groupByTagKey
-        ? groupByTagKey
-        : groupByOrg
-        ? 'org_entities'
-        : groupById,
+          ? groupByTagKey
+          : groupByOrg
+            ? 'org_entities'
+            : groupById,
       isDateMap: false, // Don't use isDateMap here, so we can use a flattened data structure with row selection
     });
     return computedItems;
@@ -205,8 +205,8 @@ class Explorer extends React.Component<ExplorerProps, ExplorerState> {
           groupByCostCategory
             ? `${awsCategoryPrefix}${groupByCostCategory}`
             : groupByTagKey
-            ? `${tagPrefix}${groupByTagKey}`
-            : groupById
+              ? `${tagPrefix}${groupByTagKey}`
+              : groupById
         }
         isOpen={isExportModalOpen}
         items={items}
@@ -264,8 +264,8 @@ class Explorer extends React.Component<ExplorerProps, ExplorerState> {
           groupByCostCategory
             ? `${awsCategoryPrefix}${groupByCostCategory}`
             : groupByTagKey
-            ? `${tagPrefix}${groupByTagKey}`
-            : groupById
+              ? `${tagPrefix}${groupByTagKey}`
+              : groupById
         }
         groupByCostCategory={groupByCostCategory}
         groupByTagKey={groupByTagKey}
@@ -512,8 +512,8 @@ class Explorer extends React.Component<ExplorerProps, ExplorerState> {
             groupByCostCategory
               ? `${awsCategoryPrefix}${groupByCostCategory}`
               : groupByTagKey
-              ? `${tagPrefix}${groupByTagKey}`
-              : groupById
+                ? `${tagPrefix}${groupByTagKey}`
+                : groupById
           }
           onCostDistributionSelected={() => handleOnCostDistributionSelected(query, router)}
           onCostTypeSelected={() => handleOnCostTypeSelected(query, router)}
@@ -537,8 +537,8 @@ class Explorer extends React.Component<ExplorerProps, ExplorerState> {
                   groupByCostCategory
                     ? `${awsCategoryPrefix}${groupByCostCategory}`
                     : groupByTagKey
-                    ? `${tagPrefix}${groupByTagKey}`
-                    : groupById
+                      ? `${tagPrefix}${groupByTagKey}`
+                      : groupById
                 }
                 perspective={perspective}
               />

diff --git a/src/routes/explorer/explorerChart.tsx b/src/routes/explorer/explorerChart.tsx
@@ -185,10 +185,10 @@ class ExplorerChartBase extends React.Component<ExplorerChartProps, ExplorerChar
     return groupByCostCategory
       ? groupByCostCategory
       : groupByTagKey
-      ? groupByTagKey
-      : groupByOrg
-      ? 'org_entities'
-      : groupById;
+        ? groupByTagKey
+        : groupByOrg
+          ? 'org_entities'
+          : groupById;
   };
 
   private getSkeleton = () => {