Skip to content

Thrive authors update #5532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 28, 2021
Merged

Thrive authors update #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a663404
Merge pull request #5525 from topcoder-platform/develop
luizrrodrigues May 21, 2021
0bd1493
Fix #5521
kkartunov May 25, 2021
6b12bd3
ci: on QA
kkartunov May 25, 2021
6141b3d
ci: on beta
kkartunov May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ workflows:
filters:
branches:
only:
- free
- thrive-authors-update
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
Expand Down
17 changes: 13 additions & 4 deletions src/shared/components/Contentful/TracksFilter/TracksFilter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,16 @@ export class TracksFilterInner extends Component {
const { authorList } = this.state;
this.setState({
authorList: _.concat(authorList, _.map(
_.sortBy(results.items, i => i.fields.name.toLowerCase()),
item => ({ label: item.fields.name, selected: false }),
_.sortBy(
results.items,
i => (i.fields.tcHandle
? i.fields.tcHandle.toLowerCase() : i.fields.name.toLowerCase()),
),
item => ({
label: item.fields.tcHandle
? item.fields.tcHandle : item.fields.name,
selected: false,
}),
)),
});
}
Expand Down Expand Up @@ -149,6 +157,7 @@ export class TracksFilterInner extends Component {
{mediaMatches => (
<Dropdown
label="Authors"
placeholder="Type author name or handle"
options={updatedAuthorList}
size="xs"
onChange={(authors) => {
Expand Down Expand Up @@ -231,8 +240,8 @@ export class TracksFilterInner extends Component {
TracksFilterInner.defaultProps = {
onClose: () => {},
onApply: () => {},
selectedAuthor: DEF_SELECTED_AUTHOR,
authorList: [{ label: DEF_SELECTED_AUTHOR, selected: true }],
selectedAuthor: '',
authorList: [{ label: DEF_SELECTED_AUTHOR, selected: false }],
startDate: moment('2001-01-02'),
endDate: moment(),
tags: [],
Expand Down