MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[collab/space] IDEA-356986 Set default project for project filter

Browse Source 
Merge-request: IJ-MR-143762
Merged-by: Dmitrii Petukhov <dmitrii.petukhov@jetbrains.com>

GitOrigin-RevId: a3bf4c249f31eced4688d0a1566d0bf25bc591f7
This commit is contained in:
Dmitrii Petukhov
2024-09-17 20:18:11 +00:00
committed by intellij-monorepo-bot
parent 6927db41ac
commit 5ca3b3705e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/collaboration-tools/api-dump.txt
View File

@@ -1641,7 +1641,7 @@ f:com.intellij.collaboration.ui.codereview.editor.action.CodeReviewEditorShowFil
- pf:getVm():com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchPanelViewModel
*f:com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchPanelFactory$Companion
*:com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchPanelViewModel
- a:getDefaultQuickFilter():com.intellij.collaboration.ui.codereview.list.search.ReviewListQuickFilter
- a:getDefaultFilter():com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue
- a:getEmptySearch():com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue
- a:getQueryState():kotlinx.coroutines.flow.MutableStateFlow
- a:getQuickFilters():java.util.List
@@ -1649,8 +1649,8 @@ f:com.intellij.collaboration.ui.codereview.editor.action.CodeReviewEditorShowFil
- a:getSearchState():kotlinx.coroutines.flow.MutableStateFlow
*a:com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchPanelViewModelBase
- com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchPanelViewModel
- <init>(kotlinx.coroutines.CoroutineScope,com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchHistoryModel,com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue,com.intellij.collaboration.ui.codereview.list.search.ReviewListQuickFilter):V
- f:getDefaultQuickFilter():com.intellij.collaboration.ui.codereview.list.search.ReviewListQuickFilter
- <init>(kotlinx.coroutines.CoroutineScope,com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchHistoryModel,com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue,com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue):V
- f:getDefaultFilter():com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue
- f:getEmptySearch():com.intellij.collaboration.ui.codereview.list.search.ReviewListSearchValue
- f:getQueryState():kotlinx.coroutines.flow.MutableStateFlow
- f:getSearchHistory():java.util.List

2
platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModel.kt
View File

@@ -9,7 +9,7 @@ interface ReviewListSearchPanelViewModel<S : ReviewListSearchValue, Q : ReviewLi
val queryState: MutableStateFlow<String?>
val emptySearch: S
val defaultQuickFilter: Q
val defaultFilter: S
fun getSearchHistory(): List<S>
}

6
platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModelBase.kt
View File

@@ -10,10 +10,10 @@ abstract class ReviewListSearchPanelViewModelBase<S : ReviewListSearchValue, Q:
private val scope: CoroutineScope,
private val historyModel: ReviewListSearchHistoryModel<S>,
final override val emptySearch: S,
final override val defaultQuickFilter: Q
final override val defaultFilter: S,
) : ReviewListSearchPanelViewModel<S, Q> {
final override val searchState = MutableStateFlow(historyModel.lastFilter ?: defaultQuickFilter.filter)
final override val searchState = MutableStateFlow(historyModel.lastFilter ?: defaultFilter)
final override val queryState = searchState.partialState(ReviewListSearchValue::searchQuery) {
withQuery(it)
@@ -35,7 +35,7 @@ abstract class ReviewListSearchPanelViewModelBase<S : ReviewListSearchValue, Q:
return@collectLatestWithPrevious
}
if (new.filterCount == 0 || new == defaultQuickFilter.filter) {
if (new.filterCount == 0 || new == defaultFilter) {
return@collectLatestWithPrevious
}

2
plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/filters/GHPRSearchPanelViewModel.kt
View File

@@ -27,7 +27,7 @@ class GHPRSearchPanelViewModel internal constructor(
ReviewListSearchPanelViewModelBase<GHPRListSearchValue, GHPRListQuickFilter>(
scope, historyViewModel,
emptySearch = GHPRListSearchValue.EMPTY,
defaultQuickFilter = AssignedToYou(currentUser)
defaultFilter = AssignedToYou(currentUser).filter
) {
override fun GHPRListSearchValue.withQuery(query: String?) = copy(searchQuery = query)

2
plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/filters/GitLabMergeRequestsFiltersViewModel.kt
View File

@@ -49,7 +49,7 @@ internal class GitLabMergeRequestsFiltersViewModelImpl(
scope,
historyModel,
emptySearch = GitLabMergeRequestsFiltersValue.EMPTY,
defaultQuickFilter = defaultQuickFilter(currentUser)
defaultFilter = defaultQuickFilter(currentUser).filter
) {
override fun GitLabMergeRequestsFiltersValue.withQuery(query: String?): GitLabMergeRequestsFiltersValue {
return copy(searchQuery = query)