@churchapps/apphelper 0.5.11 → 0.6.1

package/src/components/wrapper/UserMenu.tsx

@@ -96,10 +96,8 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
   };
 
   const handleSwitchChurch = () => {
-    console.log('UserMenu - handleSwitchChurch called');
     removeCookie("lastChurchId", { path: "/" });
     setTabIndex(2);
-    console.log('UserMenu - tabIndex set to 2');
   };
 
   const getMainLinks = () => {
@@ -151,7 +149,6 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
   const [tabIndex, setTabIndex] = React.useState(0);
 
   const getTabs = () => {
-    console.log('UserMenu getTabs - Current tabIndex:', tabIndex);
     return (
       <Box sx={{ borderBottom: 1, borderColor: "divider" }}>
         <TabPanel value={tabIndex} index={0}>
@@ -165,26 +162,16 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
           <div style={{ maxHeight: '70vh', overflowY: "auto" }}>
             <NavItem label="Back" key="ChurchBack" icon="arrow_back" onClick={() => { setTabIndex(0); }} />
             {(() => {
-              console.log('UserMenu Church Tab - Rendering church list section');
-              console.log('UserMenu Church Tab - Full context:', props.context);
-              console.log('UserMenu Church Tab - context.userChurches:', props.context?.userChurches);
-              console.log('UserMenu Church Tab - context.userChurches[0]:', props.context?.userChurches?.[0]);
-              console.log('UserMenu Church Tab - context.userChurch:', props.context?.userChurch);
-              console.log('UserMenu Church Tab - userChurches type:', typeof props.context?.userChurches);
-              console.log('UserMenu Church Tab - userChurches is array?', Array.isArray(props.context?.userChurches));
-              console.log('UserMenu Church Tab - userChurches length:', props.context?.userChurches?.length);
-              
               // Check if userChurches is actually the userChurch object
               if (props.context?.userChurches && !Array.isArray(props.context.userChurches) && (props.context.userChurches as any).id) {
                 console.error('UserMenu - ERROR: context.userChurches contains a single church object instead of an array!');
-                console.log('UserMenu - Attempting to use context.userChurch as single item array');
                 const churchArray = props.context.userChurch ? [props.context.userChurch] : [];
                 return <ChurchList userChurches={churchArray} currentUserChurch={props.context?.userChurch} context={props.context} onDelete={handleClose} onChurchChange={() => {
                     handleClose();
                     // Don't navigate - just close the menu and let the context update trigger re-renders
                 }} />;
               }
-              
+
               if (!props.context?.userChurches) {
                 return <Typography sx={{ p: 2, color: 'text.secondary' }}>Loading churches...</Typography>;
               } else if (!Array.isArray(props.context.userChurches)) {
@@ -193,10 +180,9 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
                 return <Typography sx={{ p: 2, color: 'text.secondary' }}>No churches available</Typography>;
               } else {
                 // Ensure we always pass an array
-                const churchesArray = Array.isArray(props.context.userChurches) 
-                  ? props.context.userChurches 
+                const churchesArray = Array.isArray(props.context.userChurches)
+                  ? props.context.userChurches
                   : [props.context.userChurches];
-                console.log('UserMenu - Passing to ChurchList:', churchesArray);
                 return <ChurchList userChurches={churchesArray} currentUserChurch={props.context?.userChurch} context={props.context} onDelete={handleClose} onChurchChange={() => {
                     handleClose();
                     // Don't navigate - just close the menu and let the context update trigger re-renders

package/src/helpers/ErrorHelper.ts

@@ -26,7 +26,6 @@ export class ErrorHelper {
 			details: details
 		}
 
-		console.log("ERROR LOG", log);
 
 		if (log.errorType === "401" && log.message.indexOf("/users/login") > -1) return;
 		if (log.message.indexOf("clientErrors") > -1) return;
@@ -34,7 +33,6 @@ export class ErrorHelper {
 			// Error posting to /errors endpoint disabled
 			// ApiHelper.postAnonymous("/clientErrors", [log], "MembershipApi");
 		} catch (error) {
-			console.log(error)
 		}
 		if (ErrorHelper.customErrorHandler) ErrorHelper.customErrorHandler(log);
 	}

package/src/helpers/NotificationService.ts

@@ -23,38 +23,23 @@ export class NotificationService {
     return NotificationService.instance;
   }
 
-  /**
-   * Initialize the notification service with user context
-   */
   /**
    * Initialize the notification service with user context
    */
   async initialize(context: UserContextInterface): Promise<void> {
     if (this.isInitialized) {
-      console.log('🔔 NotificationService: Already initialized, skipping');
       return;
     }
 
-    console.log('🔔 NotificationService: Starting initialization with context:', {
-      hasUser: !!context?.user,
-      hasPerson: !!context?.person,
-      hasUserChurch: !!context?.userChurch,
-      personId: context?.person?.id,
-      churchId: context?.userChurch?.church?.id
-    });
-
     try {
       // Store current person ID for conversation counting
       this.currentPersonId = context?.person?.id || null;
-      console.log('👤 NotificationService: Set current person ID:', this.currentPersonId);
       
       // Initialize WebSocket connection
-      console.log('🔌 NotificationService: Initializing SocketHelper...');
       await SocketHelper.init();
 
       // Set person/church context for websocket
       if (context?.person?.id && context?.userChurch?.church?.id) {
-        console.log('🔗 NotificationService: Setting person/church context in SocketHelper');
         SocketHelper.setPersonChurch({
           personId: context.person.id,
           churchId: context.userChurch.church.id
@@ -64,15 +49,12 @@ export class NotificationService {
       }
 
       // Register handlers for notification updates
-      console.log('📋 NotificationService: Registering WebSocket handlers');
       this.registerWebSocketHandlers();
 
       // Load initial notification counts
-      console.log('📊 NotificationService: Loading initial notification counts');
       await this.loadNotificationCounts();
 
       this.isInitialized = true;
-      console.log('✅ NotificationService: Initialization complete');
 
     } catch (error) {
       console.error("❌ Failed to initialize NotificationService:", error);
@@ -80,24 +62,14 @@ export class NotificationService {
     }
   }
 
-  /**
-   * Register websocket handlers for real-time notification updates
-   */
-  /**
-   * Register websocket handlers for real-time notification updates
-   */
   /**
    * Register websocket handlers for real-time notification updates
    */
   private registerWebSocketHandlers(): void {
     // Handler for new private messages
     SocketHelper.addHandler("privateMessage", "NotificationService-PM", (data: any) => {
-      console.log('🔔 NotificationService: New private message received, updating counts');
-      console.log('📨 Private message data:', data);
-      console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
       try {
         this.debouncedLoadNotificationCounts();
-        console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
       } catch (error) {
         console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
       }
@@ -105,12 +77,8 @@ export class NotificationService {
 
     // Handler for general notifications
     SocketHelper.addHandler("notification", "NotificationService-Notification", (data: any) => {
-      console.log('🔔 NotificationService: New notification received, updating counts');
-      console.log('📨 Notification data:', data);
-      console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
       try {
         this.debouncedLoadNotificationCounts();
-        console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
       } catch (error) {
         console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
       }
@@ -121,69 +89,48 @@ export class NotificationService {
       // Only update counts if the message update involves the current person
       if (data?.message?.personId === this.currentPersonId || 
           data?.notifyPersonId === this.currentPersonId) {
-        console.log('🔔 NotificationService: Message update affecting current user, updating counts');
-        console.log('📨 Message update data:', data);
-        console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
         try {
           this.debouncedLoadNotificationCounts();
-          console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
         } catch (error) {
           console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
         }
-      } else {
-        console.log('🔕 NotificationService: Message update not for current user, ignoring');
-        console.log('📨 Message personId:', data?.message?.personId, 'Current personId:', this.currentPersonId);
       }
     });
 
     // Handler for reconnect events
     SocketHelper.addHandler("reconnect", "NotificationService-Reconnect", (data: any) => {
-      console.log('🔔 NotificationService: WebSocket reconnected, refreshing counts');
       this.loadNotificationCounts(); // Don't debounce reconnect - need immediate update
     });
   }
 
-  /**
-   * Load notification counts from the API with debouncing
-   */
   /**
    * Load notification counts from the API with debouncing
    */
   private debouncedLoadNotificationCounts(): void {
-    console.log('⏰ NotificationService: Debounced load triggered');
     
     if (this.loadTimeout) {
-      console.log('⏰ NotificationService: Clearing existing timeout');
       clearTimeout(this.loadTimeout);
     }
     
     this.loadTimeout = setTimeout(() => {
-      console.log('⏰ NotificationService: Timeout expired, loading counts...');
       this.loadNotificationCounts();
     }, 300); // 300ms debounce
   }
 
-  /**
-   * Load notification counts from the API
-   */
   /**
    * Load notification counts from the API
    */
   async loadNotificationCounts(): Promise<void> {
-    console.log('📊 NotificationService: Loading notification counts from API...');
     
     try {
       // Use the unreadCount endpoint which returns both notification and PM counts
-      console.log('🌐 NotificationService: Making API call to /notifications/unreadCount');
       const counts = await ApiHelper.get("/notifications/unreadCount", "MessagingApi");
-      console.log('📊 NotificationService: API response:', counts);
       
       const newCounts = { 
         notificationCount: counts?.notificationCount || 0, 
         pmCount: counts?.pmCount || 0
       };
 
-      console.log('🔄 NotificationService: Updating counts:', newCounts);
       
       // Update counts and notify listeners
       this.updateCounts(newCounts);
@@ -199,38 +146,27 @@ export class NotificationService {
     }
   }
 
-  /**
-   * Update counts and notify all listeners
-   */
   /**
    * Update counts and notify all listeners
    */
   private updateCounts(newCounts: NotificationCounts): void {
-    console.log('🔔 NotificationService: updateCounts called with:', newCounts);
-    console.log('🔔 NotificationService: Current counts:', this.counts);
-    console.log('🔔 NotificationService: Number of listeners:', this.listeners.length);
     
     const countsChanged = 
       this.counts.notificationCount !== newCounts.notificationCount ||
       this.counts.pmCount !== newCounts.pmCount;
 
-    console.log('🔄 NotificationService: Counts changed?', countsChanged);
 
     if (countsChanged) {
       this.counts = { ...newCounts };
-      console.log('✅ NotificationService: Counts updated, notifying listeners...');
       
       // Notify all listeners
       this.listeners.forEach((listener, index) => {
         try {
-          console.log(`📢 NotificationService: Calling listener ${index + 1}/${this.listeners.length}`);
           listener(this.counts);
         } catch (error) {
           console.error(`❌ Error in notification listener ${index}:`, error);
         }
       });
-    } else {
-      console.log('⚪ NotificationService: Counts unchanged, not notifying listeners');
     }
   }
 

package/src/helpers/SocketHelper.ts

@@ -8,22 +8,15 @@ export class SocketHelper {
 	private static isCleanedUp: boolean = false;
 
 	static setPersonChurch = (pc: { personId: string, churchId: string }) => {
-		console.log('👤 SocketHelper: Setting person/church context:', pc);
 
 		if (pc?.personId && pc.personId && pc.churchId !== this.personIdChurchId.churchId && pc.personId !== this.personIdChurchId.personId) {
 			this.personIdChurchId = pc;
-			console.log('🔗 SocketHelper: Person/church context updated, creating alert connection');
 			this.createAlertConnection();
 		} else {
-			console.log('⚠️ SocketHelper: Person/church context unchanged or invalid');
 		}
 	}
 
 	static createAlertConnection = () => {
-		console.log('🔗 SocketHelper: Attempting to create alert connection...');
-		console.log('🆔 Socket ID:', SocketHelper.socketId);
-		console.log('👤 Person ID:', SocketHelper.personIdChurchId.personId);
-		console.log('⛪ Church ID:', SocketHelper.personIdChurchId.churchId);
 
 		if (SocketHelper.personIdChurchId.personId && SocketHelper.socketId) {
 			const connection: ConnectionInterface = {
@@ -34,10 +27,8 @@ export class SocketHelper {
 				personId: SocketHelper.personIdChurchId.personId
 			}
 
-			console.log('🔗 SocketHelper: Creating alert connection with data:', connection);
 
 			ApiHelper.postAnonymous("/connections", [connection], "MessagingApi").then((response: any) => {
-				console.log('✅ SocketHelper: Alert connection created successfully:', response);
 			}).catch((error: any) => {
 				console.error("❌ Failed to create alert connection:", error);
 				console.error("❌ Error details:", {
@@ -57,12 +48,10 @@ export class SocketHelper {
 	}
 
 	static init = async () => {
-		console.log('🔌 SocketHelper: Starting initialization...');
 		SocketHelper.cleanup();
 		SocketHelper.isCleanedUp = false;
 
 		if (SocketHelper.socket && SocketHelper.socket.readyState !== SocketHelper.socket.CLOSED) {
-			console.log('🔌 SocketHelper: Closing existing socket connection');
 			try {
 				SocketHelper.socket.close();
 			} catch (e) {
@@ -70,7 +59,6 @@ export class SocketHelper {
 			}
 		}
 
-		console.log('🔌 SocketHelper: Connecting to:', CommonEnvironmentHelper.MessagingApiSocket);
 
 		await new Promise((resolve, reject) => {
 			let hasReceivedSocketId = false;
@@ -80,44 +68,30 @@ export class SocketHelper {
 				SocketHelper.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
 
 				SocketHelper.socket.onmessage = (event) => {
-					console.log("🔔 SocketHelper: onmessage event triggered");
 					if (SocketHelper.isCleanedUp) return;
 
 					messageCount++;
-					console.log(`📨 SocketHelper: Raw message #${messageCount} received:`, event.data);
-					console.log(`📨 SocketHelper: Message timestamp:`, new Date().toISOString());
-					console.log(`📨 SocketHelper: Message size:`, event.data.length, 'characters');
 
 					try {
 						const payload = JSON.parse(event.data);
-						console.log(`📨 SocketHelper: Parsed message #${messageCount}:`, payload);
-						console.log(`📨 SocketHelper: Message action:`, payload.action);
-						console.log(`📨 SocketHelper: Message data type:`, typeof payload.data);
 
 						if (payload.action === 'socketId') {
 							hasReceivedSocketId = true;
-							console.log('🆔 SocketHelper: Socket ID received!', payload.data);
 						}
 
 						// Log all message types we receive
 						switch (payload.action) {
 							case 'socketId':
-								console.log('🆔 Message type: Socket ID assignment');
 								break;
 							case 'privateMessage':
-								console.log('💬 Message type: Private message notification');
 								break;
 							case 'notification':
-								console.log('🔔 Message type: General notification');
 								break;
 							case 'message':
-								console.log('📩 Message type: Message update');
 								break;
 							case 'reconnect':
-								console.log('🔄 Message type: Reconnection signal');
 								break;
 							default:
-								console.log('❓ Message type: Unknown action -', payload.action);
 						}
 
 						SocketHelper.handleMessage(payload);
@@ -128,40 +102,21 @@ export class SocketHelper {
 				};
 
 				SocketHelper.socket.onopen = async (e) => {
-					console.log('✅ SocketHelper: WebSocket connection opened');
-					console.log('🔌 SocketHelper: Connection URL:', SocketHelper.socket.url);
-					console.log('🔌 SocketHelper: Connection protocol:', SocketHelper.socket.protocol);
 
 					// Send the getId request
-					console.log('🔌 SocketHelper: Sending getId request...');
 					SocketHelper.socket.send("getId");
-					console.log('🔌 SocketHelper: getId request sent');
 
 					// Wait longer to see if we get a response
 					setTimeout(() => {
 						if (!hasReceivedSocketId) {
 							console.warn('⚠️ SocketHelper: No socket ID received after 3 seconds');
-							console.log('🔍 SocketHelper: Socket state:', SocketHelper.socket.readyState);
-							console.log('🔍 SocketHelper: Messages received so far:', messageCount);
 						}
 						resolve(null);
 					}, 3000);
 				};
 
 				SocketHelper.socket.onclose = async (e) => {
-					console.log('🔒 SocketHelper: WebSocket connection closed', {
-						code: e.code,
-						reason: e.reason,
-						wasClean: e.wasClean,
-						timestamp: new Date().toISOString(),
-						totalMessagesReceived: messageCount
-					});
-
-					// Log common close codes for debugging
-					if (e.code === 1005) console.log('🔍 Close code 1005: No status received (normal for some servers)');
-					else if (e.code === 1006) console.log('🔍 Close code 1006: Abnormal closure');
-					else if (e.code === 1000) console.log('🔍 Close code 1000: Normal closure');
-					else console.log('🔍 Close code:', e.code);
+					// Socket closed
 				};
 
 				SocketHelper.socket.onerror = (error) => {
@@ -202,20 +157,16 @@ export class SocketHelper {
 		if (SocketHelper.isCleanedUp) return;
 
 		try {
-			console.log('🔄 SocketHelper: Processing message with action:', payload.action);
 
 			if (payload.action === "socketId") {
-				console.log('🆔 SocketHelper: Received socket ID:', payload.data);
 				SocketHelper.socketId = payload.data;
 				SocketHelper.createAlertConnection();
 			}
 			else {
 				const matchingHandlers = ArrayHelper.getAll(SocketHelper.actionHandlers, "action", payload.action);
-				console.log(`📬 SocketHelper: Found ${matchingHandlers.length} handlers for action: ${payload.action}`);
 
 				matchingHandlers.forEach((handler) => {
 					try {
-						console.log(`🏃 SocketHelper: Executing handler ${handler.id} for action: ${payload.action}`);
 						handler.handleMessage(payload.data);
 					} catch (error) {
 						console.error(`❌ Error in handler ${handler.id}:`, error);

package/src/helpers/UserHelper.ts

@@ -16,7 +16,6 @@ export class UserHelper {
 			console.error('UserHelper.userChurches is not initialized or not an array:', UserHelper.userChurches);
 			// Try to get userChurches from context if available
 			if (context?.userChurches && Array.isArray(context.userChurches)) {
-				console.log('Using userChurches from context');
 				UserHelper.userChurches = context.userChurches;
 			} else {
 				console.error('Cannot select church: no valid userChurches available');
@@ -38,18 +37,15 @@ export class UserHelper {
 			// TODO - remove context code from here and perform the logic in the component itself.
 			if (context) {
 				if (context.userChurch !== null) UserHelper.churchChanged = true;
-				console.log('UserHelper.selectChurch - Setting userChurch in context:', userChurch);
 				context.setUserChurch(UserHelper.currentUserChurch);
-				
+
 				// Also ensure user is still set in context
 				if (UserHelper.user && context.setUser) {
-					console.log('UserHelper.selectChurch - Ensuring user is set in context:', UserHelper.user);
 					context.setUser(UserHelper.user);
 				}
-				
+
 				// Update person if available
 				if (UserHelper.person && context.setPerson) {
-					console.log('UserHelper.selectChurch - Ensuring person is set in context:', UserHelper.person);
 					context.setPerson(UserHelper.person);
 				}
 			}