Skip to content

fixed jobs counter in left sideBar #527

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

Open
noor1ha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed jobs counter in left sideBar #527

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
35 changes: 25 additions & 10 deletions src/Routes/Base/SidebarLeft/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,31 @@ const AnimatedTitle = () => {
);
};

const instanceCounterAdapter = obj => ({
[LEFT_SIDEBAR_NAMES.JOBS]:
obj.jobsActive > 0 ? `${obj.jobs} / ${obj.jobsActive}` : obj.jobs,
[LEFT_SIDEBAR_NAMES.QUEUE]: obj.queue || 0,
[LEFT_SIDEBAR_NAMES.PIPELINES]: obj.pipelines,
[LEFT_SIDEBAR_NAMES.ALGORITHMS]: obj.algorithms,
[LEFT_SIDEBAR_NAMES.DATASOURCES]: obj.dataSources,
[LEFT_SIDEBAR_NAMES.WORKERS]: obj.workers,
[LEFT_SIDEBAR_NAMES.DRIVERS]: obj.drivers,
});
const instanceCounterAdapter = obj => {
const instanceFilters = instanceFiltersVar();

// Check if any job filters are active (excluding experimentName and datesRange)
const hasActiveFilters =
instanceFilters.jobs.pipelineName ||
instanceFilters.jobs.algorithmName ||
instanceFilters.jobs.pipelineStatus ||
instanceFilters.jobs.user ||
instanceFilters.jobs.tag;

return {
[LEFT_SIDEBAR_NAMES.JOBS]: hasActiveFilters
? obj.jobsFiltered // Show filtered count when filters are active
: obj.jobsActive > 0
? `${obj.jobs} / ${obj.jobsActive}`
: obj.jobs, // Show total when no filters
[LEFT_SIDEBAR_NAMES.QUEUE]: obj.queue || 0,
[LEFT_SIDEBAR_NAMES.PIPELINES]: obj.pipelines,
[LEFT_SIDEBAR_NAMES.ALGORITHMS]: obj.algorithms,
[LEFT_SIDEBAR_NAMES.DATASOURCES]: obj.dataSources,
[LEFT_SIDEBAR_NAMES.WORKERS]: obj.workers,
[LEFT_SIDEBAR_NAMES.DRIVERS]: obj.drivers,
};
};

const SidebarLeft = () => {
// const { pageName } = useParams();
Expand Down
5 changes: 5 additions & 0 deletions src/Routes/Tables/Jobs/useJobsFunctionsLimit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useQuery, useReactiveVar } from '@apollo/client';
import {
filterToggeledVar,
instanceFiltersVar,
instanceCounterVar,
metaVar,
isPinActiveJobVar,
dateTimeDefaultVar,
Expand Down Expand Up @@ -246,6 +247,10 @@ const useJobsFunctionsLimit = () => {
if (queryAllJobs?.data) {
const dsAllJobs = queryAllJobs.data.jobsAggregated.jobs;
setDataSource(dsAllJobs);
instanceCounterVar({
...instanceCounterVar(),
jobsFiltered: dsAllJobs.length,
});
} else {
// setDataSource([]);
}
Expand Down
1 change: 1 addition & 0 deletions src/cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const inactiveModeVar = makeVar(false);
export const instanceCounterVar = makeVar({
jobs: 0,
jobsActive: 0,
jobsFiltered: 0,
pipelines: 0,
algorithms: 0,
algorithmsUnscheduledReason: 0,
Expand Down
Loading