@churchapps/apphelper 0.4.19 → 0.4.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/header/SiteHeader.d.ts.map +1 -1
- package/dist/components/header/SiteHeader.js +4 -1
- package/dist/components/header/SiteHeader.js.map +1 -1
- package/dist/components/wrapper/ChurchList.d.ts +1 -0
- package/dist/components/wrapper/ChurchList.d.ts.map +1 -1
- package/dist/components/wrapper/ChurchList.js +73 -13
- package/dist/components/wrapper/ChurchList.js.map +1 -1
- package/dist/components/wrapper/UserMenu.d.ts +1 -3
- package/dist/components/wrapper/UserMenu.d.ts.map +1 -1
- package/dist/components/wrapper/UserMenu.js +48 -4
- package/dist/components/wrapper/UserMenu.js.map +1 -1
- package/dist/helpers/UserHelper.d.ts.map +1 -1
- package/dist/helpers/UserHelper.js +24 -0
- package/dist/helpers/UserHelper.js.map +1 -1
- package/package.json +3 -3
- package/src/components/header/SiteHeader.tsx +4 -2
- package/src/components/wrapper/ChurchList.tsx +83 -13
- package/src/components/wrapper/UserMenu.tsx +62 -22
- package/src/helpers/UserHelper.ts +26 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteHeader.d.ts","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAAE,oBAAoB,EAA2B,MAAM,qBAAqB,CAAC;AAGpF,KAAK,KAAK,GAAG;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AAED,eAAO,MAAM,UAAU,oCAAqB,KAAK,
|
|
1
|
+
{"version":3,"file":"SiteHeader.d.ts","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,OAAO,EAAE,oBAAoB,EAA2B,MAAM,qBAAqB,CAAC;AAGpF,KAAK,KAAK,GAAG;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAA;AAED,eAAO,MAAM,UAAU,oCAAqB,KAAK,6CAuL/C,CAAC"}
|
|
@@ -36,6 +36,9 @@ export const SiteHeader = React.memo((props) => {
|
|
|
36
36
|
}, [props.context?.person]);
|
|
37
37
|
// Create a stable context object to prevent UserMenu recreation
|
|
38
38
|
const stableContext = React.useMemo(() => {
|
|
39
|
+
console.log('SiteHeader - Creating stableContext');
|
|
40
|
+
console.log('SiteHeader - props.context:', props.context);
|
|
41
|
+
console.log('SiteHeader - props.context.userChurches:', props.context?.userChurches);
|
|
39
42
|
if (!props.context)
|
|
40
43
|
return undefined;
|
|
41
44
|
return {
|
|
@@ -119,7 +122,7 @@ export const SiteHeader = React.memo((props) => {
|
|
|
119
122
|
'--c1l2': '#568BDA',
|
|
120
123
|
backgroundColor: "var(--c1)",
|
|
121
124
|
color: "#FFF"
|
|
122
|
-
}, children: [_jsx(CustomAppBar, { id: "site-app-bar", position: "absolute", children: _jsxs(Toolbar, { id: "site-toolbar", sx: { pr: "24px", backgroundColor: "var(--c1)", minHeight: "64px !important" }, children: [_jsx(PrimaryMenu, { label: props.primaryMenuLabel, menuItems: props.primaryMenuItems, onNavigate: props.onNavigate }), _jsx(SecondaryMenu, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }), _jsx("div", { id: "secondary-menu-container", style: { flex: 1 }, children: _jsx(SecondaryMenuAlt, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }) }), props.context?.user?.id && (_jsx(UserMenu, { profilePicture: profilePicture, userName: userName,
|
|
125
|
+
}, children: [_jsx(CustomAppBar, { id: "site-app-bar", position: "absolute", children: _jsxs(Toolbar, { id: "site-toolbar", sx: { pr: "24px", backgroundColor: "var(--c1)", minHeight: "64px !important" }, children: [_jsx(PrimaryMenu, { label: props.primaryMenuLabel, menuItems: props.primaryMenuItems, onNavigate: props.onNavigate }), _jsx(SecondaryMenu, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }), _jsx("div", { id: "secondary-menu-container", style: { flex: 1 }, children: _jsx(SecondaryMenuAlt, { label: props.secondaryMenuLabel, menuItems: props.secondaryMenuItems, onNavigate: props.onNavigate }) }), props.context?.user?.id && (_jsx(UserMenu, { profilePicture: profilePicture, userName: userName, context: stableContext, appName: props.appName, loadCounts: refresh, notificationCounts: { notificationCount: 0, pmCount: 0 }, onNavigate: props.onNavigate }, "user-menu-stable")), !props.context?.user?.id && _jsx(Link, { id: "login-link", href: "/login", color: "inherit", style: { textDecoration: "none" }, children: "Login" }), _jsx(SupportDrawer, { appName: props.appName, relatedArticles: getRelatedArticles() })] }) }), _jsx("div", { id: "app-bar-spacer", style: { height: '64px' } })] }) }));
|
|
123
126
|
}, (prevProps, nextProps) => {
|
|
124
127
|
// Custom comparison to prevent unnecessary re-renders
|
|
125
128
|
// Check if essential props have changed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteHeader.js","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SiteHeader.js","sourceRoot":"","sources":["../../../src/components/header/SiteHeader.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChurchList.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAe,MAAM,qBAAqB,CAAC;AAMlG,MAAM,WAAW,KAAK;IAAG,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE;
|
|
1
|
+
{"version":3,"file":"ChurchList.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAe,MAAM,qBAAqB,CAAC;AAMlG,MAAM,WAAW,KAAK;IAAG,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE;AAEnM,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8ItC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use client";
|
|
2
|
-
import { jsx as _jsx
|
|
2
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
3
3
|
import React, { useState } from "react";
|
|
4
4
|
import { ArrayHelper } from "@churchapps/helpers";
|
|
5
5
|
import { ApiHelper } from "@churchapps/helpers";
|
|
@@ -7,35 +7,87 @@ import { UserHelper } from "../../helpers/UserHelper";
|
|
|
7
7
|
import { NavItem } from "./NavItem";
|
|
8
8
|
import { Locale } from "../../helpers";
|
|
9
9
|
export const ChurchList = props => {
|
|
10
|
+
console.log('ChurchList - Rendering with props:', props);
|
|
10
11
|
const [userChurches, setUserChurches] = useState(() => {
|
|
11
12
|
try {
|
|
12
|
-
//
|
|
13
|
+
// If we have currentUserChurch, use it as fallback
|
|
14
|
+
if (props.currentUserChurch && (!props.userChurches || !Array.isArray(props.userChurches))) {
|
|
15
|
+
console.log('ChurchList - Using currentUserChurch as single item array');
|
|
16
|
+
return [props.currentUserChurch];
|
|
17
|
+
}
|
|
13
18
|
let churches = props.userChurches;
|
|
19
|
+
// Ensure we have an array
|
|
14
20
|
if (!Array.isArray(churches)) {
|
|
15
|
-
|
|
21
|
+
console.warn('ChurchList - Expected array but got:', typeof churches, churches);
|
|
22
|
+
// If it's a plain church object and we have currentUserChurch, use that
|
|
23
|
+
if (props.currentUserChurch) {
|
|
24
|
+
return [props.currentUserChurch];
|
|
25
|
+
}
|
|
26
|
+
churches = [];
|
|
27
|
+
}
|
|
28
|
+
console.log('ChurchList - Processing churches array:', churches);
|
|
29
|
+
// Filter for valid userChurch objects (should have church property)
|
|
30
|
+
const validChurches = churches.filter(uc => {
|
|
31
|
+
const isValid = uc && uc.church && uc.church.id;
|
|
32
|
+
if (!isValid) {
|
|
33
|
+
console.warn('ChurchList - Invalid church structure:', uc);
|
|
34
|
+
}
|
|
35
|
+
return isValid;
|
|
36
|
+
});
|
|
37
|
+
// If no valid churches but we have currentUserChurch, use it
|
|
38
|
+
if (validChurches.length === 0 && props.currentUserChurch) {
|
|
39
|
+
console.log('ChurchList - No valid churches found, using currentUserChurch');
|
|
40
|
+
return [props.currentUserChurch];
|
|
16
41
|
}
|
|
17
|
-
|
|
42
|
+
console.log('ChurchList - Valid churches:', validChurches);
|
|
43
|
+
return validChurches;
|
|
18
44
|
}
|
|
19
45
|
catch (error) {
|
|
20
|
-
console.error('Error
|
|
46
|
+
console.error('ChurchList - Error processing churches:', error);
|
|
47
|
+
// Last resort: if we have currentUserChurch, use it
|
|
48
|
+
if (props.currentUserChurch) {
|
|
49
|
+
return [props.currentUserChurch];
|
|
50
|
+
}
|
|
21
51
|
return [];
|
|
22
52
|
}
|
|
23
53
|
});
|
|
24
54
|
// Update local state when props change
|
|
25
55
|
React.useEffect(() => {
|
|
26
56
|
try {
|
|
27
|
-
//
|
|
57
|
+
// If we have currentUserChurch, use it as fallback
|
|
58
|
+
if (props.currentUserChurch && (!props.userChurches || !Array.isArray(props.userChurches))) {
|
|
59
|
+
setUserChurches([props.currentUserChurch]);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
28
62
|
let churches = props.userChurches;
|
|
63
|
+
// Ensure we have an array
|
|
29
64
|
if (!Array.isArray(churches)) {
|
|
30
|
-
|
|
65
|
+
if (props.currentUserChurch) {
|
|
66
|
+
setUserChurches([props.currentUserChurch]);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
churches = [];
|
|
70
|
+
}
|
|
71
|
+
// Filter for valid userChurch objects
|
|
72
|
+
const validChurches = churches.filter(uc => uc && uc.church && uc.church.id);
|
|
73
|
+
// If no valid churches but we have currentUserChurch, use it
|
|
74
|
+
if (validChurches.length === 0 && props.currentUserChurch) {
|
|
75
|
+
setUserChurches([props.currentUserChurch]);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
setUserChurches(validChurches);
|
|
31
79
|
}
|
|
32
|
-
setUserChurches(churches.filter(uc => uc && uc.apis && uc.apis.length > 0));
|
|
33
80
|
}
|
|
34
81
|
catch (error) {
|
|
35
|
-
console.error('Error updating
|
|
36
|
-
|
|
82
|
+
console.error('ChurchList useEffect - Error updating churches:', error);
|
|
83
|
+
if (props.currentUserChurch) {
|
|
84
|
+
setUserChurches([props.currentUserChurch]);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
setUserChurches([]);
|
|
88
|
+
}
|
|
37
89
|
}
|
|
38
|
-
}, [props.userChurches]);
|
|
90
|
+
}, [props.userChurches, props.currentUserChurch]);
|
|
39
91
|
const handleDelete = async (uc) => {
|
|
40
92
|
// Helper function to get label with fallback
|
|
41
93
|
const getLabel = (key, fallback) => {
|
|
@@ -62,8 +114,16 @@ export const ChurchList = props => {
|
|
|
62
114
|
userChurches.forEach(uc => {
|
|
63
115
|
const userChurch = uc;
|
|
64
116
|
const churchName = uc.church.name;
|
|
65
|
-
result.push(_jsx(NavItem, { selected: (uc.church.id === props.currentUserChurch.church.id) && true, onClick:
|
|
117
|
+
result.push(_jsx(NavItem, { selected: (uc.church.id === props.currentUserChurch.church.id) && true, onClick: async () => {
|
|
118
|
+
console.log('ChurchList - Selecting church:', userChurch.church.name);
|
|
119
|
+
await UserHelper.selectChurch(props.context, userChurch.church.id, null);
|
|
120
|
+
console.log('ChurchList - Church selected');
|
|
121
|
+
// Call the onChurchChange callback if provided
|
|
122
|
+
if (props.onChurchChange) {
|
|
123
|
+
props.onChurchChange();
|
|
124
|
+
}
|
|
125
|
+
}, label: churchName || "Unknown", icon: "church", deleteIcon: uc.church.id !== props.currentUserChurch.church.id ? "delete" : null, deleteLabel: getLabel("wrapper.deleteChurch", "Delete"), deleteFunction: () => { handleDelete(uc); } }, userChurch.church.id));
|
|
66
126
|
});
|
|
67
|
-
return _jsx(
|
|
127
|
+
return _jsx("div", { id: "church-list", children: result });
|
|
68
128
|
};
|
|
69
129
|
//# sourceMappingURL=ChurchList.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChurchList.js","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAkD,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAIvC,MAAM,CAAC,MAAM,UAAU,GAAoB,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"ChurchList.js","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import {
|
|
2
|
+
import { UserContextInterface } from "@churchapps/helpers";
|
|
3
3
|
interface Props {
|
|
4
4
|
notificationCounts: {
|
|
5
5
|
notificationCount: number;
|
|
@@ -8,8 +8,6 @@ interface Props {
|
|
|
8
8
|
loadCounts: () => void;
|
|
9
9
|
userName: string;
|
|
10
10
|
profilePicture: string;
|
|
11
|
-
userChurches: LoginUserChurchInterface[];
|
|
12
|
-
currentUserChurch: LoginUserChurchInterface;
|
|
13
11
|
context: UserContextInterface;
|
|
14
12
|
appName: string;
|
|
15
13
|
onNavigate: (url: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmD,oBAAoB,EAA2B,MAAM,qBAAqB,CAAC;AAarI,UAAU,KAAK;IACd,kBAAkB,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,UAAU,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAgUD,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAsCnC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
3
3
|
import React from "react";
|
|
4
4
|
import { ApiHelper, UserHelper, CommonEnvironmentHelper } from "@churchapps/helpers";
|
|
5
|
-
import { Avatar, Menu, Icon, Button, Box, Badge, Dialog, DialogContent, DialogTitle } from "@mui/material";
|
|
5
|
+
import { Avatar, Menu, Typography, Icon, Button, Box, Badge, Dialog, DialogContent, DialogTitle } from "@mui/material";
|
|
6
6
|
import { NavItem, AppList } from ".";
|
|
7
7
|
import { ChurchList } from "./ChurchList";
|
|
8
8
|
import { TabPanel } from "../TabPanel";
|
|
@@ -70,8 +70,10 @@ const UserMenuContent = React.memo((props) => {
|
|
|
70
70
|
setAnchorEl(null);
|
|
71
71
|
};
|
|
72
72
|
const handleSwitchChurch = () => {
|
|
73
|
+
console.log('UserMenu - handleSwitchChurch called');
|
|
73
74
|
removeCookie("lastChurchId", { path: "/" });
|
|
74
75
|
setTabIndex(2);
|
|
76
|
+
console.log('UserMenu - tabIndex set to 2');
|
|
75
77
|
};
|
|
76
78
|
const getMainLinks = () => {
|
|
77
79
|
const jwt = ApiHelper.getConfig("MembershipApi").jwt;
|
|
@@ -117,7 +119,49 @@ const UserMenuContent = React.memo((props) => {
|
|
|
117
119
|
// Handle menu item clicks if needed
|
|
118
120
|
};
|
|
119
121
|
const [tabIndex, setTabIndex] = React.useState(0);
|
|
120
|
-
const getTabs = () =>
|
|
122
|
+
const getTabs = () => {
|
|
123
|
+
console.log('UserMenu getTabs - Current tabIndex:', tabIndex);
|
|
124
|
+
return (_jsxs(Box, { sx: { borderBottom: 1, borderColor: "divider" }, children: [_jsx(TabPanel, { value: tabIndex, index: 0, children: getMainLinks() }), _jsxs(TabPanel, { value: tabIndex, index: 1, children: [_jsx(NavItem, { label: "Back", icon: "arrow_back", onClick: () => { setTabIndex(0); } }, "AppBack"), _jsx(AppList, { currentUserChurch: props.context?.userChurch, appName: props.appName, onNavigate: props.onNavigate })] }), _jsx(TabPanel, { value: tabIndex, index: 2, children: _jsxs("div", { style: { maxHeight: '70vh', overflowY: "auto" }, children: [_jsx(NavItem, { label: "Back", icon: "arrow_back", onClick: () => { setTabIndex(0); } }, "ChurchBack"), (() => {
|
|
125
|
+
console.log('UserMenu Church Tab - Rendering church list section');
|
|
126
|
+
console.log('UserMenu Church Tab - Full context:', props.context);
|
|
127
|
+
console.log('UserMenu Church Tab - context.userChurches:', props.context?.userChurches);
|
|
128
|
+
console.log('UserMenu Church Tab - context.userChurches[0]:', props.context?.userChurches?.[0]);
|
|
129
|
+
console.log('UserMenu Church Tab - context.userChurch:', props.context?.userChurch);
|
|
130
|
+
console.log('UserMenu Church Tab - userChurches type:', typeof props.context?.userChurches);
|
|
131
|
+
console.log('UserMenu Church Tab - userChurches is array?', Array.isArray(props.context?.userChurches));
|
|
132
|
+
console.log('UserMenu Church Tab - userChurches length:', props.context?.userChurches?.length);
|
|
133
|
+
// Check if userChurches is actually the userChurch object
|
|
134
|
+
if (props.context?.userChurches && !Array.isArray(props.context.userChurches) && props.context.userChurches.id) {
|
|
135
|
+
console.error('UserMenu - ERROR: context.userChurches contains a single church object instead of an array!');
|
|
136
|
+
console.log('UserMenu - Attempting to use context.userChurch as single item array');
|
|
137
|
+
const churchArray = props.context.userChurch ? [props.context.userChurch] : [];
|
|
138
|
+
return _jsx(ChurchList, { userChurches: churchArray, currentUserChurch: props.context?.userChurch, context: props.context, onDelete: handleClose, onChurchChange: () => {
|
|
139
|
+
handleClose();
|
|
140
|
+
// Don't navigate - just close the menu and let the context update trigger re-renders
|
|
141
|
+
} });
|
|
142
|
+
}
|
|
143
|
+
if (!props.context?.userChurches) {
|
|
144
|
+
return _jsx(Typography, { sx: { p: 2, color: 'text.secondary' }, children: "Loading churches..." });
|
|
145
|
+
}
|
|
146
|
+
else if (!Array.isArray(props.context.userChurches)) {
|
|
147
|
+
return _jsx(Typography, { sx: { p: 2, color: 'text.secondary', fontWeight: 'bold' }, children: "Error: Invalid church data format" });
|
|
148
|
+
}
|
|
149
|
+
else if (props.context.userChurches.length === 0) {
|
|
150
|
+
return _jsx(Typography, { sx: { p: 2, color: 'text.secondary' }, children: "No churches available" });
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
// Ensure we always pass an array
|
|
154
|
+
const churchesArray = Array.isArray(props.context.userChurches)
|
|
155
|
+
? props.context.userChurches
|
|
156
|
+
: [props.context.userChurches];
|
|
157
|
+
console.log('UserMenu - Passing to ChurchList:', churchesArray);
|
|
158
|
+
return _jsx(ChurchList, { userChurches: churchesArray, currentUserChurch: props.context?.userChurch, context: props.context, onDelete: handleClose, onChurchChange: () => {
|
|
159
|
+
handleClose();
|
|
160
|
+
// Don't navigate - just close the menu and let the context update trigger re-renders
|
|
161
|
+
} });
|
|
162
|
+
}
|
|
163
|
+
})()] }) })] }));
|
|
164
|
+
};
|
|
121
165
|
const getModals = () => {
|
|
122
166
|
// Helper function to get label with fallback
|
|
123
167
|
const getLabel = (key, fallback) => {
|
|
@@ -211,8 +255,8 @@ export const UserMenu = React.memo((props) => {
|
|
|
211
255
|
prevProps.context?.userChurch?.church?.id !== nextProps.context?.userChurch?.church?.id) {
|
|
212
256
|
return false;
|
|
213
257
|
}
|
|
214
|
-
// Check if userChurches array changed
|
|
215
|
-
if (prevProps.userChurches?.length !== nextProps.userChurches?.length) {
|
|
258
|
+
// Check if userChurches array changed in context
|
|
259
|
+
if (prevProps.context?.userChurches?.length !== nextProps.context?.userChurches?.length) {
|
|
216
260
|
return false;
|
|
217
261
|
}
|
|
218
262
|
// Check if loadCounts function reference changed (important for functionality)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAErI,qBAAa,UAAU;IACtB,MAAM,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACnD,MAAM,CAAC,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,OAAO,CAAS;IACtC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAE/B,MAAM,CAAC,YAAY,GAAU,UAAU,oBAAoB,EAAE,WAAW,MAAM,EAAE,UAAU,MAAM,
|
|
1
|
+
{"version":3,"file":"UserHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAErI,qBAAa,UAAU;IACtB,MAAM,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IACnD,MAAM,CAAC,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;IAC3B,MAAM,CAAC,aAAa,EAAE,OAAO,CAAS;IACtC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAE/B,MAAM,CAAC,YAAY,GAAU,UAAU,oBAAoB,EAAE,WAAW,MAAM,EAAE,UAAU,MAAM,mBA8C/F;IAED,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,wBAAwB;IAK1D,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,wBAAwB;IAI5D,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO;IAYzE,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAUrD,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI;CAcjF"}
|
|
@@ -47,6 +47,19 @@ _a = UserHelper;
|
|
|
47
47
|
UserHelper.churchChanged = false;
|
|
48
48
|
UserHelper.selectChurch = async (context, churchId, keyName) => {
|
|
49
49
|
let userChurch = null;
|
|
50
|
+
// Ensure userChurches is initialized
|
|
51
|
+
if (!_a.userChurches || !Array.isArray(_a.userChurches)) {
|
|
52
|
+
console.error('UserHelper.userChurches is not initialized or not an array:', _a.userChurches);
|
|
53
|
+
// Try to get userChurches from context if available
|
|
54
|
+
if (context?.userChurches && Array.isArray(context.userChurches)) {
|
|
55
|
+
console.log('Using userChurches from context');
|
|
56
|
+
_a.userChurches = context.userChurches;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
console.error('Cannot select church: no valid userChurches available');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
50
63
|
if (churchId) {
|
|
51
64
|
_a.userChurches.forEach(uc => {
|
|
52
65
|
if (uc.church.id === churchId)
|
|
@@ -67,7 +80,18 @@ UserHelper.selectChurch = async (context, churchId, keyName) => {
|
|
|
67
80
|
if (context) {
|
|
68
81
|
if (context.userChurch !== null)
|
|
69
82
|
_a.churchChanged = true;
|
|
83
|
+
console.log('UserHelper.selectChurch - Setting userChurch in context:', userChurch);
|
|
70
84
|
context.setUserChurch(_a.currentUserChurch);
|
|
85
|
+
// Also ensure user is still set in context
|
|
86
|
+
if (_a.user && context.setUser) {
|
|
87
|
+
console.log('UserHelper.selectChurch - Ensuring user is set in context:', _a.user);
|
|
88
|
+
context.setUser(_a.user);
|
|
89
|
+
}
|
|
90
|
+
// Update person if available
|
|
91
|
+
if (_a.person && context.setPerson) {
|
|
92
|
+
console.log('UserHelper.selectChurch - Ensuring person is set in context:', _a.person);
|
|
93
|
+
context.setPerson(_a.person);
|
|
94
|
+
}
|
|
71
95
|
}
|
|
72
96
|
}
|
|
73
97
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAG/C,MAAM,OAAO,UAAU;
|
|
1
|
+
{"version":3,"file":"UserHelper.js","sourceRoot":"","sources":["../../src/helpers/UserHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.21",
|
|
4
4
|
"description": "Library of helper functions for React and NextJS ChurchApps",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/LiveChurchSolutions/AppHelper#readme",
|
|
29
29
|
"peerDependencies": {
|
|
30
|
-
"react": "^18.0.0",
|
|
31
|
-
"react-dom": "^18.0.0",
|
|
30
|
+
"react": "^18.0.0 || ^19.0.0",
|
|
31
|
+
"react-dom": "^18.0.0 || ^19.0.0",
|
|
32
32
|
"react-router-dom": "^7.6.3"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
@@ -53,6 +53,10 @@ export const SiteHeader = React.memo((props:Props) => {
|
|
|
53
53
|
|
|
54
54
|
// Create a stable context object to prevent UserMenu recreation
|
|
55
55
|
const stableContext = React.useMemo(() => {
|
|
56
|
+
console.log('SiteHeader - Creating stableContext');
|
|
57
|
+
console.log('SiteHeader - props.context:', props.context);
|
|
58
|
+
console.log('SiteHeader - props.context.userChurches:', props.context?.userChurches);
|
|
59
|
+
|
|
56
60
|
if (!props.context) return undefined;
|
|
57
61
|
|
|
58
62
|
return {
|
|
@@ -141,8 +145,6 @@ export const SiteHeader = React.memo((props:Props) => {
|
|
|
141
145
|
key="user-menu-stable"
|
|
142
146
|
profilePicture={profilePicture}
|
|
143
147
|
userName={userName}
|
|
144
|
-
userChurches={props.context?.userChurches}
|
|
145
|
-
currentUserChurch={props.context?.userChurch}
|
|
146
148
|
context={stableContext}
|
|
147
149
|
appName={props.appName}
|
|
148
150
|
loadCounts={refresh}
|
|
@@ -7,20 +7,56 @@ import { UserHelper } from "../../helpers/UserHelper";
|
|
|
7
7
|
import { NavItem } from "./NavItem";
|
|
8
8
|
import { Locale } from "../../helpers";
|
|
9
9
|
|
|
10
|
-
export interface Props { userChurches: LoginUserChurchInterface[], currentUserChurch: LoginUserChurchInterface, context: UserContextInterface, onDelete?: () => void }
|
|
10
|
+
export interface Props { userChurches: LoginUserChurchInterface[], currentUserChurch: LoginUserChurchInterface, context: UserContextInterface, onDelete?: () => void, onChurchChange?: () => void }
|
|
11
11
|
|
|
12
12
|
export const ChurchList: React.FC<Props> = props => {
|
|
13
|
+
console.log('ChurchList - Rendering with props:', props);
|
|
13
14
|
|
|
14
15
|
const [userChurches, setUserChurches] = useState(() => {
|
|
15
16
|
try {
|
|
16
|
-
//
|
|
17
|
+
// If we have currentUserChurch, use it as fallback
|
|
18
|
+
if (props.currentUserChurch && (!props.userChurches || !Array.isArray(props.userChurches))) {
|
|
19
|
+
console.log('ChurchList - Using currentUserChurch as single item array');
|
|
20
|
+
return [props.currentUserChurch];
|
|
21
|
+
}
|
|
22
|
+
|
|
17
23
|
let churches = props.userChurches;
|
|
24
|
+
|
|
25
|
+
// Ensure we have an array
|
|
18
26
|
if (!Array.isArray(churches)) {
|
|
19
|
-
|
|
27
|
+
console.warn('ChurchList - Expected array but got:', typeof churches, churches);
|
|
28
|
+
// If it's a plain church object and we have currentUserChurch, use that
|
|
29
|
+
if (props.currentUserChurch) {
|
|
30
|
+
return [props.currentUserChurch];
|
|
31
|
+
}
|
|
32
|
+
churches = [];
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
console.log('ChurchList - Processing churches array:', churches);
|
|
36
|
+
|
|
37
|
+
// Filter for valid userChurch objects (should have church property)
|
|
38
|
+
const validChurches = churches.filter(uc => {
|
|
39
|
+
const isValid = uc && uc.church && uc.church.id;
|
|
40
|
+
if (!isValid) {
|
|
41
|
+
console.warn('ChurchList - Invalid church structure:', uc);
|
|
42
|
+
}
|
|
43
|
+
return isValid;
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
// If no valid churches but we have currentUserChurch, use it
|
|
47
|
+
if (validChurches.length === 0 && props.currentUserChurch) {
|
|
48
|
+
console.log('ChurchList - No valid churches found, using currentUserChurch');
|
|
49
|
+
return [props.currentUserChurch];
|
|
20
50
|
}
|
|
21
|
-
|
|
51
|
+
|
|
52
|
+
console.log('ChurchList - Valid churches:', validChurches);
|
|
53
|
+
return validChurches;
|
|
22
54
|
} catch (error) {
|
|
23
|
-
console.error('Error
|
|
55
|
+
console.error('ChurchList - Error processing churches:', error);
|
|
56
|
+
// Last resort: if we have currentUserChurch, use it
|
|
57
|
+
if (props.currentUserChurch) {
|
|
58
|
+
return [props.currentUserChurch];
|
|
59
|
+
}
|
|
24
60
|
return [];
|
|
25
61
|
}
|
|
26
62
|
});
|
|
@@ -28,17 +64,41 @@ export const ChurchList: React.FC<Props> = props => {
|
|
|
28
64
|
// Update local state when props change
|
|
29
65
|
React.useEffect(() => {
|
|
30
66
|
try {
|
|
31
|
-
//
|
|
67
|
+
// If we have currentUserChurch, use it as fallback
|
|
68
|
+
if (props.currentUserChurch && (!props.userChurches || !Array.isArray(props.userChurches))) {
|
|
69
|
+
setUserChurches([props.currentUserChurch]);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
|
|
32
73
|
let churches = props.userChurches;
|
|
74
|
+
|
|
75
|
+
// Ensure we have an array
|
|
33
76
|
if (!Array.isArray(churches)) {
|
|
34
|
-
|
|
77
|
+
if (props.currentUserChurch) {
|
|
78
|
+
setUserChurches([props.currentUserChurch]);
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
churches = [];
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
// Filter for valid userChurch objects
|
|
85
|
+
const validChurches = churches.filter(uc => uc && uc.church && uc.church.id);
|
|
86
|
+
|
|
87
|
+
// If no valid churches but we have currentUserChurch, use it
|
|
88
|
+
if (validChurches.length === 0 && props.currentUserChurch) {
|
|
89
|
+
setUserChurches([props.currentUserChurch]);
|
|
90
|
+
} else {
|
|
91
|
+
setUserChurches(validChurches);
|
|
35
92
|
}
|
|
36
|
-
setUserChurches(churches.filter(uc => uc && uc.apis && uc.apis.length > 0));
|
|
37
93
|
} catch (error) {
|
|
38
|
-
console.error('Error updating
|
|
39
|
-
|
|
94
|
+
console.error('ChurchList useEffect - Error updating churches:', error);
|
|
95
|
+
if (props.currentUserChurch) {
|
|
96
|
+
setUserChurches([props.currentUserChurch]);
|
|
97
|
+
} else {
|
|
98
|
+
setUserChurches([]);
|
|
99
|
+
}
|
|
40
100
|
}
|
|
41
|
-
}, [props.userChurches]);
|
|
101
|
+
}, [props.userChurches, props.currentUserChurch]);
|
|
42
102
|
|
|
43
103
|
const handleDelete = async (uc: LoginUserChurchInterface) => {
|
|
44
104
|
// Helper function to get label with fallback
|
|
@@ -65,13 +125,23 @@ export const ChurchList: React.FC<Props> = props => {
|
|
|
65
125
|
};
|
|
66
126
|
|
|
67
127
|
let result: React.ReactElement[] = [];
|
|
128
|
+
|
|
68
129
|
userChurches.forEach(uc => {
|
|
69
130
|
const userChurch = uc;
|
|
70
131
|
const churchName = uc.church.name;
|
|
71
132
|
result.push(<NavItem
|
|
72
133
|
key={userChurch.church.id}
|
|
73
134
|
selected={(uc.church.id === props.currentUserChurch.church.id) && true}
|
|
74
|
-
onClick={() =>
|
|
135
|
+
onClick={async () => {
|
|
136
|
+
console.log('ChurchList - Selecting church:', userChurch.church.name);
|
|
137
|
+
await UserHelper.selectChurch(props.context, userChurch.church.id, null);
|
|
138
|
+
console.log('ChurchList - Church selected');
|
|
139
|
+
|
|
140
|
+
// Call the onChurchChange callback if provided
|
|
141
|
+
if (props.onChurchChange) {
|
|
142
|
+
props.onChurchChange();
|
|
143
|
+
}
|
|
144
|
+
}}
|
|
75
145
|
label={churchName || "Unknown"}
|
|
76
146
|
icon="church"
|
|
77
147
|
deleteIcon={uc.church.id !== props.currentUserChurch.church.id ? "delete" : null}
|
|
@@ -80,5 +150,5 @@ export const ChurchList: React.FC<Props> = props => {
|
|
|
80
150
|
/>);
|
|
81
151
|
});
|
|
82
152
|
|
|
83
|
-
return
|
|
153
|
+
return <div id="church-list">{result}</div>;
|
|
84
154
|
};
|
|
@@ -19,8 +19,6 @@ interface Props {
|
|
|
19
19
|
loadCounts: () => void;
|
|
20
20
|
userName: string;
|
|
21
21
|
profilePicture: string;
|
|
22
|
-
userChurches: LoginUserChurchInterface[];
|
|
23
|
-
currentUserChurch: LoginUserChurchInterface;
|
|
24
22
|
context: UserContextInterface;
|
|
25
23
|
appName: string;
|
|
26
24
|
onNavigate: (url: string) => void;
|
|
@@ -98,8 +96,10 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
|
|
|
98
96
|
};
|
|
99
97
|
|
|
100
98
|
const handleSwitchChurch = () => {
|
|
99
|
+
console.log('UserMenu - handleSwitchChurch called');
|
|
101
100
|
removeCookie("lastChurchId", { path: "/" });
|
|
102
101
|
setTabIndex(2);
|
|
102
|
+
console.log('UserMenu - tabIndex set to 2');
|
|
103
103
|
};
|
|
104
104
|
|
|
105
105
|
const getMainLinks = () => {
|
|
@@ -151,24 +151,64 @@ const UserMenuContent: React.FC<Props> = React.memo((props) => {
|
|
|
151
151
|
|
|
152
152
|
const [tabIndex, setTabIndex] = React.useState(0);
|
|
153
153
|
|
|
154
|
-
const getTabs = () =>
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
<
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
<
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
154
|
+
const getTabs = () => {
|
|
155
|
+
console.log('UserMenu getTabs - Current tabIndex:', tabIndex);
|
|
156
|
+
return (
|
|
157
|
+
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
|
|
158
|
+
<TabPanel value={tabIndex} index={0}>
|
|
159
|
+
{getMainLinks()}
|
|
160
|
+
</TabPanel>
|
|
161
|
+
<TabPanel value={tabIndex} index={1}>
|
|
162
|
+
<NavItem label="Back" key="AppBack" icon="arrow_back" onClick={() => { setTabIndex(0); }} />
|
|
163
|
+
<AppList currentUserChurch={props.context?.userChurch} appName={props.appName} onNavigate={props.onNavigate} />
|
|
164
|
+
</TabPanel>
|
|
165
|
+
<TabPanel value={tabIndex} index={2}>
|
|
166
|
+
<div style={{ maxHeight: '70vh', overflowY: "auto" }}>
|
|
167
|
+
<NavItem label="Back" key="ChurchBack" icon="arrow_back" onClick={() => { setTabIndex(0); }} />
|
|
168
|
+
{(() => {
|
|
169
|
+
console.log('UserMenu Church Tab - Rendering church list section');
|
|
170
|
+
console.log('UserMenu Church Tab - Full context:', props.context);
|
|
171
|
+
console.log('UserMenu Church Tab - context.userChurches:', props.context?.userChurches);
|
|
172
|
+
console.log('UserMenu Church Tab - context.userChurches[0]:', props.context?.userChurches?.[0]);
|
|
173
|
+
console.log('UserMenu Church Tab - context.userChurch:', props.context?.userChurch);
|
|
174
|
+
console.log('UserMenu Church Tab - userChurches type:', typeof props.context?.userChurches);
|
|
175
|
+
console.log('UserMenu Church Tab - userChurches is array?', Array.isArray(props.context?.userChurches));
|
|
176
|
+
console.log('UserMenu Church Tab - userChurches length:', props.context?.userChurches?.length);
|
|
177
|
+
|
|
178
|
+
// Check if userChurches is actually the userChurch object
|
|
179
|
+
if (props.context?.userChurches && !Array.isArray(props.context.userChurches) && (props.context.userChurches as any).id) {
|
|
180
|
+
console.error('UserMenu - ERROR: context.userChurches contains a single church object instead of an array!');
|
|
181
|
+
console.log('UserMenu - Attempting to use context.userChurch as single item array');
|
|
182
|
+
const churchArray = props.context.userChurch ? [props.context.userChurch] : [];
|
|
183
|
+
return <ChurchList userChurches={churchArray} currentUserChurch={props.context?.userChurch} context={props.context} onDelete={handleClose} onChurchChange={() => {
|
|
184
|
+
handleClose();
|
|
185
|
+
// Don't navigate - just close the menu and let the context update trigger re-renders
|
|
186
|
+
}} />;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
if (!props.context?.userChurches) {
|
|
190
|
+
return <Typography sx={{ p: 2, color: 'text.secondary' }}>Loading churches...</Typography>;
|
|
191
|
+
} else if (!Array.isArray(props.context.userChurches)) {
|
|
192
|
+
return <Typography sx={{ p: 2, color: 'text.secondary', fontWeight: 'bold' }}>Error: Invalid church data format</Typography>;
|
|
193
|
+
} else if (props.context.userChurches.length === 0) {
|
|
194
|
+
return <Typography sx={{ p: 2, color: 'text.secondary' }}>No churches available</Typography>;
|
|
195
|
+
} else {
|
|
196
|
+
// Ensure we always pass an array
|
|
197
|
+
const churchesArray = Array.isArray(props.context.userChurches)
|
|
198
|
+
? props.context.userChurches
|
|
199
|
+
: [props.context.userChurches];
|
|
200
|
+
console.log('UserMenu - Passing to ChurchList:', churchesArray);
|
|
201
|
+
return <ChurchList userChurches={churchesArray} currentUserChurch={props.context?.userChurch} context={props.context} onDelete={handleClose} onChurchChange={() => {
|
|
202
|
+
handleClose();
|
|
203
|
+
// Don't navigate - just close the menu and let the context update trigger re-renders
|
|
204
|
+
}} />;
|
|
205
|
+
}
|
|
206
|
+
})()}
|
|
207
|
+
</div>
|
|
208
|
+
</TabPanel>
|
|
209
|
+
</Box>
|
|
210
|
+
);
|
|
211
|
+
};
|
|
172
212
|
|
|
173
213
|
const getModals = () => {
|
|
174
214
|
// Helper function to get label with fallback
|
|
@@ -328,8 +368,8 @@ export const UserMenu: React.FC<Props> = React.memo((props) => {
|
|
|
328
368
|
return false;
|
|
329
369
|
}
|
|
330
370
|
|
|
331
|
-
// Check if userChurches array changed
|
|
332
|
-
if (prevProps.userChurches?.length !== nextProps.userChurches?.length) {
|
|
371
|
+
// Check if userChurches array changed in context
|
|
372
|
+
if (prevProps.context?.userChurches?.length !== nextProps.context?.userChurches?.length) {
|
|
333
373
|
return false;
|
|
334
374
|
}
|
|
335
375
|
|
|
@@ -11,6 +11,19 @@ export class UserHelper {
|
|
|
11
11
|
static selectChurch = async (context?: UserContextInterface, churchId?: string, keyName?: string) => {
|
|
12
12
|
let userChurch = null;
|
|
13
13
|
|
|
14
|
+
// Ensure userChurches is initialized
|
|
15
|
+
if (!UserHelper.userChurches || !Array.isArray(UserHelper.userChurches)) {
|
|
16
|
+
console.error('UserHelper.userChurches is not initialized or not an array:', UserHelper.userChurches);
|
|
17
|
+
// Try to get userChurches from context if available
|
|
18
|
+
if (context?.userChurches && Array.isArray(context.userChurches)) {
|
|
19
|
+
console.log('Using userChurches from context');
|
|
20
|
+
UserHelper.userChurches = context.userChurches;
|
|
21
|
+
} else {
|
|
22
|
+
console.error('Cannot select church: no valid userChurches available');
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
14
27
|
if (churchId) {
|
|
15
28
|
UserHelper.userChurches.forEach(uc => {
|
|
16
29
|
if (uc.church.id === churchId) userChurch = uc;
|
|
@@ -25,7 +38,20 @@ export class UserHelper {
|
|
|
25
38
|
// TODO - remove context code from here and perform the logic in the component itself.
|
|
26
39
|
if (context) {
|
|
27
40
|
if (context.userChurch !== null) UserHelper.churchChanged = true;
|
|
41
|
+
console.log('UserHelper.selectChurch - Setting userChurch in context:', userChurch);
|
|
28
42
|
context.setUserChurch(UserHelper.currentUserChurch);
|
|
43
|
+
|
|
44
|
+
// Also ensure user is still set in context
|
|
45
|
+
if (UserHelper.user && context.setUser) {
|
|
46
|
+
console.log('UserHelper.selectChurch - Ensuring user is set in context:', UserHelper.user);
|
|
47
|
+
context.setUser(UserHelper.user);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
// Update person if available
|
|
51
|
+
if (UserHelper.person && context.setPerson) {
|
|
52
|
+
console.log('UserHelper.selectChurch - Ensuring person is set in context:', UserHelper.person);
|
|
53
|
+
context.setPerson(UserHelper.person);
|
|
54
|
+
}
|
|
29
55
|
}
|
|
30
56
|
}
|
|
31
57
|
}
|