From 28ea9fc93e9d3c0856746cb15b342f980f6a6dde Mon Sep 17 00:00:00 2001 From: Mingfei Shao Date: Mon, 2 Oct 2023 13:16:36 -0500 Subject: [PATCH 1/3] debug --- src/components/Utils/filters.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/Utils/filters.js b/src/components/Utils/filters.js index b7c4c6d4..315ef476 100644 --- a/src/components/Utils/filters.js +++ b/src/components/Utils/filters.js @@ -55,6 +55,11 @@ export const updateCountsInInitialTabsOptions = ( // } const flattenInitialTabsOptions = flat(initialTabsOptions, { safe: true }); const flattenProcessedTabsOptions = flat(processedTabsOptions, { safe: true }); + console.log('fito'); + console.log(flattenInitialTabsOptions); + console.log('fpto'); + console.log(flattenProcessedTabsOptions); + console.log('**********************'); Object.keys(flattenInitialTabsOptions).forEach((field) => { // in flattened tab options, to get actual field name, strip off the last '.histogram' or '.asTextHistogram' const actualFieldName = field.replace('.histogram', '').replace('.asTextHistogram', ''); @@ -108,7 +113,12 @@ export const updateCountsInInitialTabsOptions = ( } return; } + console.log('field'); + console.log(field); const findOpt = flattenProcessedTabsOptions[`${field}`].find((o) => o.key === key); + console.log('findOpt'); + console.log(findOpt); + console.log('====================='); if (findOpt) { const { count } = findOpt; updatedTabsOptions[`${actualFieldName}`].histogram.push({ key, count }); @@ -117,6 +127,11 @@ export const updateCountsInInitialTabsOptions = ( if (filtersApplied[`${actualFieldName}`]) { if (filtersApplied[`${actualFieldName}`].selectedValues) { filtersApplied[`${actualFieldName}`].selectedValues.forEach((optKey) => { + console.log('updatedTabsOptions'); + console.log(updatedTabsOptions); + console.log('actualFieldName'); + console.log(actualFieldName); + console.log('####################'); if (!updatedTabsOptions[`${actualFieldName}`].histogram.find((o) => o.key === optKey)) { updatedTabsOptions[`${actualFieldName}`].histogram.push({ key: optKey, count: 0 }); } From e46c9fb807bc234cd6e1d026ca5dce7380b2691d Mon Sep 17 00:00:00 2001 From: Mingfei Shao Date: Mon, 2 Oct 2023 16:43:20 -0500 Subject: [PATCH 2/3] fix for undefined --- src/components/Utils/filters.js | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/components/Utils/filters.js b/src/components/Utils/filters.js index 315ef476..0a99e662 100644 --- a/src/components/Utils/filters.js +++ b/src/components/Utils/filters.js @@ -55,11 +55,6 @@ export const updateCountsInInitialTabsOptions = ( // } const flattenInitialTabsOptions = flat(initialTabsOptions, { safe: true }); const flattenProcessedTabsOptions = flat(processedTabsOptions, { safe: true }); - console.log('fito'); - console.log(flattenInitialTabsOptions); - console.log('fpto'); - console.log(flattenProcessedTabsOptions); - console.log('**********************'); Object.keys(flattenInitialTabsOptions).forEach((field) => { // in flattened tab options, to get actual field name, strip off the last '.histogram' or '.asTextHistogram' const actualFieldName = field.replace('.histogram', '').replace('.asTextHistogram', ''); @@ -113,25 +108,17 @@ export const updateCountsInInitialTabsOptions = ( } return; } - console.log('field'); - console.log(field); - const findOpt = flattenProcessedTabsOptions[`${field}`].find((o) => o.key === key); - console.log('findOpt'); - console.log(findOpt); - console.log('====================='); - if (findOpt) { - const { count } = findOpt; - updatedTabsOptions[`${actualFieldName}`].histogram.push({ key, count }); + if (flattenProcessedTabsOptions[`${field}`]) { + const findOpt = flattenProcessedTabsOptions[`${field}`].find((o) => o.key === key); + if (findOpt) { + const { count } = findOpt; + updatedTabsOptions[`${actualFieldName}`].histogram.push({ key, count }); + } } }); if (filtersApplied[`${actualFieldName}`]) { if (filtersApplied[`${actualFieldName}`].selectedValues) { filtersApplied[`${actualFieldName}`].selectedValues.forEach((optKey) => { - console.log('updatedTabsOptions'); - console.log(updatedTabsOptions); - console.log('actualFieldName'); - console.log(actualFieldName); - console.log('####################'); if (!updatedTabsOptions[`${actualFieldName}`].histogram.find((o) => o.key === optKey)) { updatedTabsOptions[`${actualFieldName}`].histogram.push({ key: optKey, count: 0 }); } From 24fab95479fce81a0585878d81e8f8b19d514fa3 Mon Sep 17 00:00:00 2001 From: Mingfei Shao Date: Mon, 2 Oct 2023 20:32:19 -0500 Subject: [PATCH 3/3] update lock --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 37dbf641..bd03d5bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gen3/guppy", - "version": "0.17.0", + "version": "0.17.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@gen3/guppy", - "version": "0.17.0", + "version": "0.17.1", "license": "ISC", "dependencies": { "@apollo/server": "^4.7.5", diff --git a/package.json b/package.json index 93916454..cabe9516 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gen3/guppy", - "version": "0.17.0", + "version": "0.17.1", "description": "Server that support GraphQL queries on data from elasticsearch", "main": "src/server/server.js", "directories": {