Pei-Cheng-Yu commented on code in PR #56920:
URL: https://github.com/apache/airflow/pull/56920#discussion_r2450481913
##########
airflow-core/src/airflow/ui/src/pages/TaskInstances/TaskInstancesFilter.tsx:
##########
@@ -101,66 +191,106 @@ export const TaskInstancesFilter = ({
[pagination, searchParams, setSearchParams, setTableURLState, sorting],
);
+ const onClearFilters = useCallback(() => {
+ resetPagination();
+ setSearchParams((prev) => {
+ const next = new URLSearchParams(prev);
+
+ next.delete(STATE_PARAM);
+ next.delete(OPERATOR_PARAM);
+ next.delete(QUEUE_PARAM);
+ next.delete(POOL_PARAM);
+
+ return next;
+ });
+ }, [setSearchParams, resetPagination]);
+
+ const initialValues = useMemo(() => {
+ const values: Record<string, FilterValue> = {};
+
+ filterConfigs.forEach((config) => {
+ const value = searchParams.get(config.key);
+
+ if (value !== null && value !== "") {
+ if (config.type === "number") {
+ const parsedValue = Number(value);
+
+ values[config.key] = isNaN(parsedValue) ? value : parsedValue;
+ } else {
+ values[config.key] = value;
+ }
+ }
+ });
+
+ return values;
+ }, [searchParams, filterConfigs]);
+
+ const taskFilterCount =
+ (searchParams.getAll(STATE_PARAM).length > 0 ? 1 : 0) +
+ (searchParams.getAll(OPERATOR_PARAM).length > 0 ? 1 : 0) +
+ (searchParams.getAll(QUEUE_PARAM).length > 0 ? 1 : 0) +
+ (searchParams.getAll(POOL_PARAM).length > 0 ? 1 : 0);
+
return (
- <HStack paddingY="4px">
- {dagId === undefined && (
+ <VStack align="start" justifyContent="space-between">
+ <HStack alignItems="start" paddingY="4px" minWidth="100%">
+ {dagId === undefined && (
+ <SearchBar
+ buttonProps={{ disabled: true }}
+ defaultValue={filteredDagIdPattern ?? ""}
+ hideAdvanced
+ hotkeyDisabled={true}
+ onChange={handleDagIdPatternChange}
+ placeHolder={translate("dags:search.dags")}
+ />
+ )}
<SearchBar
buttonProps={{ disabled: true }}
- defaultValue={filteredDagIdPattern ?? ""}
+ defaultValue={taskDisplayNamePattern ?? ""}
hideAdvanced
- hotkeyDisabled={true}
- onChange={handleDagIdPatternChange}
- placeHolder={translate("dags:search.dags")}
+ hotkeyDisabled={Boolean(runId)}
+ onChange={handleSearchChange}
+ placeHolder={translate("dags:search.tasks")}
+ />
+ <StateFilter
+ onChange={handleStateChange}
+ translate={translate}
+ value={hasFilteredState ? filteredState : ["all"]}
+ />
+ </HStack>
+ <HStack>
+ <AttrSelectFilterMulti
+ displayPrefix={undefined}
+ handleSelect={handleSelectedOperators}
+ placeholderText={translate("selectOperator")}
+ selectedValues={selectedOperators}
+ values={allOperatorNames}
+ />
+ <AttrSelectFilterMulti
+ displayPrefix={undefined}
+ handleSelect={handleSelectedQueues}
+ placeholderText={translate("selectQueues")}
+ selectedValues={selectedQueues}
+ values={allQueueValues}
+ />
+ <AttrSelectFilterMulti
+ displayPrefix={undefined}
+ handleSelect={handleSelectedPools}
+ placeholderText={translate("selectPools")}
+ selectedValues={selectedPools}
+ values={allPoolValues}
+ />
+ <Box>
+ <ResetButton filterCount={taskFilterCount}
onClearFilters={onClearFilters} />
+ </Box>
+ </HStack>
+ <VStack alignItems="flex-start" gap={1}>
+ <FilterBar
+ configs={filterConfigs}
+ initialValues={initialValues}
+ onFiltersChange={handleFiltersChange}
/>
- )}
- <SearchBar
- buttonProps={{ disabled: true }}
- defaultValue={taskDisplayNamePattern ?? ""}
- hideAdvanced
- hotkeyDisabled={Boolean(runId)}
- onChange={handleSearchChange}
- placeHolder={translate("dags:search.tasks")}
- />
- <Select.Root
- collection={taskInstanceStateOptions}
- maxW="450px"
- multiple
- onValueChange={handleStateChange}
- value={hasFilteredState ? filteredState : ["all"]}
- >
- <Select.Trigger
- {...(hasFilteredState ? { clearable: true } : {})}
- colorPalette="brand"
- isActive={Boolean(filteredState)}
- >
- <Select.ValueText>
- {() =>
- hasFilteredState ? (
- <HStack flexWrap="wrap" fontSize="sm" gap="4px" paddingY="8px">
- {filteredState.map((state) => (
- <StateBadge key={state} state={state as TaskInstanceState}>
- {translate(`common:states.${state}`)}
- </StateBadge>
- ))}
- </HStack>
- ) : (
- translate("dags:filters.allStates")
- )
- }
- </Select.ValueText>
- </Select.Trigger>
- <Select.Content>
- {taskInstanceStateOptions.items.map((option) => (
- <Select.Item item={option} key={option.label}>
- {option.value === "all" ? (
- translate(option.label)
- ) : (
- <StateBadge state={option.value as
TaskInstanceState}>{translate(option.label)}</StateBadge>
- )}
- </Select.Item>
- ))}
- </Select.Content>
- </Select.Root>
- </HStack>
+ </VStack>
Review Comment:
Got it, I should move the searchBar part into FilterBar, I'll handle that
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
