FLPATH-2732 | project filtering (#1771)

Author: asmasarw

workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization-common/src/clients/optimizations/OptimizationsClient.ts

@@ -190,6 +190,112 @@ export class OptimizationsClient implements OptimizationsApi {
     return response;
   }
 
+  /**
+   * Search OpenShift projects
+   * @param search - Search term to filter projects
+   */
+  public async searchOpenShiftProjects(
+    search: string = '',
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  > {
+    const baseUrl = await this.discoveryApi.getBaseUrl('proxy');
+    const searchParam = search ? `?search=${encodeURIComponent(search)}` : '';
+    const url = `${baseUrl}/cost-management/v1/resource-types/openshift-projects/${searchParam}`;
+
+    return await this.fetchResourceType(url);
+  }
+
+  /**
+   * Search OpenShift clusters
+   * @param search - Search term to filter clusters
+   */
+  public async searchOpenShiftClusters(
+    search: string = '',
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  > {
+    const baseUrl = await this.discoveryApi.getBaseUrl('proxy');
+    const searchParam = search ? `?search=${encodeURIComponent(search)}` : '';
+    const url = `${baseUrl}/cost-management/v1/resource-types/openshift-clusters/${searchParam}`;
+
+    return await this.fetchResourceType(url);
+  }
+
+  /**
+   * Search OpenShift nodes
+   * @param search - Search term to filter nodes
+   */
+  public async searchOpenShiftNodes(
+    search: string = '',
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  > {
+    const baseUrl = await this.discoveryApi.getBaseUrl('proxy');
+    const searchParam = search ? `?search=${encodeURIComponent(search)}` : '';
+    const url = `${baseUrl}/cost-management/v1/resource-types/openshift-nodes/${searchParam}`;
+
+    return await this.fetchResourceType(url);
+  }
+
+  private async fetchResourceType(
+    url: string,
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  > {
+    // Get access permission
+    const accessAPIResponse = await this.getAccess();
+
+    if (accessAPIResponse.decision === AuthorizeResult.DENY) {
+      throw new UnauthorizedError();
+    }
+
+    // Get or refresh token
+    if (!this.token) {
+      const { accessToken } = await this.getNewToken();
+      this.token = accessToken;
+    }
+
+    // Call the API via backend proxy
+    let response = await this.fetchApi.fetch(url, {
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${this.token}`,
+      },
+      method: 'GET',
+    });
+
+    // Handle 401 errors by refreshing token and retrying
+    if (!response.ok && response.status === 401) {
+      const { accessToken } = await this.getNewToken();
+      this.token = accessToken;
+
+      response = await this.fetchApi.fetch(url, {
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${this.token}`,
+        },
+        method: 'GET',
+      });
+    }
+
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+
+    return {
+      ...response,
+      json: async () => {
+        const data = await response.json();
+        return data as {
+          data: Array<{ value: string }>;
+          meta?: any;
+          links?: any;
+        };
+      },
+    };
+  }
+
   private async getAccess(): Promise<GetAccessResponse> {
     const baseUrl = await this.discoveryApi.getBaseUrl(`${pluginId}`);
     const response = await this.fetchApi.fetch(`${baseUrl}/access`);

workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization-common/src/clients/optimizations/types.ts

@@ -15,12 +15,29 @@
  */
 
 import { DefaultApiClient } from '../../generated/apis/DefaultApi.client';
+import type { TypedResponse } from '../../generated/apis/DefaultApi.client';
 
 /** @public */
 export type OptimizationsApi = Omit<
   InstanceType<typeof DefaultApiClient>,
   'fetchApi' | 'discoveryApi'
->;
+> & {
+  searchOpenShiftProjects(
+    search?: string,
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  >;
+  searchOpenShiftClusters(
+    search?: string,
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  >;
+  searchOpenShiftNodes(
+    search?: string,
+  ): Promise<
+    TypedResponse<{ data: Array<{ value: string }>; meta?: any; links?: any }>
+  >;
+};
 
 /** @public */
 export type GetCostManagementRequest = Parameters<

workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization-common/src/clients/types/cost-management.ts

@@ -14,6 +14,40 @@
  * limitations under the License.
  */
 
+/** @public */
+export type CurrencyCode =
+  | 'USD'
+  | 'EUR'
+  | 'GBP'
+  | 'JPY'
+  | 'AUD'
+  | 'CAD'
+  | 'CHF'
+  | 'CNY'
+  | 'INR'
+  | 'MXN'
+  | 'NZD'
+  | 'SEK'
+  | 'SGD'
+  | 'HKD'
+  | 'TWD'
+  | 'THB'
+  | 'RUB'
+  | 'BRL'
+  | 'ZAR'
+  | 'PLN'
+  | 'KRW'
+  | 'TRY'
+  | 'IDR'
+  | 'MYR'
+  | 'PHP'
+  | 'VND'
+  | 'HUF'
+  | 'CZK'
+  | 'NOK'
+  | 'DKK'
+  | 'NGN';
+
 /** @public */
 export interface CostValue {
   value: number;
@@ -40,7 +74,10 @@ export interface DistributedCost extends BasicCost {
 /** @public */
 export interface ProjectValue {
   date: string;
-  project: string;
+  project?: string;
+  cluster?: string;
+  node?: string;
+  tag?: string;
   cost_group: number | string;
   classification: string;
   source_uuid: string[];
@@ -54,14 +91,36 @@ export interface ProjectValue {
 
 /** @public */
 export interface Project {
-  project: string;
+  project?: string;
+  values: ProjectValue[];
+}
+
+/** @public */
+export interface Cluster {
+  cluster: string;
+  values: ProjectValue[];
+}
+
+/** @public */
+export interface Node {
+  node: string;
+  values: ProjectValue[];
+}
+
+/** @public */
+export interface Tag {
+  tag: string;
   values: ProjectValue[];
 }
 
 /** @public */
 export interface DateData {
   date: string;
-  projects: Project[];
+  projects?: Project[];
+  clusters?: Cluster[];
+  nodes?: Node[];
+  tags?: Tag[];
+  [key: string]: unknown;
 }
 
 /** @public */
@@ -109,7 +168,7 @@ export interface CostManagementReport {
 /** @public */
 export interface GetCostManagementRequest {
   query: {
-    currency?: 'USD' | 'EUR' | 'GBP';
+    currency?: CurrencyCode;
     delta?: string;
     'filter[limit]'?: number;
     'filter[offset]'?: number;

workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization-common/src/generated/apis/DefaultApi.client.ts

@@ -25,7 +25,10 @@ import * as parser from 'uri-template';
 
 import { RecommendationBoxPlots } from '../models/RecommendationBoxPlots.model';
 import { RecommendationList } from '../models/RecommendationList.model';
-import type { CostManagementReport } from '../../clients/types/cost-management';
+import type {
+  CostManagementReport,
+  CurrencyCode,
+} from '../../clients/types/cost-management';
 
 /**
  * Wraps the Response type to convey a type on the json call.
@@ -158,7 +161,7 @@ export class DefaultApiClient {
 
   /**
    * Get cost management report for OpenShift projects
-   * @param currency - Currency preference (USD, EUR, GBP)
+   * @param currency - Currency preference (USD, EUR, GBP, JPY, AUD, CAD, CHF, CNY, INR, MXN, NZD, SEK, SGD, HKD, TWD, THB, RUB, BRL, ZAR, PLN, KRW, TRY, IDR, MYR, PHP, VND, HUF, CZK, NOK, DKK, NGN)
    * @param delta - Delta calculation method
    * @param filter - Filter parameters
    * @param group_by - Group by parameters
@@ -167,17 +170,22 @@ export class DefaultApiClient {
   public async getCostManagementReport(
     request: {
       query: {
-        currency?: 'USD' | 'EUR' | 'GBP';
+        currency?: CurrencyCode;
         delta?: string;
         'filter[limit]'?: number;
         'filter[offset]'?: number;
         'filter[resolution]'?: 'daily' | 'monthly';
         'filter[time_scope_units]'?: 'day' | 'month';
         'filter[time_scope_value]'?: number;
         'group_by[project]'?: '*' | string;
+        'group_by[cluster]'?: '*' | string;
+        'group_by[node]'?: '*' | string;
+        'group_by[tag]'?: '*' | string;
+        'order_by[cost]'?: 'asc' | 'desc';
         'order_by[distributed_cost]'?: 'asc' | 'desc';
         'order_by[markup_cost]'?: 'asc' | 'desc';
         'order_by[raw_cost]'?: 'asc' | 'desc';
+        [key: string]: string | number | undefined;
       };
     },
     options?: RequestOptions,
@@ -224,30 +232,47 @@ export class DefaultApiClient {
         String(request.query['filter[time_scope_value]']),
       );
     }
-    if (request.query['group_by[project]']) {
-      queryParams.append(
-        'group_by[project]',
-        request.query['group_by[project]'],
-      );
-    }
-    if (request.query['order_by[distributed_cost]']) {
-      queryParams.append(
-        'order_by[distributed_cost]',
-        request.query['order_by[distributed_cost]'],
-      );
-    }
-    if (request.query['order_by[markup_cost]']) {
-      queryParams.append(
-        'order_by[markup_cost]',
-        request.query['order_by[markup_cost]'],
-      );
-    }
-    if (request.query['order_by[raw_cost]']) {
-      queryParams.append(
-        'order_by[raw_cost]',
-        request.query['order_by[raw_cost]'],
-      );
-    }
+    // Handle dynamic group_by parameters (project, cluster, node, tag, etc.)
+    Object.keys(request.query).forEach(key => {
+      if (key.startsWith('group_by[') && key.endsWith(']')) {
+        const value = request.query[key as keyof typeof request.query];
+        if (value) {
+          queryParams.append(key, String(value));
+        }
+      }
+    });
+
+    // Handle dynamic order_by parameters (cost, distributed_cost, raw_cost, etc.)
+    Object.keys(request.query).forEach(key => {
+      if (key.startsWith('order_by[') && key.endsWith(']')) {
+        const value = request.query[key as keyof typeof request.query];
+        if (value) {
+          queryParams.append(key, String(value));
+        }
+      }
+    });
+
+    // Handle dynamic filter parameters (filter[project], filter[cluster], filter[node], etc.)
+    // Skip the ones already handled explicitly above (limit, offset, resolution, time_scope_units, time_scope_value)
+    const handledFilterKeys = [
+      'filter[limit]',
+      'filter[offset]',
+      'filter[resolution]',
+      'filter[time_scope_units]',
+      'filter[time_scope_value]',
+    ];
+    Object.keys(request.query).forEach(key => {
+      if (
+        key.startsWith('filter[') &&
+        key.endsWith(']') &&
+        !handledFilterKeys.includes(key)
+      ) {
+        const value = request.query[key as keyof typeof request.query];
+        if (value) {
+          queryParams.append(key, String(value));
+        }
+      }
+    });
 
     const queryString = queryParams.toString();
     const url = `${baseUrl}${uri}${queryString ? `?${queryString}` : ''}`;