From 0bd149333e39be8decc7e0dfeab0ddd6a40071fc Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Tue, 25 May 2021 14:29:54 +0300
Subject: [PATCH 1/3] Fix #5521

---
 .../Contentful/TracksFilter/TracksFilter.jsx    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/Contentful/TracksFilter/TracksFilter.jsx b/src/shared/components/Contentful/TracksFilter/TracksFilter.jsx
index 432a25d596..6e2f84e364 100644
--- a/src/shared/components/Contentful/TracksFilter/TracksFilter.jsx
+++ b/src/shared/components/Contentful/TracksFilter/TracksFilter.jsx
@@ -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,
+              }),
             )),
           });
         }
@@ -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) => {
@@ -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: [],

From 6b12bd30d90eaa5090c13d2bb25d2ad62e20b850 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Tue, 25 May 2021 15:05:07 +0300
Subject: [PATCH 2/3] ci: on QA

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d723a4d47b..83a186594c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,7 +289,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-authors-update
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

From 6141b3d351e4c2e277430d7c2272d878086dc6e6 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kkartunov@users.noreply.github.com>
Date: Wed, 26 May 2021 09:41:00 +0300
Subject: [PATCH 3/3] ci: on beta

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83a186594c..3e629d2576 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,14 +289,14 @@ workflows:
           filters:
             branches:
               only:
-                - thrive-authors-update
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - free
+                - thrive-authors-update
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global