@churchapps/apphelper 0.6.14 → 0.6.16

package/src/helpers/NotificationService.ts

@@ -1,233 +0,0 @@
-import { SocketHelper } from "./SocketHelper";
-import { ApiHelper, UserContextInterface } from "@churchapps/helpers";
-
-export interface NotificationCounts {
-  notificationCount: number;
-  pmCount: number;
-}
-
-export class NotificationService {
-  private static instance: NotificationService;
-  private counts: NotificationCounts = { notificationCount: 0, pmCount: 0 };
-  private listeners: Array<(counts: NotificationCounts) => void> = [];
-  private isInitialized: boolean = false;
-  private currentPersonId: string | null = null;
-  private loadTimeout: any | null = null;
-
-  private constructor() {}
-
-  static getInstance(): NotificationService {
-    if (!NotificationService.instance) {
-      NotificationService.instance = new NotificationService();
-    }
-    return NotificationService.instance;
-  }
-
-  /**
-   * Initialize the notification service with user context
-   */
-  async initialize(context: UserContextInterface): Promise<void> {
-    if (this.isInitialized) {
-      return;
-    }
-
-    try {
-      // Store current person ID for conversation counting
-      this.currentPersonId = context?.person?.id || null;
-      
-      // Initialize WebSocket connection
-      await SocketHelper.init();
-
-      // Set person/church context for websocket
-      if (context?.person?.id && context?.userChurch?.church?.id) {
-        SocketHelper.setPersonChurch({
-          personId: context.person.id,
-          churchId: context.userChurch.church.id
-        });
-      } else {
-        console.warn('⚠️ NotificationService: Missing person/church IDs, cannot set socket context');
-      }
-
-      // Register handlers for notification updates
-      this.registerWebSocketHandlers();
-
-      // Load initial notification counts
-      await this.loadNotificationCounts();
-
-      this.isInitialized = true;
-
-    } catch (error) {
-      console.error("❌ Failed to initialize NotificationService:", error);
-      throw error;
-    }
-  }
-
-  /**
-   * Register websocket handlers for real-time notification updates
-   */
-  private registerWebSocketHandlers(): void {
-    // Handler for new private messages
-    SocketHelper.addHandler("privateMessage", "NotificationService-PM", (data: any) => {
-      try {
-        this.debouncedLoadNotificationCounts();
-      } catch (error) {
-        console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
-      }
-    });
-
-    // Handler for general notifications
-    SocketHelper.addHandler("notification", "NotificationService-Notification", (data: any) => {
-      try {
-        this.debouncedLoadNotificationCounts();
-      } catch (error) {
-        console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
-      }
-    });
-
-    // Handler for message updates that could affect notification counts
-    SocketHelper.addHandler("message", "NotificationService-MessageUpdate", (data: any) => {
-      // Only update counts if the message update involves the current person
-      if (data?.message?.personId === this.currentPersonId || 
-          data?.notifyPersonId === this.currentPersonId) {
-        try {
-          this.debouncedLoadNotificationCounts();
-        } catch (error) {
-          console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
-        }
-      }
-    });
-
-    // Handler for reconnect events
-    SocketHelper.addHandler("reconnect", "NotificationService-Reconnect", (data: any) => {
-      this.loadNotificationCounts(); // Don't debounce reconnect - need immediate update
-    });
-  }
-
-  /**
-   * Load notification counts from the API with debouncing
-   */
-  private debouncedLoadNotificationCounts(): void {
-    
-    if (this.loadTimeout) {
-      clearTimeout(this.loadTimeout);
-    }
-    
-    this.loadTimeout = setTimeout(() => {
-      this.loadNotificationCounts();
-    }, 300); // 300ms debounce
-  }
-
-  /**
-   * Load notification counts from the API
-   */
-  async loadNotificationCounts(): Promise<void> {
-    
-    try {
-      // Use the unreadCount endpoint which returns both notification and PM counts
-      const counts = await ApiHelper.get("/notifications/unreadCount", "MessagingApi");
-      
-      const newCounts = { 
-        notificationCount: counts?.notificationCount || 0, 
-        pmCount: counts?.pmCount || 0
-      };
-
-      
-      // Update counts and notify listeners
-      this.updateCounts(newCounts);
-
-    } catch (error) {
-      console.error("❌ Failed to load notification counts:", error);
-      console.error("❌ Error details:", {
-        message: error.message,
-        status: error.status,
-        response: error.response
-      });
-      // Don't throw - just log the error and keep existing counts
-    }
-  }
-
-  /**
-   * Update counts and notify all listeners
-   */
-  private updateCounts(newCounts: NotificationCounts): void {
-    
-    const countsChanged = 
-      this.counts.notificationCount !== newCounts.notificationCount ||
-      this.counts.pmCount !== newCounts.pmCount;
-
-
-    if (countsChanged) {
-      this.counts = { ...newCounts };
-      
-      // Notify all listeners
-      this.listeners.forEach((listener, index) => {
-        try {
-          listener(this.counts);
-        } catch (error) {
-          console.error(`❌ Error in notification listener ${index}:`, error);
-        }
-      });
-    }
-  }
-
-  /**
-   * Subscribe to notification count changes
-   */
-  subscribe(listener: (counts: NotificationCounts) => void): () => void {
-    this.listeners.push(listener);
-
-    // Immediately call with current counts
-    listener(this.counts);
-
-    // Return unsubscribe function
-    return () => {
-      this.listeners = this.listeners.filter(l => l !== listener);
-    };
-  }
-
-  /**
-   * Get current notification counts
-   */
-  getCounts(): NotificationCounts {
-    return { ...this.counts };
-  }
-
-  /**
-   * Manually refresh notification counts
-   */
-  async refresh(): Promise<void> {
-    await this.loadNotificationCounts();
-  }
-
-  /**
-   * Cleanup the service
-   */
-  cleanup(): void {
-    // Clear any pending timeout
-    if (this.loadTimeout) {
-      clearTimeout(this.loadTimeout);
-      this.loadTimeout = null;
-    }
-
-    // Remove websocket handlers
-    SocketHelper.removeHandler("NotificationService-PM");
-    SocketHelper.removeHandler("NotificationService-Notification");
-    SocketHelper.removeHandler("NotificationService-MessageUpdate");
-    SocketHelper.removeHandler("NotificationService-Reconnect");
-
-    // Clear listeners
-    this.listeners = [];
-    
-    // Reset state
-    this.counts = { notificationCount: 0, pmCount: 0 };
-    this.currentPersonId = null;
-    this.isInitialized = false;
-  }
-
-  /**
-   * Check if service is initialized
-   */
-  isReady(): boolean {
-    return this.isInitialized && SocketHelper.isConnected();
-  }
-}

package/src/helpers/PersonHelper.ts

@@ -1,62 +0,0 @@
-import { PersonInterface, ContactInfoInterface, CommonEnvironmentHelper } from "@churchapps/helpers";
-import { Locale } from "./Locale";
-
-export class PersonHelper {
-
-	static getPhotoUrl(person: PersonInterface) {
-		if (!person?.photo) return "/images/sample-profile.png"
-		else return (person?.photo?.startsWith("data:image/png;base64,") || person.photo?.indexOf("://") > -1)
-			? person.photo
-			: CommonEnvironmentHelper.ContentRoot + person.photo;
-	}
-
-	static getAge(birthdate: Date): string {
-		if (birthdate !== undefined && birthdate !== null) {
-			let ageDifMs = Date.now() - new Date(birthdate).getTime();
-			let ageDate = new Date(ageDifMs);
-			let years = Math.abs(ageDate.getUTCFullYear() - 1970);
-			return years + " " + Locale.label("person.years");
-		}
-		else return "";
-	}
-
-	static getDisplayName(firstName: string, lastName: string, nickName: string): string {
-		if (nickName !== undefined && nickName !== null && nickName.length > 0) return firstName + ' "' + nickName + '" ' + lastName;
-		else return firstName + " " + lastName;
-	}
-
-	public static compareAddress(address1: ContactInfoInterface, address2: ContactInfoInterface): boolean {
-		const displayAddress1: string = this.addressToString(address1).trim();
-		const displayAddress2: string = this.addressToString(address2).trim();
-
-		if (displayAddress1 !== displayAddress2) {
-			return true
-		}
-		return false
-	}
-
-	public static addressToString(address: ContactInfoInterface): string {
-		return `${address.address1 || ""} ${address.address2 || ""} ${address.city || ""}${(address.city && address.state) ? "," : ""} ${address.state || ""} ${address.zip || ""}`
-	}
-
-	public static changeOnlyAddress(contactInfo1: ContactInfoInterface, contactInfo2: ContactInfoInterface): ContactInfoInterface {
-		const updatedAddress: ContactInfoInterface = {
-			...contactInfo1,
-			address1: contactInfo2.address1,
-			address2: contactInfo2.address2,
-			city: contactInfo2.city,
-			state: contactInfo2.state,
-			zip: contactInfo2.zip
-		}
-
-		return updatedAddress
-	}
-
-	public static checkAddressAvailabilty(person: PersonInterface): boolean {
-		const addressString: string = this.addressToString(person.contactInfo).trim();
-		if (addressString !== "") {
-			return true;
-		}
-		return false;
-	}
-}

package/src/helpers/SlugHelper.ts

@@ -1,27 +0,0 @@
-import slug from "slug";
-
-export class SlugHelper {
-
-  static slugifyString(string: string, type: "urlPath" | "urlSlug", removeCharacters?: string[]) {
-    const charactersToRemove = removeCharacters ? removeCharacters : ["for", "and", "nor", "but", "or", "yet", "so", "the", "a", "an"];
-    const characStr = charactersToRemove.join("|");
-    if (type === "urlPath") {
-      slug.extend({'/': '/'}); //To keep '/' in the url since it's a special character.
-    }
-    const initialSlug = slug(string, { remove: new RegExp('\\b(' + characStr + ')\\b', 'gi') });
-    const verfiedSlug = this.numerifySlug(initialSlug);
-    return verfiedSlug;
-  }
-
-  //remove long sequences of single-digit numbers (e.g., 1-2-3-4 becomes 1), but preserve normal number patterns
-  static numerifySlug(slug: string) {
-    let initialString = slug;
-    // Only match sequences of 3+ single-digit numbers separated by hyphens (e.g., 1-2-3, 1-2-3-4)
-    // This avoids mangling things like chapter-verse references (6-11) or dates
-    const regex = /\b(\d)-(\d)-(\d)(?:-\d)*\b/g;
-    initialString = initialString.replace(regex, "$1");
-
-    return initialString;
-  }
-
-}

package/src/helpers/SocketHelper.ts

@@ -1,183 +0,0 @@
-import { ConnectionInterface, SocketActionHandlerInterface, SocketPayloadInterface, ApiHelper, ArrayHelper, CommonEnvironmentHelper } from "@churchapps/helpers";
-
-export class SocketHelper {
-	static socket: WebSocket;
-	static socketId: string;
-	static actionHandlers: SocketActionHandlerInterface[] = [];
-	private static personIdChurchId: { personId: string, churchId: string } = { personId: "", churchId: "" };
-	private static isCleanedUp: boolean = false;
-
-	static setPersonChurch = (pc: { personId: string, churchId: string }) => {
-
-		if (pc?.personId && pc.personId && pc.churchId !== this.personIdChurchId.churchId && pc.personId !== this.personIdChurchId.personId) {
-			this.personIdChurchId = pc;
-			this.createAlertConnection();
-		} else {
-		}
-	}
-
-	static createAlertConnection = () => {
-		if (SocketHelper.personIdChurchId.personId && SocketHelper.socketId) {
-			const connection: ConnectionInterface = {
-				conversationId: "alerts",
-				churchId: SocketHelper.personIdChurchId.churchId,
-				displayName: "Test",
-				socketId: SocketHelper.socketId,
-				personId: SocketHelper.personIdChurchId.personId
-			}
-
-			ApiHelper.postAnonymous("/connections", [connection], "MessagingApi");
-		}
-	}
-
-	static init = async () => {
-		SocketHelper.cleanup();
-		SocketHelper.isCleanedUp = false;
-
-		if (SocketHelper.socket && SocketHelper.socket.readyState !== SocketHelper.socket.CLOSED) {
-			try {
-				SocketHelper.socket.close();
-			} catch { /* ignore */ }
-		}
-
-		await new Promise((resolve, reject) => {
-			try {
-				SocketHelper.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
-
-				SocketHelper.socket.onmessage = (event) => {
-					if (SocketHelper.isCleanedUp) return;
-
-					try {
-						const payload = JSON.parse(event.data);
-						SocketHelper.handleMessage(payload);
-					} catch { /* ignore parse errors */ }
-				};
-
-				SocketHelper.socket.onopen = async () => {
-					SocketHelper.socket.send("getId");
-
-					setTimeout(() => {
-						resolve(null);
-					}, 3000);
-				};
-
-				SocketHelper.socket.onclose = async () => { };
-
-				SocketHelper.socket.onerror = (error) => {
-					reject(error);
-				};
-
-			} catch (error) {
-				reject(error);
-			}
-		});
-	}
-
-	static addHandler = (action: string, id: string, handleMessage: (data: any) => void) => {
-		const existing = ArrayHelper.getOne(SocketHelper.actionHandlers, "id", id);
-		if (existing !== null) {
-			existing.handleMessage = handleMessage;
-		} else {
-			SocketHelper.actionHandlers.push({ action, id, handleMessage });
-		}
-	}
-
-	static removeHandler = (id: string) => {
-		SocketHelper.actionHandlers = SocketHelper.actionHandlers.filter(handler => handler.id !== id);
-	}
-
-	static removeHandlersByAction = (action: string) => {
-		SocketHelper.actionHandlers = SocketHelper.actionHandlers.filter(handler => handler.action !== action);
-	}
-
-	static clearAllHandlers = () => {
-		SocketHelper.actionHandlers = [];
-	}
-
-	static handleMessage = (payload: SocketPayloadInterface) => {
-		if (SocketHelper.isCleanedUp) return;
-
-		try {
-			if (payload.action === "socketId") {
-				SocketHelper.socketId = payload.data;
-				SocketHelper.createAlertConnection();
-			}
-			else {
-				const matchingHandlers = ArrayHelper.getAll(SocketHelper.actionHandlers, "action", payload.action);
-				matchingHandlers.forEach((handler) => {
-					try {
-						handler.handleMessage(payload.data);
-					} catch (error) {
-						console.error(`Error in handler ${handler.id}:`, error);
-					}
-				});
-			}
-		} catch (error) {
-			console.error("Error handling socket message:", error);
-		}
-	}
-
-	static cleanup = () => {
-		SocketHelper.isCleanedUp = true;
-
-		// Close socket connection
-		if (SocketHelper.socket && SocketHelper.socket.readyState !== SocketHelper.socket.CLOSED) {
-			try {
-				SocketHelper.socket.close();
-			} catch { /* ignore */ }
-		}
-
-		// Clear references but preserve handlers - they should persist across reconnects
-		SocketHelper.socket = null;
-		SocketHelper.socketId = null;
-		SocketHelper.personIdChurchId = { personId: "", churchId: "" };
-	}
-
-	static disconnect = () => {
-		SocketHelper.cleanup();
-	}
-
-	static isConnected = (): boolean => {
-		return SocketHelper.socket && SocketHelper.socket.readyState === SocketHelper.socket.OPEN;
-	}
-
-	static getConnectionState = (): string => {
-		if (!SocketHelper.socket) return "UNINITIALIZED";
-
-		switch (SocketHelper.socket.readyState) {
-			case SocketHelper.socket.CONNECTING:
-				return "CONNECTING";
-			case SocketHelper.socket.OPEN:
-				return "OPEN";
-			case SocketHelper.socket.CLOSING:
-				return "CLOSING";
-			case SocketHelper.socket.CLOSED:
-				return "CLOSED";
-			default:
-				return "UNKNOWN";
-		}
-	}
-
-	// Global cleanup on window unload
-	static setupGlobalCleanup = () => {
-		if (typeof window !== "undefined") {
-			const cleanup = () => {
-				SocketHelper.cleanup();
-			};
-
-			window.addEventListener("beforeunload", cleanup);
-			window.addEventListener("unload", cleanup);
-
-			// Also cleanup on page visibility change (when tab is closed)
-			document.addEventListener("visibilitychange", () => {
-				if (document.visibilityState === "hidden") {
-					// Optional: cleanup when tab becomes hidden
-					// SocketHelper.cleanup();
-				}
-			});
-
-			return cleanup;
-		}
-	}
-
-}

package/src/helpers/UniqueIdHelper.ts

@@ -1,36 +0,0 @@
-export class UniqueIdHelper {
-
-  static chars = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0",
-    "-", "_"];
-
-  static alphanumericChars = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"];
-
-  public static isMissing(obj: any) {
-    if (obj === undefined || obj === null) return true;
-    else if (obj.toString() === "") return true;
-    else return false;
-  }
-
-  public static shortId() {
-    return this.generate(UniqueIdHelper.chars, 11);
-  }
-
-  public static generateAlphanumeric() {
-    return this.generate(UniqueIdHelper.alphanumericChars, 11);
-  }
-
-  public static generate(charList: string[], length: number) {
-    let result = "";
-    for (let i = 0; i < length; i++) {
-      const idx = Math.floor(Math.random() * charList.length);
-      const c = charList[idx];
-      result += c;
-    }
-    return result;
-  }
-
-}

package/src/helpers/UserHelper.ts

@@ -1,103 +0,0 @@
-import { ApiHelper } from "@churchapps/helpers"
-import { UserInterface, UserContextInterface, IApiPermission, PersonInterface, LoginUserChurchInterface } from "@churchapps/helpers";
-
-export class UserHelper {
-	static currentUserChurch: LoginUserChurchInterface;
-	static userChurches: LoginUserChurchInterface[];
-	static user: UserInterface;
-	static churchChanged: boolean = false;
-	static person: PersonInterface;
-
-	static selectChurch = async (context?: UserContextInterface, churchId?: string, keyName?: string) => {
-		let userChurch = null;
-
-		// Ensure userChurches is initialized
-		if (!UserHelper.userChurches || !Array.isArray(UserHelper.userChurches)) {
-			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)) {
-				UserHelper.userChurches = context.userChurches;
-			} else {
-				console.error('Cannot select church: no valid userChurches available');
-				return;
-			}
-		}
-
-		if (churchId) {
-			UserHelper.userChurches.forEach(uc => {
-				if (uc.church.id === churchId) userChurch = uc;
-			});
-		}
-		else if (keyName) UserHelper.userChurches.forEach(uc => { if (uc.church.subDomain === keyName) userChurch = uc; });
-		else userChurch = UserHelper.userChurches[0];
-		if (!userChurch) return;
-		else {
-			UserHelper.currentUserChurch = userChurch;
-			UserHelper.setupApiHelper(UserHelper.currentUserChurch);
-			// TODO - remove context code from here and perform the logic in the component itself.
-			if (context) {
-				if (context.userChurch !== null) UserHelper.churchChanged = true;
-				context.setUserChurch(UserHelper.currentUserChurch);
-
-				// Also ensure user is still set in context
-				if (UserHelper.user && context.setUser) {
-					context.setUser(UserHelper.user);
-				}
-
-				// Update person if available
-				if (UserHelper.person && context.setPerson) {
-					context.setPerson(UserHelper.person);
-				}
-			}
-		}
-	}
-
-	static setupApiHelper(userChurch: LoginUserChurchInterface) {
-		ApiHelper.setDefaultPermissions(userChurch.jwt);
-		userChurch.apis.forEach(api => { ApiHelper.setPermissions(api.keyName, api.jwt, api.permissions); });
-	}
-
-	static setupApiHelperNoChurch(user: LoginUserChurchInterface) {
-		ApiHelper.setDefaultPermissions(user.jwt);
-	}
-
-	static checkAccess({ api, contentType, action }: IApiPermission): boolean {
-		const config = ApiHelper.getConfig(api);
-		if (!config) return false;
-
-		const permissions = config.permissions || [];
-
-		let result = false;
-		if (permissions !== undefined) {
-			permissions.forEach((element: any) => {
-				if (element.contentType === contentType && element.action === action) result = true;
-			});
-		}
-		return result;
-	}
-
-	static createAppUrl(appUrl: string, returnUrl: string) {
-		const jwt = ApiHelper.getConfig("MembershipApi")?.jwt;
-
-		if (jwt) {
-			return `${appUrl}/login/?jwt=${jwt}&returnUrl=${encodeURIComponent(returnUrl)}`;
-		} else {
-			return `${appUrl}/login/?returnUrl=${encodeURIComponent(returnUrl)}`;
-		}
-	}
-
-	static redirectToLogin(returnUrl?: string, handleRedirect?: (url: string) => void) {
-		if (typeof window !== "undefined") {
-			const currentUrl = returnUrl || window.location.pathname + window.location.search;
-			const encodedReturnUrl = encodeURIComponent(currentUrl);
-			const loginUrl = `/login?returnUrl=${encodedReturnUrl}`;
-
-			// Use handleRedirect function if available, otherwise fallback to window.location
-			if (handleRedirect) {
-				handleRedirect(loginUrl);
-			} else {
-				window.location.href = loginUrl;
-			}
-		}
-	}
-}

package/src/helpers/createEmotionCache.ts

@@ -1,17 +0,0 @@
-import createCache from "@emotion/cache";
-
-const isBrowser = typeof document !== "undefined";
-
-// On the client side, Create a meta tag at the top of the <head> and set it as insertionPoint.
-// This assures that MUI styles are loaded first.
-// It allows developers to easily override MUI styles with other styling solutions, like CSS modules.
-export function createEmotionCache() {
-  let insertionPoint;
-
-  if (isBrowser) {
-    const emotionInsertionPoint = document.querySelector<HTMLMetaElement>('meta[name="emotion-insertion-point"]');
-    insertionPoint = emotionInsertionPoint ?? undefined;
-  }
-
-  return createCache({ key: "mui-style", insertionPoint });
-}