Merge pull request #4062 from dlabrecq/cost-5596

Improve resource type search in Cost explorer

Author: dlabrecq

src/api/resources/awsOcpResource.test.ts

@@ -5,5 +5,5 @@ import { ResourceType } from './resource';
 
 test('runExport API request for OCP on AWS', () => {
   runResource(ResourceType.account, '');
-  expect(axiosInstance.get).toBeCalledWith('resource-types/aws-accounts/');
+  expect(axiosInstance.get).toBeCalledWith('resource-types/aws-accounts/?openshift=true');
 });

src/api/resources/awsOcpResource.ts

@@ -15,6 +15,6 @@ export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
 
 export function runResource(resourceType: ResourceType, query: string) {
   const path = ResourceTypePaths[resourceType];
-  const queryString = query ? `?${query}` : '';
+  const queryString = query ? `?openshift=true;${query}` : '?openshift=true';
   return axiosInstance.get<Resource>(`${path}${queryString}`);
 }

src/routes/components/resourceTypeahead/resourceInput.tsx

@@ -64,6 +64,7 @@ const ResourceInput: React.FC<ResourceInputProps> = ({
             onChange={onChange}
             onFocus={() => setIsOpen(true)}
             onKeyDown={handleOnTextInputKeyDown}
+            onBlur={onClear}
             placeholder={placeholder}
           />
           {search && search.length && (

src/routes/explorer/explorerFilter.tsx

@@ -130,6 +130,7 @@ export class ExplorerFilterBase extends React.Component<ExplorerFilterProps, Exp
       options.push({
         name: intl.formatMessage(messages.filterByValues, { value: option.label }),
         key: option.value,
+        resourceKey: option.resourceKey,
       });
     });
     if (orgReport?.data?.length > 0) {

src/routes/explorer/explorerToolbar.tsx

@@ -1,4 +1,3 @@
-import type { ToolbarChipGroup } from '@patternfly/react-core';
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
@@ -33,7 +32,7 @@ interface ExplorerToolbarDispatchProps {
 }
 
 interface ExplorerToolbarState {
-  categoryOptions?: ToolbarChipGroup[];
+  // TBD...
 }
 
 type ExplorerToolbarProps = ExplorerToolbarOwnProps &

src/routes/explorer/explorerUtils.ts

@@ -56,8 +56,9 @@ export const baseQuery: Query = {
 export const groupByAwsOptions: {
   label: string;
   value: ComputedAwsReportItemsParams['idKey'];
+  resourceKey?: string;
 }[] = [
-  { label: 'account', value: 'account' },
+  { label: 'account', value: 'account', resourceKey: 'account_alias' },
   { label: 'service', value: 'service' },
   { label: 'region', value: 'region' },
 ];