maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Only make one network call to fetch all existing tags in editor (#16610)" (#16641)

Browse source 
This reverts commit c76909a428.
This commit is contained in:
Suzanne Aitchison 2022-02-18 11:54:38 +00:00 • committed by GitHub
parent 46404ed8c2
commit b358c3810c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/api/v0/tags_controller.rb
View file

@ -13,11 +13,7 @@ module Api
per_page = (params[:per_page] || 10).to_i
num = [per_page, 1000].min
if params[:tag_ids].present?
@tags = @tags.where(id: params[:tag_ids])
elsif params[:tag_names].present?
@tags = @tags.where(name: params[:tag_names])
end
@tags = @tags.where(id: params[:tag_ids]) if params[:tag_ids].present?
@tags = @tags.order(taggings_count: :desc).page(page).per(num)

25
app/javascript/article-form/components/TagsField.jsx
View file

@ -29,19 +29,20 @@ export const TagsField = ({ onInput, defaultValue, switchHelpContext }) => {
// Fetching further tag data allows us to display a richer UI
// This fetch only happens once on first component load
if (defaultValue && defaultValue !== '' && !defaultsLoaded) {
const tagNamesQueryString = defaultValue
.split(', ')
.reduce((queryString, nextTagName) => {
if (nextTagName) {
return queryString
? `${queryString}&tag_names[]=${nextTagName}`
: `tag_names[]=${nextTagName}`;
}
}, '');
const tagNames = defaultValue.split(', ');
fetch(`/api/tags.json?${tagNamesQueryString}`)
.then((res) => res.json())
.then((data) => setDefaultSelections(data));
const tagRequests = tagNames.map((tagName) =>
fetchSearch('tags', { name: tagName }).then(({ result = [] }) => {
const [potentialMatch = {}] = result;
return potentialMatch.name === tagName
? potentialMatch
: { name: tagName };
}),
);
Promise.all(tagRequests).then((data) => {
setDefaultSelections(data);
});
}
setDefaultsLoaded(true);
}, [defaultValue, defaultsLoaded]);

19
spec/requests/api/v0/tags_spec.rb
View file

@ -45,25 +45,6 @@ RSpec.describe "Api::V0::Tags", type: :request do
expect(response.parsed_body.map { |t| t["id"] }).to match_array(tag_ids)
end
it "finds tags from array of tag_names" do
tags = create_list(:tag, 10, taggings_count: 10)
tag_names = tags.sample(4).map(&:name)
get api_tags_path, params: { tag_names: tag_names }
expect(response.parsed_body.map { |t| t["name"] }).to match_array(tag_names)
end
it "finds tags from array of tag_ids if both tag_ids and tag_names is passed" do
tags = create_list(:tag, 10, taggings_count: 10)
tag_names = tags.sample(2).map(&:name)
tag_ids = tags.sample(4).map(&:id)
get api_tags_path, params: { tag_names: tag_names, tag_ids: tag_ids }
expect(response.parsed_body.map { |t| t["id"] }).to match_array(tag_ids)
end
it "supports pagination" do
create_list(:tag, 3)