subscriptionSelectors: Fix caching in "for streamId" selectors.

part of #3015
zulip · Feb 16, 2019 · 3a909aa · 3a909aa
1 parent 0674ea4
commit 3a909aa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/streams/EditStreamScreen.js b/src/streams/EditStreamScreen.js
@@ -37,5 +37,5 @@ class EditStreamScreen extends PureComponent<Props> {
 }
 
 export default connect((state: GlobalState, props) => ({
-  stream: getStreamFromId(props.navigation.state.params.streamId)(state),
+  stream: getStreamFromId(state, props.navigation.state.params.streamId),
 }))(EditStreamScreen);
diff --git a/src/streams/InviteUsersScreen.js b/src/streams/InviteUsersScreen.js
@@ -46,5 +46,5 @@ class InviteUsersScreen extends PureComponent<Props, State> {
 
 export default connect((state: GlobalState, props) => ({
   auth: getAuth(state),
-  stream: getStreamFromId(props.navigation.state.params.streamId)(state),
+  stream: getStreamFromId(state, props.navigation.state.params.streamId),
 }))(InviteUsersScreen);
diff --git a/src/streams/StreamScreen.js b/src/streams/StreamScreen.js
@@ -100,6 +100,6 @@ class StreamScreen extends PureComponent<Props> {
 
 export default connect((state: GlobalState, props) => ({
   isAdmin: getIsAdmin(state),
-  stream: getStreamFromId(props.navigation.state.params.streamId)(state),
-  subscription: getSubscriptionFromId(props.navigation.state.params.streamId)(state),
+  stream: getStreamFromId(state, props.navigation.state.params.streamId),
+  subscription: getSubscriptionFromId(state, props.navigation.state.params.streamId),
 }))(StreamScreen);
diff --git a/src/subscriptions/subscriptionSelectors.js b/src/subscriptions/subscriptionSelectors.js
@@ -44,20 +44,24 @@ export const getSubscribedStreams: Selector<Subscription[]> = createSelector(
     })),
 );
 
-export const getStreamFromId = (streamId: string): Selector<Stream> =>
-  createSelector([getStreams], (streams, params) => {
+export const getStreamFromId: Selector<Stream, number> = createSelector(
+  (state, streamId) => streamId,
+  state => getStreams(state),
+  (streamId, streams, params) => {
     const stream = streams.find(x => x.stream_id === streamId);
     if (!stream) {
       throw new Error(`getStreamFromId: missing stream: id ${streamId}`);
     }
     return stream;
-  });
+  },
+);
 
-export const getSubscriptionFromId = (streamId: string): Selector<Subscription> =>
-  createSelector(
-    [getSubscriptions],
-    subscriptions => subscriptions.find(x => x.stream_id === streamId) || NULL_SUBSCRIPTION,
-  );
+export const getSubscriptionFromId: Selector<Subscription, number> = createSelector(
+  (state, streamId) => streamId,
+  state => getSubscriptions(state),
+  (streamId, subscriptions) =>
+    subscriptions.find(x => x.stream_id === streamId) || NULL_SUBSCRIPTION,
+);
 
 export const getIsActiveStreamAnnouncementOnly: Selector<boolean, Narrow> = createSelector(
   (state, narrow) => narrow,

diff --git a/src/topics/TopicListScreen.js b/src/topics/TopicListScreen.js
@@ -53,6 +53,6 @@ class TopicListScreen extends PureComponent<Props, State> {
 }
 
 export default connect((state: GlobalState, props) => ({
-  stream: getStreamFromId(props.navigation.state.params.streamId)(state),
+  stream: getStreamFromId(state, props.navigation.state.params.streamId),
   topics: getTopicsForStream(state, props.navigation.state.params.streamId),
 }))(TopicListScreen);