@plusscommunities/pluss-circles-app-groups 8.0.5 → 8.0.6-beta.0

package/src/js/index.js

@@ -1,5 +1,5 @@
-import { Session, Helper } from '../core.config';
-import mapStateToDirectMessages from './circles/MapStateToDirectMessages';
+import { Session, Helper } from "../core.config";
+import mapStateToDirectMessages from "./circles/MapStateToDirectMessages";
 
 // Session
 export const authedFunction = Session.authedFunction;
@@ -21,4 +21,4 @@ export const searchUsers = Helper.searchUsers;
 
 export { mapStateToDirectMessages };
 
-export * from './Colors';
+export * from "./Colors";

package/src/reducers/ChatsReducer.js

@@ -1,63 +1,76 @@
-import { REHYDRATE } from 'redux-persist';
+import { REHYDRATE } from "redux-persist";
 import {
-  SOFT_ADD_CIRCLE_CHAT,
-  CREATED_CIRCLE_CHAT,
-  RECEIVED_CIRCLE_CHATS,
-  RECEIVED_CIRCLE_MESSAGES,
-  RECEIVED_BLOCKED_CIRCLE_USERS,
-  LOGOUT,
-  CHANGE_ROLE,
-} from '../actions/types';
-import { CHAT_REDUCER_KEY } from './reducerKeys';
+	SOFT_ADD_CIRCLE_CHAT,
+	CREATED_CIRCLE_CHAT,
+	RECEIVED_CIRCLE_CHATS,
+	RECEIVED_CIRCLE_MESSAGES,
+	RECEIVED_BLOCKED_CIRCLE_USERS,
+	LOGOUT,
+	CHANGE_ROLE,
+} from "../actions/types";
+import { CHAT_REDUCER_KEY } from "./reducerKeys";
 
 const INITIAL_STATE = {
-  selectedChatKey: null,
-  list: [],
-  messages: {},
-  unreadCount: 0,
-  blockedUsers: {},
+	selectedChatKey: null,
+	list: [],
+	messages: {},
+	unreadCount: 0,
+	blockedUsers: {},
 };
 
 export default (state = INITIAL_STATE, action) => {
-  switch (action.type) {
-    case LOGOUT:
-    case CHANGE_ROLE:
-      return INITIAL_STATE;
-    case CREATED_CIRCLE_CHAT:
-      return { ...state, selectedChatKey: action.payload, messages: [] };
-    case SOFT_ADD_CIRCLE_CHAT:
-      return { ...state, list: [...state.list, ...action.payload] };
-    case RECEIVED_CIRCLE_CHATS:
-      return { ...state, list: action.payload, unreadCount: action.unreadCount };
-    case RECEIVED_CIRCLE_MESSAGES:
-      return { ...state, messages: { ...state.messages, [action.payload.chatKey]: action.payload.messages } };
-    case RECEIVED_BLOCKED_CIRCLE_USERS:
-      return { ...state, blockedUsers: action.payload };
+	switch (action.type) {
+		case LOGOUT:
+		case CHANGE_ROLE:
+			return INITIAL_STATE;
+		case CREATED_CIRCLE_CHAT:
+			return { ...state, selectedChatKey: action.payload, messages: [] };
+		case SOFT_ADD_CIRCLE_CHAT:
+			return { ...state, list: [...state.list, ...action.payload] };
+		case RECEIVED_CIRCLE_CHATS:
+			return {
+				...state,
+				list: action.payload,
+				unreadCount: action.unreadCount,
+			};
+		case RECEIVED_CIRCLE_MESSAGES:
+			return {
+				...state,
+				messages: {
+					...state.messages,
+					[action.payload.chatKey]: action.payload.messages,
+				},
+			};
+		case RECEIVED_BLOCKED_CIRCLE_USERS:
+			return { ...state, blockedUsers: action.payload };
 
-    case REHYDRATE:
-      if (!action.payload) return state;
-      if (action.payload[CHAT_REDUCER_KEY] && Array.isArray(action.payload[CHAT_REDUCER_KEY])) {
-        return {
-          list: action.payload[CHAT_REDUCER_KEY],
-          // areas: _.groupBy(action.payload[CHAT_REDUCER_KEY], (event) => { return event.Area })
-        };
-      } else if (action.payload[CHAT_REDUCER_KEY]) {
-        if (action.payload[CHAT_REDUCER_KEY].messages == null) {
-          action.payload[CHAT_REDUCER_KEY].messages = {};
-        }
-        if (action.payload[CHAT_REDUCER_KEY].unreadCount == null) {
-          action.payload[CHAT_REDUCER_KEY].unreadCount = 0;
-        }
-        if (action.payload[CHAT_REDUCER_KEY].blockedUsers == null) {
-          action.payload[CHAT_REDUCER_KEY].blockedUsers = {};
-        }
-        /* fixSelectedTimes(action.payload[CHAT_REDUCER_KEY].list);
+		case REHYDRATE:
+			if (!action.payload) return state;
+			if (
+				action.payload[CHAT_REDUCER_KEY] &&
+				Array.isArray(action.payload[CHAT_REDUCER_KEY])
+			) {
+				return {
+					list: action.payload[CHAT_REDUCER_KEY],
+					// areas: _.groupBy(action.payload[CHAT_REDUCER_KEY], (event) => { return event.Area })
+				};
+			} else if (action.payload[CHAT_REDUCER_KEY]) {
+				if (action.payload[CHAT_REDUCER_KEY].messages == null) {
+					action.payload[CHAT_REDUCER_KEY].messages = {};
+				}
+				if (action.payload[CHAT_REDUCER_KEY].unreadCount == null) {
+					action.payload[CHAT_REDUCER_KEY].unreadCount = 0;
+				}
+				if (action.payload[CHAT_REDUCER_KEY].blockedUsers == null) {
+					action.payload[CHAT_REDUCER_KEY].blockedUsers = {};
+				}
+				/* fixSelectedTimes(action.payload[CHAT_REDUCER_KEY].list);
                 fixRepeatedTimes(action.payload[CHAT_REDUCER_KEY].list); */
-        return action.payload[CHAT_REDUCER_KEY];
-      }
-      return state;
+				return action.payload[CHAT_REDUCER_KEY];
+			}
+			return state;
 
-    default:
-      return state;
-  }
+		default:
+			return state;
+	}
 };

package/src/reducers/GroupsReducer.js

@@ -1,205 +1,218 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-case-declarations */
-import { REHYDRATE } from 'redux-persist';
-import _ from 'lodash';
+import { REHYDRATE } from "redux-persist";
+import _ from "lodash";
 import {
-  LOGOUT,
-  CIRCLE_INVITES_LOADED,
-  CIRCLE_INVITES_UPDATED,
-  PUBLIC_CIRCLES_LOAD_INITIALISE,
-  CIRCLES_LOAD_INITIALISE,
-  CIRCLES_LOADED,
-  CREATED_CIRCLE,
-  CLEAR_CIRCLES,
-  UPDATE_CIRCLE_UNREAD,
-  CLEAR_SINGLE_CIRCLE_UNREAD,
-  CHANGE_ROLE,
-  ARCHIVE_CIRCLE,
-} from '../actions/types';
-import { GROUPS_REDUCER_KEY } from './reducerKeys';
+	LOGOUT,
+	CIRCLE_INVITES_LOADED,
+	CIRCLE_INVITES_UPDATED,
+	PUBLIC_CIRCLES_LOAD_INITIALISE,
+	CIRCLES_LOAD_INITIALISE,
+	CIRCLES_LOADED,
+	CREATED_CIRCLE,
+	CLEAR_CIRCLES,
+	UPDATE_CIRCLE_UNREAD,
+	CLEAR_SINGLE_CIRCLE_UNREAD,
+	CHANGE_ROLE,
+	ARCHIVE_CIRCLE,
+} from "../actions/types";
+import { GROUPS_REDUCER_KEY } from "./reducerKeys";
 
 const INITIAL_STATE = {
-  list: [],
-  publicList: [],
-  invites: [],
-  unreadCount: 0,
-  privateCount: 0,
-  recentlyArchived: {}, // Track recently archived with last message timestamp
+	list: [],
+	publicList: [],
+	invites: [],
+	unreadCount: 0,
+	privateCount: 0,
+	recentlyArchived: {}, // Track recently archived with last message timestamp
 };
 
 export default (state = INITIAL_STATE, action) => {
-  switch (action.type) {
-    case LOGOUT:
-    case CHANGE_ROLE:
-      return INITIAL_STATE;
-    case UPDATE_CIRCLE_UNREAD: {
-      return { ...state, unreadCount: action.payload };
-    }
-    case CLEAR_SINGLE_CIRCLE_UNREAD: {
-      const growps = [...state.list];
-      let newCount = state.unreadCount;
-      if (!_.isEmpty(growps)) {
-        growps.forEach(g => {
-          if (!g.Unread) {
-            g.Unread = {};
-          }
-          if (g.Id === action.payload.groupId) {
-            g.Unread[action.payload.userId] = 0;
-          }
-        });
-        let counter = 0;
-        growps.forEach(element => {
-          if (!_.isUndefined(element.Unread) && !_.isEmpty(element.Unread) && !_.isUndefined(element.Unread[action.payload.userId])) {
-            counter += element.Unread[action.payload.userId];
-          }
-        });
-        newCount = counter;
-      }
-      return { ...state, list: growps, unreadCount: newCount };
-    }
-    case CIRCLE_INVITES_LOADED:
-      if (action.payload == null) {
-        return state;
-      }
-      return { ...state, invites: action.payload };
-    case CIRCLE_INVITES_UPDATED:
-      if (action.payload == null || action.payload.length === 0) {
-        return state;
-      }
-      let pInvites = [...state.invites];
-      if (pInvites === null) pInvites = [];
+	switch (action.type) {
+		case LOGOUT:
+		case CHANGE_ROLE:
+			return INITIAL_STATE;
+		case UPDATE_CIRCLE_UNREAD: {
+			return { ...state, unreadCount: action.payload };
+		}
+		case CLEAR_SINGLE_CIRCLE_UNREAD: {
+			const growps = [...state.list];
+			let newCount = state.unreadCount;
+			if (!_.isEmpty(growps)) {
+				growps.forEach((g) => {
+					if (!g.Unread) {
+						g.Unread = {};
+					}
+					if (g.Id === action.payload.groupId) {
+						g.Unread[action.payload.userId] = 0;
+					}
+				});
+				let counter = 0;
+				growps.forEach((element) => {
+					if (
+						!_.isUndefined(element.Unread) &&
+						!_.isEmpty(element.Unread) &&
+						!_.isUndefined(element.Unread[action.payload.userId])
+					) {
+						counter += element.Unread[action.payload.userId];
+					}
+				});
+				newCount = counter;
+			}
+			return { ...state, list: growps, unreadCount: newCount };
+		}
+		case CIRCLE_INVITES_LOADED:
+			if (action.payload == null) {
+				return state;
+			}
+			return { ...state, invites: action.payload };
+		case CIRCLE_INVITES_UPDATED:
+			if (action.payload == null || action.payload.length === 0) {
+				return state;
+			}
+			let pInvites = [...state.invites];
+			if (pInvites === null) pInvites = [];
 
-      let pInvResult = _.unionWith(action.payload, pInvites, (v1, v2) => {
-        return v1 != null && v2 != null && v1.Id === v2.Id;
-      });
+			let pInvResult = _.unionWith(action.payload, pInvites, (v1, v2) => {
+				return v1 != null && v2 != null && v1.Id === v2.Id;
+			});
 
-      pInvResult = _.filter(pInvResult, group => {
-        return group != null && !group.Deleted;
-      });
-      return { ...state, invites: pInvResult };
-    case PUBLIC_CIRCLES_LOAD_INITIALISE:
-      // console.log('PUBLIC_CIRCLES_LOAD_INITIALISE', action.payload);
-      if (action.payload == null) {
-        return state;
-      }
-      return { ...state, publicList: action.payload };
-    case CIRCLES_LOAD_INITIALISE:
-      if (action.payload == null) {
-        return state;
-      }
-      // Filter out recently archived items UNLESS they have new messages (auto-unarchived)
-      const filteredList = _.filter(action.payload, group => {
-        if (group == null || group.Deleted) return false;
-        
-        // Check if this was recently archived
-        const archivedInfo = state.recentlyArchived[group.Id];
-        if (archivedInfo) {
-          // If there's a new message since archiving, allow it (auto-unarchived)
-          if (group.lastMessage && group.lastMessage.createdAt > archivedInfo.timestamp) {
-            // Remove from recently archived since it's been unarchived
-            delete state.recentlyArchived[group.Id];
-            return true;
-          }
-          // Otherwise filter it out (still archived)
-          return false;
-        }
-        return true;
-      });
-      return {
-        ...state,
-        list: filteredList,
-      };
-    case CIRCLES_LOADED:
-      if (action.payload == null || action.payload.length === 0) {
-        return state;
-      }
-      let pGroups = state.list;
-      if (pGroups === null) pGroups = [];
+			pInvResult = _.filter(pInvResult, (group) => {
+				return group != null && !group.Deleted;
+			});
+			return { ...state, invites: pInvResult };
+		case PUBLIC_CIRCLES_LOAD_INITIALISE:
+			// console.log('PUBLIC_CIRCLES_LOAD_INITIALISE', action.payload);
+			if (action.payload == null) {
+				return state;
+			}
+			return { ...state, publicList: action.payload };
+		case CIRCLES_LOAD_INITIALISE:
+			if (action.payload == null) {
+				return state;
+			}
+			// Filter out recently archived items UNLESS they have new messages (auto-unarchived)
+			const filteredList = _.filter(action.payload, (group) => {
+				if (group == null || group.Deleted) return false;
 
-      let pResult = _.unionWith(action.payload, pGroups, (v1, v2) => {
-        return v1 != null && v2 != null && v1.Id === v2.Id;
-      });
+				// Check if this was recently archived
+				const archivedInfo = state.recentlyArchived[group.Id];
+				if (archivedInfo) {
+					// If there's a new message since archiving, allow it (auto-unarchived)
+					if (
+						group.lastMessage &&
+						group.lastMessage.createdAt > archivedInfo.timestamp
+					) {
+						// Remove from recently archived since it's been unarchived
+						delete state.recentlyArchived[group.Id];
+						return true;
+					}
+					// Otherwise filter it out (still archived)
+					return false;
+				}
+				return true;
+			});
+			return {
+				...state,
+				list: filteredList,
+			};
+		case CIRCLES_LOADED:
+			if (action.payload == null || action.payload.length === 0) {
+				return state;
+			}
+			let pGroups = state.list;
+			if (pGroups === null) pGroups = [];
 
-      // Clean up recently archived based on new messages
-      const cleanedRecentlyArchived = { ...state.recentlyArchived };
-      
-      pResult = _.filter(pResult, group => {
-        if (group == null || group.Deleted) return false;
-        
-        const archivedInfo = cleanedRecentlyArchived[group.Id];
-        if (archivedInfo) {
-          // Check for new messages that would trigger auto-unarchive
-          if (group.lastMessage && group.lastMessage.createdAt > archivedInfo.timestamp) {
-            delete cleanedRecentlyArchived[group.Id];
-            return true;
-          }
-          return false;
-        }
-        return true;
-      });
+			let pResult = _.unionWith(action.payload, pGroups, (v1, v2) => {
+				return v1 != null && v2 != null && v1.Id === v2.Id;
+			});
 
-      return {
-        ...state,
-        list: pResult,
-        recentlyArchived: cleanedRecentlyArchived,
-      };
-    case CREATED_CIRCLE:
-      const zzzz = [...state.list];
-      zzzz.push(action.payload);
-      return { ...state, list: zzzz };
-    case CLEAR_CIRCLES:
-      return { list: [], invites: [] };
-    case ARCHIVE_CIRCLE:
-      // Remove the archived conversation from the list
-      const newList = state.list.filter(group => group.Id !== action.payload);
-      
-      // Find the group being archived to get its last message timestamp
-      const archivedGroup = state.list.find(group => group.Id === action.payload);
-      const lastMessageTime = archivedGroup?.lastMessage?.createdAt || Date.now();
-      
-      // Track when it was archived with last message timestamp
-      const updatedRecentlyArchived = {
-        ...state.recentlyArchived,
-        [action.payload]: {
-          timestamp: lastMessageTime,
-          archivedAt: Date.now()
-        }
-      };
-      
-      // Clean up old archived entries (older than 5 minutes)
-      const fiveMinutesAgo = Date.now() - (5 * 60 * 1000);
-      Object.keys(updatedRecentlyArchived).forEach(key => {
-        if (updatedRecentlyArchived[key].archivedAt < fiveMinutesAgo) {
-          delete updatedRecentlyArchived[key];
-        }
-      });
-      
-      return {
-        ...state,
-        list: newList,
-        recentlyArchived: updatedRecentlyArchived,
-      };
-    case REHYDRATE:
-      if (!action.payload) return state;
-      if (action.payload[GROUPS_REDUCER_KEY]) {
-        if (action.payload[GROUPS_REDUCER_KEY].list == null) {
-          action.payload[GROUPS_REDUCER_KEY].list = [];
-        }
-        if (action.payload[GROUPS_REDUCER_KEY].invites == null) {
-          action.payload[GROUPS_REDUCER_KEY].invites = [];
-        }
-        if (action.payload[GROUPS_REDUCER_KEY].unreadCount == null) {
-          action.payload[GROUPS_REDUCER_KEY].unreadCount = 0;
-        }
-        if (action.payload[GROUPS_REDUCER_KEY].recentlyArchived == null) {
-          action.payload[GROUPS_REDUCER_KEY].recentlyArchived = {};
-        }
-        /* fixSelectedTimes(action.payload[GROUPS_REDUCER_KEY].list);
+			// Clean up recently archived based on new messages
+			const cleanedRecentlyArchived = { ...state.recentlyArchived };
+
+			pResult = _.filter(pResult, (group) => {
+				if (group == null || group.Deleted) return false;
+
+				const archivedInfo = cleanedRecentlyArchived[group.Id];
+				if (archivedInfo) {
+					// Check for new messages that would trigger auto-unarchive
+					if (
+						group.lastMessage &&
+						group.lastMessage.createdAt > archivedInfo.timestamp
+					) {
+						delete cleanedRecentlyArchived[group.Id];
+						return true;
+					}
+					return false;
+				}
+				return true;
+			});
+
+			return {
+				...state,
+				list: pResult,
+				recentlyArchived: cleanedRecentlyArchived,
+			};
+		case CREATED_CIRCLE:
+			const zzzz = [...state.list];
+			zzzz.push(action.payload);
+			return { ...state, list: zzzz };
+		case CLEAR_CIRCLES:
+			return { list: [], invites: [] };
+		case ARCHIVE_CIRCLE:
+			// Remove the archived conversation from the list
+			const newList = state.list.filter((group) => group.Id !== action.payload);
+
+			// Find the group being archived to get its last message timestamp
+			const archivedGroup = state.list.find(
+				(group) => group.Id === action.payload,
+			);
+			const lastMessageTime =
+				archivedGroup?.lastMessage?.createdAt || Date.now();
+
+			// Track when it was archived with last message timestamp
+			const updatedRecentlyArchived = {
+				...state.recentlyArchived,
+				[action.payload]: {
+					timestamp: lastMessageTime,
+					archivedAt: Date.now(),
+				},
+			};
+
+			// Clean up old archived entries (older than 5 minutes)
+			const fiveMinutesAgo = Date.now() - 5 * 60 * 1000;
+			Object.keys(updatedRecentlyArchived).forEach((key) => {
+				if (updatedRecentlyArchived[key].archivedAt < fiveMinutesAgo) {
+					delete updatedRecentlyArchived[key];
+				}
+			});
+
+			return {
+				...state,
+				list: newList,
+				recentlyArchived: updatedRecentlyArchived,
+			};
+		case REHYDRATE:
+			if (!action.payload) return state;
+			if (action.payload[GROUPS_REDUCER_KEY]) {
+				if (action.payload[GROUPS_REDUCER_KEY].list == null) {
+					action.payload[GROUPS_REDUCER_KEY].list = [];
+				}
+				if (action.payload[GROUPS_REDUCER_KEY].invites == null) {
+					action.payload[GROUPS_REDUCER_KEY].invites = [];
+				}
+				if (action.payload[GROUPS_REDUCER_KEY].unreadCount == null) {
+					action.payload[GROUPS_REDUCER_KEY].unreadCount = 0;
+				}
+				if (action.payload[GROUPS_REDUCER_KEY].recentlyArchived == null) {
+					action.payload[GROUPS_REDUCER_KEY].recentlyArchived = {};
+				}
+				/* fixSelectedTimes(action.payload[GROUPS_REDUCER_KEY].list);
                 fixRepeatedTimes(action.payload[GROUPS_REDUCER_KEY].list); */
-        return action.payload[GROUPS_REDUCER_KEY];
-      }
-      return state;
-    default:
-      return state;
-  }
+				return action.payload[GROUPS_REDUCER_KEY];
+			}
+			return state;
+		default:
+			return state;
+	}
 };

package/src/reducers/reducerKeys.js

@@ -1,4 +1,4 @@
-import { values } from '../values.config';
+import { values } from "../values.config";
 
 export const GROUPS_REDUCER_KEY = values.reducerKey;
 export const CHAT_REDUCER_KEY = values.reducerKeyChats;

package/src/values.config.default.js

@@ -1,39 +1,39 @@
 const values = {
-  featureKey: 'circles',
-  entityKey: 'circle',
-  entityName: 'circle',
-  serviceKey: 'circles',
-  permission: 'circles',
+	featureKey: "circles",
+	entityKey: "circle",
+	entityName: "circle",
+	serviceKey: "circles",
+	permission: "circles",
 
-  reducerKey: 'circles',
-  reducerKeyChats: 'circleChats',
+	reducerKey: "circles",
+	reducerKeyChats: "circleChats",
 
-  actionCircleKey: 'CIRCLE',
+	actionCircleKey: "CIRCLE",
 
-  screenNewCircle: 'newCircle',
-  screenCircleDetails: 'circleDetails',
-  screenEditCircle: 'editCircle',
-  screenCirclePeopleContainer: 'circlePeopleContainer',
-  screenCircleChat: 'circleChat',
-  screenCircleChatList: 'circleChatList',
+	screenNewCircle: "newCircle",
+	screenCircleDetails: "circleDetails",
+	screenEditCircle: "editCircle",
+	screenCirclePeopleContainer: "circlePeopleContainer",
+	screenCircleChat: "circleChat",
+	screenCircleChatList: "circleChatList",
 
-  notificationInvite: 'CircleInvite',
-  notificationMessage: 'CircleChat',
-  notificationDirectMessage: 'CircleProfileChat',
+	notificationInvite: "CircleInvite",
+	notificationMessage: "CircleChat",
+	notificationDirectMessage: "CircleProfileChat",
 
-  textFeatureTitle: 'Circles',
-  textAddMenuTitle: 'Circle',
-  textEmptyGroups: "You aren't in any Circles",
-  textEmptyPeople: 'Contacts will show here',
+	textFeatureTitle: "Circles",
+	textAddMenuTitle: "Circle",
+	textEmptyGroups: "You aren't in any Circles",
+	textEmptyPeople: "Contacts will show here",
 
-  inviteKey: 'circleInvite',
-  messageKey: 'circleMessage',
-  chatRoute: 'circleChat',
-  updateKeyUserCircles: 'userCircles',
-  allowPublicKey: 'circleAllowPublicCircles',
+	inviteKey: "circleInvite",
+	messageKey: "circleMessage",
+	chatRoute: "circleChat",
+	updateKeyUserCircles: "userCircles",
+	allowPublicKey: "circleAllowPublicCircles",
 
-  settings: {
-    allowAnyCreate: false,
-  },
+	settings: {
+		allowAnyCreate: false,
+	},
 };
 exports.values = values;