fix: add opensearch support

fix: remove ? at the end of _msearch fix: improve default sort by id with unmapped_type addition
appbaseio · Sep 8, 2021 · 7b8ee48 · 7b8ee48
1 parent 2bf0c70
commit 7b8ee48
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/packages/browser/src/apis/version.js b/packages/browser/src/apis/version.js
@@ -47,12 +47,17 @@ export default async (rawUrl, indexName) => {
 					res[defaultIndex].settings.index.version.upgraded ||
 					res[defaultIndex].settings.index.version.created;
 			} else {
-				version = '5';
+				version = '7';
 			}
 		} else {
 			version = res.version.number;
 		}
 
+		// Handle opensearch version
+		if (!version || Number(version[0]) < 5) {
+			version = '7';
+		}
+
 		return version.replace(/\./g, '');
 	} catch (error) {
 		throw new CustomError(

diff --git a/packages/browser/src/components/DataBrowser/DataBrowser.js b/packages/browser/src/components/DataBrowser/DataBrowser.js
@@ -56,7 +56,10 @@ class DataBrowser extends Component<Props> {
 	};
 
 	transformRequest = request => {
-		const newRequest = { ...request };
+		const newRequest = {
+			...request,
+			url: request.url.replace('_msearch?', '_msearch'),
+		};
 		if (newRequest.headers) {
 			Object.keys(newRequest.headers).forEach(headerItem => {
 				newRequest.headers[headerItem] = decodeURIComponent(

diff --git a/packages/browser/src/components/DataBrowser/ResultSet.js b/packages/browser/src/components/DataBrowser/ResultSet.js
@@ -123,6 +123,7 @@ class ResultSet extends React.Component<Props, State> {
 					[sortField]: { order: sortOrder },
 					[version > 5 ? '_id' : '_uid']: {
 						order: sortOrder,
+						unmapped_type: 'long',
 					},
 				},
 			],