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.

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

Jump to bottom

fix(xo-web/tasks): fix tasks filter #6424

Merged
merged 3 commits into from
Sep 21, 2022
Merged

fix(xo-web/tasks): fix tasks filter #6424

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51621c3
fix(xo-web/tasks): fix tasks filter
Rajaa-BARHTAOUI Sep 15, 2022
a5b0291
changelog
Rajaa-BARHTAOUI Sep 15, 2022
b567d6e
Merge branch 'master' into fixTasksFilter
pdonias Sep 21, 2022
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 CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

- [Backup/Restore] Fix backup list not loading on page load (PR [#6364](https://github.com/vatesfr/xen-orchestra/pull/6364))
- [Host] Fix `should not contains property ["ignoreBackup"]` on some host operations (PR [#6362](https://github.com/vatesfr/xen-orchestra/pull/6362))
- [Tasks] Fix the pool filter that did not display tasks even if they existed (PR [#6424](https://github.com/vatesfr/xen-orchestra/pull/6424))

### Packages to release

Expand Down
34 changes: 12 additions & 22 deletions packages/xo-web/src/xo-app/tasks/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { addSubscriptions, connectStore, resolveIds } from 'utils'
import { FormattedDate, FormattedRelative, injectIntl } from 'react-intl'
import { SelectPool } from 'select-objects'
import { Col, Container, Row } from 'grid'
import { differenceBy, flatMap, groupBy, isEmpty, keys, map, some } from 'lodash'
import { differenceBy, isEmpty, map, some } from 'lodash'
import {
createFilter,
createGetObject,
Expand Down Expand Up @@ -192,20 +192,18 @@ const GROUPED_ACTIONS = [
permissions: subscribePermissions,
})
@connectStore(() => {
const getResolvedPendingTasksByPool = createSelector(getResolvedPendingTasks, resolvedPendingTasks =>
groupBy(resolvedPendingTasks, '$pool')
const getPools = createGetObjectsOfType('pool').pick(
createSelector(getResolvedPendingTasks, resolvedPendingTasks => resolvedPendingTasks.map(task => task.$poolId))
)

const getPools = createGetObjectsOfType('pool').pick(createSelector(getResolvedPendingTasksByPool, keys))

return (state, props) => {
// true: useResourceSet to bypass permissions
const resolvedPendingTasksByPool = getResolvedPendingTasks(state, props, true)
const resolvedPendingTasks = getResolvedPendingTasks(state, props, true)
return {
isAdmin: isAdmin(state, props),
nResolvedTasks: resolvedPendingTasksByPool.length,
nResolvedTasks: resolvedPendingTasks.length,
pools: getPools(state, props, true),
resolvedPendingTasksByPool,
resolvedPendingTasks,
}
}
})
Expand All @@ -216,7 +214,7 @@ export default class Tasks extends Component {
}

componentWillReceiveProps(props) {
const finishedTasks = differenceBy(this.props.resolvedPendingTasksByPool, props.resolvedPendingTasksByPool, 'id')
const finishedTasks = differenceBy(this.props.resolvedPendingTasks, props.resolvedPendingTasks, 'id')
if (!isEmpty(finishedTasks)) {
this.setState({
finishedTasks: finishedTasks
Expand All @@ -226,22 +224,14 @@ export default class Tasks extends Component {
}
}

_getTasks = createSelector(
_getPoolFilter = createSelector(
createSelector(() => this.state.pools, resolveIds),
() => this.props.resolvedPendingTasksByPool,
(poolIds, resolvedPendingTasksByPool) =>
isEmpty(poolIds)
? resolvedPendingTasksByPool
: flatMap(poolIds, poolId => resolvedPendingTasksByPool[poolId] || [])
poolIds => (isEmpty(poolIds) ? null : ({ $poolId }) => poolIds.includes($poolId))
)

_getFinishedTasks = createFilter(
() => this.state.finishedTasks,
createSelector(
createSelector(() => this.state.pools, resolveIds),
poolIds => (isEmpty(poolIds) ? null : ({ $poolId }) => poolIds.includes($poolId))
)
)
_getTasks = createFilter(() => this.props.resolvedPendingTasks, this._getPoolFilter)

_getFinishedTasks = createFilter(() => this.state.finishedTasks, this._getPoolFilter)

_getItemsPerPageContainer = () => this.state.itemsPerPageContainer

Expand Down