@churchapps/apphelper 0.4.30 → 0.4.32
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/gallery/GalleryModal.d.ts +0 -1
- package/dist/components/gallery/GalleryModal.d.ts.map +1 -1
- package/dist/components/gallery/GalleryModal.js +3 -2
- package/dist/components/gallery/GalleryModal.js.map +1 -1
- package/dist/components/gallery/StockPhotos.d.ts +0 -1
- package/dist/components/gallery/StockPhotos.d.ts.map +1 -1
- package/dist/components/gallery/StockPhotos.js +2 -1
- package/dist/components/gallery/StockPhotos.js.map +1 -1
- package/dist/helpers/NotificationService.d.ts +18 -0
- package/dist/helpers/NotificationService.d.ts.map +1 -1
- package/dist/helpers/NotificationService.js +91 -6
- package/dist/helpers/NotificationService.js.map +1 -1
- package/dist/helpers/SocketHelper.d.ts.map +1 -1
- package/dist/helpers/SocketHelper.js +110 -8
- package/dist/helpers/SocketHelper.js.map +1 -1
- package/package.json +1 -1
- package/src/components/gallery/GalleryModal.tsx +4 -4
- package/src/components/gallery/StockPhotos.tsx +3 -3
- package/src/helpers/NotificationService.ts +92 -6
- package/src/helpers/SocketHelper.ts +291 -181
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GalleryModal.d.ts","sourceRoot":"","sources":["../../../src/components/gallery/GalleryModal.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GalleryModal.d.ts","sourceRoot":"","sources":["../../../src/components/gallery/GalleryModal.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,UAAU,KAAK;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA2JxC,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
3
3
|
import { FileHelper } from "../../helpers/FileHelper";
|
|
4
4
|
import { ApiHelper } from "../../helpers";
|
|
5
5
|
import { Locale } from "../../helpers";
|
|
6
|
+
import { CommonEnvironmentHelper } from "@churchapps/helpers";
|
|
6
7
|
import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, FormControl, Grid, IconButton, InputLabel, MenuItem, Select, Tab, Tabs, Tooltip, Icon } from "@mui/material";
|
|
7
8
|
import React, { useState } from "react";
|
|
8
9
|
import { ImageEditor } from "../ImageEditor";
|
|
@@ -13,7 +14,7 @@ export const GalleryModal = (props) => {
|
|
|
13
14
|
const [tabIndex, setTabIndex] = React.useState(0);
|
|
14
15
|
const [aspectRatio, setAspectRatio] = React.useState(Math.round(props.aspectRatio * 100) / 100);
|
|
15
16
|
const [editorPhotoUrl, setEditorPhotoUrl] = React.useState("");
|
|
16
|
-
const contentRoot =
|
|
17
|
+
const contentRoot = CommonEnvironmentHelper.ContentRoot;
|
|
17
18
|
const handleTabChange = (el, newValue) => { setTabIndex(newValue); };
|
|
18
19
|
const loadData = () => { ApiHelper.get("/gallery/" + aspectRatio.toString(), "ContentApi").then((data) => setImages(data.images)); };
|
|
19
20
|
const handleImageUpdated = async (dataUrl) => {
|
|
@@ -94,6 +95,6 @@ export const GalleryModal = (props) => {
|
|
|
94
95
|
result = "9:16";
|
|
95
96
|
return result;
|
|
96
97
|
};
|
|
97
|
-
return (_jsx(_Fragment, { children: _jsxs(Dialog, { open: true, onClose: props.onClose, children: [_jsx(DialogTitle, { children: "Select a Photo" }), _jsxs(DialogContent, { style: { overflowX: "hidden" }, children: [(props.aspectRatio === 0) && (_jsxs(FormControl, { fullWidth: true, children: [_jsx(InputLabel, { children: Locale.label("gallery.aspectRatio") }), _jsxs(Select, { size: "small", label: Locale.label("gallery.aspectRatio"), name: "aspectRatio", value: aspectRatio, onChange: (e) => setAspectRatio(parseFloat(e.target.value.toString())), children: [_jsx(MenuItem, { value: "0", children: Locale.label("gallery.freeForm") }), _jsx(MenuItem, { value: "1", children: "1:1" }), _jsx(MenuItem, { value: "2", children: "2:1" }), _jsx(MenuItem, { value: "3", children: "3:1" }), _jsx(MenuItem, { value: "4", children: "4:1" }), _jsx(MenuItem, { value: "1.33", children: "4:3" }), _jsx(MenuItem, { value: "1.78", children: "16:9" }), _jsx(MenuItem, { value: "0.5", children: "1:2" }), _jsx(MenuItem, { value: "0.5625", children: "9:16" })] })] })), _jsxs(Tabs, { variant: "fullWidth", value: tabIndex, onChange: handleTabChange, children: [_jsx(Tab, { label: "Gallery" }), _jsx(Tab, { label: "Upload" }), _jsx(Tab, { label: "Stock Photos" })] }), _jsx(TabPanel, { value: tabIndex, index: 0, children: _jsx(Grid, { container: true, spacing: 3, alignItems: "center", children: getImages() }) }), _jsxs(TabPanel, { value: tabIndex, index: 1, children: [_jsxs("div", { children: [Locale.label("gallery.aspectRatio"), ": ", getDisplayAspect()] }), _jsx(ImageEditor, { onUpdate: handleImageUpdated, photoUrl: editorPhotoUrl, aspectRatio: aspectRatio, outputWidth: 1280, outputHeight: 768, hideDelete: true })] }), _jsx(TabPanel, { value: tabIndex, index: 2, children: _jsx(StockPhotos, { aspectRatio: aspectRatio, onSelect: props.onSelect, onStockSelect: handleStockSelect
|
|
98
|
+
return (_jsx(_Fragment, { children: _jsxs(Dialog, { open: true, onClose: props.onClose, children: [_jsx(DialogTitle, { children: "Select a Photo" }), _jsxs(DialogContent, { style: { overflowX: "hidden" }, children: [(props.aspectRatio === 0) && (_jsxs(FormControl, { fullWidth: true, children: [_jsx(InputLabel, { children: Locale.label("gallery.aspectRatio") }), _jsxs(Select, { size: "small", label: Locale.label("gallery.aspectRatio"), name: "aspectRatio", value: aspectRatio, onChange: (e) => setAspectRatio(parseFloat(e.target.value.toString())), children: [_jsx(MenuItem, { value: "0", children: Locale.label("gallery.freeForm") }), _jsx(MenuItem, { value: "1", children: "1:1" }), _jsx(MenuItem, { value: "2", children: "2:1" }), _jsx(MenuItem, { value: "3", children: "3:1" }), _jsx(MenuItem, { value: "4", children: "4:1" }), _jsx(MenuItem, { value: "1.33", children: "4:3" }), _jsx(MenuItem, { value: "1.78", children: "16:9" }), _jsx(MenuItem, { value: "0.5", children: "1:2" }), _jsx(MenuItem, { value: "0.5625", children: "9:16" })] })] })), _jsxs(Tabs, { variant: "fullWidth", value: tabIndex, onChange: handleTabChange, children: [_jsx(Tab, { label: "Gallery" }), _jsx(Tab, { label: "Upload" }), _jsx(Tab, { label: "Stock Photos" })] }), _jsx(TabPanel, { value: tabIndex, index: 0, children: _jsx(Grid, { container: true, spacing: 3, alignItems: "center", children: getImages() }) }), _jsxs(TabPanel, { value: tabIndex, index: 1, children: [_jsxs("div", { children: [Locale.label("gallery.aspectRatio"), ": ", getDisplayAspect()] }), _jsx(ImageEditor, { onUpdate: handleImageUpdated, photoUrl: editorPhotoUrl, aspectRatio: aspectRatio, outputWidth: 1280, outputHeight: 768, hideDelete: true })] }), _jsx(TabPanel, { value: tabIndex, index: 2, children: _jsx(StockPhotos, { aspectRatio: aspectRatio, onSelect: props.onSelect, onStockSelect: handleStockSelect }) })] }), _jsx(DialogActions, { sx: { paddingX: "16px", paddingBottom: "12px" }, children: _jsx(Button, { variant: "outlined", onClick: props.onClose, children: "Close" }) })] }) }));
|
|
98
99
|
};
|
|
99
100
|
//# sourceMappingURL=GalleryModal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GalleryModal.js","sourceRoot":"","sources":["../../../src/components/gallery/GalleryModal.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACtL,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"GalleryModal.js","sourceRoot":"","sources":["../../../src/components/gallery/GalleryModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StockPhotos.d.ts","sourceRoot":"","sources":["../../../src/components/gallery/StockPhotos.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"StockPhotos.d.ts","sourceRoot":"","sources":["../../../src/components/gallery/StockPhotos.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,UAAU,KAAK;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CACrC;AAID,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAgFvC,CAAC"}
|
|
@@ -4,11 +4,12 @@ import { Button, Grid, TextField } from "@mui/material";
|
|
|
4
4
|
import React, { useState } from "react";
|
|
5
5
|
import { ApiHelper } from "../../helpers";
|
|
6
6
|
import { Locale } from "../../helpers";
|
|
7
|
+
import { CommonEnvironmentHelper } from "@churchapps/helpers";
|
|
7
8
|
export const StockPhotos = (props) => {
|
|
8
9
|
const [images, setImages] = useState([]);
|
|
9
10
|
const [searchText, setSearchText] = useState("");
|
|
10
11
|
const [searchResults, setSearchResults] = useState(null);
|
|
11
|
-
const contentRoot =
|
|
12
|
+
const contentRoot = CommonEnvironmentHelper.ContentRoot;
|
|
12
13
|
const loadData = () => { ApiHelper.getAnonymous("/gallery/stock/" + props.aspectRatio.toString(), "ContentApi").then((data) => setImages(data.images)); };
|
|
13
14
|
React.useEffect(loadData, [props.aspectRatio]); //eslint-disable-line
|
|
14
15
|
const handleChange = (e) => { e.preventDefault(); setSearchText(e.currentTarget.value); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StockPhotos.js","sourceRoot":"","sources":["../../../src/components/gallery/StockPhotos.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"StockPhotos.js","sourceRoot":"","sources":["../../../src/components/gallery/StockPhotos.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,22 +12,40 @@ export declare class NotificationService {
|
|
|
12
12
|
private loadTimeout;
|
|
13
13
|
private constructor();
|
|
14
14
|
static getInstance(): NotificationService;
|
|
15
|
+
/**
|
|
16
|
+
* Initialize the notification service with user context
|
|
17
|
+
*/
|
|
15
18
|
/**
|
|
16
19
|
* Initialize the notification service with user context
|
|
17
20
|
*/
|
|
18
21
|
initialize(context: UserContextInterface): Promise<void>;
|
|
22
|
+
/**
|
|
23
|
+
* Register websocket handlers for real-time notification updates
|
|
24
|
+
*/
|
|
25
|
+
/**
|
|
26
|
+
* Register websocket handlers for real-time notification updates
|
|
27
|
+
*/
|
|
19
28
|
/**
|
|
20
29
|
* Register websocket handlers for real-time notification updates
|
|
21
30
|
*/
|
|
22
31
|
private registerWebSocketHandlers;
|
|
32
|
+
/**
|
|
33
|
+
* Load notification counts from the API with debouncing
|
|
34
|
+
*/
|
|
23
35
|
/**
|
|
24
36
|
* Load notification counts from the API with debouncing
|
|
25
37
|
*/
|
|
26
38
|
private debouncedLoadNotificationCounts;
|
|
39
|
+
/**
|
|
40
|
+
* Load notification counts from the API
|
|
41
|
+
*/
|
|
27
42
|
/**
|
|
28
43
|
* Load notification counts from the API
|
|
29
44
|
*/
|
|
30
45
|
loadNotificationCounts(): Promise<void>;
|
|
46
|
+
/**
|
|
47
|
+
* Update counts and notify all listeners
|
|
48
|
+
*/
|
|
31
49
|
/**
|
|
32
50
|
* Update counts and notify all listeners
|
|
33
51
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/helpers/NotificationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,SAAS,CAAmD;IACpE,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO;IAEP,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAOzC;;OAEG;IACG,UAAU,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/helpers/NotificationService.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEtE,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,SAAS,CAAmD;IACpE,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO;IAEP,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAOzC;;OAEG;IACH;;OAEG;IACG,UAAU,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmD9D;;OAEG;IACH;;OAEG;IACH;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAsDjC;;OAEG;IACH;;OAEG;IACH,OAAO,CAAC,+BAA+B;IAcvC;;OAEG;IACH;;OAEG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B7C;;OAEG;IACH;;OAEG;IACH,OAAO,CAAC,YAAY;IA6BpB;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,GAAG,MAAM,IAAI;IAYrE;;OAEG;IACH,SAAS,IAAI,kBAAkB;IAI/B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;OAEG;IACH,OAAO,IAAI,IAAI;IAsBf;;OAEG;IACH,OAAO,IAAI,OAAO;CAGnB"}
|
|
@@ -14,35 +14,62 @@ export class NotificationService {
|
|
|
14
14
|
}
|
|
15
15
|
return NotificationService.instance;
|
|
16
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Initialize the notification service with user context
|
|
19
|
+
*/
|
|
17
20
|
/**
|
|
18
21
|
* Initialize the notification service with user context
|
|
19
22
|
*/
|
|
20
23
|
async initialize(context) {
|
|
21
|
-
if (this.isInitialized)
|
|
24
|
+
if (this.isInitialized) {
|
|
25
|
+
console.log('🔔 NotificationService: Already initialized, skipping');
|
|
22
26
|
return;
|
|
27
|
+
}
|
|
28
|
+
console.log('🔔 NotificationService: Starting initialization with context:', {
|
|
29
|
+
hasUser: !!context?.user,
|
|
30
|
+
hasPerson: !!context?.person,
|
|
31
|
+
hasUserChurch: !!context?.userChurch,
|
|
32
|
+
personId: context?.person?.id,
|
|
33
|
+
churchId: context?.userChurch?.church?.id
|
|
34
|
+
});
|
|
23
35
|
try {
|
|
24
36
|
// Store current person ID for conversation counting
|
|
25
37
|
this.currentPersonId = context?.person?.id || null;
|
|
38
|
+
console.log('👤 NotificationService: Set current person ID:', this.currentPersonId);
|
|
26
39
|
// Initialize WebSocket connection
|
|
40
|
+
console.log('🔌 NotificationService: Initializing SocketHelper...');
|
|
27
41
|
await SocketHelper.init();
|
|
28
42
|
// Set person/church context for websocket
|
|
29
43
|
if (context?.person?.id && context?.userChurch?.church?.id) {
|
|
44
|
+
console.log('🔗 NotificationService: Setting person/church context in SocketHelper');
|
|
30
45
|
SocketHelper.setPersonChurch({
|
|
31
46
|
personId: context.person.id,
|
|
32
47
|
churchId: context.userChurch.church.id
|
|
33
48
|
});
|
|
34
49
|
}
|
|
50
|
+
else {
|
|
51
|
+
console.warn('⚠️ NotificationService: Missing person/church IDs, cannot set socket context');
|
|
52
|
+
}
|
|
35
53
|
// Register handlers for notification updates
|
|
54
|
+
console.log('📋 NotificationService: Registering WebSocket handlers');
|
|
36
55
|
this.registerWebSocketHandlers();
|
|
37
56
|
// Load initial notification counts
|
|
57
|
+
console.log('📊 NotificationService: Loading initial notification counts');
|
|
38
58
|
await this.loadNotificationCounts();
|
|
39
59
|
this.isInitialized = true;
|
|
60
|
+
console.log('✅ NotificationService: Initialization complete');
|
|
40
61
|
}
|
|
41
62
|
catch (error) {
|
|
42
63
|
console.error("❌ Failed to initialize NotificationService:", error);
|
|
43
64
|
throw error;
|
|
44
65
|
}
|
|
45
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Register websocket handlers for real-time notification updates
|
|
69
|
+
*/
|
|
70
|
+
/**
|
|
71
|
+
* Register websocket handlers for real-time notification updates
|
|
72
|
+
*/
|
|
46
73
|
/**
|
|
47
74
|
* Register websocket handlers for real-time notification updates
|
|
48
75
|
*/
|
|
@@ -50,12 +77,28 @@ export class NotificationService {
|
|
|
50
77
|
// Handler for new private messages
|
|
51
78
|
SocketHelper.addHandler("privateMessage", "NotificationService-PM", (data) => {
|
|
52
79
|
console.log('🔔 NotificationService: New private message received, updating counts');
|
|
53
|
-
|
|
80
|
+
console.log('📨 Private message data:', data);
|
|
81
|
+
console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
|
|
82
|
+
try {
|
|
83
|
+
this.debouncedLoadNotificationCounts();
|
|
84
|
+
console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
|
|
88
|
+
}
|
|
54
89
|
});
|
|
55
90
|
// Handler for general notifications
|
|
56
91
|
SocketHelper.addHandler("notification", "NotificationService-Notification", (data) => {
|
|
57
92
|
console.log('🔔 NotificationService: New notification received, updating counts');
|
|
58
|
-
|
|
93
|
+
console.log('📨 Notification data:', data);
|
|
94
|
+
console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
|
|
95
|
+
try {
|
|
96
|
+
this.debouncedLoadNotificationCounts();
|
|
97
|
+
console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
|
|
101
|
+
}
|
|
59
102
|
});
|
|
60
103
|
// Handler for message updates that could affect notification counts
|
|
61
104
|
SocketHelper.addHandler("message", "NotificationService-MessageUpdate", (data) => {
|
|
@@ -63,7 +106,19 @@ export class NotificationService {
|
|
|
63
106
|
if (data?.message?.personId === this.currentPersonId ||
|
|
64
107
|
data?.notifyPersonId === this.currentPersonId) {
|
|
65
108
|
console.log('🔔 NotificationService: Message update affecting current user, updating counts');
|
|
66
|
-
|
|
109
|
+
console.log('📨 Message update data:', data);
|
|
110
|
+
console.log('🔄 NotificationService: About to call debouncedLoadNotificationCounts...');
|
|
111
|
+
try {
|
|
112
|
+
this.debouncedLoadNotificationCounts();
|
|
113
|
+
console.log('✅ NotificationService: debouncedLoadNotificationCounts called successfully');
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
console.error('❌ NotificationService: Error calling debouncedLoadNotificationCounts:', error);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
console.log('🔕 NotificationService: Message update not for current user, ignoring');
|
|
121
|
+
console.log('📨 Message personId:', data?.message?.personId, 'Current personId:', this.currentPersonId);
|
|
67
122
|
}
|
|
68
123
|
});
|
|
69
124
|
// Handler for reconnect events
|
|
@@ -72,54 +127,84 @@ export class NotificationService {
|
|
|
72
127
|
this.loadNotificationCounts(); // Don't debounce reconnect - need immediate update
|
|
73
128
|
});
|
|
74
129
|
}
|
|
130
|
+
/**
|
|
131
|
+
* Load notification counts from the API with debouncing
|
|
132
|
+
*/
|
|
75
133
|
/**
|
|
76
134
|
* Load notification counts from the API with debouncing
|
|
77
135
|
*/
|
|
78
136
|
debouncedLoadNotificationCounts() {
|
|
137
|
+
console.log('⏰ NotificationService: Debounced load triggered');
|
|
79
138
|
if (this.loadTimeout) {
|
|
139
|
+
console.log('⏰ NotificationService: Clearing existing timeout');
|
|
80
140
|
clearTimeout(this.loadTimeout);
|
|
81
141
|
}
|
|
82
142
|
this.loadTimeout = setTimeout(() => {
|
|
143
|
+
console.log('⏰ NotificationService: Timeout expired, loading counts...');
|
|
83
144
|
this.loadNotificationCounts();
|
|
84
145
|
}, 300); // 300ms debounce
|
|
85
146
|
}
|
|
147
|
+
/**
|
|
148
|
+
* Load notification counts from the API
|
|
149
|
+
*/
|
|
86
150
|
/**
|
|
87
151
|
* Load notification counts from the API
|
|
88
152
|
*/
|
|
89
153
|
async loadNotificationCounts() {
|
|
154
|
+
console.log('📊 NotificationService: Loading notification counts from API...');
|
|
90
155
|
try {
|
|
91
156
|
// Use the unreadCount endpoint which returns both notification and PM counts
|
|
157
|
+
console.log('🌐 NotificationService: Making API call to /notifications/unreadCount');
|
|
92
158
|
const counts = await ApiHelper.get("/notifications/unreadCount", "MessagingApi");
|
|
159
|
+
console.log('📊 NotificationService: API response:', counts);
|
|
93
160
|
const newCounts = {
|
|
94
161
|
notificationCount: counts?.notificationCount || 0,
|
|
95
162
|
pmCount: counts?.pmCount || 0
|
|
96
163
|
};
|
|
164
|
+
console.log('🔄 NotificationService: Updating counts:', newCounts);
|
|
97
165
|
// Update counts and notify listeners
|
|
98
166
|
this.updateCounts(newCounts);
|
|
99
167
|
}
|
|
100
168
|
catch (error) {
|
|
101
169
|
console.error("❌ Failed to load notification counts:", error);
|
|
170
|
+
console.error("❌ Error details:", {
|
|
171
|
+
message: error.message,
|
|
172
|
+
status: error.status,
|
|
173
|
+
response: error.response
|
|
174
|
+
});
|
|
102
175
|
// Don't throw - just log the error and keep existing counts
|
|
103
176
|
}
|
|
104
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Update counts and notify all listeners
|
|
180
|
+
*/
|
|
105
181
|
/**
|
|
106
182
|
* Update counts and notify all listeners
|
|
107
183
|
*/
|
|
108
184
|
updateCounts(newCounts) {
|
|
185
|
+
console.log('🔔 NotificationService: updateCounts called with:', newCounts);
|
|
186
|
+
console.log('🔔 NotificationService: Current counts:', this.counts);
|
|
187
|
+
console.log('🔔 NotificationService: Number of listeners:', this.listeners.length);
|
|
109
188
|
const countsChanged = this.counts.notificationCount !== newCounts.notificationCount ||
|
|
110
189
|
this.counts.pmCount !== newCounts.pmCount;
|
|
190
|
+
console.log('🔄 NotificationService: Counts changed?', countsChanged);
|
|
111
191
|
if (countsChanged) {
|
|
112
192
|
this.counts = { ...newCounts };
|
|
193
|
+
console.log('✅ NotificationService: Counts updated, notifying listeners...');
|
|
113
194
|
// Notify all listeners
|
|
114
|
-
this.listeners.forEach(listener => {
|
|
195
|
+
this.listeners.forEach((listener, index) => {
|
|
115
196
|
try {
|
|
197
|
+
console.log(`📢 NotificationService: Calling listener ${index + 1}/${this.listeners.length}`);
|
|
116
198
|
listener(this.counts);
|
|
117
199
|
}
|
|
118
200
|
catch (error) {
|
|
119
|
-
console.error(
|
|
201
|
+
console.error(`❌ Error in notification listener ${index}:`, error);
|
|
120
202
|
}
|
|
121
203
|
});
|
|
122
204
|
}
|
|
205
|
+
else {
|
|
206
|
+
console.log('⚪ NotificationService: Counts unchanged, not notifying listeners');
|
|
207
|
+
}
|
|
123
208
|
}
|
|
124
209
|
/**
|
|
125
210
|
* Subscribe to notification count changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationService.js","sourceRoot":"","sources":["../../src/helpers/NotificationService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAwB,MAAM,qBAAqB,CAAC;AAOtE,MAAM,OAAO,mBAAmB;IAQ9B;QANQ,WAAM,GAAuB,EAAE,iBAAiB,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAClE,cAAS,GAAgD,EAAE,CAAC;QAC5D,kBAAa,GAAY,KAAK,CAAC;QAC/B,oBAAe,GAAkB,IAAI,CAAC;QACtC,gBAAW,GAAe,IAAI,CAAC;IAEhB,CAAC;IAExB,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;YAClC,mBAAmB,CAAC,QAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAC;QAC3D,CAAC;QACD,OAAO,mBAAmB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAC,OAA6B;QAC5C,IAAI,IAAI,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"NotificationService.js","sourceRoot":"","sources":["../../src/helpers/NotificationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,4BAA4B,EAAE,sBAAsB,EAAmD,MAAM,qBAAqB,CAAC;AAEjK,qBAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"SocketHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/SocketHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,4BAA4B,EAAE,sBAAsB,EAAmD,MAAM,qBAAqB,CAAC;AAEjK,qBAAa,YAAY;IACxB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;IACzB,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,cAAc,EAAE,4BAA4B,EAAE,CAAM;IAC3D,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0E;IACzG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAkB;IAE5C,MAAM,CAAC,eAAe,GAAI,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,UAUnE;IAED,MAAM,CAAC,qBAAqB,aAmC3B;IAED,MAAM,CAAC,IAAI,sBAuHV;IAED,MAAM,CAAC,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,UAOlF;IAED,MAAM,CAAC,aAAa,GAAI,IAAI,MAAM,UAEjC;IAED,MAAM,CAAC,sBAAsB,GAAI,QAAQ,MAAM,UAE9C;IAED,MAAM,CAAC,gBAAgB,aAEtB;IAED,MAAM,CAAC,aAAa,GAAI,SAAS,sBAAsB,UA2BtD;IAED,MAAM,CAAC,OAAO,aAiBb;IAED,MAAM,CAAC,UAAU,aAEhB;IAED,MAAM,CAAC,WAAW,QAAO,OAAO,CAE/B;IAED,MAAM,CAAC,kBAAkB,QAAO,MAAM,CAerC;IAGD,MAAM,CAAC,kBAAkB,mBAmBxB;CAED"}
|
|
@@ -7,23 +7,56 @@ SocketHelper.actionHandlers = [];
|
|
|
7
7
|
SocketHelper.personIdChurchId = { personId: "", churchId: "" };
|
|
8
8
|
SocketHelper.isCleanedUp = false;
|
|
9
9
|
SocketHelper.setPersonChurch = (pc) => {
|
|
10
|
+
console.log('👤 SocketHelper: Setting person/church context:', pc);
|
|
10
11
|
if (pc?.personId && pc.personId && pc.churchId !== _a.personIdChurchId.churchId && pc.personId !== _a.personIdChurchId.personId) {
|
|
11
12
|
_a.personIdChurchId = pc;
|
|
13
|
+
console.log('🔗 SocketHelper: Person/church context updated, creating alert connection');
|
|
12
14
|
_a.createAlertConnection();
|
|
13
15
|
}
|
|
16
|
+
else {
|
|
17
|
+
console.log('⚠️ SocketHelper: Person/church context unchanged or invalid');
|
|
18
|
+
}
|
|
14
19
|
};
|
|
15
20
|
SocketHelper.createAlertConnection = () => {
|
|
21
|
+
console.log('🔗 SocketHelper: Attempting to create alert connection...');
|
|
22
|
+
console.log('🆔 Socket ID:', _a.socketId);
|
|
23
|
+
console.log('👤 Person ID:', _a.personIdChurchId.personId);
|
|
24
|
+
console.log('⛪ Church ID:', _a.personIdChurchId.churchId);
|
|
16
25
|
if (_a.personIdChurchId.personId && _a.socketId) {
|
|
17
|
-
const connection = {
|
|
18
|
-
|
|
26
|
+
const connection = {
|
|
27
|
+
conversationId: "alerts",
|
|
28
|
+
churchId: _a.personIdChurchId.churchId,
|
|
29
|
+
displayName: "Test",
|
|
30
|
+
socketId: _a.socketId,
|
|
31
|
+
personId: _a.personIdChurchId.personId
|
|
32
|
+
};
|
|
33
|
+
console.log('🔗 SocketHelper: Creating alert connection with data:', connection);
|
|
34
|
+
ApiHelper.postAnonymous("/connections", [connection], "MessagingApi").then((response) => {
|
|
35
|
+
console.log('✅ SocketHelper: Alert connection created successfully:', response);
|
|
36
|
+
}).catch((error) => {
|
|
19
37
|
console.error("❌ Failed to create alert connection:", error);
|
|
38
|
+
console.error("❌ Error details:", {
|
|
39
|
+
status: error.status,
|
|
40
|
+
message: error.message,
|
|
41
|
+
response: error.response
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
console.warn('⚠️ SocketHelper: Cannot create alert connection - missing data:', {
|
|
47
|
+
hasPersonId: !!_a.personIdChurchId.personId,
|
|
48
|
+
hasSocketId: !!_a.socketId,
|
|
49
|
+
personId: _a.personIdChurchId.personId,
|
|
50
|
+
socketId: _a.socketId
|
|
20
51
|
});
|
|
21
52
|
}
|
|
22
53
|
};
|
|
23
54
|
SocketHelper.init = async () => {
|
|
55
|
+
console.log('🔌 SocketHelper: Starting initialization...');
|
|
24
56
|
_a.cleanup();
|
|
25
57
|
_a.isCleanedUp = false;
|
|
26
58
|
if (_a.socket && _a.socket.readyState !== _a.socket.CLOSED) {
|
|
59
|
+
console.log('🔌 SocketHelper: Closing existing socket connection');
|
|
27
60
|
try {
|
|
28
61
|
_a.socket.close();
|
|
29
62
|
}
|
|
@@ -31,35 +64,100 @@ SocketHelper.init = async () => {
|
|
|
31
64
|
console.error("❌ Error closing existing socket:", e);
|
|
32
65
|
}
|
|
33
66
|
}
|
|
67
|
+
console.log('🔌 SocketHelper: Connecting to:', CommonEnvironmentHelper.MessagingApiSocket);
|
|
34
68
|
await new Promise((resolve, reject) => {
|
|
69
|
+
let hasReceivedSocketId = false;
|
|
70
|
+
let messageCount = 0;
|
|
35
71
|
try {
|
|
36
72
|
_a.socket = new WebSocket(CommonEnvironmentHelper.MessagingApiSocket);
|
|
37
73
|
_a.socket.onmessage = (event) => {
|
|
74
|
+
console.log("🔔 SocketHelper: onmessage event triggered");
|
|
38
75
|
if (_a.isCleanedUp)
|
|
39
76
|
return;
|
|
77
|
+
messageCount++;
|
|
78
|
+
console.log(`📨 SocketHelper: Raw message #${messageCount} received:`, event.data);
|
|
79
|
+
console.log(`📨 SocketHelper: Message timestamp:`, new Date().toISOString());
|
|
80
|
+
console.log(`📨 SocketHelper: Message size:`, event.data.length, 'characters');
|
|
40
81
|
try {
|
|
41
82
|
const payload = JSON.parse(event.data);
|
|
83
|
+
console.log(`📨 SocketHelper: Parsed message #${messageCount}:`, payload);
|
|
84
|
+
console.log(`📨 SocketHelper: Message action:`, payload.action);
|
|
85
|
+
console.log(`📨 SocketHelper: Message data type:`, typeof payload.data);
|
|
86
|
+
if (payload.action === 'socketId') {
|
|
87
|
+
hasReceivedSocketId = true;
|
|
88
|
+
console.log('🆔 SocketHelper: Socket ID received!', payload.data);
|
|
89
|
+
}
|
|
90
|
+
// Log all message types we receive
|
|
91
|
+
switch (payload.action) {
|
|
92
|
+
case 'socketId':
|
|
93
|
+
console.log('🆔 Message type: Socket ID assignment');
|
|
94
|
+
break;
|
|
95
|
+
case 'privateMessage':
|
|
96
|
+
console.log('💬 Message type: Private message notification');
|
|
97
|
+
break;
|
|
98
|
+
case 'notification':
|
|
99
|
+
console.log('🔔 Message type: General notification');
|
|
100
|
+
break;
|
|
101
|
+
case 'message':
|
|
102
|
+
console.log('📩 Message type: Message update');
|
|
103
|
+
break;
|
|
104
|
+
case 'reconnect':
|
|
105
|
+
console.log('🔄 Message type: Reconnection signal');
|
|
106
|
+
break;
|
|
107
|
+
default:
|
|
108
|
+
console.log('❓ Message type: Unknown action -', payload.action);
|
|
109
|
+
}
|
|
42
110
|
_a.handleMessage(payload);
|
|
43
111
|
}
|
|
44
112
|
catch (error) {
|
|
45
113
|
console.error("❌ Error parsing socket message:", error);
|
|
114
|
+
console.error("❌ Raw message was:", event.data);
|
|
46
115
|
}
|
|
47
116
|
};
|
|
48
117
|
_a.socket.onopen = async (e) => {
|
|
49
|
-
|
|
50
|
-
|
|
118
|
+
console.log('✅ SocketHelper: WebSocket connection opened');
|
|
119
|
+
console.log('🔌 SocketHelper: Connection URL:', _a.socket.url);
|
|
120
|
+
console.log('🔌 SocketHelper: Connection protocol:', _a.socket.protocol);
|
|
121
|
+
// Send the getId request
|
|
122
|
+
console.log('🔌 SocketHelper: Sending getId request...');
|
|
123
|
+
_a.socket.send("getId");
|
|
124
|
+
console.log('🔌 SocketHelper: getId request sent');
|
|
125
|
+
// Wait longer to see if we get a response
|
|
126
|
+
setTimeout(() => {
|
|
127
|
+
if (!hasReceivedSocketId) {
|
|
128
|
+
console.warn('⚠️ SocketHelper: No socket ID received after 3 seconds');
|
|
129
|
+
console.log('🔍 SocketHelper: Socket state:', _a.socket.readyState);
|
|
130
|
+
console.log('🔍 SocketHelper: Messages received so far:', messageCount);
|
|
131
|
+
}
|
|
132
|
+
resolve(null);
|
|
133
|
+
}, 3000);
|
|
51
134
|
};
|
|
52
135
|
_a.socket.onclose = async (e) => {
|
|
53
|
-
console.log(
|
|
54
|
-
|
|
136
|
+
console.log('🔒 SocketHelper: WebSocket connection closed', {
|
|
137
|
+
code: e.code,
|
|
138
|
+
reason: e.reason,
|
|
139
|
+
wasClean: e.wasClean,
|
|
140
|
+
timestamp: new Date().toISOString(),
|
|
141
|
+
totalMessagesReceived: messageCount
|
|
142
|
+
});
|
|
143
|
+
// Log common close codes for debugging
|
|
144
|
+
if (e.code === 1005)
|
|
145
|
+
console.log('🔍 Close code 1005: No status received (normal for some servers)');
|
|
146
|
+
else if (e.code === 1006)
|
|
147
|
+
console.log('🔍 Close code 1006: Abnormal closure');
|
|
148
|
+
else if (e.code === 1000)
|
|
149
|
+
console.log('🔍 Close code 1000: Normal closure');
|
|
150
|
+
else
|
|
151
|
+
console.log('🔍 Close code:', e.code);
|
|
55
152
|
};
|
|
56
153
|
_a.socket.onerror = (error) => {
|
|
57
|
-
console.error(
|
|
154
|
+
console.error('❌ SocketHelper: WebSocket connection error:', error);
|
|
155
|
+
console.error('❌ SocketHelper: Messages received before error:', messageCount);
|
|
58
156
|
reject(error);
|
|
59
157
|
};
|
|
60
158
|
}
|
|
61
159
|
catch (error) {
|
|
62
|
-
console.error(
|
|
160
|
+
console.error('❌ SocketHelper: Error initializing socket:', error);
|
|
63
161
|
reject(error);
|
|
64
162
|
}
|
|
65
163
|
});
|
|
@@ -86,14 +184,18 @@ SocketHelper.handleMessage = (payload) => {
|
|
|
86
184
|
if (_a.isCleanedUp)
|
|
87
185
|
return;
|
|
88
186
|
try {
|
|
187
|
+
console.log('🔄 SocketHelper: Processing message with action:', payload.action);
|
|
89
188
|
if (payload.action === "socketId") {
|
|
189
|
+
console.log('🆔 SocketHelper: Received socket ID:', payload.data);
|
|
90
190
|
_a.socketId = payload.data;
|
|
91
191
|
_a.createAlertConnection();
|
|
92
192
|
}
|
|
93
193
|
else {
|
|
94
194
|
const matchingHandlers = ArrayHelper.getAll(_a.actionHandlers, "action", payload.action);
|
|
195
|
+
console.log(`📬 SocketHelper: Found ${matchingHandlers.length} handlers for action: ${payload.action}`);
|
|
95
196
|
matchingHandlers.forEach((handler) => {
|
|
96
197
|
try {
|
|
198
|
+
console.log(`🏃 SocketHelper: Executing handler ${handler.id} for action: ${payload.action}`);
|
|
97
199
|
handler.handleMessage(payload.data);
|
|
98
200
|
}
|
|
99
201
|
catch (error) {
|