Skip to content

Fix poolbar counts #53825

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.

Sign up for GitHub

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

Merged
pierrejeambrun merged 1 commit into from
Jul 28, 2025
Merged

Fix poolbar counts #53825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions airflow-core/src/airflow/ui/src/components/PoolBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { Flex, Link } from "@chakra-ui/react";
import { Flex, Link, Box } from "@chakra-ui/react";
import { useTranslation } from "react-i18next";
import { Link as RouterLink } from "react-router-dom";

Expand Down Expand Up @@ -54,13 +54,12 @@ export const PoolBar = ({
alignItems="center"
bg={`${color}.solid`}
color="white"
flex={flexValue}
gap={1}
h="100%"
justifyContent="center"
px={1}
py={0.5}
textAlign="center"
w="100%"
>
{icon}
{slotValue}
Expand All @@ -69,11 +68,13 @@ export const PoolBar = ({
);

return color !== "success" && "name" in pool ? (
<Link asChild key={key}>
<Link asChild display="flex" flex={flexValue} key={key}>
<RouterLink to={`/task_instances?state=${color}&pool=${pool.name}`}>{poolContent}</RouterLink>
</Link>
) : (
poolContent
<Box display="flex" flex={flexValue} key={key}>
{poolContent}
</Box>
);
})}
</>
Expand Down
12 changes: 11 additions & 1 deletion airflow-core/src/airflow/ui/src/pages/Dashboard/PoolSummary/PoolSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,17 @@ export const PoolSummary = () => {
const hasPoolsAccess = authLinks?.authorized_menu_items.includes("Pools");

const pools = data?.pools;
const totalSlots = pools?.reduce((sum, pool) => sum + pool.slots, 0) ?? 0;
const totalSlots =
pools?.reduce(
(sum, pool) =>
sum +
pool.running_slots +
pool.queued_slots +
pool.deferred_slots +
pool.scheduled_slots +
pool.open_slots,
0,
) ?? 0;
const aggregatePool: Slots = {
deferred_slots: 0,
open_slots: 0,
Expand Down
11 changes: 10 additions & 1 deletion airflow-core/src/airflow/ui/src/pages/Pools/PoolBarCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,16 @@ const PoolBarCard = ({ pool }: PoolBarCardProps) => {

<Box margin={4}>
<Flex bg="gray.muted" borderRadius="md" h="20px" overflow="hidden" w="100%">
<PoolBar pool={pool} totalSlots={pool.slots} />
<PoolBar
pool={pool}
totalSlots={
pool.running_slots +
pool.queued_slots +
pool.deferred_slots +
pool.scheduled_slots +
pool.open_slots
}
/>
</Flex>
</Box>
</Box>
Expand Down