@churchapps/apphelper 0.2.21 → 0.2.22
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/wrapper/NotificationMenu.js +1 -1
- package/dist/components/wrapper/NotificationMenu.js.map +1 -1
- package/dist/components/wrapper/Notifications.d.ts +1 -0
- package/dist/components/wrapper/Notifications.d.ts.map +1 -1
- package/dist/components/wrapper/Notifications.js +11 -1
- package/dist/components/wrapper/Notifications.js.map +1 -1
- package/package.json +1 -1
- package/src/components/wrapper/NotificationMenu.tsx +2 -2
- package/src/components/wrapper/Notifications.tsx +11 -1
|
@@ -68,7 +68,7 @@ const NotificationMenu = (props) => {
|
|
|
68
68
|
react_1.default.createElement(material_1.Tab, { label: "Messages", icon: (props.counts.pmCount > 0) ? react_1.default.createElement(material_1.Icon, { style: { color: "#FF0000" } }, "notifications") : react_1.default.createElement(react_1.default.Fragment, null), iconPosition: "end" }),
|
|
69
69
|
react_1.default.createElement(material_1.Tab, { label: "Notifications", icon: (props.counts.notificationCount > 0) ? react_1.default.createElement(material_1.Icon, { style: { color: "#FF0000" } }, "notifications") : react_1.default.createElement(react_1.default.Fragment, null), iconPosition: "end" })),
|
|
70
70
|
tabIndex === 0 && react_1.default.createElement(PrivateMessages_1.PrivateMessages, { context: props.context, refreshKey: refreshKey, onUpdate: props.onUpdate }),
|
|
71
|
-
tabIndex === 1 && react_1.default.createElement(Notifications_1.Notifications, { context: props.context, appName: props.appName, onUpdate: props.onUpdate })))));
|
|
71
|
+
tabIndex === 1 && react_1.default.createElement(Notifications_1.Notifications, { context: props.context, appName: props.appName, onUpdate: props.onUpdate, router: props.router })))));
|
|
72
72
|
};
|
|
73
73
|
exports.NotificationMenu = NotificationMenu;
|
|
74
74
|
//# sourceMappingURL=NotificationMenu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NotificationMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/NotificationMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAyB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIlF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"Notifications.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAyB,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIlF,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAsEzC,CAAC"}
|
|
@@ -68,7 +68,17 @@ const Notifications = (props) => {
|
|
|
68
68
|
path = "/member/plans/" + notification.contentId;
|
|
69
69
|
break;
|
|
70
70
|
}
|
|
71
|
-
|
|
71
|
+
const appUrl = getAppUrl(app);
|
|
72
|
+
if (appUrl === "") {
|
|
73
|
+
if (props.router)
|
|
74
|
+
props.router.push(path);
|
|
75
|
+
else
|
|
76
|
+
setRedirectUrl(path);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
console.log("REDIRECTING TO", appUrl + path);
|
|
80
|
+
window.location.assign(appUrl + path);
|
|
81
|
+
}
|
|
72
82
|
};
|
|
73
83
|
const getMainLinks = () => {
|
|
74
84
|
let result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,uDAAoD;AACpD,4CAAiD;AAEjD,2CAA2C;AAC3C,uDAA4C;
|
|
1
|
+
{"version":3,"file":"Notifications.js","sourceRoot":"","sources":["../../../src/components/wrapper/Notifications.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -83,10 +83,10 @@ export const NotificationMenu: React.FC<Props> = (props) => {
|
|
|
83
83
|
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
|
|
84
84
|
<Tabs variant="fullWidth" value={tabIndex} onChange={handleChange}>
|
|
85
85
|
<Tab label="Messages" icon={(props.counts.pmCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end" />
|
|
86
|
-
<Tab label="Notifications" icon={(props.counts.notificationCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end"
|
|
86
|
+
<Tab label="Notifications" icon={(props.counts.notificationCount>0) ? <Icon style={{color:"#FF0000"}}>notifications</Icon> : <></>} iconPosition="end" />
|
|
87
87
|
</Tabs>
|
|
88
88
|
{tabIndex === 0 && <PrivateMessages context={props.context} refreshKey={refreshKey} onUpdate={props.onUpdate} />}
|
|
89
|
-
{tabIndex === 1 && <Notifications context={props.context} appName={props.appName} onUpdate={props.onUpdate} />}
|
|
89
|
+
{tabIndex === 1 && <Notifications context={props.context} appName={props.appName} onUpdate={props.onUpdate} router={props.router} />}
|
|
90
90
|
</Box>
|
|
91
91
|
</Menu>
|
|
92
92
|
</>
|
|
@@ -8,6 +8,7 @@ import { Navigate } from "react-router-dom";
|
|
|
8
8
|
interface Props {
|
|
9
9
|
appName: string;
|
|
10
10
|
context: UserContextInterface;
|
|
11
|
+
router?: any;
|
|
11
12
|
onUpdate: () => void;
|
|
12
13
|
}
|
|
13
14
|
|
|
@@ -39,7 +40,16 @@ export const Notifications: React.FC<Props> = (props) => {
|
|
|
39
40
|
case "task": app = "chums"; path = "/tasks/" + notification.contentId; break;
|
|
40
41
|
case "assignment": app = "b1"; path = "/member/plans/" + notification.contentId; break;
|
|
41
42
|
}
|
|
42
|
-
|
|
43
|
+
|
|
44
|
+
const appUrl = getAppUrl(app);
|
|
45
|
+
if (appUrl === "") {
|
|
46
|
+
if (props.router) props.router.push(path);
|
|
47
|
+
else setRedirectUrl(path);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
console.log("REDIRECTING TO", appUrl + path)
|
|
51
|
+
window.location.assign(appUrl + path);
|
|
52
|
+
}
|
|
43
53
|
}
|
|
44
54
|
|
|
45
55
|
const getMainLinks = () => {
|