Skip to content

Commit f1c7381

Browse files
benkeenbenkeen
committed
closes #741; closes #742 
1 parent 9beab26 commit f1c7381

File tree

16 files changed

+137
-360
lines changed

16 files changed

+137
-360
lines changed

‎client/_localeFileMap.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { GDLocaleMap } from '~types/general';
33
export const localeFileMap: GDLocaleMap = {
44
"ar": "ar-531cbf91.js",
55
"de": "de-08061372.js",
6-
"en": "en-c03675c1.js",
6+
"en": "en-275f4d17.js",
77
"es": "es-9e326cfd.js",
88
"fr": "fr-9e525864.js",
99
"hi": "hi-50946462.js",

‎client/_pluginWebWorkers.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ export default {
22
"coreWorker": "",
33
"coreDataTypeWorker": "dataTypes.worker-66b442524f84509e3a98b84cffeafdb8.js",
44
"coreExportTypeWorker": "exportTypes.worker-9b546d7c7909e02146fafee124180d37.js",
5-
"workerUtils": "workerUtils-78f34cab796da4086a9250dab0e9f2e4.js",
5+
"workerUtils": "workerUtils-95d23a18b0b0b50d72d6ba0e501b3f14.js",
66
"dataTypes": {
77
"Alphanumeric": "DT-Alphanumeric.generator-0185a235eabc5b0a7ba6afdbb2af8676.js",
8-
"AutoIncrement": "DT-AutoIncrement.generator-eccb050ece38a91e2a849d125e417298.js",
9-
"BitcoinAddress": "DT-BitcoinAddress.generator-02bf8166cf988fda63bc859c57fc58e6.js",
8+
"AutoIncrement": "DT-AutoIncrement.generator-86980afec62b375f50bee9949bc4ae10.js",
9+
"BitcoinAddress": "DT-BitcoinAddress.generator-9842a8a9076ec8040bf40f8d8e51523a.js",
1010
"Boolean": "DT-Boolean.generator-7f17cf17c450482e71f66b8ccec1530a.js",
1111
"CVV": "DT-CVV.generator-c21d2fbc402d72056955f30db7831267.js",
12-
"City": "DT-City.generator-169323d47645d9e1ab6254eff6ba6b7a.js",
12+
"City": "DT-City.generator-e2164864b5d453430a9931c989242521.js",
1313
"Colour": "DT-Colour.generator-db77c6f8b622fcac974e40561e905414.js",
1414
"Company": "DT-Company.generator-b7bd7c08c48f94fb2c88412cc82fcef4.js",
1515
"Computed": "DT-Computed.generator-51452612f3dcfd6bae1a695081e53a36.js",
1616
"Constant": "DT-Constant.generator-ca9cf12d5f32cc92c9158072a5231bd9.js",
17-
"Country": "DT-Country.generator-04d825eed1ef0c5dea5addfabfe442bc.js",
17+
"Country": "DT-Country.generator-a76bcf6ce202d7ed3902c67b26a566f6.js",
1818
"Currency": "DT-Currency.generator-a5a862ac03206548ee1458fcf6a958a2.js",
1919
"Date": "DT-Date.generator-f6604b2cd22cdcc0b4339b3a55cdc719.js",
2020
"Email": "DT-Email.generator-51b7a552887bb25b88f15633805b48f1.js",
2121
"GUID": "DT-GUID.generator-54966dabad4987a193e4cf4a467d4d93.js",
2222
"IBAN": "DT-IBAN.generator-b92eaa02e83c98a15767dfd6866d8bd1.js",
2323
"LatLng": "DT-LatLng.generator-e54a6ba6fdf1679297e01d8729131379.js",
24-
"List": "DT-List.generator-b4257616edb0642d4e3cd012009e385f.js",
24+
"List": "DT-List.generator-e37ce48cda8b003ddba3ef1cafe34346.js",
2525
"Names": "DT-Names.generator-1196b22273319c62350d579ca42b926f.js",
2626
"NormalDistribution": "DT-NormalDistribution.generator-adbc977198013088e21d0c3ad5a62e7e.js",
2727
"NumberRange": "DT-NumberRange.generator-057ed424452f4e991ebc399c615ae34c.js",
@@ -31,7 +31,7 @@ export default {
3131
"PersonalNumber": "DT-PersonalNumber.generator-68b329da9893e34099c7d8ad5cb9c940.js",
3232
"Phone": "DT-Phone.generator-ca7bb8282784726ece5e8ced1ccfd964.js",
3333
"PostalZip": "DT-PostalZip.generator-cb358d5ab424dd19fde4b694e4e591c4.js",
34-
"Region": "DT-Region.generator-0023f303e736310d27968e3cdf8826dc.js",
34+
"Region": "DT-Region.generator-13c509fcd5339090bdfb938671eb7fba.js",
3535
"Rut": "DT-Rut.generator-9b365251acec194f57b64031c112bfbc.js",
3636
"SIRET": "DT-SIRET.generator-853bfefc8d3f8a2a9d055de5f7c6a1f7.js",
3737
"StreetAddress": "DT-StreetAddress.generator-562c2395fbd1e5308000516909d2a3b6.js",

‎client/_plugins.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const dataTypes = {
8383

8484
export type DataTypeFolder = keyof typeof dataTypes;
8585

86-
export const blacklistedDataTypeFolders = ['BitcoinAddress','_PhoneRegional','OrganizationNumber','PersonalNumber','SIRET'];
86+
export const blacklistedDataTypeFolders = ['_PhoneRegional','OrganizationNumber','PersonalNumber','SIRET'];
8787

8888
import CSV from './src/plugins/exportTypes/CSV/config';
8989
import CSharp from './src/plugins/exportTypes/CSharp/config';

‎client/src/plugins/dataTypes/BitcoinAddress/BitcoinAddress.generator.ts‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
import utils from '../../../utils';
2+
import { BitcoinAddressFormat, BitcoinAddressState } from './BitcoinAddress';
23
import { DTOnMessage } from '~types/dataTypes';
3-
import { BitcoinAddressFormat } from './BitcoinAddress';
4+
// import ECPairFactory from 'ecpair';
5+
// import * as ecc from 'tiny-secp256k1';
6+
// import { payments } from 'bitcoinjs-lib';
47

58
let utilsLoaded = false;
69

7-
const placeholders = {
8-
x: 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ123456789',
9-
y: 'acdefghjklmnpqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
10-
};
11-
12-
export const onmessage = (e: DTOnMessage) => {
13-
if (!utilsLoaded) {
14-
importScripts(e.data.workerResources.workerUtils);
15-
utilsLoaded = true;
16-
}
17-
const rowState = e.data.rowState;
10+
// const ECPair = ECPairFactory(ecc);
1811

12+
export const generate = (rowState: BitcoinAddressState) => {
1913
const formats: any = {};
2014
if (rowState[BitcoinAddressFormat.Legacy].enabled && rowState[BitcoinAddressFormat.Legacy].weight) {
2115
formats[BitcoinAddressFormat.Legacy] = rowState[BitcoinAddressFormat.Legacy].weight;
@@ -30,26 +24,39 @@ export const onmessage = (e: DTOnMessage) => {
3024
// get a random format
3125
const format = utils.randomUtils.getRandomWeightedValue(formats);
3226

33-
let display;
34-
switch (format) {
35-
// Nope! actual generation needs to be better than this. Will put this on hold.
36-
37-
// case BitcoinAddressFormat.Legacy: {
38-
// const length = utils.randomUtils.getRandomNum(25, 35);
39-
// display = utils.randomUtils.generateRandomAlphanumericStr('1' + ('x'.repeat(length)), placeholders);
40-
// break;
41-
// }
42-
// case BitcoinAddressFormat.Compatibility: {
43-
// const length = utils.randomUtils.getRandomNum(25, 35);
44-
// display = utils.randomUtils.generateRandomAlphanumericStr('3' + ('x'.repeat(length)), placeholders);
45-
// break;
46-
// }
47-
// case BitcoinAddressFormat.Segwit:
48-
// display = utils.randomUtils.generateRandomAlphanumericStr('bc1' + ('y'.repeat(39)), placeholders);
49-
// break;
27+
// let display;
28+
// switch (format) {
29+
// // Nope! actual generation needs to be better than this. Will put this on hold.
30+
//
31+
// // case BitcoinAddressFormat.Legacy: {
32+
// // const length = utils.randomUtils.getRandomNum(25, 35);
33+
// // display = utils.randomUtils.generateRandomAlphanumericStr('1' + ('x'.repeat(length)), placeholders);
34+
// // break;
35+
// // }
36+
// // case BitcoinAddressFormat.Compatibility: {
37+
// // const length = utils.randomUtils.getRandomNum(25, 35);
38+
// // display = utils.randomUtils.generateRandomAlphanumericStr('3' + ('x'.repeat(length)), placeholders);
39+
// // break;
40+
// // }
41+
// // case BitcoinAddressFormat.Segwit:
42+
// // display = utils.randomUtils.generateRandomAlphanumericStr('bc1' + ('y'.repeat(39)), placeholders);
43+
// // break;
44+
// }
45+
46+
return "";
47+
// const keyPair = ECPair.makeRandom();
48+
// const { address } = bitcoin.payments.p2pkh({ pubkey: keyPair.publicKey });
49+
// return address;
50+
};
51+
52+
53+
self.onmessage = (e: DTOnMessage) => {
54+
if (!utilsLoaded) {
55+
importScripts(e.data.workerResources.workerUtils);
56+
utilsLoaded = true;
5057
}
5158

5259
postMessage({
53-
display
60+
display: generate(e.data.rowState)
5461
});
5562
};

‎client/src/plugins/dataTypes/BitcoinAddress/__tests__/BitcoinAddress.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { generate } from '../BitcoinAddress.generator';
2+
import { BitcoinAddressFormat, BitcoinAddressState } from '../BitcoinAddress';
3+
4+
describe('generate', () => {
5+
it('generates', () => {
6+
const state: BitcoinAddressState = {
7+
[BitcoinAddressFormat.Legacy]: {
8+
enabled: true,
9+
weight: 1
10+
},
11+
[BitcoinAddressFormat.Compatibility]: {
12+
enabled: false,
13+
weight: 1
14+
},
15+
[BitcoinAddressFormat.Segwit]: {
16+
enabled: false,
17+
weight: 1
18+
},
19+
};
20+
expect(generate(state)).toEqual('123'); // won't work yet. Just testing
21+
});
22+
});

‎client/src/plugins/dataTypes/CVV/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DTDefinition } from '~types/dataTypes';
22

33
const definition: DTDefinition = {
44
fieldGroup: 'financial',
5-
fieldGroupOrder: 30
5+
fieldGroupOrder: 50
66
};
77

88
export default definition;

‎client/src/plugins/dataTypes/Currency/config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { DTDefinition } from '~types/dataTypes';
22

33
const definition: DTDefinition = {
4-
fieldGroup: 'numeric',
5-
fieldGroupOrder: 60,
4+
fieldGroup: 'financial',
5+
fieldGroupOrder: 10,
66
schema: {
77
$schema: 'http://json-schema.org/draft-04/schema#',
88
type: 'object',

‎client/src/plugins/dataTypes/IBAN/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DTDefinition } from '~types/dataTypes';
22

33
const definition: DTDefinition = {
44
fieldGroup: 'financial',
5-
fieldGroupOrder: 5
5+
fieldGroupOrder: 25
66
};
77

88
export default definition;

‎client/src/plugins/dataTypes/List/List.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ export const Example = ({ data, onUpdate, i18n }: DTExampleProps): JSX.Element =
5757
{ value: i18n.companies, label: i18n.example9 },
5858
{ value: i18n.drugNames, label: i18n.example10 },
5959
{ value: i18n.foodTypes, label: i18n.example11 },
60-
{ value: i18n.carBrands, label: i18n.example12 }
60+
{ value: i18n.carBrands, label: i18n.example12 },
61+
{ value: 'ALL|DZD|AOA|ARS|AMD|AUD|EUR|AZN|BHD|BBD|BYN|EUR|BMD|BOB|BAM|BWP|BRL|BGN|CVE|KHR|XAF|CAD|KYD|XAF|CLP|CNY|COP|CDF|XAF|CRC|HRK|EUR|\'CZK|DKK|DOP|USD|EGP|USD|XAF|EUR|FJD|EUR|EUR|XAF|GEL|EUR|GHS|GIP|\'EUR|DKK|GTQ|GBP|GYD|HNL|HKD|HUF|ISK|INR|IDR|IQD|EUR|IMP|ILS|EUR|\'XOF|JMD|JPY|GBP|JOD|KZT|KES|KRW|EUR|KWD|KGS|LAK|EUR|LBP|LYD|CHF|\'EUR|EUR|MOP|MGA|MWK|MYR|MVR|EUR|MRU|MUR|MXN|MDL|MNT|EUR|MAD|MZN|\'MMK|NAD|EUR|NZD|NIO|NGN|MKD|NOK|OMR|PKR|PGK|PYG|PEN|PHP|PLN|EUR|USD|QAR|RON|RUB|RWF|XCD|SAR|XOF|RSD|SGD|EUR|EUR|ZAR|EUR|LKR|SZL|SEK|CHF|TWD|TJS|TZS|THB|USD|TTD|TND|TRY|TMT|UGX|UAH|AED|GBP|USD|UYU|UZS|VEF|VND|ZMW|ZWD', label: i18n.currencyCode },
62+
{ value: 'lek|dinar|kwanza|peso|dram|dollar|euro|manat|rouble|boliviano|konvertibilna marka|pula|real|lev|escudo|riel|yuan|franc|colon|kuna|koruna|kroner|pound|lari|cedi|Danish krone|quetzal|lempira|forint|krona|rupee|rupiah|shekel|yen|tenge|shilling|won|som|kip|pound|pataca|ariary|kwacha|ringgit|rufiyaa|ouguiya|leu|tugrik|dirham|metical|kyat|cordoba oro|naira|denar|rial|kina|guarani|nuevo sol|zloty|riyal|ruble|rand|lilangeni|somoni|baht|lira|hryvnia|sterling|sum|bolivar|dong', label: i18n.currencyName }
63+
6164
];
6265

6366
return (

‎client/src/plugins/dataTypes/List/i18n/en.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
"noRangeEntered": "No range entered",
4444
"between": "Between",
4545
"and": "and",
46-
"items": "items"
46+
"items": "items",
47+
"currencyCode": "Currency code",
48+
"currencyName": "Currency name"
4749
}

0 commit comments

Comments
 (0)