Merge pull request #2235 from appbaseio/feat/compound-clause

mohdashraf010897 · web-flow · commit 2a642f674e06 · 2023-07-31T10:10:02.000+05:30
Feat/compound clause
diff --git a/packages/maps/src/components/basic/GeoDistanceDropdown.js b/packages/maps/src/components/basic/GeoDistanceDropdown.js
@@ -583,6 +583,7 @@ GeoDistanceDropdown.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	countries: types.stringArray,
 	customQuery: types.func,
 	data: types.data,
diff --git a/packages/maps/src/components/basic/GeoDistanceSlider.js b/packages/maps/src/components/basic/GeoDistanceSlider.js
@@ -558,6 +558,7 @@ GeoDistanceSlider.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	countries: types.stringArray,
 	customQuery: types.func,
 	data: types.data,
diff --git a/packages/maps/src/components/result/ReactiveGoogleMap.js b/packages/maps/src/components/result/ReactiveGoogleMap.js
@@ -185,6 +185,7 @@ ReactiveGoogleMap.propTypes = {
 	center: types.location,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.stringRequired,
 	defaultCenter: types.location,
 	defaultMapStyle: types.string,
diff --git a/packages/maps/src/components/result/ReactiveMap.js b/packages/maps/src/components/result/ReactiveMap.js
@@ -1030,6 +1030,7 @@ ReactiveMap.propTypes = {
 	center: types.location,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.stringRequired,
 	defaultCenter: types.location,
 	defaultMapStyle: types.string,
diff --git a/packages/maps/src/components/result/ReactiveOpenStreetMap.js b/packages/maps/src/components/result/ReactiveOpenStreetMap.js
@@ -231,6 +231,7 @@ ReactiveOpenStreetMap.propTypes = {
 	center: types.location,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.stringRequired,
 	defaultCenter: types.location,
 	defaultZoom: types.number,
diff --git a/packages/vue/src/components/basic/ReactiveComponent.jsx b/packages/vue/src/components/basic/ReactiveComponent.jsx
@@ -25,6 +25,7 @@ const ReactiveComponent = {
 	name: 'ReactiveComponent',
 	props: {
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		aggregationField: types.string,
 		aggregationSize: VueTypes.number,
 		size: VueTypes.number,
diff --git a/packages/vue/src/components/list/MultiDropdownList.jsx b/packages/vue/src/components/list/MultiDropdownList.jsx
@@ -50,6 +50,7 @@ const MultiDropdownList = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		dataField: types.stringRequired,
 		defaultValue: types.stringArray,
diff --git a/packages/vue/src/components/list/MultiList.jsx b/packages/vue/src/components/list/MultiList.jsx
@@ -42,6 +42,7 @@ const MultiList = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		dataField: types.stringRequired,
 		defaultQuery: types.func,
diff --git a/packages/vue/src/components/list/SingleDropdownList.jsx b/packages/vue/src/components/list/SingleDropdownList.jsx
@@ -48,6 +48,7 @@ const SingleDropdownList = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		dataField: types.stringRequired,
 		defaultQuery: types.func,
diff --git a/packages/vue/src/components/list/SingleList.jsx b/packages/vue/src/components/list/SingleList.jsx
@@ -37,6 +37,7 @@ const SingleList = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		dataField: types.stringRequired,
 		defaultValue: types.string,
diff --git a/packages/vue/src/components/list/ToggleButton.jsx b/packages/vue/src/components/list/ToggleButton.jsx
@@ -16,6 +16,7 @@ const ToggleButton = {
 	name: 'ToggleButton',
 	props: {
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		data: types.data,
 		dataField: types.stringRequired,
diff --git a/packages/vue/src/components/maps/ReactiveGoogleMap.jsx b/packages/vue/src/components/maps/ReactiveGoogleMap.jsx
@@ -11,6 +11,7 @@ const ReactiveGoogleMap = {
 	props: {
 		className: types.string,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		dataField: types.stringRequired,
 		defaultQuery: VueTypes.func,
 		loader: types.title,
@@ -160,6 +161,7 @@ const ReactiveGoogleMap = {
 				getMapRef={this.getMapRef}
 				renderMap={this.renderMap}
 				componentId={this.componentId}
+				compoundClause={this.compoundClause}
 				className={this.className}
 				dataField={this.dataField}
 				defaultZoom={this.defaultZoom}
diff --git a/packages/vue/src/components/maps/ReactiveMap.jsx b/packages/vue/src/components/maps/ReactiveMap.jsx
@@ -99,6 +99,7 @@ const ReactiveMap = {
 	props: {
 		className: types.string,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		dataField: types.stringRequired,
 		react: types.react,
 		size: types.number,
diff --git a/packages/vue/src/components/range/DynamicRangeSlider.jsx b/packages/vue/src/components/range/DynamicRangeSlider.jsx
@@ -43,6 +43,7 @@ const DynamicRangeSlider = {
 		className: VueTypes.string.def(''),
 		rangeLabels: types.func,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		data: types.data,
 		dataField: types.stringRequired,
diff --git a/packages/vue/src/components/range/MultiRange.jsx b/packages/vue/src/components/range/MultiRange.jsx
@@ -27,6 +27,7 @@ const MultiRange = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		data: types.data,
 		dataField: types.stringRequired,
diff --git a/packages/vue/src/components/range/RangeInput.jsx b/packages/vue/src/components/range/RangeInput.jsx
@@ -58,6 +58,7 @@ const RangeInput = {
 		stepValue: types.number,
 		componentStyle: types.style,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		includeNullValues: VueTypes.bool,
 		beforeValueChange: types.func,
 		customQuery: types.func,
diff --git a/packages/vue/src/components/range/RangeSlider.jsx b/packages/vue/src/components/range/RangeSlider.jsx
@@ -41,6 +41,7 @@ const RangeSlider = {
 		}),
 		rangeLabels: types.rangeLabels,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		data: types.data,
 		dataField: types.stringRequired,
diff --git a/packages/vue/src/components/range/SingleRange.jsx b/packages/vue/src/components/range/SingleRange.jsx
@@ -25,6 +25,7 @@ const SingleRange = {
 		beforeValueChange: types.func,
 		className: VueTypes.string.def(''),
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customQuery: types.func,
 		data: types.data,
 		dataField: types.stringRequired,
diff --git a/packages/vue/src/components/result/ReactiveList.jsx b/packages/vue/src/components/result/ReactiveList.jsx
@@ -105,6 +105,7 @@ const ReactiveList = {
 		// component props
 		className: types.string,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		dataField: types.stringRequired,
 		aggregationField: types.string,
 		aggregationSize: VueTypes.number,
diff --git a/packages/vue/src/components/search/SearchBox.jsx b/packages/vue/src/components/search/SearchBox.jsx
@@ -225,6 +225,7 @@ const SearchBox = defineComponent({
 		className: VueTypes.string.def(''),
 		clearIcon: types.children,
 		componentId: types.stringRequired,
+		compoundClause: types.compoundClause,
 		customHighlight: types.func,
 		customQuery: types.func,
 		defaultQuery: types.func,
diff --git a/packages/vue/src/index.d.ts b/packages/vue/src/index.d.ts
@@ -2,6 +2,7 @@ import * as types from './types.ts';
 
 export interface CommonProps {
 	componentId: string;
+	compoundClause: "filter" | "must";
 	URLParams?: boolean;
 	uRLParams?: boolean;
 	className?: string;
diff --git a/packages/vue/src/utils/vueTypes.js b/packages/vue/src/utils/vueTypes.js
@@ -41,6 +41,7 @@ const types = {
 	bool: VueTypes.bool,
 	boolRequired: VueTypes.bool.isRequired,
 	components: VueTypes.arrayOf(VueTypes.string),
+	compoundClause: VueTypes.oneOf(['filter', 'must']),
 	children: VueTypes.any,
 	data: VueTypes.arrayOf(VueTypes.object),
 	dataFieldArray: VueTypes.oneOfType([VueTypes.string, VueTypes.arrayOf(VueTypes.string)])
diff --git a/packages/web/src/components/basic/NumberBox.js b/packages/web/src/components/basic/NumberBox.js
@@ -188,6 +188,7 @@ NumberBox.propTypes = {
 	// component props
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	data: types.dataNumberBox,
 	dataField: types.stringRequired,
 	defaultValue: types.number,
diff --git a/packages/web/src/components/basic/ReactiveComponent.js b/packages/web/src/components/basic/ReactiveComponent.js
@@ -315,6 +315,7 @@ ReactiveComponent.propTypes = {
 	// component props
 	children: types.func,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	defaultQuery: types.func,
 	customQuery: types.func,
 	defaultValue: types.any, // eslint-disable-line
diff --git a/packages/web/src/components/chart/ReactiveChart.js b/packages/web/src/components/chart/ReactiveChart.js
@@ -709,6 +709,7 @@ ReactiveChart.propTypes = {
 	// ---- user props ---
 	// props to configure query
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	URLParams: types.bool,
 	dataField: types.stringRequired,
 	showFilter: types.bool,
diff --git a/packages/web/src/components/date/DatePicker.js b/packages/web/src/components/date/DatePicker.js
@@ -235,6 +235,7 @@ DatePicker.propTypes = {
 	className: types.string,
 	clickUnselectsDay: types.bool,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.stringRequired,
 	dayPickerInputProps: types.props,
 	defaultValue: types.date,
diff --git a/packages/web/src/components/date/DateRange.js b/packages/web/src/components/date/DateRange.js
@@ -479,6 +479,7 @@ DateRange.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.dataFieldArray,
 	dayPickerInputProps: types.props,
 	defaultValue: types.dateObject,
diff --git a/packages/web/src/components/list/MultiDataList.js b/packages/web/src/components/list/MultiDataList.js
@@ -512,6 +512,7 @@ MultiDataList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	defaultQuery: types.func,
 	data: types.data,
diff --git a/packages/web/src/components/list/MultiDropdownList.js b/packages/web/src/components/list/MultiDropdownList.js
@@ -452,6 +452,7 @@ MultiDropdownList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	defaultQuery: types.func,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/list/MultiList.js b/packages/web/src/components/list/MultiList.js
@@ -623,6 +623,7 @@ MultiList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	defaultQuery: types.func,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/list/SingleDataList.js b/packages/web/src/components/list/SingleDataList.js
@@ -472,6 +472,7 @@ SingleDataList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/list/SingleDropdownList.js b/packages/web/src/components/list/SingleDropdownList.js
@@ -361,6 +361,7 @@ SingleDropdownList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	defaultQuery: types.func,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/list/SingleList.js b/packages/web/src/components/list/SingleList.js
@@ -513,6 +513,7 @@ SingleList.propTypes = {
 	children: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	defaultQuery: types.func,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/list/TabDataList.js b/packages/web/src/components/list/TabDataList.js
@@ -74,6 +74,7 @@ TabDataList.propTypes = {
 	displayAsVertical: bool,
 	children: types.func,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	dataField: types.stringRequired,
 	onChange: types.func,
 	react: types.react,
diff --git a/packages/web/src/components/list/TagCloud.js b/packages/web/src/components/list/TagCloud.js
@@ -288,6 +288,7 @@ TagCloud.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	dataField: types.stringRequired,
 	defaultValue: types.stringOrArray,
diff --git a/packages/web/src/components/list/ToggleButton.js b/packages/web/src/components/list/ToggleButton.js
@@ -256,6 +256,7 @@ ToggleButton.propTypes = {
 	// component props
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	data: types.data,
 	dataField: types.stringRequired,
 	defaultValue: types.stringOrArray,
diff --git a/packages/web/src/components/range/DynamicRangeSlider.js b/packages/web/src/components/range/DynamicRangeSlider.js
@@ -709,6 +709,7 @@ DynamicRangeSlider.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	dataField: types.stringRequired,
 	defaultValue: types.func,
diff --git a/packages/web/src/components/range/MultiDropdownRange.js b/packages/web/src/components/range/MultiDropdownRange.js
@@ -230,6 +230,7 @@ MultiDropdownRange.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/range/MultiRange.js b/packages/web/src/components/range/MultiRange.js
@@ -243,6 +243,7 @@ MultiRange.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/range/RangeInput.js b/packages/web/src/components/range/RangeInput.js
@@ -487,6 +487,7 @@ RangeInput.propTypes = {
 	themePreset: types.themePreset,
 	showHistogram: types.bool,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	includeNullValues: types.bool,
 	index: types.string,
 	queryFormat: oneOf([...Object.keys(dateFormats)]),
diff --git a/packages/web/src/components/range/RangeSlider.js b/packages/web/src/components/range/RangeSlider.js
@@ -543,6 +543,7 @@ RangeSlider.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	dataField: types.stringRequired,
 	defaultValue: types.range,
diff --git a/packages/web/src/components/range/RatingsFilter.js b/packages/web/src/components/range/RatingsFilter.js
@@ -211,6 +211,7 @@ RatingsFilter.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/range/SingleDropdownRange.js b/packages/web/src/components/range/SingleDropdownRange.js
@@ -169,6 +169,7 @@ SingleDropdownRange.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/range/SingleRange.js b/packages/web/src/components/range/SingleRange.js
@@ -186,6 +186,7 @@ SingleRange.propTypes = {
 	beforeValueChange: types.func,
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customQuery: types.func,
 	data: types.data,
 	dataField: types.stringRequired,
diff --git a/packages/web/src/components/result/ReactiveList.js b/packages/web/src/components/result/ReactiveList.js
@@ -919,6 +919,7 @@ ReactiveList.propTypes = {
 	// component props
 	className: types.string,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	children: types.func,
 	dataField: types.stringRequired,
 	aggregationField: types.string,
diff --git a/packages/web/src/components/search/SearchBox.js b/packages/web/src/components/search/SearchBox.js
@@ -2155,6 +2155,7 @@ SearchBox.propTypes = {
 	className: types.string,
 	clearIcon: types.children,
 	componentId: types.stringRequired,
+	compoundClause: types.compoundClause,
 	customHighlight: types.func,
 	customQuery: types.func,
 	defaultQuery: types.func,
diff --git a/packages/web/src/index.d.ts b/packages/web/src/index.d.ts
@@ -5,6 +5,7 @@ import getServerState from './server';
 
 export interface CommonProps {
 	componentId: string;
+	compoundClause: "filter" | "must";
 	URLParams?: boolean;
 	className?: string;
 	onQueryChange?: (...args: any[]) => any;
