diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /app/assets/javascripts/diffs/store/getters.js | |
parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/diffs/store/getters.js')
-rw-r--r-- | app/assets/javascripts/diffs/store/getters.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/store/getters.js b/app/assets/javascripts/diffs/store/getters.js index 10a6a872fe4..a8a831fb269 100644 --- a/app/assets/javascripts/diffs/store/getters.js +++ b/app/assets/javascripts/diffs/store/getters.js @@ -63,9 +63,12 @@ export const diffHasAllCollapsedDiscussions = (state, getters) => (diff) => { * @returns {Boolean} */ export const diffHasExpandedDiscussions = () => (diff) => { - return diff[INLINE_DIFF_LINES_KEY].filter((l) => l.discussions.length >= 1).some( - (l) => l.discussionsExpanded, - ); + const diffLineDiscussionsExpanded = diff[INLINE_DIFF_LINES_KEY].filter( + (l) => l.discussions.length >= 1, + ).some((l) => l.discussionsExpanded); + const diffFileDiscussionsExpanded = diff.discussions?.some((d) => d.expanded); + + return diffFileDiscussionsExpanded || diffLineDiscussionsExpanded; }; /** @@ -74,7 +77,10 @@ export const diffHasExpandedDiscussions = () => (diff) => { * @returns {Boolean} */ export const diffHasDiscussions = () => (diff) => { - return diff[INLINE_DIFF_LINES_KEY].some((l) => l.discussions.length >= 1); + return ( + diff.discussions?.length >= 1 || + diff[INLINE_DIFF_LINES_KEY].some((l) => l.discussions.length >= 1) + ); }; /** |