Merge pull request #804 from mediacloud/multi-query-error-bug

Multi query error bug fix
mediacloud · Sep 30, 2024 · 970edcb · 970edcb
2 parents 66d97c2 + 00af54d
commit 970edcb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/mcweb/frontend/src/features/search/TabbedSearch.jsx b/mcweb/frontend/src/features/search/TabbedSearch.jsx
@@ -166,6 +166,7 @@ export default function TabbedSearch() {
             {queryState.map((query, i) => (
               <Tab
                 disableRipple
+                // eslint-disable-next-line react/no-array-index-key
                 key={i}
                 sx={{ marginRight: 0.5 }}
                 style={{ outline: `4px solid ${color[i]}`, outlineOffset: '-4px', borderRadius: '4px' }}
@@ -248,6 +249,7 @@ export default function TabbedSearch() {
         </Box>
 
         {queryState.map((query, i) => (
+          // eslint-disable-next-line react/no-array-index-key
           <TabPanelHelper key={i} value={value} index={i}>
             <Search queryIndex={i} />
           </TabPanelHelper>

diff --git a/mcweb/frontend/src/features/search/results/CountOverTimeResults.jsx b/mcweb/frontend/src/features/search/results/CountOverTimeResults.jsx
@@ -23,7 +23,6 @@ import {
 export default function CountOverTimeResults() {
   const dispatch = useDispatch();
   const queryState = useSelector((state) => state.query);
-
   const {
     platform,
     initialSearchTime,

diff --git a/mcweb/frontend/src/features/search/results/SampleStories.jsx b/mcweb/frontend/src/features/search/results/SampleStories.jsx
@@ -93,7 +93,8 @@ export default function SampleStories() {
           </Box>
 
           {data.map((results, i) => (
-            <TabPanelHelper value={value} index={i} key={`${results.sample[0].id}`}>
+            // eslint-disable-next-line react/no-array-index-key
+            <TabPanelHelper value={value} index={i} key={`$sample-story-${i}`}>
               <SampleStoryShow
                 data={results.sample}
                 lSTP={lastSearchTimePlatform}

diff --git a/mcweb/frontend/src/features/search/results/TopLanguages.jsx b/mcweb/frontend/src/features/search/results/TopLanguages.jsx
@@ -86,7 +86,8 @@ export default function TopLanguages() {
             </Box>
 
             {prepareLanguageData(data).map((results, i) => (
-              <TabPanelHelper value={value} index={i} key={`${results.data[0].value}`}>
+              // eslint-disable-next-line react/no-array-index-key
+              <TabPanelHelper value={value} index={i} key={`top-language-${i}`}>
                 <BarChart
                   series={[results]}
                   normalized

diff --git a/mcweb/frontend/src/features/search/results/TopSources.jsx b/mcweb/frontend/src/features/search/results/TopSources.jsx
@@ -96,7 +96,8 @@ export default function TopSources() {
           </Box>
 
           {prepareSourceData(data, normalized).map((results, i) => (
-            <TabPanelHelper value={value} index={i} key={`${results.data[0].value}`}>
+            // eslint-disable-next-line react/no-array-index-key
+            <TabPanelHelper value={value} index={i} key={`top-sources-${i}`}>
               <BarChart
                 series={[results]}
                 normalized={normalized}

diff --git a/mcweb/frontend/src/features/search/util/CSVDialog.jsx b/mcweb/frontend/src/features/search/util/CSVDialog.jsx
@@ -151,7 +151,9 @@ CSVDialog.propTypes = {
   snackbarText: PropTypes.string,
   variant: PropTypes.string,
   userEmail: PropTypes.string,
+  // eslint-disable-next-line react/forbid-prop-types
   data: PropTypes.arrayOf(PropTypes.object),
+  // eslint-disable-next-line react/forbid-prop-types
   queryState: PropTypes.arrayOf(PropTypes.object),
 };
 
@@ -160,4 +162,5 @@ CSVDialog.defaultProps = {
   variant: 'text',
   userEmail: '',
   data: [{}],
+  queryState: [{}],
 };
diff --git a/mcweb/frontend/src/features/search/util/prepareCountOverTimeData.js b/mcweb/frontend/src/features/search/util/prepareCountOverTimeData.js
@@ -40,7 +40,7 @@ function groupValues(elements, duration, normalized) {
 
 export const prepareCountOverTimeData = (results, normalized, chartBy, queryState) => {
   const series = [];
-  const colors = getColors(queryState)
+  const colors = getColors(queryState);
   if (chartBy === DAY) {
     results.forEach((result, i) => {
       const preparedData = result.count_over_time.counts.map((r) => [