Skip to content

Commit ef9836a

Browse files
nvanwittnvanwitt
committed
parent 55bc308
author nvanwitt <[email protected]> 1568764570 -0400 committer nvanwitt <[email protected]> 1568767292 -0400 parent 55bc308 author nvanwitt <[email protected]> 1568764570 -0400 committer nvanwitt <[email protected]> 1568767259 -0400 Refined Jest testing for ObsFuncs, added cache file for WEP tables, added rough print page
1 parent 55bc308 commit ef9836a

34 files changed

+1255
-227
lines changed

‎jest-preprocess.js

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const babelOptions = {
2+
presets: ["babel-preset-gatsby"],
3+
}
4+
module.exports = require("babel-jest").createTransformer(babelOptions)

‎jest.config.js

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
module.exports = {
2+
transform: {
3+
"^.+\\.(t|j)sx?$": "<rootDir>/jest-preprocess.js",
4+
},
5+
testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.([tj]sx?)$",
6+
moduleNameMapper: {
7+
".+\\.(css|styl|less|sass|scss)$": "identity-obj-proxy",
8+
".+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
9+
"<rootDir>/__mocks__/file-mock.js",
10+
},
11+
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
12+
testPathIgnorePatterns: ["node_modules", ".cache"],
13+
transformIgnorePatterns: ["node_modules/(?!(gatsby)/)"],
14+
globals: {
15+
"ts-jest": {
16+
diagnostics: false
17+
},
18+
__PATH_PREFIX__: "",
19+
},
20+
testURL: "http://localhost",
21+
setupFiles: ["<rootDir>/loadershim.js"],
22+
}

‎loadershim.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
global.___loader = {
2+
enqueue: jest.fn(),
3+
}

‎package.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
"@emotion/styled": "^10.0.10",
1010
"@observablehq/runtime": "^4.0.1",
1111
"@reach/router": "^1.2.1",
12+
"@rebass/grid": "^6.0.0",
1213
"@types/react-helmet": "^5.0.8",
1314
"babel-preset-gatsby": "^0.1.11",
15+
"d3": "^5.11.0",
16+
"dayjs": "^1.8.15",
1417
"fast-xml-parser": "^3.12.16",
1518
"gatsby": "^2.4.2",
1619
"gatsby-cli": "^2.5.13",
@@ -24,7 +27,7 @@
2427
"gatsby-plugin-typescript": "^2.0.11",
2528
"gatsby-source-filesystem": "^2.0.28",
2629
"gatsby-transformer-sharp": "^2.1.17",
27-
"pdfjs-dist": "^2.1.266",
30+
"pdfjs-dist": "2.1.266",
2831
"prop-types": "^15.7.2",
2932
"react": "^16.8.5",
3033
"react-dom": "^16.8.5",
@@ -36,8 +39,12 @@
3639
"devDependencies": {
3740
"@types/react": "^16.8.8",
3841
"@types/react-dom": "^16.8.3",
42+
"babel-jest": "^24.9.0",
3943
"babel-plugin-emotion": "^10.0.9",
40-
"prettier": "^1.16.4"
44+
"identity-obj-proxy": "^3.0.0",
45+
"jest": "^24.9.0",
46+
"prettier": "^1.16.4",
47+
"ts-jest": "^24.0.2"
4148
},
4249
"keywords": [
4350
"gatsby"
@@ -49,7 +56,7 @@
4956
"format": "prettier --write src/**/*.{js,jsx,tsx}",
5057
"start": "npm run develop",
5158
"serve": "gatsby serve",
52-
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\""
59+
"test": "jest"
5360
},
5461
"repository": {
5562
"type": "git",

‎src/components/button-link-red.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { colors } from "../constants";
55
export const ButtonLinkRed = styled(ButtonLink)`
66
background-color: ${colors.white};
77
color: ${colors.black};
8-
border: 2px solid ${colors.lime};
8+
border: 2px solid ${colors.lightblue};
99
&:hover {
10-
border-color: ${colors.lime};
11-
background-color: ${colors.lime};
10+
border-color: ${colors.lightblue};
11+
background-color: ${colors.lightblue};
1212
color: ${colors.white};
1313
}
1414
`;

‎src/components/button-link.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ export const ButtonLink = styled(Link)`
66
padding: ${spacing[1]} ${spacing[2]};
77
margin: ${spacing[2]} ${spacing[2]};
88
background-color: ${props =>
9-
props.disabled ? colors.gray : colors.darkGreen};
9+
props.disabled ? colors.gray : colors.blue};
1010
border-radius: ${radii[2]};
1111
font-size: ${fontSizes[1]};
1212
color: ${colors.white};
1313
text-decoration: none;
1414
display: inline-block;
15-
border: 2px solid ${colors.darkGreen};
15+
border: 2px solid ${colors.blue};
16+
box-shadow: 5px 5px 5px #424440;
1617
&:hover {
1718
background-color: ${colors.white};
18-
color: ${colors.darkGreen};
19+
color: ${colors.blue};
1920
cursor: pointer;
2021
}
2122
pointer-events: ${props => props.disabled && "none"};

‎src/components/file-upload.jsx

+43-30
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import styled from "@emotion/styled";
33
import fastXml from "fast-xml-parser";
44
import pdfJS from "pdfjs-dist";
55
import { spacing, colors, fontSizes, radii } from "../constants";
6-
import { ObservableCell, SessionStore } from "../components";
6+
import { ObservableCell } from "../components";
7+
import { SessionStore } from "../library/session-store";
78

89
//Upload page specific css/html
910
export const UploadButton = styled("div")`
@@ -121,6 +122,7 @@ export default class FileUpload extends React.Component {
121122
constructor(props, context) {
122123
super(props, context);
123124

125+
//Make sure that the worker version matches package.json pdfjs-dist version.
124126
pdfJS.GlobalWorkerOptions.workerSrc = 'https://cdn.jsdelivr.net/npm/[email protected]/build/pdf.worker.js';
125127

126128
this.handleUpload = this.handleUpload.bind(this);
@@ -257,6 +259,7 @@ export default class FileUpload extends React.Component {
257259
handleXMLFile(reader) {
258260
if (fastXml.validate(reader.target.result) === true) {
259261
var parsedText = fastXml.parse(reader.target.result, {ignoreAttributes: false})
262+
console.log(parsedText)
260263
var earningsJSON = JSON.stringify(parsedText)
261264
SessionStore.push('earnings', earningsJSON)
262265
this.setState({
@@ -266,23 +269,36 @@ export default class FileUpload extends React.Component {
266269
}
267270

268271
//Parse PDF file
269-
handlePDFFile(reader) {
272+
async handlePDFFile(reader) {
270273
//Returns first page of document
271274
var combinedValues = []
272-
pdfJS.getDocument(reader.target.result).promise
273-
.then(
274-
ssaDoc => ssaDoc.getPage(3)).then(earningsPage => earningsPage.getTextContent())
275-
.then( (doc) => {
276-
doc.items.forEach((item) => {
277-
278-
var filter = Number(item.str.replace(",", "").replace(" ",""))
279-
if (!(Number.isNaN(filter))) {
280-
combinedValues.push(filter)
281-
}
275+
await pdfJS.getDocument(reader.target.result).promise
276+
.then(async ssaDoc => {
277+
var earningsPage;
278+
for (var page of Array(ssaDoc.numPages).keys()) {
279+
var docPage = ssaDoc.getPage(page + 1)
280+
await Promise.resolve(docPage)
281+
.then(pageContent => pageContent.getTextContent())
282+
.then(doc => {
283+
var textheader = doc.items.slice(0,10)
284+
for (var text of textheader) {
285+
var textstr = text.str.replace(/ /g, "")
286+
if (textstr === "YourEarningsRecord") {
287+
earningsPage = doc
288+
return
289+
}
290+
}
291+
})
292+
}
293+
294+
earningsPage.items.forEach((item) => {
295+
var filter = Number(item.str.replace(",", "").replace(" ",""))
296+
if (!(Number.isNaN(filter))) {
297+
combinedValues.push(filter)
298+
}
282299
})
283300
})
284-
.then(() => {
285-
301+
286302
var tempRecord = this.state.defaultRecord
287303
do {
288304
var newvalue = combinedValues.shift()
@@ -293,21 +309,19 @@ export default class FileUpload extends React.Component {
293309
'@_endYear': newvalue,
294310
'osss:FicaEarnings': combinedValues.shift(),
295311
'osss:MedicafreEarnings': combinedValues.shift()
296-
}
297-
298-
currentRecord.push(newrecord)
312+
}
313+
currentRecord.push(newrecord)
299314
}
300-
} while (combinedValues.length > 0)})
301-
.then(() => {
302-
var earningsJSON = JSON.stringify(this.state.defaultRecord)
303-
SessionStore.push('earnings', earningsJSON)
304-
this.setState({
305-
earningsRecord: this.state.defaultRecord
306-
})
315+
} while (combinedValues.length > 0)
316+
317+
var earningsJSON = JSON.stringify(this.state.defaultRecord)
318+
SessionStore.push('earnings', earningsJSON)
319+
this.setState({
320+
earningsRecord: this.state.defaultRecord
307321
})
308322
}
309323

310-
handleUpload(formResponse) {
324+
handleUpload(formResponse) {
311325
this.setState({
312326
displayTable: true
313327
});
@@ -332,11 +346,7 @@ export default class FileUpload extends React.Component {
332346
default:
333347
alert("I'm sorry, that file was not recognized.")
334348
break;
335-
}
336-
337-
338-
339-
349+
}
340350
}
341351

342352
//Stores users input for manually entered table to allow for persistence across page changes
@@ -357,12 +367,14 @@ export default class FileUpload extends React.Component {
357367

358368
//Saves manually entered record to this.state.earningsRecord object, becomes noticable to Observable API
359369
handleSave() {
370+
//Load earnings record; if not present, set default record.
360371
var tempRecord = this.state.earningsRecord ?
361372
this.state.earningsRecord['osss:OnlineSocialSecurityStatementData']['osss:EarningsRecord']['osss:Earnings'].length === this.state.manualTable.length
362373
? this.state.earningsRecord : this.state.defaultRecord
363374
:
364375
this.state.defaultRecord
365376

377+
//Update global earnings record with the manually inputed values
366378
this.state.manualTable.forEach((record, i) => {
367379
var currentRecord = tempRecord['osss:OnlineSocialSecurityStatementData']['osss:EarningsRecord']['osss:Earnings']
368380
var newrecord = {
@@ -379,6 +391,7 @@ export default class FileUpload extends React.Component {
379391

380392
})
381393

394+
//Store earnings record and updated table
382395
var arrayJSON = JSON.stringify(this.state.manualTable)
383396
SessionStore.push('tableArray', arrayJSON)
384397

‎src/components/font-layout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
2-
import { SessionStore, FontControl } from "../components";
2+
import { SessionStore } from "../library/session-store";
3+
import { FontControl } from "../library/font-control";
34
import { fontSizes } from "../constants";
45

56

‎src/components/font-pad.tsx

+48-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import styled from "@emotion/styled";
3-
import { colors, spacing, fontSizes } from "../constants";
4-
import { FontControl } from "../components";
3+
import { colors, spacing, fontSizes, radii } from "../constants";
4+
import { FontControl } from "../library/font-control";
55

66

77
const FontButtonHolder = styled("div")`
@@ -10,23 +10,63 @@ const FontButtonHolder = styled("div")`
1010
right: -35px;
1111
margin-left: -200px;
1212
width: 150px;
13-
background: ${colors.darkGreen};
14-
border: 2px solid ${colors.black};
15-
color: ${colors.white};
13+
background: ${colors.white};
14+
color: ${colors.black};
1615
font-size: ${fontSizes[1]};
1716
display: grid;
1817
justify-content: center;
1918
text-align: center;
2019
`;
2120

2221
const FontButton= styled("div")`
22+
display: inline-block;
23+
text-align: center;
24+
width: 15px;
25+
padding: ${spacing[0]} ${spacing[1]};
26+
background-color: ${colors.white};
27+
color: ${colors.white};
28+
border: 1px solid ${colors.black};
29+
border-radius: 50%;
30+
&:hover {
31+
border-color: ${colors.lime};
32+
background-color: ${colors.lime};
33+
color: ${colors.white}
34+
}
35+
36+
pointer-events: ${props => props.disabled ? "none" : "false"};
37+
38+
`;
39+
40+
const FontButtonLeft= styled("div")`
41+
display: inline-block;
42+
text-align: center;
43+
width: 15px;
44+
padding: ${spacing[0]} ${spacing[1]};
45+
background-color: ${colors.white};
46+
color: ${colors.black};
47+
border: 2px solid ${colors.black};
48+
border-radius: 1.5em 0 0 1.5em;
49+
padding-left: 1em;
50+
&:hover {
51+
border-color: ${colors.lime};
52+
background-color: ${colors.lime};
53+
color: ${colors.white}
54+
}
55+
56+
pointer-events: ${props => props.disabled ? "none" : "false"};
57+
58+
`;
59+
60+
const FontButtonRight= styled("div")`
2361
display: inline-block;
2462
text-align: center;
2563
width: 15px;
2664
padding: ${spacing[0]} ${spacing[1]};
2765
background-color: ${colors.white};
2866
color: ${colors.black};
2967
border: 2px solid ${colors.black};
68+
border-radius: 0 1.5em 1.5em 0;
69+
padding-right: 1em;
3070
&:hover {
3171
border-color: ${colors.lime};
3272
background-color: ${colors.lime};
@@ -71,11 +111,11 @@ export default class FontPad extends React.Component {
71111
<FontButtonHolder>
72112
Font Size
73113
<div style={{ display: "block"}}>
74-
<FontButton id="increase" onClick={this.checkDisable} disabled={this.state.IncDisable}>+</FontButton>
75-
<FontButton id="decrease" onClick={this.checkDisable} disabled={this.state.DecDisable}>-</FontButton>
114+
<FontButtonLeft id="decrease" onClick={this.checkDisable} disabled={this.state.DecDisable}>-</FontButtonLeft>
115+
<FontButtonRight id="increase" onClick={this.checkDisable} disabled={this.state.IncDisable}>+</FontButtonRight>
76116
</div>
77117
</FontButtonHolder>
78118
</div>
79119
)
80120
}
81-
}
121+
}

‎src/components/footer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import styled from "@emotion/styled";
44
import { colors } from "../constants";
55

66
const Wrapper = styled("footer")`
7-
background: ${colors.darkGreen};
7+
background: ${colors.white};
88
display: flex;
99
justify-content: center;
1010
`;

0 commit comments

Comments
 (0)