diff --git a/platform/collaboration-tools/api-dump.txt b/platform/collaboration-tools/api-dump.txt index 1f5fceb6c5c6..18f12f2a1551 100644 --- a/platform/collaboration-tools/api-dump.txt +++ b/platform/collaboration-tools/api-dump.txt @@ -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 -- (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 +- (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 diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModel.kt b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModel.kt index c9104f6c0ba7..11edaa7aaea7 100644 --- a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModel.kt +++ b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModel.kt @@ -9,7 +9,7 @@ interface ReviewListSearchPanelViewModel val emptySearch: S - val defaultQuickFilter: Q + val defaultFilter: S fun getSearchHistory(): List } diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModelBase.kt b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModelBase.kt index eed04b4a67b6..c8b699558aff 100644 --- a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModelBase.kt +++ b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/list/search/ReviewListSearchPanelViewModelBase.kt @@ -10,10 +10,10 @@ abstract class ReviewListSearchPanelViewModelBase, final override val emptySearch: S, - final override val defaultQuickFilter: Q + final override val defaultFilter: S, ) : ReviewListSearchPanelViewModel { - 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( scope, historyViewModel, emptySearch = GHPRListSearchValue.EMPTY, - defaultQuickFilter = AssignedToYou(currentUser) + defaultFilter = AssignedToYou(currentUser).filter ) { override fun GHPRListSearchValue.withQuery(query: String?) = copy(searchQuery = query) diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/filters/GitLabMergeRequestsFiltersViewModel.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/filters/GitLabMergeRequestsFiltersViewModel.kt index 04b89decfce4..6eea18bbcd3e 100644 --- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/filters/GitLabMergeRequestsFiltersViewModel.kt +++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/filters/GitLabMergeRequestsFiltersViewModel.kt @@ -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)