@churchapps/apphelper 0.3.21 → 0.3.23
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/reporting/ReportOutput.d.ts.map +1 -1
- package/dist/components/reporting/ReportOutput.js +10 -1
- package/dist/components/reporting/ReportOutput.js.map +1 -1
- package/dist/helpers/FileHelper.d.ts +1 -1
- package/dist/helpers/FileHelper.d.ts.map +1 -1
- package/dist/helpers/FileHelper.js +6 -2
- package/dist/helpers/FileHelper.js.map +1 -1
- package/dist/pageComponents/components/LoginSetPassword.js +1 -1
- package/package.json +1 -1
- package/src/components/reporting/ReportOutput.tsx +10 -1
- package/src/helpers/FileHelper.ts +6 -3
- package/src/pageComponents/components/LoginSetPassword.tsx +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportOutput.d.ts","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAgC,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAW3G,UAAU,KAAK;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE;AAE5D,eAAO,MAAM,YAAY,UAAW,KAAK,
|
|
1
|
+
{"version":3,"file":"ReportOutput.d.ts","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAgC,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAW3G,UAAU,KAAK;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE;AAE5D,eAAO,MAAM,YAAY,UAAW,KAAK,4CAmJxC,CAAA"}
|
|
@@ -50,6 +50,7 @@ const ReportOutput = (props) => {
|
|
|
50
50
|
const [detailedPersonSummary, setDetailedPersonSummary] = react_1.default.useState(null);
|
|
51
51
|
const [customHeaders, setCustomHeaders] = react_1.default.useState([]);
|
|
52
52
|
const [anchorEl, setAnchorEl] = react_1.default.useState(null);
|
|
53
|
+
const [downloadData, setDownloadData] = react_1.default.useState(null);
|
|
53
54
|
const open = Boolean(anchorEl);
|
|
54
55
|
const contentRef = (0, react_1.useRef)(null);
|
|
55
56
|
const isMounted = (0, useMountedState_1.useMountedState)();
|
|
@@ -102,6 +103,14 @@ const ReportOutput = (props) => {
|
|
|
102
103
|
});
|
|
103
104
|
const donationUrl = "/donations/summary?type=person&" + queryParams.join("&");
|
|
104
105
|
helpers_2.ApiHelper.get(donationUrl, "GivingApi").then((data) => { populatePeople(data); });
|
|
106
|
+
if (props.keyName === "groupAttendance") {
|
|
107
|
+
let url = "/reports/groupAttendanceDownload/run";
|
|
108
|
+
if (queryParams)
|
|
109
|
+
url += "?" + queryParams.join("&");
|
|
110
|
+
helpers_2.ApiHelper.get(url, "ReportingApi").then((data) => {
|
|
111
|
+
setDownloadData(data);
|
|
112
|
+
});
|
|
113
|
+
}
|
|
105
114
|
}
|
|
106
115
|
};
|
|
107
116
|
const getExportMenu = (key) => {
|
|
@@ -112,7 +121,7 @@ const ReportOutput = (props) => {
|
|
|
112
121
|
const handleClose = () => {
|
|
113
122
|
setAnchorEl(null);
|
|
114
123
|
};
|
|
115
|
-
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", title: helpers_2.Locale.label("reporting.downloadOptions"), onClick: handleClick, children: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "download" }) }, key), (0, jsx_runtime_1.jsxs)(material_1.Menu, { anchorEl: anchorEl, open: open, onClose: handleClose, children: [((_a = reportResult === null || reportResult === void 0 ? void 0 : reportResult.table) === null || _a === void 0 ? void 0 : _a.length) > 0 && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsx)(__1.ExportLink, { data: reportResult.table, filename: props.report.displayName.replace(" ", "_") + ".csv", text: helpers_2.Locale.label("reporting.summary"), icon: props.keyName === "attendanceTrend" ? "calendar_month" : "volunteer_activism" }) }), (props.keyName === "donationSummary" && (detailedPersonSummary === null || detailedPersonSummary === void 0 ? void 0 : detailedPersonSummary.length) > 0) && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsx)(__1.ExportLink, { data: detailedPersonSummary, filename: "Detailed_Donation_Summary.csv", text: helpers_2.Locale.label("reporting.detailed"), icon: "person", customHeaders: customHeaders, spaceAfter: true }) }), (props.keyName === "donationSummary" && (detailedPersonSummary === null || detailedPersonSummary === void 0 ? void 0 : detailedPersonSummary.length) > 0) && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsxs)(material_1.Button, { onClick: () => { window.open("/downloads/DonationTemplate.docx"); }, children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { sx: { marginRight: 1 }, children: "description" }), helpers_2.Locale.label("reporting.sampleTemplate")] }) })] })] }));
|
|
124
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Button, { size: "small", title: helpers_2.Locale.label("reporting.downloadOptions"), onClick: handleClick, children: (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "download" }) }, key), (0, jsx_runtime_1.jsxs)(material_1.Menu, { anchorEl: anchorEl, open: open, onClose: handleClose, children: [((_a = reportResult === null || reportResult === void 0 ? void 0 : reportResult.table) === null || _a === void 0 ? void 0 : _a.length) > 0 && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsx)(__1.ExportLink, { data: props.keyName === "groupAttendance" ? downloadData === null || downloadData === void 0 ? void 0 : downloadData.table : reportResult.table, filename: props.report.displayName.replace(" ", "_") + ".csv", text: helpers_2.Locale.label("reporting.summary"), icon: props.keyName === "attendanceTrend" ? "calendar_month" : "volunteer_activism" }) }), (props.keyName === "donationSummary" && (detailedPersonSummary === null || detailedPersonSummary === void 0 ? void 0 : detailedPersonSummary.length) > 0) && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsx)(__1.ExportLink, { data: detailedPersonSummary, filename: "Detailed_Donation_Summary.csv", text: helpers_2.Locale.label("reporting.detailed"), icon: "person", customHeaders: customHeaders, spaceAfter: true }) }), (props.keyName === "donationSummary" && (detailedPersonSummary === null || detailedPersonSummary === void 0 ? void 0 : detailedPersonSummary.length) > 0) && (0, jsx_runtime_1.jsx)(material_1.MenuItem, { sx: { padding: "5px" }, onClick: handleClose, children: (0, jsx_runtime_1.jsxs)(material_1.Button, { onClick: () => { window.open("/downloads/DonationTemplate.docx"); }, children: [(0, jsx_runtime_1.jsx)(material_1.Icon, { sx: { marginRight: 1 }, children: "description" }), helpers_2.Locale.label("reporting.sampleTemplate")] }) })] })] }));
|
|
116
125
|
};
|
|
117
126
|
react_1.default.useEffect(runReport, [props.report, isMounted]);
|
|
118
127
|
const getEditContent = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportOutput.js","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ReportOutput.js","sourceRoot":"","sources":["../../../src/components/reporting/ReportOutput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare class FileHelper {
|
|
2
|
-
static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void) =>
|
|
2
|
+
static postPresignedFile: (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void, axiosInstance?: any) => any;
|
|
3
3
|
static dataURLtoBlob(dataurl: string): Blob;
|
|
4
4
|
}
|
|
5
5
|
//# sourceMappingURL=FileHelper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":"AAEA,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FileHelper.d.ts","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":"AAEA,qBAAa,UAAU;IACrB,MAAM,CAAC,iBAAiB,cAAe,GAAG,gBAAgB,IAAI,8BAA8B,MAAM,KAAK,IAAI,kBAAkB,GAAG,SAoB9H;IAEF,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM;CAQrC"}
|
|
@@ -15,7 +15,8 @@ class FileHelper {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.FileHelper = FileHelper;
|
|
18
|
-
FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback) => {
|
|
18
|
+
FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback, axiosInstance) => {
|
|
19
|
+
const axiosToUse = axiosInstance || axios_1.default;
|
|
19
20
|
const formData = new FormData();
|
|
20
21
|
//formData.append("key", presigned.key); //no longer needed with new aws sdk
|
|
21
22
|
formData.append("acl", "public-read");
|
|
@@ -29,6 +30,9 @@ FileHelper.postPresignedFile = (presigned, uploadedFile, progressCallback) => {
|
|
|
29
30
|
progressCallback(Math.round((100 * data.loaded) / data.total));
|
|
30
31
|
}
|
|
31
32
|
};
|
|
32
|
-
|
|
33
|
+
console.log("#10");
|
|
34
|
+
console.log("axios: ", axiosToUse);
|
|
35
|
+
console.log("axios tyeof: ", typeof axiosToUse.post);
|
|
36
|
+
return axiosToUse.post(presigned.url, formData, axiosConfig);
|
|
33
37
|
};
|
|
34
38
|
//# sourceMappingURL=FileHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FileHelper.js","sourceRoot":"","sources":["../../src/helpers/FileHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,MAAa,UAAU;IAuBrB,MAAM,CAAC,aAAa,CAAC,OAAe;QAClC,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7D,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,EAAE,EAAE;YACV,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;;AA9BH,gCA+BC;AA9BQ,4BAAiB,GAAG,CAAC,SAAc,EAAE,YAAkB,EAAE,gBAA2C,EAAE,aAAmB,EAAE,EAAE;IAClI,MAAM,UAAU,GAAG,aAAa,IAAI,eAAK,CAAC;IAC1C,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAChC,4EAA4E;IAC5E,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM;QAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,EAAE,cAAc,EAAE,qBAAqB,EAAE;QAClD,gBAAgB,EAAE,CAAC,IAAS,EAAE,EAAE;YAC9B,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACnC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AAC/D,CAAC,CAAC"}
|
|
@@ -90,7 +90,7 @@ const LoginSetPassword = props => {
|
|
|
90
90
|
const linkTimestamp = parseInt(timestampParam, 10);
|
|
91
91
|
const currentTime = Date.now();
|
|
92
92
|
//Check if the link is expired (2 min)
|
|
93
|
-
if (currentTime - linkTimestamp >
|
|
93
|
+
if (currentTime - linkTimestamp > 600000) {
|
|
94
94
|
setLinkExpired(true);
|
|
95
95
|
}
|
|
96
96
|
else {
|
package/package.json
CHANGED
|
@@ -19,6 +19,7 @@ export const ReportOutput = (props: Props) => {
|
|
|
19
19
|
const [detailedPersonSummary, setDetailedPersonSummary] = React.useState<any[]>(null);
|
|
20
20
|
const [customHeaders, setCustomHeaders] = React.useState([]);
|
|
21
21
|
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
|
|
22
|
+
const [downloadData, setDownloadData] = React.useState<ReportResultInterface>(null);
|
|
22
23
|
const open = Boolean(anchorEl);
|
|
23
24
|
const contentRef = useRef<HTMLDivElement>(null);
|
|
24
25
|
const isMounted = useMountedState();
|
|
@@ -90,6 +91,14 @@ export const ReportOutput = (props: Props) => {
|
|
|
90
91
|
|
|
91
92
|
const donationUrl = "/donations/summary?type=person&" + queryParams.join("&");
|
|
92
93
|
ApiHelper.get(donationUrl, "GivingApi").then((data) => { populatePeople(data); });
|
|
94
|
+
|
|
95
|
+
if (props.keyName === "groupAttendance") {
|
|
96
|
+
let url = "/reports/groupAttendanceDownload/run";
|
|
97
|
+
if (queryParams) url += "?" + queryParams.join("&");
|
|
98
|
+
ApiHelper.get(url, "ReportingApi").then((data: ReportResultInterface) => {
|
|
99
|
+
setDownloadData(data);
|
|
100
|
+
})
|
|
101
|
+
}
|
|
93
102
|
}
|
|
94
103
|
}
|
|
95
104
|
|
|
@@ -104,7 +113,7 @@ export const ReportOutput = (props: Props) => {
|
|
|
104
113
|
return (<>
|
|
105
114
|
<Button size="small" title={Locale.label("reporting.downloadOptions")} onClick={handleClick} key={key}><Icon>download</Icon></Button>
|
|
106
115
|
<Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
|
|
107
|
-
{reportResult?.table?.length > 0 && <MenuItem sx={{ padding: "5px" }} onClick={handleClose}><ExportLink data={reportResult.table} filename={props.report.displayName.replace(" ", "_") + ".csv"} text={Locale.label("reporting.summary")} icon={props.keyName === "attendanceTrend" ? "calendar_month" : "volunteer_activism"} /></MenuItem>}
|
|
116
|
+
{reportResult?.table?.length > 0 && <MenuItem sx={{ padding: "5px" }} onClick={handleClose}><ExportLink data={props.keyName === "groupAttendance" ? downloadData?.table : reportResult.table} filename={props.report.displayName.replace(" ", "_") + ".csv"} text={Locale.label("reporting.summary")} icon={props.keyName === "attendanceTrend" ? "calendar_month" : "volunteer_activism"} /></MenuItem>}
|
|
108
117
|
{(props.keyName ==="donationSummary" && detailedPersonSummary?.length > 0) && <MenuItem sx={{ padding: "5px" }} onClick={handleClose}><ExportLink data={detailedPersonSummary} filename="Detailed_Donation_Summary.csv" text={Locale.label("reporting.detailed")} icon="person" customHeaders={customHeaders} spaceAfter={true} /></MenuItem>}
|
|
109
118
|
{(props.keyName ==="donationSummary" && detailedPersonSummary?.length > 0) && <MenuItem sx={{ padding: "5px" }} onClick={handleClose}><Button onClick={() => { window.open("/downloads/DonationTemplate.docx") }}><Icon sx={{ marginRight: 1 }}>description</Icon>{Locale.label("reporting.sampleTemplate")}</Button></MenuItem>}
|
|
110
119
|
</Menu>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import axios from "axios";
|
|
2
2
|
|
|
3
3
|
export class FileHelper {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
static postPresignedFile = (presigned: any, uploadedFile: File, progressCallback: (percent: number) => void, axiosInstance?: any) => {
|
|
5
|
+
const axiosToUse = axiosInstance || axios;
|
|
6
6
|
const formData = new FormData();
|
|
7
7
|
//formData.append("key", presigned.key); //no longer needed with new aws sdk
|
|
8
8
|
formData.append("acl", "public-read");
|
|
@@ -17,7 +17,10 @@ export class FileHelper {
|
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
console.log("#10");
|
|
21
|
+
console.log("axios: ", axiosToUse);
|
|
22
|
+
console.log("axios tyeof: ", typeof axiosToUse.post);
|
|
23
|
+
return axiosToUse.post(presigned.url, formData, axiosConfig);
|
|
21
24
|
};
|
|
22
25
|
|
|
23
26
|
static dataURLtoBlob(dataurl: string) {
|
|
@@ -66,7 +66,7 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
66
66
|
const currentTime = Date.now();
|
|
67
67
|
|
|
68
68
|
//Check if the link is expired (2 min)
|
|
69
|
-
if (currentTime - linkTimestamp >
|
|
69
|
+
if (currentTime - linkTimestamp > 600000) {
|
|
70
70
|
setLinkExpired(true);
|
|
71
71
|
} else {
|
|
72
72
|
loadUser();
|