Bundles forward availability (#24)

* restructure bundles.json to express avail fwding * support multiple parents to a single bundle
NEONScience · Sep 21, 2020 · aad9e95 · aad9e95
1 parent a83a85f
commit aad9e95
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 13 deletions.
diff --git a/lib/components/NeonContext/NeonContext.d.ts b/lib/components/NeonContext/NeonContext.d.ts
@@ -442,8 +442,43 @@ declare function useNeonContextState(): ({
                 "DP4.00007.001": string;
                 "DP4.00137.001": string;
                 "DP4.00201.001": string;
+                "DP1.10102.001": string[];
+                "DP1.10099.001": string[];
+                "DP1.10053.001": string;
+                "DP1.10031.001": string;
+                "DP1.10101.001": string;
+                "DP1.10080.001": string;
+                "DP1.10078.001": string;
+                "DP1.10100.001": string;
+                "DP1.10008.001": string;
+                "DP1.00097.001": string;
+            };
+            parents: {
+                "DP4.00200.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10067.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10026.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10033.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10086.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10047.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.00096.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10066.001": {
+                    forwardAvailability: boolean;
+                };
             };
-            parents: string[];
         };
         timeSeriesDataProducts: {
             productCodes: string[];
@@ -893,8 +928,43 @@ declare function useNeonContextState(): ({
                 "DP4.00007.001": string;
                 "DP4.00137.001": string;
                 "DP4.00201.001": string;
+                "DP1.10102.001": string[];
+                "DP1.10099.001": string[];
+                "DP1.10053.001": string;
+                "DP1.10031.001": string;
+                "DP1.10101.001": string;
+                "DP1.10080.001": string;
+                "DP1.10078.001": string;
+                "DP1.10100.001": string;
+                "DP1.10008.001": string;
+                "DP1.00097.001": string;
+            };
+            parents: {
+                "DP4.00200.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10067.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10026.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10033.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10086.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10047.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.00096.001": {
+                    forwardAvailability: boolean;
+                };
+                "DP1.10066.001": {
+                    forwardAvailability: boolean;
+                };
             };
-            parents: string[];
         };
         timeSeriesDataProducts: {
             productCodes: string[];

diff --git a/lib/staticJSON/bundles.json b/lib/staticJSON/bundles.json
@@ -18,9 +18,26 @@
     "DP4.00002.001": "DP4.00200.001",
     "DP4.00007.001": "DP4.00200.001",
     "DP4.00137.001": "DP4.00200.001",
-    "DP4.00201.001": "DP4.00200.001"
+    "DP4.00201.001": "DP4.00200.001",
+    "DP1.10102.001": ["DP1.10066.001", "DP1.10067.001"],
+    "DP1.10099.001": ["DP1.10066.001", "DP1.10067.001"],
+    "DP1.10053.001": "DP1.10026.001",
+    "DP1.10031.001": "DP1.10033.001",
+    "DP1.10101.001": "DP1.10033.001",
+    "DP1.10080.001": "DP1.10086.001",
+    "DP1.10078.001": "DP1.10086.001",
+    "DP1.10100.001": "DP1.10086.001",
+    "DP1.10008.001": "DP1.10047.001",
+    "DP1.00097.001": "DP1.00096.001"
   },
-  "parents": [
-    "DP4.00200.001"
-  ]
+  "parents": {
+    "DP4.00200.001": { "forwardAvailability": true },
+    "DP1.10067.001": { "forwardAvailability": false },
+    "DP1.10026.001": { "forwardAvailability": false },
+    "DP1.10033.001": { "forwardAvailability": false },
+    "DP1.10086.001": { "forwardAvailability": false },
+    "DP1.10047.001": { "forwardAvailability": false },
+    "DP1.00096.001": { "forwardAvailability": false },
+    "DP1.10066.001": { "forwardAvailability": false }
+  }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "portal-core-components",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "main": "./lib/index.js",
   "private": true,
   "homepage": "http://localhost:3010/core-components",
@@ -91,7 +91,7 @@
     "lib:clean": "rm -r ./lib || true",
     "lib:clean-build": "(rm -r ./lib || true) && npm run lib",
     "lib:types": "tsc --project tsconfig.d.json",
-    "lib:post-cleanup": "rm ./lib/components/**/StyleGuide.* && rm -rf ./lib/*/__tests__ && rm -rf ./lib/*/*/__tests__ && node ./lib-fix-worker-babel.js"
+    "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"
   },
   "jest": {
     "collectCoverageFrom": [

diff --git a/src/lib_components/components/TimeSeriesViewer/StyleGuide.jsx b/src/lib_components/components/TimeSeriesViewer/StyleGuide.jsx
@@ -75,7 +75,7 @@ const AllProductsTimeSeries = () => {
             product.siteCodes
               && product.siteCodes.length
               && productIsIS(product)
-              && !bundles.parents.includes(product.productCode)
+              && !Object.keys(bundles.parents).includes(product.productCode)
               && !Object.keys(bundles.children).includes(product.productCode)
           ))
           .map(product => ({ productCode: product.productCode, productName: product.productName }));

diff --git a/src/lib_components/staticJSON/bundles.json b/src/lib_components/staticJSON/bundles.json
@@ -18,9 +18,26 @@
     "DP4.00002.001": "DP4.00200.001",
     "DP4.00007.001": "DP4.00200.001",
     "DP4.00137.001": "DP4.00200.001",
-    "DP4.00201.001": "DP4.00200.001"
+    "DP4.00201.001": "DP4.00200.001",
+    "DP1.10102.001": ["DP1.10066.001", "DP1.10067.001"],
+    "DP1.10099.001": ["DP1.10066.001", "DP1.10067.001"],
+    "DP1.10053.001": "DP1.10026.001",
+    "DP1.10031.001": "DP1.10033.001",
+    "DP1.10101.001": "DP1.10033.001",
+    "DP1.10080.001": "DP1.10086.001",
+    "DP1.10078.001": "DP1.10086.001",
+    "DP1.10100.001": "DP1.10086.001",
+    "DP1.10008.001": "DP1.10047.001",
+    "DP1.00097.001": "DP1.00096.001"
   },
-  "parents": [
-    "DP4.00200.001"
-  ]
+  "parents": {
+    "DP4.00200.001": { "forwardAvailability": true },
+    "DP1.10067.001": { "forwardAvailability": false },
+    "DP1.10026.001": { "forwardAvailability": false },
+    "DP1.10033.001": { "forwardAvailability": false },
+    "DP1.10086.001": { "forwardAvailability": false },
+    "DP1.10047.001": { "forwardAvailability": false },
+    "DP1.00096.001": { "forwardAvailability": false },
+    "DP1.10066.001": { "forwardAvailability": false }
+  }
 }