Releasing v0.5.1.

Jeff · Jeff · commit ed88b2a66be9 · 2019-11-13T01:32:24.000Z
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "team-chat",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Team Chat - A Reference Application for PubNub with Typescript, React and Redux",
   "license": "MIT",
   "private": true,
diff --git a/src/features/authentication/Login/Login.tsx b/src/features/authentication/Login/Login.tsx
@@ -9,8 +9,8 @@ import {
 } from "./Login.style";
 import PubNubLogo from "./PubNub_Logo.svg";
 import { login } from "../loginCommand";
-import { isLoggingIn } from "../authenticationStore";
-import { isUserLoggedIn } from "features/authentication/authenticationStore";
+import { isLoggingIn } from "../authenticationModel";
+import { isUserLoggedIn } from "features/authentication/authenticationModel";
 import { useSelector } from "react-redux";
 import KnownIds from "./knownUserIds.json";
 
diff --git a/src/features/authentication/authenticationModel.ts b/src/features/authentication/authenticationModel.ts
diff --git a/src/features/authentication/loginCommand.ts b/src/features/authentication/loginCommand.ts
@@ -1,7 +1,7 @@
 import { ThunkAction } from "main/storeTypes";
-import { loggingIn, loginSucceeded } from "./authenticationStore";
+import { loggingIn, loginSucceeded } from "./authenticationModel";
 import { fetchUserById, fetchMemberships } from "pubnub-redux";
-import { getConversationsByUserId } from "features/joinedConversations/joinedConversationStore";
+import { getConversationsByUserId } from "features/joinedConversations/joinedConversationModel";
 
 export const login = (userId: string): ThunkAction<Promise<void>> => {
   return (dispatch, getState, context) => {
diff --git a/src/features/chat/Menu/Menu.tsx b/src/features/chat/Menu/Menu.tsx
@@ -1,6 +1,6 @@
 import React, { useRef } from "react";
 import { useSelector } from "react-redux";
-import { Breakpoint } from "features/layout/store";
+import { Breakpoint } from "features/layout/layoutModel";
 import { getPanelStates, getBreakpoint } from "features/layout/selectors";
 import { MyUserDetails } from "features/currentUser/MyUserDetails/MyUserDetails";
 import { MyConversations } from "features/joinedConversations/MyConversations/MyConversations";
diff --git a/src/features/conversationMembers/ConversationMembers/ConversationMembers.tsx b/src/features/conversationMembers/ConversationMembers/ConversationMembers.tsx
@@ -2,18 +2,18 @@ import React, { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { createSelector } from "reselect";
 import { getPanelStates, getBreakpoint } from "features/layout/selectors";
-import { Breakpoint } from "features/layout/store";
-import { UsersIndexedById, getUsersById } from "features/users/userStore";
+import { Breakpoint } from "features/layout/layoutModel";
+import { UsersIndexedById, getUsersById } from "features/users/userModel";
 import {
   getUsersByConversationId,
   MembershipHash
-} from "../conversationMemberStore";
+} from "../conversationMemberModel";
 import {
   getPresenceByConversationId,
   ConversationPresence
-} from "features/memberPresence/memberPresenceStore";
+} from "features/memberPresence/memberPresenceModel";
 import { MemberDescription, UserFragment } from "../MemberDescription";
-import { getCurrentConversationId } from "features/currentConversation/currentConversationStore";
+import { getCurrentConversationId } from "features/currentConversation/currentConversationModel";
 import { setLayoutDefault } from "features/layout/actions";
 import { Cross as CrossIcon } from "foundations/components/icons/Cross";
 import { Back as BackIcon } from "foundations/components/icons/Back";
diff --git a/src/features/conversationMembers/conversationMemberModel.ts b/src/features/conversationMembers/conversationMemberModel.ts
diff --git a/src/features/conversations/conversationModel.ts b/src/features/conversations/conversationModel.ts
diff --git a/src/features/currentConversation/ConversationOccupancy/ConversationOccupancy.tsx b/src/features/currentConversation/ConversationOccupancy/ConversationOccupancy.tsx
@@ -1,15 +1,15 @@
 import React from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { createSelector } from "reselect";
-import { getCurrentConversationId } from "../currentConversationStore";
+import { getCurrentConversationId } from "../currentConversationModel";
 import {
   getUsersByConversationId,
   MembershipHash
-} from "features/conversationMembers/conversationMemberStore";
+} from "features/conversationMembers/conversationMemberModel";
 import {
   getPresenceByConversationId,
   ConversationPresence
-} from "features/memberPresence/memberPresenceStore";
+} from "features/memberPresence/memberPresenceModel";
 import { getPanelStates } from "features/layout/selectors";
 import { setLayoutRight } from "features/layout/actions";
 import { PeopleGroup as PeopleGroupIcon } from "foundations/components/icons/PeopleGroup";
diff --git a/src/features/currentConversation/Header/Header.tsx b/src/features/currentConversation/Header/Header.tsx
@@ -6,8 +6,8 @@ import { setLayoutLeft } from "features/layout/actions";
 import {
   ConversationsIndexedById,
   getConversationsById
-} from "features/conversations/conversationStore";
-import { getCurrentConversationId } from "../currentConversationStore";
+} from "features/conversations/conversationModel";
+import { getCurrentConversationId } from "../currentConversationModel";
 import {
   Wrapper,
   Body,
diff --git a/src/features/currentConversation/MessageInput/MessageInput.tsx b/src/features/currentConversation/MessageInput/MessageInput.tsx
@@ -7,8 +7,8 @@ import { sendMessageAction } from "features/messages/sendMessageCommand";
 import {
   getCurrentConversationId,
   getConversationMessageInputValue
-} from "../currentConversationStore";
-import { updateConversationMessageInputValueAction } from "features/currentConversation/currentConversationStore";
+} from "../currentConversationModel";
+import { updateConversationMessageInputValueAction } from "features/currentConversation/currentConversationModel";
 
 const emptyMessage = "";
 
diff --git a/src/features/currentConversation/MessageList/MessageList.tsx b/src/features/currentConversation/MessageList/MessageList.tsx
@@ -2,9 +2,9 @@ import React, { useRef, useEffect, useState, useCallback } from "react";
 import { useSelector } from "react-redux";
 import { createSelector } from "reselect";
 import { Message, MessageFragment } from "../Message";
-import { getCurrentConversationId } from "../currentConversationStore";
-import { getUsersById } from "features/users/userStore";
-import { getMessagesById } from "features/messages/messageStore";
+import { getCurrentConversationId } from "../currentConversationModel";
+import { getUsersById } from "features/users/userModel";
+import { getMessagesById } from "features/messages/messageModel";
 import { Wrapper } from "./MessageList.style";
 import WelcomeMessage from "./WelcomeMessage";
 
diff --git a/src/features/currentConversation/currentConversationModel.ts b/src/features/currentConversation/currentConversationModel.ts
diff --git a/src/features/currentUser/MyUserDetails/MyUserDetails.tsx b/src/features/currentUser/MyUserDetails/MyUserDetails.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { useSelector } from "react-redux";
 import { UserInitialsAvatar } from "foundations/components/UserInitialsAvatar";
-import { getLoggedInUserId } from "features/authentication/authenticationStore";
-import { getUsersById } from "features/users/userStore";
+import { getLoggedInUserId } from "features/authentication/authenticationModel";
+import { getUsersById } from "features/users/userModel";
 import { NetworkStatus } from "../NetworkStatus";
 import {
   Wrapper,
diff --git a/src/features/currentUser/networkStatusModel.ts b/src/features/currentUser/networkStatusModel.ts
diff --git a/src/features/emoji/EmojiSuggestion/EmojiSuggestion.tsx b/src/features/emoji/EmojiSuggestion/EmojiSuggestion.tsx
@@ -1,7 +1,7 @@
 import "emoji-mart/css/emoji-mart.css";
 import { getBreakpoint } from "features/layout/selectors";
 import { useSelector } from "react-redux";
-import { Breakpoint } from "features/layout/store";
+import { Breakpoint } from "features/layout/layoutModel";
 import React, { useRef } from "react";
 import useClickOutside from "foundations/hooks/useClickOutside";
 import { emojiIndex, EmojiData } from "emoji-mart";
diff --git a/src/features/joinedConversations/ConversationItem/ConversationItem.tsx b/src/features/joinedConversations/ConversationItem/ConversationItem.tsx
@@ -9,7 +9,7 @@ import {
 } from "./ConversationItem.style";
 import { Leave } from "foundations/components/icons/Leave";
 import useHover from "foundations/hooks/useHover";
-import { DEFAULT_CONVERSATION } from "features/currentConversation/currentConversationStore";
+import { DEFAULT_CONVERSATION } from "features/currentConversation/currentConversationModel";
 
 interface ConversationItemProps {
   selected: boolean;
diff --git a/src/features/joinedConversations/JoinConversationModal/JoinConversationModal.tsx b/src/features/joinedConversations/JoinConversationModal/JoinConversationModal.tsx
@@ -2,15 +2,15 @@ import React from "react";
 import { getPanelStates } from "features/layout/selectors";
 import { useSelector, useDispatch } from "react-redux";
 import { setLayoutDefault } from "features/layout/actions";
-import { getLoggedInUserId } from "features/authentication/authenticationStore";
+import { getLoggedInUserId } from "features/authentication/authenticationModel";
 import {
   ConversationDescription,
   ConversationDescriptionFragment
 } from "../ConversationDescription";
 import {
   getConversationsByUserId,
   MembershipHash
-} from "../joinedConversationStore";
+} from "../joinedConversationModel";
 import { Cross as CrossIcon } from "foundations/components/icons/Cross";
 import {
   ScrollView,
@@ -23,8 +23,8 @@ import { createSelector } from "reselect";
 import {
   getAllConversations,
   Conversation
-} from "features/conversations/conversationStore";
-import { Breakpoint } from "features/layout/store";
+} from "features/conversations/conversationModel";
+import { Breakpoint } from "features/layout/layoutModel";
 import { getBreakpoint } from "features/layout/selectors";
 import { joinConversation } from "../joinConversationCommand";
 
diff --git a/src/features/joinedConversations/MyConversations/MyConversations.tsx b/src/features/joinedConversations/MyConversations/MyConversations.tsx
@@ -1,16 +1,16 @@
 import React from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { createSelector } from "reselect";
-import { getCurrentConversationId } from "features/currentConversation/currentConversationStore";
+import { getCurrentConversationId } from "features/currentConversation/currentConversationModel";
 import { setLayoutOverlay, setLayoutDefault } from "features/layout/actions";
-import { getConversationsByUserId } from "../joinedConversationStore";
-import { MembershipHash } from "../joinedConversationStore";
+import { getConversationsByUserId } from "../joinedConversationModel";
+import { MembershipHash } from "../joinedConversationModel";
 import {
   ConversationsIndexedById,
   getConversationsById
-} from "features/conversations/conversationStore";
-import { focusOnConversation } from "features/currentConversation/currentConversationStore";
-import { getLoggedInUserId } from "features/authentication/authenticationStore";
+} from "features/conversations/conversationModel";
+import { focusOnConversation } from "features/currentConversation/currentConversationModel";
+import { getLoggedInUserId } from "features/authentication/authenticationModel";
 import { Add } from "foundations/components/icons/Add";
 import { ConversationItem } from "../ConversationItem";
 import {
diff --git a/src/features/joinedConversations/joinConversationCommand.ts b/src/features/joinedConversations/joinConversationCommand.ts
@@ -1,6 +1,6 @@
 import { ThunkAction } from "main/storeTypes";
 import { joinSpaces } from "pubnub-redux";
-import { focusOnConversation } from "features/currentConversation/currentConversationStore";
+import { focusOnConversation } from "features/currentConversation/currentConversationModel";
 
 export const joinConversation = (
   userId: string,
diff --git a/src/features/joinedConversations/joinedConversationModel.ts b/src/features/joinedConversations/joinedConversationModel.ts
diff --git a/src/features/joinedConversations/leaveConversationCommand.ts b/src/features/joinedConversations/leaveConversationCommand.ts
@@ -3,7 +3,7 @@ import { leaveSpaces } from "pubnub-redux";
 import {
   focusOnConversation,
   DEFAULT_CONVERSATION
-} from "features/currentConversation/currentConversationStore";
+} from "features/currentConversation/currentConversationModel";
 
 export const leaveConversation = (
   userId: string,
diff --git a/src/features/layout/actions.ts b/src/features/layout/actions.ts
@@ -1,4 +1,4 @@
-import { Breakpoint, Layout, setLayout, setBreakpoint } from "./store";
+import { Breakpoint, Layout, setLayout, setBreakpoint } from "./layoutModel";
 import { getBreakpoint, getLayout } from "./selectors";
 
 import { ThunkAction } from "main/storeTypes";
diff --git a/src/features/layout/layoutModel.ts b/src/features/layout/layoutModel.ts
diff --git a/src/features/layout/selectors.ts b/src/features/layout/selectors.ts
@@ -1,6 +1,6 @@
 import { createSelector } from "reselect";
 import { AppState } from "main/storeTypes";
-import { Breakpoint, Layout } from "./store";
+import { Breakpoint, Layout } from "./layoutModel";
 
 const getLayoutSlice = (state: AppState) => state.layout;
 
diff --git a/src/features/memberPresence/memberPresenceModel.ts b/src/features/memberPresence/memberPresenceModel.ts
diff --git a/src/features/messages/messageModel.ts b/src/features/messages/messageModel.ts
diff --git a/src/features/messages/sendMessageCommand.ts b/src/features/messages/sendMessageCommand.ts
@@ -1,8 +1,8 @@
 import { ThunkAction } from "main/storeTypes";
-import { getCurrentConversationId } from "features/currentConversation/currentConversationStore";
-import { MessageContent } from "./messageStore";
+import { getCurrentConversationId } from "features/currentConversation/currentConversationModel";
+import { MessageContent } from "./messageModel";
 import { sendMessage } from "pubnub-redux";
-import { getLoggedInUserId } from "features/authentication/authenticationStore";
+import { getLoggedInUserId } from "features/authentication/authenticationModel";
 
 export const sendMessageAction = (message: MessageContent): ThunkAction => {
   return (dispatch, getState) => {
diff --git a/src/features/users/userModel.ts b/src/features/users/userModel.ts
diff --git a/src/main/App.tsx b/src/main/App.tsx
@@ -31,13 +31,17 @@ const onResize = () => {
   store.dispatch(resize(window.innerWidth));
 };
 
+const leaveApplication = () => {
+  // This is required to show the current user leave immediately rather than
+  // wating for the timeout period
+  pubnub.unsubscribeAll();
+};
+
 const App = () => {
   useEffect(() => {
     // Start listening for messages and events from PubNub
     pubnub.addListener(createPubNubListener(store.dispatch));
-    return () => {
-      pubnub.stop(); // This should be `destroy` but that's not defined in TS
-    };
+    return leaveApplication;
   }, []);
 
   useEffect(() => {
@@ -49,6 +53,10 @@ const App = () => {
     };
   });
 
+  useEffect(() => {
+    window.addEventListener("beforeunload", leaveApplication);
+  }, []);
+
   return (
     <Provider store={store}>
       <PubNubProvider client={pubnub}>
diff --git a/src/main/AppActions.ts b/src/main/AppActions.ts
@@ -1,12 +1,15 @@
 import {
   focusOnConversationAction,
   updateConversationMessageInputValueAction
-} from "features/currentConversation/currentConversationStore";
-import { setLayoutAction, setBreakpointAction } from "features/layout/store";
+} from "features/currentConversation/currentConversationModel";
+import {
+  setLayoutAction,
+  setBreakpointAction
+} from "features/layout/layoutModel";
 import {
   logingInAction,
   loginSucceededAction
-} from "features/authentication/authenticationStore";
+} from "features/authentication/authenticationModel";
 
 /**
  * AppActions is the union of all basic actions in this application.
diff --git a/src/main/Router.tsx b/src/main/Router.tsx
@@ -3,11 +3,11 @@ import React from "react";
 import { Wrapper } from "./style";
 import { Login } from "features/authentication/Login/Login";
 import { ChatUI } from "features/chat/Chat";
-import { isUserLoggedIn } from "features/authentication/authenticationStore";
+import { isUserLoggedIn } from "features/authentication/authenticationModel";
 import { useSelector } from "react-redux";
 import keyConfiguration from "config/pubnub-keys.json";
 import isPubNubConfigured from "foundations/utilities/isPubNubConfigured";
-import { ErrorBanner } from "features/errorUI/ErrorUI.style";
+import { ErrorBanner } from "main/styles/ErrorBanner.style";
 
 const ErrorBannerComponent = (
   <ErrorBanner>
diff --git a/src/main/rootReducer.ts b/src/main/rootReducer.ts
@@ -1,15 +1,15 @@
 import { combineReducers } from "redux";
 
-import { currentConversationStateReducer } from "features/currentConversation/currentConversationStore";
-import { LayoutStateReducer } from "features/layout/store";
-import { UsersReducer } from "features/users/userStore";
-import { AuthenticationStateReducer } from "features/authentication/authenticationStore";
-import { MessageStateReducer } from "features/messages/messageStore";
-import { conversationStateReducer } from "features/conversations/conversationStore";
-import { JoinedConversationsStateReducer } from "features/joinedConversations/joinedConversationStore";
-import { ConversationMembersStateReducer } from "features/conversationMembers/conversationMemberStore";
-import { NetworkStatusReducer } from "features/currentUser/networkStatusStore";
-import { MemberPresenceReducer } from "features/memberPresence/memberPresenceStore";
+import { currentConversationStateReducer } from "features/currentConversation/currentConversationModel";
+import { LayoutStateReducer } from "features/layout/layoutModel";
+import { UsersReducer } from "features/users/userModel";
+import { AuthenticationStateReducer } from "features/authentication/authenticationModel";
+import { MessageStateReducer } from "features/messages/messageModel";
+import { conversationStateReducer } from "features/conversations/conversationModel";
+import { JoinedConversationsStateReducer } from "features/joinedConversations/joinedConversationModel";
+import { ConversationMembersStateReducer } from "features/conversationMembers/conversationMemberModel";
+import { NetworkStatusReducer } from "features/currentUser/networkStatusModel";
+import { MemberPresenceReducer } from "features/memberPresence/memberPresenceModel";
 
 /**
  * Combine all of the reducers in this application
diff --git a/src/main/styles/ErrorBanner.style.tsx b/src/main/styles/ErrorBanner.style.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "team-chat",`
`3`		`- "version": "0.4.2",`
	`3`	`+ "version": "0.5.0",`
`4`	`4`	`"description": "Team Chat - A Reference Application for PubNub with Typescript, React and Redux",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"private": true,`