Revert "Feed: three-tab UI (For You / Following / Uploads Only) (#14237)"

This reverts commit 6203998.

Author: dylanjeffers

packages/common/src/api/index.ts

@@ -38,7 +38,6 @@ export * from './tan-query/collection/useBestSellingAlbums'
 
 // Lineups
 export * from './tan-query/lineups/useFeed'
-export * from './tan-query/lineups/useForYouFeed'
 export * from './tan-query/lineups/useExclusiveTracks'
 export * from './tan-query/lineups/useLibraryTracks'
 export * from './tan-query/lineups/useProfileReposts'

packages/common/src/api/tan-query/lineups/useForYouFeed.ts

@@ -68,7 +68,6 @@ export const QUERY_KEYS = {
   trackHistory: 'trackHistory',
   topTags: 'topTags',
   feed: 'feed',
-  forYouFeed: 'forYouFeed',
   authorizedApps: 'authorizedApps',
   developerApps: 'developerApps',
   searchAutocomplete: 'searchAutocomplete',

packages/common/src/api/tan-query/queryKeys.ts

@@ -1,7 +1,6 @@
 import { ChatPermission, Genre } from '@audius/sdk'
 
 import { FeedFilter } from '~/models/FeedFilter'
-import { FeedTab } from '~/models/FeedTab'
 import { ID, PlayableType } from '~/models/Identifiers'
 import { TimeRange } from '~/models/TimeRange'
 import { WalletAddress } from '~/models/Wallet'
@@ -1352,7 +1351,7 @@ type TrendingChangeView = {
 // Feed
 type FeedChangeView = {
   eventName: Name.FEED_CHANGE_VIEW
-  view: FeedFilter | FeedTab
+  view: FeedFilter
 }
 
 // Notifications

packages/common/src/models/Analytics.ts

@@ -12,7 +12,6 @@ export * from './DownloadQuality'
 export * from './ErrorReporting'
 export * from './Favorite'
 export * from './FeedFilter'
-export * from './FeedTab'
 export * from './Identifiers'
 export * from './ImageSizes'
 export * from './Kind'

packages/common/src/models/FeedTab.ts

@@ -1,10 +1,8 @@
 import { FeedFilter } from '~/models/FeedFilter'
-import { FeedTab } from '~/models/FeedTab'
 import { ID } from '~/models/Identifiers'
 
 export const FOLLOW_USERS = 'FEED/FOLLOW_USERS'
 export const SET_FEED_FILTER = 'FEED/SET_FEED_FILTER'
-export const SET_FEED_TAB = 'FEED/SET_FEED_TAB'
 
 export type FollowUsersAction = {
   type: typeof FOLLOW_USERS
@@ -16,15 +14,7 @@ export type SetFeedFilterAction = {
   filter: FeedFilter
 }
 
-export type SetFeedTabAction = {
-  type: typeof SET_FEED_TAB
-  tab: FeedTab
-}
-
-export type FeedPageAction =
-  | FollowUsersAction
-  | SetFeedFilterAction
-  | SetFeedTabAction
+export type FeedPageAction = FollowUsersAction | SetFeedFilterAction
 
 export const followUsers = (userIds: ID[]): FollowUsersAction => ({
   type: FOLLOW_USERS,
@@ -35,8 +25,3 @@ export const setFeedFilter = (filter: FeedFilter): SetFeedFilterAction => ({
   type: SET_FEED_FILTER,
   filter
 })
-
-export const setFeedTab = (tab: FeedTab): SetFeedTabAction => ({
-  type: SET_FEED_TAB,
-  tab
-})

packages/common/src/models/index.ts

@@ -3,19 +3,16 @@ import { persistReducer } from 'redux-persist'
 
 import {
   SET_FEED_FILTER,
-  SET_FEED_TAB,
   SetFeedFilterAction,
-  SetFeedTabAction,
   FeedPageAction
 } from '~/store/pages/feed/actions'
 
-import { FeedFilter, FeedTab } from '../../../models'
+import { FeedFilter } from '../../../models'
 
 import { FeedPageState } from './types'
 
-const initialState: FeedPageState = {
-  feedFilter: FeedFilter.ALL,
-  feedTab: FeedTab.FOR_YOU
+const initialState = {
+  feedFilter: FeedFilter.ALL
 }
 
 const actionsMap = {
@@ -24,26 +21,19 @@ const actionsMap = {
       ...state,
       feedFilter: action.filter
     }
-  },
-  [SET_FEED_TAB](state: FeedPageState, action: SetFeedTabAction) {
-    return {
-      ...state,
-      feedTab: action.tab
-    }
   }
 }
 
 const feedPageReducer = (state = initialState, action: FeedPageAction) => {
-  const matchingReduceFunction =
-    actionsMap[action.type as keyof typeof actionsMap]
+  const matchingReduceFunction = actionsMap[action.type]
   if (!matchingReduceFunction) return state
-  return matchingReduceFunction(state, action as any)
+  return matchingReduceFunction(state, action)
 }
 
 export const feedPagePersistConfig = (storage: Storage) => ({
   key: 'feed-page',
   storage,
-  whitelist: ['feedFilter', 'feedTab']
+  whitelist: ['feedFilter']
 })
 
 const persistedFeedPageReducer = (storage: Storage) => {

packages/common/src/store/pages/feed/actions.ts

@@ -1,5 +1,3 @@
 import { CommonState } from '~/store/commonStore'
 
 export const getFeedFilter = (state: CommonState) => state.pages.feed.feedFilter
-
-export const getFeedTab = (state: CommonState) => state.pages.feed.feedTab

packages/common/src/store/pages/feed/reducer.ts

@@ -1,6 +1,5 @@
-import { FeedFilter, FeedTab } from '../../../models'
+import { FeedFilter } from '../../../models'
 
 export type FeedPageState = {
   feedFilter: FeedFilter
-  feedTab: FeedTab
 }