Skip to content

Commit aad9e95

Browse files
FrencilFrencil
authored
Bundles forward availability (#24)
* restructure bundles.json to express avail fwding * support multiple parents to a single bundle
1 parent a83a85f commit aad9e95

File tree

5 files changed

+117
-13
lines changed

5 files changed

+117
-13
lines changed

‎lib/components/NeonContext/NeonContext.d.ts‎

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,43 @@ declare function useNeonContextState(): ({
442442
"DP4.00007.001": string;
443443
"DP4.00137.001": string;
444444
"DP4.00201.001": string;
445+
"DP1.10102.001": string[];
446+
"DP1.10099.001": string[];
447+
"DP1.10053.001": string;
448+
"DP1.10031.001": string;
449+
"DP1.10101.001": string;
450+
"DP1.10080.001": string;
451+
"DP1.10078.001": string;
452+
"DP1.10100.001": string;
453+
"DP1.10008.001": string;
454+
"DP1.00097.001": string;
455+
};
456+
parents: {
457+
"DP4.00200.001": {
458+
forwardAvailability: boolean;
459+
};
460+
"DP1.10067.001": {
461+
forwardAvailability: boolean;
462+
};
463+
"DP1.10026.001": {
464+
forwardAvailability: boolean;
465+
};
466+
"DP1.10033.001": {
467+
forwardAvailability: boolean;
468+
};
469+
"DP1.10086.001": {
470+
forwardAvailability: boolean;
471+
};
472+
"DP1.10047.001": {
473+
forwardAvailability: boolean;
474+
};
475+
"DP1.00096.001": {
476+
forwardAvailability: boolean;
477+
};
478+
"DP1.10066.001": {
479+
forwardAvailability: boolean;
480+
};
445481
};
446-
parents: string[];
447482
};
448483
timeSeriesDataProducts: {
449484
productCodes: string[];
@@ -893,8 +928,43 @@ declare function useNeonContextState(): ({
893928
"DP4.00007.001": string;
894929
"DP4.00137.001": string;
895930
"DP4.00201.001": string;
931+
"DP1.10102.001": string[];
932+
"DP1.10099.001": string[];
933+
"DP1.10053.001": string;
934+
"DP1.10031.001": string;
935+
"DP1.10101.001": string;
936+
"DP1.10080.001": string;
937+
"DP1.10078.001": string;
938+
"DP1.10100.001": string;
939+
"DP1.10008.001": string;
940+
"DP1.00097.001": string;
941+
};
942+
parents: {
943+
"DP4.00200.001": {
944+
forwardAvailability: boolean;
945+
};
946+
"DP1.10067.001": {
947+
forwardAvailability: boolean;
948+
};
949+
"DP1.10026.001": {
950+
forwardAvailability: boolean;
951+
};
952+
"DP1.10033.001": {
953+
forwardAvailability: boolean;
954+
};
955+
"DP1.10086.001": {
956+
forwardAvailability: boolean;
957+
};
958+
"DP1.10047.001": {
959+
forwardAvailability: boolean;
960+
};
961+
"DP1.00096.001": {
962+
forwardAvailability: boolean;
963+
};
964+
"DP1.10066.001": {
965+
forwardAvailability: boolean;
966+
};
896967
};
897-
parents: string[];
898968
};
899969
timeSeriesDataProducts: {
900970
productCodes: string[];

‎lib/staticJSON/bundles.json‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,26 @@
1818
"DP4.00002.001": "DP4.00200.001",
1919
"DP4.00007.001": "DP4.00200.001",
2020
"DP4.00137.001": "DP4.00200.001",
21-
"DP4.00201.001": "DP4.00200.001"
21+
"DP4.00201.001": "DP4.00200.001",
22+
"DP1.10102.001": ["DP1.10066.001", "DP1.10067.001"],
23+
"DP1.10099.001": ["DP1.10066.001", "DP1.10067.001"],
24+
"DP1.10053.001": "DP1.10026.001",
25+
"DP1.10031.001": "DP1.10033.001",
26+
"DP1.10101.001": "DP1.10033.001",
27+
"DP1.10080.001": "DP1.10086.001",
28+
"DP1.10078.001": "DP1.10086.001",
29+
"DP1.10100.001": "DP1.10086.001",
30+
"DP1.10008.001": "DP1.10047.001",
31+
"DP1.00097.001": "DP1.00096.001"
2232
},
23-
"parents": [
24-
"DP4.00200.001"
25-
]
33+
"parents": {
34+
"DP4.00200.001": { "forwardAvailability": true },
35+
"DP1.10067.001": { "forwardAvailability": false },
36+
"DP1.10026.001": { "forwardAvailability": false },
37+
"DP1.10033.001": { "forwardAvailability": false },
38+
"DP1.10086.001": { "forwardAvailability": false },
39+
"DP1.10047.001": { "forwardAvailability": false },
40+
"DP1.00096.001": { "forwardAvailability": false },
41+
"DP1.10066.001": { "forwardAvailability": false }
42+
}
2643
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "portal-core-components",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"main": "./lib/index.js",
55
"private": true,
66
"homepage": "http://localhost:3010/core-components",
@@ -91,7 +91,7 @@
9191
"lib:clean": "rm -r ./lib || true",
9292
"lib:clean-build": "(rm -r ./lib || true) && npm run lib",
9393
"lib:types": "tsc --project tsconfig.d.json",
94-
"lib:post-cleanup": "rm ./lib/components/**/StyleGuide.* && rm -rf ./lib/*/__tests__ && rm -rf ./lib/*/*/__tests__ && node ./lib-fix-worker-babel.js"
94+
"lib:post-cleanup": "rm ./lib/components/**/StyleGuide.* && rm -rf ./lib/components/SiteMap/png && rm -rf ./lib/*/__tests__ && rm -rf ./lib/*/*/__tests__ && node ./lib-fix-worker-babel.js"
9595
},
9696
"jest": {
9797
"collectCoverageFrom": [

‎src/lib_components/components/TimeSeriesViewer/StyleGuide.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const AllProductsTimeSeries = () => {
7575
product.siteCodes
7676
&& product.siteCodes.length
7777
&& productIsIS(product)
78-
&& !bundles.parents.includes(product.productCode)
78+
&& !Object.keys(bundles.parents).includes(product.productCode)
7979
&& !Object.keys(bundles.children).includes(product.productCode)
8080
))
8181
.map(product => ({ productCode: product.productCode, productName: product.productName }));

‎src/lib_components/staticJSON/bundles.json‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,26 @@
1818
"DP4.00002.001": "DP4.00200.001",
1919
"DP4.00007.001": "DP4.00200.001",
2020
"DP4.00137.001": "DP4.00200.001",
21-
"DP4.00201.001": "DP4.00200.001"
21+
"DP4.00201.001": "DP4.00200.001",
22+
"DP1.10102.001": ["DP1.10066.001", "DP1.10067.001"],
23+
"DP1.10099.001": ["DP1.10066.001", "DP1.10067.001"],
24+
"DP1.10053.001": "DP1.10026.001",
25+
"DP1.10031.001": "DP1.10033.001",
26+
"DP1.10101.001": "DP1.10033.001",
27+
"DP1.10080.001": "DP1.10086.001",
28+
"DP1.10078.001": "DP1.10086.001",
29+
"DP1.10100.001": "DP1.10086.001",
30+
"DP1.10008.001": "DP1.10047.001",
31+
"DP1.00097.001": "DP1.00096.001"
2232
},
23-
"parents": [
24-
"DP4.00200.001"
25-
]
33+
"parents": {
34+
"DP4.00200.001": { "forwardAvailability": true },
35+
"DP1.10067.001": { "forwardAvailability": false },
36+
"DP1.10026.001": { "forwardAvailability": false },
37+
"DP1.10033.001": { "forwardAvailability": false },
38+
"DP1.10086.001": { "forwardAvailability": false },
39+
"DP1.10047.001": { "forwardAvailability": false },
40+
"DP1.00096.001": { "forwardAvailability": false },
41+
"DP1.10066.001": { "forwardAvailability": false }
42+
}
2643
}

0 commit comments

Comments
 (0)