@churchapps/apphelper 0.2.8 → 0.2.10
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/B1ShareModal.d.ts +0 -1
- package/dist/components/B1ShareModal.d.ts.map +1 -1
- package/dist/components/B1ShareModal.js +2 -2
- package/dist/components/B1ShareModal.js.map +1 -1
- package/dist/components/reporting/ReportOutput.d.ts.map +1 -1
- package/dist/components/reporting/ReportOutput.js +11 -2
- package/dist/components/reporting/ReportOutput.js.map +1 -1
- package/package.json +2 -2
- package/src/components/B1ShareModal.tsx +2 -3
- package/src/components/reporting/ReportOutput.tsx +15 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"B1ShareModal.d.ts","sourceRoot":"","sources":["../../src/components/B1ShareModal.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,KAAK,KAAK,GAAG;IACX,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"B1ShareModal.d.ts","sourceRoot":"","sources":["../../src/components/B1ShareModal.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,KAAK,KAAK,GAAG;IACX,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,qBAwFxC"}
|
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.B1ShareModal = void 0;
|
|
16
|
-
const helpers_1 = require("
|
|
16
|
+
const helpers_1 = require("../helpers");
|
|
17
17
|
const material_1 = require("@mui/material");
|
|
18
18
|
const react_1 = __importDefault(require("react"));
|
|
19
19
|
const react_2 = require("react");
|
|
@@ -71,7 +71,7 @@ function B1ShareModal(props) {
|
|
|
71
71
|
boxShadow: 24,
|
|
72
72
|
};
|
|
73
73
|
const getModalContent = () => {
|
|
74
|
-
if (!
|
|
74
|
+
if (!helpers_1.ApiHelper.isAuthenticated)
|
|
75
75
|
return react_1.default.createElement("p", null, "Please log in first.");
|
|
76
76
|
else if (!groups)
|
|
77
77
|
return (react_1.default.createElement(Loading_1.Loading, null));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"B1ShareModal.js","sourceRoot":"","sources":["../../src/components/B1ShareModal.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"B1ShareModal.js","sourceRoot":"","sources":["../../src/components/B1ShareModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportOutput.d.ts","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AACtC,OAAO,EAAgC,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAU3G,UAAU,KAAK;IAAG,MAAM,EAAE,eAAe,CAAA;CAAE;AAE3C,eAAO,MAAM,YAAY,UAAW,KAAK,
|
|
1
|
+
{"version":3,"file":"ReportOutput.d.ts","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAC;AACtC,OAAO,EAAgC,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAU3G,UAAU,KAAK;IAAG,MAAM,EAAE,eAAe,CAAA;CAAE;AAE3C,eAAO,MAAM,YAAY,UAAW,KAAK,sBA2IxC,CAAA"}
|
|
@@ -60,13 +60,22 @@ const ReportOutput = (props) => {
|
|
|
60
60
|
const peopleIds = helpers_1.ArrayHelper.getIds(data, "personId");
|
|
61
61
|
if (peopleIds.length > 0) {
|
|
62
62
|
const people = yield helpers_2.ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
|
|
63
|
-
data.
|
|
63
|
+
const filteredData = data.filter((d) => d.personId !== null);
|
|
64
|
+
filteredData.forEach((d) => {
|
|
65
|
+
var _a;
|
|
64
66
|
const person = helpers_1.ArrayHelper.getOne(people, "id", d.personId);
|
|
65
67
|
const funds = Object.assign({}, ...d.funds);
|
|
66
|
-
const obj = Object.assign({ firstName: person.name.first, lastName: person.name.last, address: person.contactInfo.address1 + (person.contactInfo.address2 ? `, ${person.contactInfo.address2}` : ""), city: person.contactInfo.city, state: person.contactInfo.state, zip: person.contactInfo.zip, totalDonation: d.totalAmount }, funds);
|
|
68
|
+
const obj = Object.assign({ firstName: person.name.first, lastName: person.name.last, email: (_a = person.contactInfo) === null || _a === void 0 ? void 0 : _a.email, address: person.contactInfo.address1 + (person.contactInfo.address2 ? `, ${person.contactInfo.address2}` : ""), city: person.contactInfo.city, state: person.contactInfo.state, zip: person.contactInfo.zip, totalDonation: d.totalAmount }, funds);
|
|
67
69
|
result.push(obj);
|
|
68
70
|
});
|
|
69
71
|
}
|
|
72
|
+
//for anonymous donations
|
|
73
|
+
const anonDonations = helpers_1.ArrayHelper.getOne(data, "personId", null);
|
|
74
|
+
if (anonDonations) {
|
|
75
|
+
const funds = Object.assign({}, ...anonDonations.funds);
|
|
76
|
+
const obj = Object.assign({ firstName: "Anonymous", totalDonation: anonDonations.totalAmount }, funds);
|
|
77
|
+
result.push(obj);
|
|
78
|
+
}
|
|
70
79
|
//set custom headers
|
|
71
80
|
const maxKeysObj = result === null || result === void 0 ? void 0 : result.reduce((a, b) => {
|
|
72
81
|
return Object.keys(a).length > Object.keys(b).length ? a : b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportOutput.js","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsC;AACtC,iDAA2G;AAC3G,2BAAqD;AACrD,2CAAyC;AACzC,mDAAiD;AACjD,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;AAC1C,4CAA6D;AAC7D,iEAA8D;AAIvD,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE;IAC3C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAwB,IAAI,CAAC,CAAC;IACpF,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAQ,IAAI,CAAC,CAAC;IACtF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEpC,MAAM,WAAW,GAAG,IAAA,gCAAe,EAAC;QAClC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO;KAClC,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,CAAO,IAAW,EAAE,EAAE;QAC3C,IAAI,MAAM,GAAU,EAAE,CAAC;QACvB,IAAI,OAAO,GAAmC,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,qBAAW,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;YAC9F,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ReportOutput.js","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apphelper",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.10",
|
|
4
4
|
"description": "Library of helper functions for React and NextJS ChurchApps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"react-router-dom": "^6.15.0"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@churchapps/helpers": "^1.0.
|
|
37
|
+
"@churchapps/helpers": "^1.0.15",
|
|
38
38
|
"@emotion/cache": "^11.11.0",
|
|
39
39
|
"@emotion/react": "^11.11.1",
|
|
40
40
|
"@emotion/styled": "^11.11.0",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GroupInterface, ApiHelper
|
|
1
|
+
import { GroupInterface, ApiHelper } from "../helpers";
|
|
2
2
|
import { Modal, Box, FormControl, InputLabel, MenuItem, Select, TextField, SelectChangeEvent, Button, DialogActions, Alert, Snackbar } from "@mui/material";
|
|
3
3
|
import React from "react";
|
|
4
4
|
import { useEffect, useState } from "react";
|
|
@@ -8,7 +8,6 @@ type Props = {
|
|
|
8
8
|
contentDisplayName: string;
|
|
9
9
|
contentType: string;
|
|
10
10
|
contentId: string;
|
|
11
|
-
isAuthenticated: boolean;
|
|
12
11
|
onClose: () => void;
|
|
13
12
|
};
|
|
14
13
|
|
|
@@ -68,7 +67,7 @@ export function B1ShareModal(props: Props) {
|
|
|
68
67
|
};
|
|
69
68
|
|
|
70
69
|
const getModalContent = () => {
|
|
71
|
-
if (!
|
|
70
|
+
if (!ApiHelper.isAuthenticated) return <p>Please log in first.</p>
|
|
72
71
|
else if (!groups) return (<Loading />);
|
|
73
72
|
else if (groups.length === 0) return (<p>You are not a currently a member of any groups on B1.</p>);
|
|
74
73
|
else return (<>
|
|
@@ -30,12 +30,14 @@ export const ReportOutput = (props: Props) => {
|
|
|
30
30
|
const peopleIds = ArrayHelper.getIds(data, "personId");
|
|
31
31
|
if (peopleIds.length > 0) {
|
|
32
32
|
const people = await ApiHelper.get("/people/ids?ids=" + peopleIds.join(","), "MembershipApi");
|
|
33
|
-
data.
|
|
33
|
+
const filteredData = data.filter((d) => d.personId !== null);
|
|
34
|
+
filteredData.forEach((d) => {
|
|
34
35
|
const person: PersonInterface = ArrayHelper.getOne(people, "id", d.personId);
|
|
35
36
|
const funds = Object.assign({}, ...d.funds);
|
|
36
37
|
const obj = {
|
|
37
38
|
firstName: person.name.first,
|
|
38
39
|
lastName: person.name.last,
|
|
40
|
+
email: person.contactInfo?.email,
|
|
39
41
|
address: person.contactInfo.address1 + (person.contactInfo.address2 ? `, ${person.contactInfo.address2}` : ""),
|
|
40
42
|
city: person.contactInfo.city,
|
|
41
43
|
state: person.contactInfo.state,
|
|
@@ -47,6 +49,18 @@ export const ReportOutput = (props: Props) => {
|
|
|
47
49
|
});
|
|
48
50
|
}
|
|
49
51
|
|
|
52
|
+
//for anonymous donations
|
|
53
|
+
const anonDonations = ArrayHelper.getOne(data, "personId", null);
|
|
54
|
+
if (anonDonations) {
|
|
55
|
+
const funds = Object.assign({}, ...anonDonations.funds);
|
|
56
|
+
const obj = {
|
|
57
|
+
firstName: "Anonymous",
|
|
58
|
+
totalDonation: anonDonations.totalAmount,
|
|
59
|
+
...funds
|
|
60
|
+
}
|
|
61
|
+
result.push(obj);
|
|
62
|
+
}
|
|
63
|
+
|
|
50
64
|
//set custom headers
|
|
51
65
|
const maxKeysObj = result?.reduce((a, b) => {
|
|
52
66
|
return Object.keys(a).length > Object.keys(b).length ? a : b;
|