getAdvancedDataFromQuery
} from 'store/search-bar/search-bar-actions';
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
-import { joinFilters } from 'services/api/filter-builder';
+import { FilterBuilder, joinFilters } from 'services/api/filter-builder';
import { DataColumns } from 'components/data-table/data-table';
import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters';
import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
-import { Resource } from 'models/resource';
+import { ResourceKind } from 'models/resource';
+import { ContainerRequestResource } from 'models/container-request';
export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
.then((response) => {
api.dispatch(updateResources(response.items));
api.dispatch(appendItems(response));
+ // Request all containers for process status to be available
+ const containerRequests = response.items.filter((item) => item.kind === ResourceKind.CONTAINER_REQUEST) as ContainerRequestResource[];
+ const containerUuids = containerRequests.map(container => container.containerUuid).filter(uuid => uuid !== null) as string[];
+ containerUuids.length && this.services.containerService
+ .list({
+ filters: new FilterBuilder()
+ .addIn('uuid', containerUuids)
+ .getFilters()
+ }, false)
+ .then((containers) => {
+ api.dispatch(updateResources(containers.items));
+ });
}).catch(() => {
api.dispatch(couldNotFetchSearchResults(session.clusterId));
});
}
}
-const typeFilters = (columns: DataColumns<string>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
+const typeFilters = (columns: DataColumns<string, GroupContentsResource>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({
...dataExplorerToListParams(dataExplorer),
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<GroupContentsResource>(dataExplorer);
const order = new OrderBuilder<GroupContentsResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
return order
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
.getOrder();
} else {
return order.getOrder();