github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

UX: remove in:unpinned filter from advanced search page. (#9911)

Browse Source
This commit is contained in:
Vinoth Kannan 2020-05-29 00:47:28 +05:30 committed by GitHub
parent 74d28a43d1
commit ce1491e830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/components/search-advanced-options.js
View File

@ -21,7 +21,7 @@ const REGEXP_MIN_POST_COUNT_PREFIX = /^min_post_count:/gi;
const REGEXP_POST_TIME_PREFIX = /^(before|after):/gi;
const REGEXP_TAGS_REPLACE = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$)/gi;
const REGEXP_IN_MATCH = /^(in|with):(posted|created|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/gi;
const REGEXP_IN_MATCH = /^(in|with):(posted|created|watching|tracking|bookmarks|first|pinned|wiki|unseen|image)/gi;
const REGEXP_SPECIAL_IN_LIKES_MATCH = /^in:likes/gi;
const REGEXP_SPECIAL_IN_TITLE_MATCH = /^in:title/gi;
const REGEXP_SPECIAL_IN_PERSONAL_MATCH = /^in:personal/gi;
@ -51,7 +51,6 @@ export default Component.extend({
this.inOptionsForAll = [
{ name: I18n.t("search.advanced.filters.first"), value: "first" },
{ name: I18n.t("search.advanced.filters.pinned"), value: "pinned" },
{ name: I18n.t("search.advanced.filters.unpinned"), value: "unpinned" },
{ name: I18n.t("search.advanced.filters.wiki"), value: "wiki" },
{ name: I18n.t("search.advanced.filters.images"), value: "images" }
];

1
config/locales/client.en.yml
View File

@ -2005,7 +2005,6 @@ en:
bookmarks: I bookmarked
first: are the very first post
pinned: are pinned
unpinned: are not pinned
seen: I read
unseen: I've not read
wiki: are wiki

8
lib/search.rb
View File

@ -354,14 +354,6 @@ class Search
posts.where("topics.pinned_at IS NOT NULL")
end
advanced_filter(/^in:unpinned$/) do |posts|
if @guardian.user
posts.where("topics.pinned_at IS NOT NULL AND topics.id IN (
SELECT topic_id FROM topic_users WHERE user_id = ? AND cleared_pinned_at IS NOT NULL
)", @guardian.user.id)
end
end
advanced_filter(/^in:wiki$/) do |posts, match|
posts.where(wiki: true)
end

7
spec/components/search_spec.rb
View File

@ -946,7 +946,7 @@ describe Search do
describe 'Advanced search' do
it 'supports pinned and unpinned' do
it 'supports pinned' do
topic = Fabricate(:topic)
Fabricate(:post, raw: 'hi this is a test 123 123', topic: topic)
_post = Fabricate(:post, raw: 'boom boom shake the room', topic: topic)
@ -957,11 +957,6 @@ describe Search do
guardian = Guardian.new(user)
expect(Search.execute('boom in:pinned').posts.length).to eq(1)
expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(0)
topic.clear_pin_for(user)
expect(Search.execute('boom in:unpinned', guardian: guardian).posts.length).to eq(1)
end
it 'supports wiki' do

2
test/javascripts/acceptance/search-test.js
View File

@ -135,7 +135,6 @@ QUnit.test("Right filters are shown to anonymous users", async assert => {
assert.ok(inSelector.rowByValue("first").exists());
assert.ok(inSelector.rowByValue("pinned").exists());
assert.ok(inSelector.rowByValue("unpinned").exists());
assert.ok(inSelector.rowByValue("wiki").exists());
assert.ok(inSelector.rowByValue("images").exists());
@ -161,7 +160,6 @@ QUnit.test("Right filters are shown to logged-in users", async assert => {
assert.ok(inSelector.rowByValue("first").exists());
assert.ok(inSelector.rowByValue("pinned").exists());
assert.ok(inSelector.rowByValue("unpinned").exists());
assert.ok(inSelector.rowByValue("wiki").exists());
assert.ok(inSelector.rowByValue("images").exists());