Skip to content

Commit c0aefee

Browse files
contolinicontolini
authored
Merge pull request #2628 from cfpb/5119-s3-links-fix
Put all fileServerDomain references from local config files
2 parents b5072c2 + b12e282 commit c0aefee

File tree

11 files changed

+186
-180
lines changed

11 files changed

+186
-180
lines changed

‎cypress/e2e/data-publication/CombinedMLAR.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getDefaultConfig } from '../../../src/common/configUtils'
33
import { isBeta } from '../../support/helpers'
44

55
const { HOST } = Cypress.env()
6-
const config = getDefaultConfig(HOST)
6+
const { fileServerDomain } = getDefaultConfig(HOST)
77

88
onlyOn(isBeta(HOST), () => {
99
describe('Combined MLAR', function () {
@@ -19,13 +19,13 @@ onlyOn(!isBeta(HOST), () => {
1919
cy.visit(`${HOST}/data-publication/modified-lar/${year}`)
2020
cy.request({
2121
method: 'HEAD',
22-
url: `${config.fileServerDomain}/prod/dynamic-data/combined-mlar/${year}/header/${year}_combined_mlar_header.zip`,
22+
url: `${fileServerDomain}/prod/dynamic-data/combined-mlar/${year}/header/${year}_combined_mlar_header.zip`,
2323
})
2424
.its('status')
2525
.should('equal', 200)
2626
cy.request({
2727
method: 'HEAD',
28-
url: `${config.fileServerDomain}/prod/dynamic-data/combined-mlar/${year}/${year}_combined_mlar.zip`,
28+
url: `${fileServerDomain}/prod/dynamic-data/combined-mlar/${year}/${year}_combined_mlar.zip`,
2929
})
3030
.its('status')
3131
.should('equal', 200)

‎src/data-browser/maps/filterUtils.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { getDefaultConfig } from '../../common/configUtils'
22

33
function getFile(y, g, v, val) {
4-
const config = getDefaultConfig(window.location.hostname)
4+
const { fileServerDomain } = getDefaultConfig(window.location.hostname)
55

66
const dec = decodeURIComponent(val)
7-
return `${config.fileServerDomain}/prod/data-browser/filter-data/${y}/${g}-${v}-${dec
7+
return `${fileServerDomain}/prod/data-browser/filter-data/${y}/${g}-${v}-${dec
88
.replace(/[^a-z0-9]/gi, '-')
99
.toLowerCase()}.json`
1010
}

‎src/data-publication/constants/dynamic-dataset.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
import { getDefaultConfig } from '../../common/configUtils'
22

3-
const config = getDefaultConfig(window.location.hostname)
3+
const { fileServerDomain } = getDefaultConfig(window.location.hostname)
44

55
export const DYNAMIC_DATASET = {
66
2024: {
7-
lar: `${config.fileServerDomain}/prod/dynamic-data/2024/2024_lar.zip`,
8-
ts: `${config.fileServerDomain}/prod/dynamic-data/2024/2024_ts.zip`,
7+
lar: `${fileServerDomain}/prod/dynamic-data/2024/2024_lar.zip`,
8+
ts: `${fileServerDomain}/prod/dynamic-data/2024/2024_ts.zip`,
99
},
1010
2023: {
11-
lar: `${config.fileServerDomain}/prod/dynamic-data/2023/2023_lar.zip`,
12-
ts: `${config.fileServerDomain}/prod/dynamic-data/2023/2023_ts.zip`,
11+
lar: `${fileServerDomain}/prod/dynamic-data/2023/2023_lar.zip`,
12+
ts: `${fileServerDomain}/prod/dynamic-data/2023/2023_ts.zip`,
1313
},
1414
2022: {
15-
lar: `${config.fileServerDomain}/prod/dynamic-data/2022/2022_lar.zip`,
16-
ts: `${config.fileServerDomain}/prod/dynamic-data/2022/2022_ts.zip`,
15+
lar: `${fileServerDomain}/prod/dynamic-data/2022/2022_lar.zip`,
16+
ts: `${fileServerDomain}/prod/dynamic-data/2022/2022_ts.zip`,
1717
},
1818
2021: {
19-
lar: `${config.fileServerDomain}/prod/dynamic-data/2021/2021_lar.zip`,
20-
ts: `${config.fileServerDomain}/prod/dynamic-data/2021/2021_ts.zip`,
19+
lar: `${fileServerDomain}/prod/dynamic-data/2021/2021_lar.zip`,
20+
ts: `${fileServerDomain}/prod/dynamic-data/2021/2021_ts.zip`,
2121
},
2222
2020: {
23-
lar: `${config.fileServerDomain}/prod/dynamic-data/2020/2020_lar.zip`,
24-
ts: `${config.fileServerDomain}/prod/dynamic-data/2020/2020_ts.zip`,
23+
lar: `${fileServerDomain}/prod/dynamic-data/2020/2020_lar.zip`,
24+
ts: `${fileServerDomain}/prod/dynamic-data/2020/2020_ts.zip`,
2525
},
2626
2019: {
27-
lar: `${config.fileServerDomain}/prod/dynamic-data/2019/2019_lar.zip`,
28-
ts: `${config.fileServerDomain}/prod/dynamic-data/2019/2019_ts.zip`,
27+
lar: `${fileServerDomain}/prod/dynamic-data/2019/2019_lar.zip`,
28+
ts: `${fileServerDomain}/prod/dynamic-data/2019/2019_ts.zip`,
2929
},
3030
2018: {
31-
lar: `${config.fileServerDomain}/prod/dynamic-data/2018/2018_lar.zip`,
32-
ts: `${config.fileServerDomain}/prod/dynamic-data/2018/2018_ts.zip`,
31+
lar: `${fileServerDomain}/prod/dynamic-data/2018/2018_lar.zip`,
32+
ts: `${fileServerDomain}/prod/dynamic-data/2018/2018_ts.zip`,
3333
},
3434
2017: {
35-
lar: `${config.fileServerDomain}/prod/dynamic-data/dynamic_lar_ultimate_2017.txt`,
36-
ts: `${config.fileServerDomain}/prod/dynamic-data/dynamic_ts_ultimate_2017.txt`,
35+
lar: `${fileServerDomain}/prod/dynamic-data/dynamic_lar_ultimate_2017.txt`,
36+
ts: `${fileServerDomain}/prod/dynamic-data/dynamic_ts_ultimate_2017.txt`,
3737
lar_spec:
3838
'https://github.com/cfpb/hmda-platform/blob/v1.x/Documents/2017_Dynamic_LAR_Spec.csv',
3939
ts_spec:

‎src/data-publication/constants/one-year-datasets.jsx‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { getDefaultConfig } from '../../common/configUtils'
22
import getOverrides from './overrides'
33

4-
const config = getDefaultConfig(window.location.hostname)
4+
const { fileServerDomain } = getDefaultConfig(window.location.hostname)
55

66
export const ONE_YEAR_DATASET = {
77
2023: {
@@ -14,14 +14,14 @@ export const ONE_YEAR_DATASET = {
1414
{
1515
dataKey: 'lar',
1616
label: 'Loan/Application Records (LAR)',
17-
csv: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_lar_one_year_csv.zip`,
18-
txt: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_lar_one_year_pipe.zip`,
17+
csv: `${fileServerDomain}/prod/one-year-data/2023/2023_public_lar_one_year_csv.zip`,
18+
txt: `${fileServerDomain}/prod/one-year-data/2023/2023_public_lar_one_year_pipe.zip`,
1919
},
2020
{
2121
dataKey: 'ts',
2222
label: 'Transmittal Sheet Records (TS)',
23-
csv: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_ts_one_year_csv.zip`,
24-
txt: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_ts_one_year_pipe.zip`,
23+
csv: `${fileServerDomain}/prod/one-year-data/2023/2023_public_ts_one_year_csv.zip`,
24+
txt: `${fileServerDomain}/prod/one-year-data/2023/2023_public_ts_one_year_pipe.zip`,
2525
},
2626
{
2727
dataKey: 'panel',
@@ -31,8 +31,8 @@ export const ONE_YEAR_DATASET = {
3131
{
3232
dataKey: 'msamd',
3333
label: 'MSA/MD Description',
34-
csv: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_msamd_one_year_csv.zip`,
35-
txt: `${config.fileServerDomain}/prod/one-year-data/2023/2023_public_msamd_one_year_pipe.zip`,
34+
csv: `${fileServerDomain}/prod/one-year-data/2023/2023_public_msamd_one_year_csv.zip`,
35+
txt: `${fileServerDomain}/prod/one-year-data/2023/2023_public_msamd_one_year_pipe.zip`,
3636
},
3737
],
3838
},
@@ -42,26 +42,26 @@ export const ONE_YEAR_DATASET = {
4242
{
4343
dataKey: 'lar',
4444
label: 'Loan/Application Records (LAR)',
45-
csv: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_lar_one_year_csv.zip`,
46-
txt: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_lar_one_year_pipe.zip`,
45+
csv: `${fileServerDomain}/prod/one-year-data/2022/2022_public_lar_one_year_csv.zip`,
46+
txt: `${fileServerDomain}/prod/one-year-data/2022/2022_public_lar_one_year_pipe.zip`,
4747
},
4848
{
4949
dataKey: 'ts',
5050
label: 'Transmittal Sheet Records (TS)',
51-
csv: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_ts_one_year_csv.zip`,
52-
txt: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_ts_one_year_pipe.zip`,
51+
csv: `${fileServerDomain}/prod/one-year-data/2022/2022_public_ts_one_year_csv.zip`,
52+
txt: `${fileServerDomain}/prod/one-year-data/2022/2022_public_ts_one_year_pipe.zip`,
5353
},
5454
{
5555
dataKey: 'panel',
5656
label: 'Reporter Panel',
57-
csv: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_panel_one_year_csv.zip`,
58-
txt: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_panel_one_year_pipe.zip`,
57+
csv: `${fileServerDomain}/prod/one-year-data/2022/2022_public_panel_one_year_csv.zip`,
58+
txt: `${fileServerDomain}/prod/one-year-data/2022/2022_public_panel_one_year_pipe.zip`,
5959
},
6060
{
6161
dataKey: 'msamd',
6262
label: 'MSA/MD Description',
63-
csv: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_msamd_one_year_csv.zip`,
64-
txt: `${config.fileServerDomain}/prod/one-year-data/2022/2022_public_msamd_one_year_pipe.zip`,
63+
csv: `${fileServerDomain}/prod/one-year-data/2022/2022_public_msamd_one_year_csv.zip`,
64+
txt: `${fileServerDomain}/prod/one-year-data/2022/2022_public_msamd_one_year_pipe.zip`,
6565
},
6666
],
6767
},
@@ -71,26 +71,26 @@ export const ONE_YEAR_DATASET = {
7171
{
7272
dataKey: 'lar',
7373
label: 'Loan/Application Records (LAR)',
74-
csv: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_lar_one_year_csv.zip`,
75-
txt: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_lar_one_year_pipe.zip`,
74+
csv: `${fileServerDomain}/prod/one-year-data/2021/2021_public_lar_one_year_csv.zip`,
75+
txt: `${fileServerDomain}/prod/one-year-data/2021/2021_public_lar_one_year_pipe.zip`,
7676
},
7777
{
7878
dataKey: 'ts',
7979
label: 'Transmittal Sheet Records (TS)',
80-
csv: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_ts_one_year_csv.zip`,
81-
txt: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_ts_one_year_pipe.zip`,
80+
csv: `${fileServerDomain}/prod/one-year-data/2021/2021_public_ts_one_year_csv.zip`,
81+
txt: `${fileServerDomain}/prod/one-year-data/2021/2021_public_ts_one_year_pipe.zip`,
8282
},
8383
{
8484
dataKey: 'panel',
8585
label: 'Reporter Panel',
86-
csv: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_panel_one_year_csv.zip`,
87-
txt: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_panel_one_year_pipe.zip`,
86+
csv: `${fileServerDomain}/prod/one-year-data/2021/2021_public_panel_one_year_csv.zip`,
87+
txt: `${fileServerDomain}/prod/one-year-data/2021/2021_public_panel_one_year_pipe.zip`,
8888
},
8989
{
9090
dataKey: 'msamd',
9191
label: 'MSA/MD Description',
92-
csv: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_msamd_one_year_csv.zip`,
93-
txt: `${config.fileServerDomain}/prod/one-year-data/2021/2021_public_msamd_one_year_pipe.zip`,
92+
csv: `${fileServerDomain}/prod/one-year-data/2021/2021_public_msamd_one_year_csv.zip`,
93+
txt: `${fileServerDomain}/prod/one-year-data/2021/2021_public_msamd_one_year_pipe.zip`,
9494
},
9595
],
9696
},
@@ -100,26 +100,26 @@ export const ONE_YEAR_DATASET = {
100100
{
101101
dataKey: 'lar',
102102
label: 'Loan/Application Records (LAR)',
103-
csv: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_lar_one_year_csv.zip`,
104-
txt: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_lar_one_year_pipe.zip`,
103+
csv: `${fileServerDomain}/prod/one-year-data/2020/2020_public_lar_one_year_csv.zip`,
104+
txt: `${fileServerDomain}/prod/one-year-data/2020/2020_public_lar_one_year_pipe.zip`,
105105
},
106106
{
107107
dataKey: 'ts',
108108
label: 'Transmittal Sheet Records (TS)',
109-
csv: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_ts_one_year_csv.zip`,
110-
txt: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_ts_one_year_pipe.zip`,
109+
csv: `${fileServerDomain}/prod/one-year-data/2020/2020_public_ts_one_year_csv.zip`,
110+
txt: `${fileServerDomain}/prod/one-year-data/2020/2020_public_ts_one_year_pipe.zip`,
111111
},
112112
{
113113
dataKey: 'panel',
114114
label: 'Reporter Panel',
115-
csv: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_panel_one_year_csv.zip`,
116-
txt: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_panel_one_year_pipe.zip`,
115+
csv: `${fileServerDomain}/prod/one-year-data/2020/2020_public_panel_one_year_csv.zip`,
116+
txt: `${fileServerDomain}/prod/one-year-data/2020/2020_public_panel_one_year_pipe.zip`,
117117
},
118118
{
119119
dataKey: 'msamd',
120120
label: 'MSA/MD Description',
121-
csv: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_msamd_one_year_csv.zip`,
122-
txt: `${config.fileServerDomain}/prod/one-year-data/2020/2020_public_msamd_one_year_pipe.zip`,
121+
csv: `${fileServerDomain}/prod/one-year-data/2020/2020_public_msamd_one_year_csv.zip`,
122+
txt: `${fileServerDomain}/prod/one-year-data/2020/2020_public_msamd_one_year_pipe.zip`,
123123
},
124124
],
125125
},
@@ -136,26 +136,26 @@ export const ONE_YEAR_DATASET = {
136136
{
137137
dataKey: 'lar',
138138
label: 'Loan/Application Records (LAR)',
139-
csv: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_lar_one_year_csv.zip`,
140-
txt: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_lar_one_year_pipe.zip`,
139+
csv: `${fileServerDomain}/prod/one-year-data/2019/2019_public_lar_one_year_csv.zip`,
140+
txt: `${fileServerDomain}/prod/one-year-data/2019/2019_public_lar_one_year_pipe.zip`,
141141
},
142142
{
143143
dataKey: 'ts',
144144
label: 'Transmittal Sheet Records (TS)',
145-
csv: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_ts_one_year_csv.zip`,
146-
txt: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_ts_one_year_pipe.zip`,
145+
csv: `${fileServerDomain}/prod/one-year-data/2019/2019_public_ts_one_year_csv.zip`,
146+
txt: `${fileServerDomain}/prod/one-year-data/2019/2019_public_ts_one_year_pipe.zip`,
147147
},
148148
{
149149
dataKey: 'panel',
150150
label: 'Reporter Panel',
151-
csv: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_panel_one_year_csv.zip`,
152-
txt: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_panel_one_year_pipe.zip`,
151+
csv: `${fileServerDomain}/prod/one-year-data/2019/2019_public_panel_one_year_csv.zip`,
152+
txt: `${fileServerDomain}/prod/one-year-data/2019/2019_public_panel_one_year_pipe.zip`,
153153
},
154154
{
155155
dataKey: 'msamd',
156156
label: 'MSA/MD Description',
157-
csv: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_msamd_one_year_csv.zip`,
158-
txt: `${config.fileServerDomain}/prod/one-year-data/2019/2019_public_msamd_one_year_pipe.zip`,
157+
csv: `${fileServerDomain}/prod/one-year-data/2019/2019_public_msamd_one_year_csv.zip`,
158+
txt: `${fileServerDomain}/prod/one-year-data/2019/2019_public_msamd_one_year_pipe.zip`,
159159
},
160160
],
161161
},

0 commit comments

Comments
 (0)