fix #392 - Return array values properly for getJSONPathValue (#393)

Closes #392
dassana-io · Jul 19, 2021 · 27fee5e · 27fee5e
1 parent 0083a5a
commit 27fee5e
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 45 deletions.
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -55,6 +55,7 @@ export default {
 		'react-helmet',
 		'react-hook-form',
 		'react-jss',
+		'react-scroll',
 		'remark-gfm',
 		'react-markdown',
 		'typescript',

diff --git a/src/components/Table/utils.tsx b/src/components/Table/utils.tsx
@@ -99,7 +99,10 @@ export function processData<TableData extends DataId>(
 		columns.forEach(col => {
 			const { dataIndex } = col
 
-			const value = getJSONPathValue(`$.${dataIndex}`, item)
+			const value = getJSONPathValue(
+				`$.${dataIndex}`,
+				item
+			) as ProcessedData<TableData>[keyof TableData]
 
 			if (value) {
 				partialData[dataIndex as keyof TableData] = value
@@ -186,9 +189,9 @@ const compareIcons =
 			? `$.${dataIndex}.${iconKey}`
 			: `$.${dataIndex}`
 
-		const compareValA = getJSONPathValue(jsonPath, a) || ''
+		const compareValA = getJSONPathValue(jsonPath, a)?.toString() || ''
 
-		const compareValB = getJSONPathValue(jsonPath, b) || ''
+		const compareValB = getJSONPathValue(jsonPath, b)?.toString() || ''
 
 		return compareValA.localeCompare(compareValB)
 	}
@@ -299,7 +302,7 @@ const getIconOrIconKey = (
 	jsonPath: string
 ): string | IconName | undefined => {
 	if (typeof record === 'object') {
-		const value = getJSONPathValue(jsonPath, record)
+		const value = getJSONPathValue(jsonPath, record)?.toString()
 
 		if (value) return value
 	} else return record
@@ -505,7 +508,10 @@ function applyRender<TableData extends DataId>(
 								const labelVal =
 									typeof record === 'string'
 										? labelKey
-										: getJSONPathValue(jsonPath, record)
+										: (getJSONPathValue(
+												jsonPath,
+												record
+										  ) as string) // eslint-disable-line no-mixed-spaces-and-tabs
 
 								return (
 									<IconCell

diff --git a/src/components/assets/images/404_error_2.svg b/src/components/assets/images/404_error_2.svg
diff --git a/src/components/utils.ts b/src/components/utils.ts
@@ -126,16 +126,27 @@ export const getDataTestAttributeProp = (
 	[TAG]: dataTag ? `${cmpName}-${dataTag}` : cmpName
 })
 
-export const getJSONPathValue = (
+export const getJSONPathValue = <T = string>(
 	path: string,
 	obj: Record<string, JSONValue>
 ) => {
-	const value = JSONPath({
+	const value = JSONPath<T>({
 		json: obj,
 		path
 	})
 
-	if (value && Array.isArray(value)) return value[0]
+	if (Array.isArray(value)) {
+		switch (value.length) {
+			case 0:
+				return undefined
+			case 1:
+				return value[0] as T
+			default:
+				return value as T[]
+		}
+	}
+
+	return value
 }
 
 /**