Skip to content

Commit 3709776

Browse files
committed
added fixes for status page and documents download
1 parent 201410d commit 3709776

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

client/src/features/History/ListItem.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@ export const ListItem = ({ item, onClick }) => {
1313
<td className="text-right">
1414
<div className="dropdown">
1515
<button
16-
className="dropdown-toggle"
17-
type="button"
18-
id="dropdownMenuButton"
19-
data-toggle="dropdown"
20-
data-target="#dropdown"
21-
aria-haspopup="true"
22-
aria-expanded="false"
16+
className="dropdown-toggle btn btn-secondary"
17+
type="button"
18+
id="options3"
19+
data-bs-toggle="dropdown"
20+
aria-expanded="false"
2321
>
2422
{t("OptionsButton")}
2523
</button>
2624
<div
2725
className="dropdown-menu dropdown-menu-right"
28-
aria-labelledby="dropdownMenuButton"
26+
aria-labelledby="options3"
2927
>
3028
<a href="#/"
3129
className="dropdown-item"

client/src/features/History/components/ApiDescription.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import React from "react";
22
import { useTranslation } from "react-i18next";
33
import parse from "html-react-parser";
4+
import { Collapse } from 'react-bootstrap'
45

56
export const ApiDescription = () => {
67
const { t } = useTranslation("History");
7-
const style = {
8-
// minWidth: 400
9-
};
8+
const [open, setOpen] = React.useState(false);
109

1110
return (
12-
<div className="col-lg-5" style={style}>
11+
<div className="col-lg-5">
1312
<div id="accordion">
1413
<div className="card">
1514
<div className="card-header" id="headingOne">
@@ -20,20 +19,22 @@ export const ApiDescription = () => {
2019
data-target="#collapseOne"
2120
aria-expanded="false"
2221
aria-controls="collapseOne"
22+
onClick={() => {setOpen(!open)}}
2323
>
2424
{t("ApiDecription.SeeMore")}
2525
</button>
2626
</h5>
2727
</div>
2828
<div
2929
id="collapseOne"
30-
className="collapse"
3130
aria-labelledby="headingOne"
3231
data-parent="#accordion"
3332
>
33+
<Collapse in={open}>
3434
<div className="card-body">
3535
{parse(t("ApiDecription.CodeFlow"))}
3636
</div>
37+
</Collapse>
3738
</div>
3839
</div>
3940
</div>

client/src/features/RequestTranscript/index.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const RequestTranscriptPage = () => {
3838
}
3939

4040
const body = {
41+
"callback-url": process.env.REACT_APP_DS_RETURN_URL + "/signing_complete",
4142
"terms-name": t("Transcript.TermsName"),
4243
"terms-transcript": t("Transcript.DisplayName"),
4344
"display-name": t("Transcript.TermsTranscript")
@@ -48,7 +49,9 @@ export const RequestTranscriptPage = () => {
4849
dispatch({
4950
type: Actions.GET_CLICKWRAP_SUCCESS,
5051
payload: {
51-
clickwrap: response.clickwrap
52+
clickwrap: response.clickwrap,
53+
envelopeId: response.envelope_id,
54+
redirectUrl: response.redirect_url
5255
}
5356
});
5457
window.addEventListener(
@@ -73,11 +76,21 @@ export const RequestTranscriptPage = () => {
7376
}
7477
};
7578
try {
79+
7680
const response = await studentsAPI.requestTranscript(body);
7781
download(response, "transcript", "html", "text/html");
82+
7883
window.addEventListener(
7984
"message",
80-
event => goToSigningComplete(event),
85+
event => {
86+
if(event.data.type == "DOWNLOADED"){
87+
setTimeout(() => {
88+
goToSigningComplete(event);
89+
}, 5000);
90+
} else {
91+
goToSigningComplete(event);
92+
}
93+
},
8194
false
8295
);
8396
} catch (error) {

0 commit comments

Comments
 (0)