Fix Sonar issues - PR-1954 (#1955)

Author: asmasarw

workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization/src/pages/openshift/OpenShiftPage.tsx

@@ -83,6 +83,130 @@ function getDateRangeText(timeRange: string): string {
   return `${monthName} 1-${lastDay}`;
 }
 
+/**
+ * Configuration for building query parameters
+ */
+interface QueryParamsConfig {
+  groupBy: string;
+  selectedTag: string;
+  overheadDistribution: string;
+  timeRange: string;
+  currency: string;
+  showPlatformSum: boolean;
+  filterBy: string;
+  filterValue: string;
+  filterOperation: string;
+  selectedTagKey: string;
+  selectedTagValue: string;
+  sortField: string | null;
+  sortDirection: 'asc' | 'desc';
+}
+
+/**
+ * Options for building query parameters
+ */
+interface BuildQueryParamsOptions {
+  /** Pagination limit - omit for download (uses 0) */
+  limit?: number;
+  /** Pagination offset - omit for download */
+  offset?: number;
+  /** Specific item name to filter by (for row-level download) */
+  specificItemName?: string;
+}
+
+/**
+ * Builds query parameters for cost management API requests
+ * Shared between data fetching and download functionality
+ */
+function buildCostManagementQueryParams(
+  config: QueryParamsConfig,
+  options: BuildQueryParamsOptions = {},
+): Record<string, string | number> {
+  const {
+    groupBy,
+    selectedTag,
+    overheadDistribution,
+    timeRange,
+    currency,
+    showPlatformSum,
+    filterBy,
+    filterValue,
+    filterOperation,
+    selectedTagKey,
+    selectedTagValue,
+    sortField,
+    sortDirection,
+  } = config;
+
+  const { limit, offset, specificItemName } = options;
+
+  // Build group by parameter
+  const groupByParam =
+    groupBy === 'tag' ? `group_by[tag:${selectedTag}]` : `group_by[${groupBy}]`;
+
+  // Determine delta parameter
+  const deltaParam =
+    groupBy === 'project' && overheadDistribution === 'distribute'
+      ? 'distributed_cost'
+      : 'cost';
+
+  const timeScopeValue = timeRange === 'month-to-date' ? -1 : -2;
+
+  const queryParams: Record<string, string | number> = {
+    currency,
+    delta: deltaParam,
+    'filter[resolution]': 'monthly',
+    'filter[time_scope_units]': 'month',
+    'filter[time_scope_value]': timeScopeValue,
+  };
+
+  // Add pagination if provided
+  if (limit !== undefined) {
+    queryParams['filter[limit]'] = limit;
+  }
+  if (offset !== undefined) {
+    queryParams['filter[offset]'] = offset;
+  }
+
+  // Add category parameter when showPlatformSum is enabled
+  if (showPlatformSum) {
+    queryParams.category = 'Platform';
+  }
+
+  queryParams[groupByParam] = '*';
+
+  // Handle filtering
+  if (specificItemName) {
+    // Filter for specific item (row-level download)
+    queryParams[`filter[${groupBy}]`] = specificItemName;
+  } else if (filterBy === 'tag' && selectedTagKey && selectedTagValue) {
+    // Tag filtering
+    const filterPrefix = filterOperation === 'excludes' ? 'exclude' : 'filter';
+    queryParams[`${filterPrefix}[tag:${selectedTagKey}]`] = selectedTagValue;
+  } else if (filterValue) {
+    // Regular filtering
+    const filterPrefix = filterOperation === 'excludes' ? 'exclude' : 'filter';
+    queryParams[`${filterPrefix}[${filterBy}]`] = filterValue;
+  }
+
+  // Add sorting
+  let apiSortField: string;
+  if (sortField) {
+    if (sortField === 'cost') {
+      apiSortField = deltaParam;
+    } else if (sortField === 'projectName') {
+      apiSortField = groupBy;
+    } else {
+      apiSortField = deltaParam;
+    }
+    queryParams[`order_by[${apiSortField}]`] = sortDirection;
+  } else {
+    queryParams[`order_by[${deltaParam}]`] = 'desc';
+  }
+
+  return queryParams;
+}
+
 /** @public */
 export function OpenShiftPage() {
   const api = useApi(optimizationsApiRef);
@@ -128,6 +252,40 @@ export function OpenShiftPage() {
     }
   }, [api, timeRange]);
 
+  // Build config object for query params builder (memoized to prevent unnecessary re-renders)
+  const queryParamsConfig: QueryParamsConfig = useMemo(
+    () => ({
+      groupBy,
+      selectedTag,
+      overheadDistribution,
+      timeRange,
+      currency,
+      showPlatformSum,
+      filterBy,
+      filterValue,
+      filterOperation,
+      selectedTagKey,
+      selectedTagValue,
+      sortField,
+      sortDirection,
+    }),
+    [
+      groupBy,
+      selectedTag,
+      overheadDistribution,
+      timeRange,
+      currency,
+      showPlatformSum,
+      filterBy,
+      filterValue,
+      filterOperation,
+      selectedTagKey,
+      selectedTagValue,
+      sortField,
+      sortDirection,
+    ],
+  );
+
   const {
     value: costData,
     loading,
@@ -139,71 +297,11 @@ export function OpenShiftPage() {
     }
 
     try {
-      let groupByParam: string;
-      if (groupBy === 'tag') {
-        groupByParam = `group_by[tag:${selectedTag}]`;
-      } else {
-        groupByParam = `group_by[${groupBy}]`;
-      }
-
-      let deltaParam = 'cost';
-      if (groupBy === 'project' && overheadDistribution === 'distribute') {
-        deltaParam = 'distributed_cost';
-      }
-
-      const timeScopeValue = timeRange === 'month-to-date' ? -1 : -2;
-      const timeScopeUnits = 'month';
-
       const offset = currentPage * pageSize;
-      const queryParams: Record<string, string | number> = {
-        currency,
-        delta: deltaParam,
-        'filter[limit]': pageSize,
-        'filter[offset]': offset,
-        'filter[resolution]': 'monthly',
-        'filter[time_scope_units]': timeScopeUnits,
-        'filter[time_scope_value]': timeScopeValue,
-      };
-
-      // Add category parameter when showPlatformSum is enabled
-      if (showPlatformSum) {
-        queryParams.category = 'Platform';
-      }
-
-      queryParams[groupByParam] = '*';
-
-      // Handle filtering based on operation (includes/excludes)
-      if (filterBy === 'tag' && selectedTagKey && selectedTagValue) {
-        // Tag filtering uses filter[tag:key] or exclude[tag:key]
-        if (filterOperation === 'excludes') {
-          queryParams[`exclude[tag:${selectedTagKey}]`] = selectedTagValue;
-        } else {
-          queryParams[`filter[tag:${selectedTagKey}]`] = selectedTagValue;
-        }
-      } else if (filterValue) {
-        // Regular filtering uses filter[field] or exclude[field]
-        if (filterOperation === 'excludes') {
-          queryParams[`exclude[${filterBy}]`] = filterValue;
-        } else {
-          queryParams[`filter[${filterBy}]`] = filterValue;
-        }
-      }
-
-      if (sortField) {
-        let apiSortField: string;
-        if (sortField === 'cost') {
-          apiSortField = deltaParam;
-        } else if (sortField === 'projectName') {
-          apiSortField = groupBy;
-        } else {
-          apiSortField = deltaParam;
-        }
-        const orderByParam = `order_by[${apiSortField}]`;
-        queryParams[orderByParam] = sortDirection;
-      } else {
-        const orderByParam = `order_by[${deltaParam}]`;
-        queryParams[orderByParam] = 'desc';
-      }
+      const queryParams = buildCostManagementQueryParams(queryParamsConfig, {
+        limit: pageSize,
+        offset,
+      });
 
       const response = await api.getCostManagementReport({
         query: queryParams,
@@ -384,88 +482,11 @@ export function OpenShiftPage() {
    */
   const buildDownloadQueryParams = useCallback(
     (specificItemName?: string): Record<string, string | number> => {
-      let groupByParam: string;
-      if (groupBy === 'tag') {
-        groupByParam = `group_by[tag:${selectedTag}]`;
-      } else {
-        groupByParam = `group_by[${groupBy}]`;
-      }
-
-      let deltaParam = 'cost';
-      if (groupBy === 'project' && overheadDistribution === 'distribute') {
-        deltaParam = 'distributed_cost';
-      }
-
-      const timeScopeValue = timeRange === 'month-to-date' ? -1 : -2;
-      const timeScopeUnits = 'month';
-
-      const queryParams: Record<string, string | number> = {
-        currency,
-        delta: deltaParam,
-        'filter[resolution]': 'monthly',
-        'filter[time_scope_units]': timeScopeUnits,
-        'filter[time_scope_value]': timeScopeValue,
-      };
-
-      // Add category parameter when showPlatformSum is enabled
-      if (showPlatformSum) {
-        queryParams.category = 'Platform';
-      }
-
-      queryParams[groupByParam] = '*';
-
-      // If downloading a specific row, add filter for that item
-      if (specificItemName) {
-        queryParams[`filter[${groupBy}]`] = specificItemName;
-      } else {
-        // Apply current filters for header download (all data)
-        if (filterBy === 'tag' && selectedTagKey && selectedTagValue) {
-          if (filterOperation === 'excludes') {
-            queryParams[`exclude[tag:${selectedTagKey}]`] = selectedTagValue;
-          } else {
-            queryParams[`filter[tag:${selectedTagKey}]`] = selectedTagValue;
-          }
-        } else if (filterValue) {
-          if (filterOperation === 'excludes') {
-            queryParams[`exclude[${filterBy}]`] = filterValue;
-          } else {
-            queryParams[`filter[${filterBy}]`] = filterValue;
-          }
-        }
-      }
-
-      // Add sorting
-      if (sortField) {
-        let apiSortField: string;
-        if (sortField === 'cost') {
-          apiSortField = deltaParam;
-        } else if (sortField === 'projectName') {
-          apiSortField = groupBy;
-        } else {
-          apiSortField = deltaParam;
-        }
-        queryParams[`order_by[${apiSortField}]`] = sortDirection;
-      } else {
-        queryParams[`order_by[${deltaParam}]`] = 'desc';
-      }
-
-      return queryParams;
+      return buildCostManagementQueryParams(queryParamsConfig, {
+        specificItemName,
+      });
     },
-    [
-      groupBy,
-      selectedTag,
-      overheadDistribution,
-      timeRange,
-      currency,
-      showPlatformSum,
-      filterBy,
-      filterValue,
-      filterOperation,
-      selectedTagKey,
-      selectedTagValue,
-      sortField,
-      sortDirection,
-    ],
+    [queryParamsConfig],
   );
 
   /**