diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/jobs/components/table/graphql/cache_config.js | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/jobs/components/table/graphql/cache_config.js')
-rw-r--r-- | app/assets/javascripts/jobs/components/table/graphql/cache_config.js | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/table/graphql/cache_config.js b/app/assets/javascripts/jobs/components/table/graphql/cache_config.js index b9946925c95..8bcd7ffd10f 100644 --- a/app/assets/javascripts/jobs/components/table/graphql/cache_config.js +++ b/app/assets/javascripts/jobs/components/table/graphql/cache_config.js @@ -13,16 +13,40 @@ export default { merge(existing = {}, incoming, { args = {} }) { let nodes; + const areNodesEqual = isEqual(existing.nodes, incoming.nodes); + const statuses = Array.isArray(args.statuses) ? [...args.statuses] : args.statuses; + const { pageInfo } = incoming; + if (Object.keys(existing).length !== 0 && isEqual(existing?.statuses, args?.statuses)) { - nodes = [...existing.nodes, ...incoming.nodes]; + if (areNodesEqual) { + if (incoming.pageInfo.hasNextPage) { + nodes = [...existing.nodes, ...incoming.nodes]; + } else { + nodes = [...incoming.nodes]; + } + } else { + if (!existing.pageInfo?.hasNextPage) { + nodes = [...incoming.nodes]; + + return { + nodes, + statuses, + pageInfo, + count: incoming.count, + }; + } + + nodes = [...existing.nodes, ...incoming.nodes]; + } } else { nodes = [...incoming.nodes]; } return { nodes, - statuses: Array.isArray(args.statuses) ? [...args.statuses] : args.statuses, - pageInfo: incoming.pageInfo, + statuses, + pageInfo, + count: incoming.count, }; }, }, |