@churchapps/apphelper 0.4.49 → 0.5.0

package/src/helpers/UniqueIdHelper.ts

@@ -1,36 +1,36 @@
-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;
-  }
-
-}
+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,104 +1,104 @@
-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)) {
-				console.log('Using userChurches from context');
-				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;
-				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);
-				}
-			}
-		}
-	}
-
-	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 permissions = ApiHelper.getConfig(api)?.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;
-			}
-		}
-	}
-}
+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)) {
+				console.log('Using userChurches from context');
+				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;
+				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);
+				}
+			}
+		}
+	}
+
+	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 permissions = ApiHelper.getConfig(api)?.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 +1,17 @@
-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 });
-}
+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 });
+}

package/src/helpers/index.ts

@@ -1,50 +1,58 @@
-// Re-export from @churchapps/helpers
-export { 
-  ApiHelper, 
-  AppearanceHelper as BaseAppearanceHelper,
-  ArrayHelper, 
-  CommonEnvironmentHelper, 
-  CurrencyHelper, 
-  DateHelper, 
-  ErrorHelper, 
-  EventHelper, 
-  FileHelper, 
-  PersonHelper, 
-  UserHelper, 
-  UniqueIdHelper,
-  Permissions
-} from "@churchapps/helpers";
-
-// Re-export interfaces from @churchapps/helpers
-export type { 
-  ErrorLogInterface,
-  UserContextInterface,
-  PermissionInterface,
-  ChurchInterface,
-  PersonInterface,
-  UserInterface,
-  LoginUserChurchInterface,
-  ContactInfoInterface,
-  DonationInterface,
-  FundInterface,
-  PaymentMethodInterface,
-  StripeDonationInterface,
-  FundDonationInterface,
-  ResetPasswordRequestInterface,
-  ResetPasswordResponseInterface,
-  ConnectionInterface,
-  SocketActionHandlerInterface,
-  SocketPayloadInterface,
-  UserChurchInterface
-} from "@churchapps/helpers";
-
-// Export local helpers
-export { AnalyticsHelper } from "./AnalyticsHelper";
-export { AppearanceHelper } from "./AppearanceHelper";
-export type { AppearanceInterface } from "./AppearanceHelper";
-export { createEmotionCache } from "./createEmotionCache";
-export { Locale } from "./Locale";
-export { SlugHelper } from "./SlugHelper";
-export { SocketHelper } from "./SocketHelper";
-export { NotificationService } from "./NotificationService";
-export type { NotificationCounts } from "./NotificationService";
+// Re-export helpers from @churchapps/helpers
+export {
+  ApiHelper,
+  AppearanceHelper as BaseAppearanceHelper,
+  ArrayHelper,
+  CommonEnvironmentHelper,
+  CurrencyHelper,
+  DateHelper,
+  ErrorHelper,
+  EventHelper,
+  FileHelper,
+  PersonHelper,
+  UserHelper,
+  UniqueIdHelper,
+  Permissions
+} from "@churchapps/helpers";
+
+// Re-export interfaces from @churchapps/helpers
+export type {
+  ErrorLogInterface,
+  UserContextInterface,
+  PermissionInterface,
+  ChurchInterface,
+  PersonInterface,
+  UserInterface,
+  LoginUserChurchInterface,
+  ContactInfoInterface,
+  DonationInterface,
+  FundInterface,
+  PaymentMethodInterface,
+  StripeDonationInterface,
+  FundDonationInterface,
+  ResetPasswordRequestInterface,
+  ResetPasswordResponseInterface,
+  ConnectionInterface,
+  SocketActionHandlerInterface,
+  SocketPayloadInterface,
+  UserChurchInterface,
+  QuestionInterface,
+  AnswerInterface,
+  FormSubmissionInterface,
+  MessageInterface,
+  ConversationInterface,
+  PrivateMessageInterface,
+  IApiPermission,
+  NotificationInterface
+} from "@churchapps/helpers";
+
+// Export local helpers
+export { AnalyticsHelper } from "./AnalyticsHelper";
+export { AppearanceHelper } from "./AppearanceHelper";
+export type { AppearanceInterface } from "./AppearanceHelper";
+export { createEmotionCache } from "./createEmotionCache";
+export { Locale } from "./Locale";
+export { SlugHelper } from "./SlugHelper";
+export { SocketHelper } from "./SocketHelper";
+export { NotificationService } from "./NotificationService";
+export type { NotificationCounts } from "./NotificationService";

package/src/hooks/index.ts

@@ -1,3 +1,3 @@
-export { useMountedState } from "./useMountedState";
-export { useNotifications } from "./useNotifications";
-export type { UseNotificationsResult } from "./useNotifications";
+export { useMountedState } from "./useMountedState";
+export { useNotifications } from "./useNotifications";
+export type { UseNotificationsResult } from "./useNotifications";

package/src/hooks/useMountedState.ts

@@ -1,16 +1,16 @@
-import { useEffect, useRef, useCallback } from "react";
-
-export const useMountedState = () => {
-  const mountedRef = useRef(false)
-  const isMounted = useCallback(() => mountedRef.current, [])
-
-  useEffect(() => {
-    mountedRef.current = true
-
-    return () => {
-      mountedRef.current = false
-    }
-  }, [])
-
-  return isMounted
-}
+import { useEffect, useRef, useCallback } from "react";
+
+export const useMountedState = () => {
+  const mountedRef = useRef(false)
+  const isMounted = useCallback(() => mountedRef.current, [])
+
+  useEffect(() => {
+    mountedRef.current = true
+
+    return () => {
+      mountedRef.current = false
+    }
+  }, [])
+
+  return isMounted
+}

package/src/hooks/useNotifications.ts

@@ -1,94 +1,94 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import { NotificationService, NotificationCounts } from '../helpers/NotificationService';
-import { UserContextInterface } from '@churchapps/helpers';
-
-export interface UseNotificationsResult {
-  counts: NotificationCounts;
-  isLoading: boolean;
-  isReady: boolean;
-  refresh: () => Promise<void>;
-  error: string | null;
-}
-
-/**
- * Custom hook for managing real-time notifications
- * 
- * @param context - User context containing person and church information
- * @returns Object containing notification counts and management functions
- * 
- * @example
- * ```tsx
- * const { counts, isLoading, refresh } = useNotifications(context);
- * 
- * return (
- *   <UserMenu 
- *     notificationCounts={counts}
- *     loadCounts={refresh}
- *     // ... other props
- *   />
- * );
- * ```
- */
-export function useNotifications(context: UserContextInterface | null): UseNotificationsResult {
-  const [counts, setCounts] = useState<NotificationCounts>({ notificationCount: 0, pmCount: 0 });
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-
-  // Get the singleton instance only once
-  const notificationService = React.useMemo(() => NotificationService.getInstance(), []);
-
-  // Initialize the service when context becomes available
-  useEffect(() => {
-    if (!context?.person?.id || !context?.userChurch?.church?.id) {
-      setIsLoading(false);
-      return;
-    }
-
-    const initializeService = async () => {
-      try {
-        setIsLoading(true);
-        setError(null);
-        
-        await notificationService.initialize(context);
-      } catch (err) {
-        console.error("❌ useNotifications: Failed to initialize:", err);
-        setError(err instanceof Error ? err.message : 'Failed to initialize notifications');
-      } finally {
-        setIsLoading(false);
-      }
-    };
-
-    initializeService();
-  }, [context?.person?.id, context?.userChurch?.church?.id]);
-
-  // Subscribe to notification count changes
-  useEffect(() => {
-    const unsubscribe = notificationService.subscribe((newCounts) => {
-      setCounts(newCounts);
-    });
-
-    // Cleanup subscription on unmount
-    return () => {
-      unsubscribe();
-    };
-  }, [notificationService]);
-
-  // Refresh function - memoized without dependencies for stable reference
-  const refresh = useCallback(async () => {
-    try {
-      setError(null);
-      await NotificationService.getInstance().refresh();
-    } catch (err) {
-      console.error("❌ useNotifications: Refresh failed:", err);
-      setError(err instanceof Error ? err.message : 'Failed to refresh notifications');
-    }
-  }, []);
-
-  return {
-    counts,
-    isLoading,
-    isReady: notificationService.isReady(),
-    refresh,
-    error
-  };
+import React, { useState, useEffect, useCallback } from 'react';
+import { NotificationService, NotificationCounts } from '../helpers/NotificationService';
+import { UserContextInterface } from '@churchapps/helpers';
+
+export interface UseNotificationsResult {
+  counts: NotificationCounts;
+  isLoading: boolean;
+  isReady: boolean;
+  refresh: () => Promise<void>;
+  error: string | null;
+}
+
+/**
+ * Custom hook for managing real-time notifications
+ * 
+ * @param context - User context containing person and church information
+ * @returns Object containing notification counts and management functions
+ * 
+ * @example
+ * ```tsx
+ * const { counts, isLoading, refresh } = useNotifications(context);
+ * 
+ * return (
+ *   <UserMenu 
+ *     notificationCounts={counts}
+ *     loadCounts={refresh}
+ *     // ... other props
+ *   />
+ * );
+ * ```
+ */
+export function useNotifications(context: UserContextInterface | null): UseNotificationsResult {
+  const [counts, setCounts] = useState<NotificationCounts>({ notificationCount: 0, pmCount: 0 });
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  // Get the singleton instance only once
+  const notificationService = React.useMemo(() => NotificationService.getInstance(), []);
+
+  // Initialize the service when context becomes available
+  useEffect(() => {
+    if (!context?.person?.id || !context?.userChurch?.church?.id) {
+      setIsLoading(false);
+      return;
+    }
+
+    const initializeService = async () => {
+      try {
+        setIsLoading(true);
+        setError(null);
+        
+        await notificationService.initialize(context);
+      } catch (err) {
+        console.error("❌ useNotifications: Failed to initialize:", err);
+        setError(err instanceof Error ? err.message : 'Failed to initialize notifications');
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    initializeService();
+  }, [context?.person?.id, context?.userChurch?.church?.id]);
+
+  // Subscribe to notification count changes
+  useEffect(() => {
+    const unsubscribe = notificationService.subscribe((newCounts) => {
+      setCounts(newCounts);
+    });
+
+    // Cleanup subscription on unmount
+    return () => {
+      unsubscribe();
+    };
+  }, [notificationService]);
+
+  // Refresh function - memoized without dependencies for stable reference
+  const refresh = useCallback(async () => {
+    try {
+      setError(null);
+      await NotificationService.getInstance().refresh();
+    } catch (err) {
+      console.error("❌ useNotifications: Refresh failed:", err);
+      setError(err instanceof Error ? err.message : 'Failed to refresh notifications');
+    }
+  }, []);
+
+  return {
+    counts,
+    isLoading,
+    isReady: notificationService.isReady(),
+    refresh,
+    error
+  };
 }