Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

console2: configure children process columns #1085

Merged
merged 6 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions console2/src/api/org/project/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export enum ProjectVisibility {

export interface ProjectEntryMetaUI {
processList?: ColumnDefinition[];
childrenProcessList?: ColumnDefinition[];
}

export interface ProjectEntryMeta {
Expand Down
2 changes: 2 additions & 0 deletions console2/src/components/organisms/ProcessActivity/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ const ProcessActivity = (props: ExternalProps) => {
<ProcessChildrenActivity
instanceId={instanceId}
processStatus={process ? process.status : undefined}
processOrgName={process ? process.orgName : undefined}
processProjectName={process ? process.projectName : undefined}
loadingHandler={loadingHandler}
forceRefresh={refresh}
dataFetchInterval={dataFetchInterval}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/

import * as React from 'react';
import { ConcordId, queryParams } from '../../../api/common';
import { ConcordId, ConcordKey, queryParams } from '../../../api/common';
import { Pagination } from '../../../state/data/processes';
import {
list as apiProcessList,
Expand All @@ -37,11 +37,14 @@ import {
STATUS_COLUMN
} from '../../molecules/ProcessList';
import { useHistory, useLocation } from 'react-router';
import { filtersToQuery, parseSearchFilter, ProcessSearchFilter } from '../ProcessListActivity';
import { addBuiltInColumns, filtersToQuery, parseSearchFilter, ProcessSearchFilter } from '../ProcessListActivity';
import { ProcessFilters } from '../../../api/process';
import RequestErrorActivity from '../RequestErrorActivity';
import { useCallback, useEffect, useRef, useState } from 'react';
import { usePolling } from '../../../api/usePolling';
import { get as apiGetProject, ProjectEntry } from "../../../api/org/project";
import { useApi } from "../../../hooks/useApi";
import { LoadingDispatch } from "../../../App";

const COLUMNS = [
STATUS_COLUMN,
Expand All @@ -55,6 +58,8 @@ interface ExternalProps {
instanceId: ConcordId;
loadingHandler: (inc: number) => void;
processStatus?: ProcessStatus;
processOrgName?: ConcordKey;
processProjectName?: ConcordKey;
forceRefresh: boolean;
dataFetchInterval: number;
}
Expand All @@ -64,8 +69,12 @@ const ProcessChildrenActivity = ({
loadingHandler,
processStatus,
forceRefresh,
dataFetchInterval
dataFetchInterval,
processOrgName,
processProjectName
}: ExternalProps) => {
const dispatch = React.useContext(LoadingDispatch);

const isInitialMount = useRef(true);
const location = useLocation();
const history = useHistory();
Expand All @@ -74,6 +83,20 @@ const ProcessChildrenActivity = ({
parseSearchFilter(location.search)
);

const fetchProjectData = useCallback(() => {
if (!processOrgName || !processProjectName) {
return Promise.resolve(undefined);
}

return apiGetProject(processOrgName, processProjectName);
}, [processOrgName, processProjectName]);

const { data : project, error : projectError} = useApi<ProjectEntry | undefined>(fetchProjectData, {
fetchOnMount: true,
forceRequest: forceRefresh,
dispatch: dispatch
});

useEffect(() => {
if (isInitialMount.current) {
isInitialMount.current = false;
Expand Down Expand Up @@ -117,15 +140,18 @@ const ProcessChildrenActivity = ({
[history]
);

const columns = addBuiltInColumns(project?.meta?.ui?.childrenProcessList) ?? COLUMNS;

return (
<>
{error && <RequestErrorActivity error={error} />}
{projectError && <RequestErrorActivity error={projectError} />}

<ProcessListWithSearch
processFilters={searchFilter.filters}
paginationFilter={searchFilter.pagination}
processes={data?.items}
columns={COLUMNS}
columns={columns}
loading={false}
refresh={onRefresh}
next={data?.next}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const parseSearchFilter = (s: string): ProcessSearchFilter => {
};
};

const addBuiltInColumns = (columns?: ColumnDefinition[]): ColumnDefinition[] | undefined => {
export const addBuiltInColumns = (columns?: ColumnDefinition[]): ColumnDefinition[] | undefined => {
if (!columns) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ private ProcessFilter createProcessFilter(UUID orgId,
List<MetadataFilter> metaFilters = MetadataUtils.parseMetadataFilters(uriInfo);

// can't allow seq scans, we don't index PROCESS_QUEUE.META (yet?)
if (!metaFilters.isEmpty() && effectiveProjectId == null) {
throw new ValidationErrorsException("Process metadata filters require a project name or an ID to be included in the query.");
if (!metaFilters.isEmpty() && (effectiveProjectId == null && parentId == null)) {
throw new ValidationErrorsException("Process metadata filters require a project name or project ID or a parent process ID to be included in the query.");
}

return ProcessFilter.builder()
Expand Down