chore: updated itemsfilter, fixed regressions from staging merge, upd…

…ated markdown fetching for new catalog assets approach
eurodatacube · Jul 25, 2023 · 6bef60a · 6bef60a
1 parent 9bf0d04
commit 6bef60a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@chenfengyuan/vue-countdown": "^1.1.5",
-    "@eox/itemfilter": "^0.2.2",
+    "@eox/itemfilter": "^0.5.4",
     "@eox/layerswitcher": "^0.1.0",
     "@geoblocks/ol-maplibre-layer": "git+https://git@github.com/EOX-A/ol-maplibre-layer.git#37c00560e4140a13d3083a148dca46d490aac4bd",
     "@turf/difference": "^6.5.0",

diff --git a/app/src/components/DataPanel.vue b/app/src/components/DataPanel.vue
@@ -198,9 +198,7 @@
                   target="_blank"
                   v-if="dataObject
                     && !showMap
-                    && !this.baseConfig.indicatorsDefinition[
-                      indicatorObject.indicator
-                    ].disableCSV"
+                    && !dataObject.disableCSV"
                 >
                   <v-icon left>mdi-download</v-icon>
                   download csv
@@ -604,10 +602,8 @@ export default {
       */
     },
     externalData() {
-      const dataFromDefinition = this.baseConfig.indicatorsDefinition[
-        this.indicatorObject.indicator
-      ].externalData;
-      const dataFromIndicator = this.indicatorObject.externalData;
+      const dataFromDefinition = this.indicatorObject.externalData;
+      const dataFromIndicator = this.dataObject.externalData;
       if (dataFromDefinition) {
         return dataFromDefinition;
       }

diff --git a/app/src/components/IndicatorFiltersPanel.vue b/app/src/components/IndicatorFiltersPanel.vue
@@ -66,7 +66,12 @@ export default {
         const configs = {
           esa: {
             titleProperty: 'title',
-            filterProperties: ['themes', 'region', 'tags', 'satellite', 'sensor'],
+            filterProperties: [
+              // { key: 'themes', title: 'Theme' },
+              { key: 'tags', title: 'Tag' },
+              { key: 'satellite', title: 'Satellite' },
+              { key: 'sensor', title: 'Sensor' },
+            ],
             aggregateResults: 'themes',
             enableSearch: true,
             enableHighlighting: true,

diff --git a/app/src/config/esa.js b/app/src/config/esa.js
@@ -336,11 +336,13 @@ export const indicatorsDefinition = Object.freeze({
     themes: ['economy'],
     story: '/eodash-data/stories/E4',
   },
+  /*
   E5: {
     indicatorSummary: 'Inventory levels of intermediate goods',
     themes: ['economy'],
     story: '/eodash-data/stories/E5',
   },
+  */
   E6: {
     indicatorSummary: 'Inventory levels of factory inputs',
     themes: ['economy'],

diff --git a/app/src/utils.js b/app/src/utils.js
@@ -228,12 +228,8 @@ export async function loadIndicatorData(baseConfig, payload) {
     // Check for stac story asset
     if ('assets' in jsonData) {
       if ('story' in jsonData.assets) {
-        const mdUrl = `${
-          baseConfig.STACEndpoint.replace('collection.json', '')
-        }/${jsonData.assets.story.href}`;
-        indicatorObject.story = mdUrl;
         // Now we fetch the markdown info direcly
-        indicatorObject.markdown = await fetch(mdUrl).then((md) => md.text());
+        indicatorObject.markdown = await fetch(jsonData.assets.story.href).then((md) => md.text());
       }
     }