Merge pull request #2741 from dlabrecq/3283-category-filter

Refactor platform costs to use category filter
project-koku · Dec 1, 2022 · 1d5e3f6 · 1d5e3f6
2 parents e9a6dcf + ab0310c
commit 1d5e3f6
Show file tree

Hide file tree

Showing 15 changed files with 1,155 additions and 22,676 deletions.
diff --git a/locales/data.json b/locales/data.json
diff --git a/src/api/queries/query.ts b/src/api/queries/query.ts
@@ -15,6 +15,7 @@ export const unallocatedPlatformCapacity = 'Platform Unallocated Capacity'; // U
 export const unallocatedWorkersCapacity = 'Workers Unallocated Capacity'; // Unallocated workers costs
 
 export interface Filters {
+  category?: string;
   limit?: number;
   offset?: number;
   resolution?: 'daily' | 'monthly';

diff --git a/src/routes/views/details/components/breakdown/breakdownHeader.tsx b/src/routes/views/details/components/breakdown/breakdownHeader.tsx
@@ -72,6 +72,7 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps> {
     // Don't want these params when returning to the details page
     if (newQuery.filter) {
       newQuery.filter.account = undefined;
+      newQuery.filter.category = undefined;
       newQuery[breakdownDescKey] = undefined;
       newQuery[orgUnitIdKey] = undefined;
       newQuery[breakdownTitleKey] = undefined;

diff --git a/src/routes/views/details/components/historicalData/historicalDataCostChart.tsx b/src/routes/views/details/components/historicalData/historicalDataCostChart.tsx
@@ -152,6 +152,7 @@ const mapStateToProps = createMapStateToProps<HistoricalDataCostChartOwnProps, H
       filter_by: {
         // Add filters here to apply logical OR/AND
         ...(queryFromRoute && queryFromRoute.filter_by && queryFromRoute.filter_by),
+        ...(queryFromRoute && queryFromRoute.filter && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
       },
       exclude: {

diff --git a/src/routes/views/details/components/historicalData/historicalDataTrendChart.tsx b/src/routes/views/details/components/historicalData/historicalDataTrendChart.tsx
@@ -171,6 +171,9 @@ const mapStateToProps = createMapStateToProps<HistoricalDataTrendChartOwnProps,
         ...(queryFromRoute &&
           queryFromRoute.filter &&
           queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+        ...(queryFromRoute &&
+          queryFromRoute.filter &&
+          queryFromRoute.filter.category && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
       },
       exclude: {

diff --git a/src/routes/views/details/components/historicalData/historicalDataUsageChart.tsx b/src/routes/views/details/components/historicalData/historicalDataUsageChart.tsx
@@ -138,6 +138,9 @@ const mapStateToProps = createMapStateToProps<HistoricalDataUsageChartOwnProps,
         ...(queryFromRoute &&
           queryFromRoute.filter &&
           queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+        ...(queryFromRoute &&
+          queryFromRoute.filter &&
+          queryFromRoute.filter.category && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
         ...(groupByOrgValue && useFilter && { [orgUnitIdKey]: groupByOrgValue }),
       },

diff --git a/src/routes/views/details/components/summary/summaryCard.tsx b/src/routes/views/details/components/summary/summaryCard.tsx
@@ -211,6 +211,9 @@ const mapStateToProps = createMapStateToProps<SummaryOwnProps, SummaryStateProps
         ...(queryFromRoute &&
           queryFromRoute.filter &&
           queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+        ...(queryFromRoute &&
+          queryFromRoute.filter &&
+          queryFromRoute.filter.category && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
         ...(groupBy && { [groupBy]: groupByValue }), // group bys must appear in filter to show costs by region, account, etc
       },

diff --git a/src/routes/views/details/components/summary/summaryModalContent.tsx b/src/routes/views/details/components/summary/summaryModalContent.tsx
@@ -114,6 +114,9 @@ const mapStateToProps = createMapStateToProps<SummaryModalContentOwnProps, Summa
         ...(queryFromRoute &&
           queryFromRoute.filter &&
           queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+        ...(queryFromRoute &&
+          queryFromRoute.filter &&
+          queryFromRoute.filter.category && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
         ...(groupBy && { [groupBy]: groupByValue }), // group bys must appear in filter to show costs by regions, accounts, etc
       },

diff --git a/src/routes/views/details/components/tag/tagLink.tsx b/src/routes/views/details/components/tag/tagLink.tsx
@@ -131,6 +131,8 @@ const mapStateToProps = createMapStateToProps<TagLinkOwnProps, TagLinkStateProps
       ...(queryFromRoute &&
         queryFromRoute.filter &&
         queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+      // Todo: enable when tags API is ready
+      // ...(queryFromRoute && queryFromRoute.filter && queryFromRoute.filter.category &&  { category: queryFromRoute.filter.category }),
       ...(groupBy && groupBy.indexOf(tagPrefix) === -1 && { [groupBy]: groupByValue }), // Note: Cannot use group_by with tags
     },
   };

diff --git a/src/routes/views/details/components/tag/tagModal.tsx b/src/routes/views/details/components/tag/tagModal.tsx
@@ -130,6 +130,8 @@ const mapStateToProps = createMapStateToProps<TagModalOwnProps, TagModalStatePro
       ...(queryFromRoute &&
         queryFromRoute.filter &&
         queryFromRoute.filter.account && { [`${logicalAndPrefix}account`]: queryFromRoute.filter.account }),
+      // Todo: enable when tags API is ready
+      // ...(queryFromRoute && queryFromRoute.filter && queryFromRoute.filter.category &&  { category: queryFromRoute.filter.category }),
       ...(groupBy && groupBy.indexOf(tagPrefix) === -1 && { [groupBy]: groupByValue }), // Note: Cannot use group_by with tags
     },
   };

diff --git a/src/routes/views/details/components/usageChart/usageChart.tsx b/src/routes/views/details/components/usageChart/usageChart.tsx
@@ -384,6 +384,7 @@ const mapStateToProps = createMapStateToProps<UsageChartOwnProps, UsageChartStat
       filter_by: {
         // Add filters here to apply logical OR/AND
         ...(queryFromRoute && queryFromRoute.filter_by && queryFromRoute.filter_by),
+        ...(queryFromRoute && queryFromRoute.filter && { category: queryFromRoute.filter.category }),
         ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
       },
       exclude: {

diff --git a/src/routes/views/details/ocpBreakdown/ocpBreakdown.tsx b/src/routes/views/details/ocpBreakdown/ocpBreakdown.tsx
@@ -67,6 +67,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, OcpBreakdown
     filter_by: {
       // Add filters here to apply logical OR/AND
       ...(queryFromRoute && queryFromRoute.filter_by && queryFromRoute.filter_by),
+      ...(queryFromRoute && queryFromRoute.filter && { category: queryFromRoute.filter.category }),
       ...(groupBy && { [groupBy]: undefined }), // Omit filters associated with the current group_by -- see https://issues.redhat.com/browse/COST-1131
     },
     exclude: {
@@ -81,6 +82,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, OcpBreakdown
   const reportQueryString = getQuery({
     ...newQuery,
     currency,
+    category: undefined,
   });
   const report = reportSelectors.selectReport(state, reportPathsType, reportType, reportQueryString);
   const reportError = reportSelectors.selectReportError(state, reportPathsType, reportType, reportQueryString);

diff --git a/src/routes/views/details/ocpDetails/detailsTable.tsx b/src/routes/views/details/ocpDetails/detailsTable.tsx
@@ -182,7 +182,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
         item.label === unallocatedPlatformCapacity || item.label === unallocatedWorkersCapacity;
       const desc = item.id && item.id !== item.label ? <div style={styles.infoDescription}>{item.id}</div> : null;
       const isDisabled = label === `no-${groupBy}` || label === `no-${groupByTagKey}` || isUnallocatedCosts;
-      const actions = this.getActions(item, isDisabled || isPlatformCosts);
+      const actions = this.getActions(item, isDisabled);
 
       const name = isDisabled ? (
         (label as any)
@@ -231,7 +231,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps> {
         ],
         item,
         selected: isAllSelected || (selectedItems && selectedItems.find(val => val.id === item.id) !== undefined),
-        selectionDisabled: isDisabled || isPlatformCosts,
+        selectionDisabled: isDisabled,
       });
     });
 

diff --git a/src/routes/views/utils/paths.ts b/src/routes/views/utils/paths.ts
@@ -22,14 +22,15 @@ export const getBreakdownPath = ({
     ...(description && description !== label && { [breakdownDescKey]: description }),
     ...(isPlatformCosts && { [breakdownTitleKey]: label }),
     group_by: {
-      [groupBy]: label,
+      [groupBy]: isPlatformCosts ? '*' : label,
     },
-    ...(isPlatformCosts && {
-      group_by: {
-        [groupBy]: ['kube-', 'openshift-'],
-      },
-    }),
   };
+  if (isPlatformCosts) {
+    if (!newQuery.filter) {
+      newQuery.filter = {};
+    }
+    newQuery.filter.category = platformCategory;
+  }
   return `${basePath}?${getQueryRoute(newQuery)}`;
 };
 
@@ -77,13 +78,5 @@ export const getOrgBreakdownPath = ({
 };
 
 export const isPlatformCosts = (queryFromRoute: Query) => {
-  let result = false;
-
-  // Note that "kube-" and "openshift-" are provided only when users select the 'platform' project.
-  // The category below is mainly used to restore state for the previous page
-  if (Array.isArray(queryFromRoute.group_by.project)) {
-    result =
-      queryFromRoute.group_by.project.includes('kube-') && queryFromRoute.group_by.project.includes('openshift-');
-  }
-  return result && queryFromRoute.category === platformCategory;
+  return queryFromRoute.filter.category === platformCategory;
 };
diff --git a/src/utils/computedReport/getComputedReportItems.ts b/src/utils/computedReport/getComputedReportItems.ts
@@ -72,7 +72,7 @@ export function getComputedReportItems<R extends Report, T extends ReportItem>({
   );
 }
 
-// For multiple group_by's (platform costs; 'kube-' and 'openshift-'), all clusters are listed in the breakdown page
+// For filter[categpry]=platform, all clusters are listed in the breakdown page
 function getClusters(val, item?: any) {
   const clusters = val.clusters ? val.clusters : [];
   if (item && item.clusters) {