3497075941

Build Type

Pull #1973

github

Committed by GitHub

Commit Message

<a href="https://github.com/geostyler/geostyler/commit/<a class=hub.com/geostyler/geostyler/commit/<a class="double-link" href="https://git"><a class=hub.com/geostyler/geostyler/commit/<a class="double-link" href="https://git"><a class=hub.com/geostyler/geostyler/commit/<a class="double-link" href="https://git"><a class=hub.com/geostyler/geostyler/commit/d34b350972ce8eeddbc50d2bc254e00a05d5f43c">d34b35097">&lt;a href=&quot;https://github.com/geostyler/geostyler/commit/</a><a class="double-link" href="https://github.com/geostyler/geostyler/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/geostyler/geostyler/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/geostyler/geostyler/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/geostyler/geostyler/commit/d34b350972ce8eeddbc50d2bc254e00a05d5f43c">d34b35097</a><a href="https://github.com/geostyler/geostyler/commit/d34b350972ce8eeddbc50d2bc254e00a05d5f43c">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/geostyler/geostyler/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/geostyler/geostyler/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/geostyler/geostyler/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/geostyler/geostyler/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/geostyler/geostyler/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/geostyler/geostyler/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/geostyler/geostyler/commit/d34b350972ce8eeddbc50d2bc254e00a05d5f43c&quot;&gt;d34b35097&lt;/a&gt;&lt;a href=&quot;https://github.com/geostyler/geostyler/commit/d34b350972ce8eeddbc50d2bc254e00a05d5f43c&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/geostyler/geostyler/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&a... (continued)

Pull Request Pull Request #1973: Fix onValueChange for ComparisonFilter (between)

Run Details

834 of 1537 branches covered (54.26%)

Branch coverage included in aggregate %.

1 of 1 new or added line in 1 file covered. (100.0%)

1907 of 2709 relevant lines covered (70.39%)

36.67 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

64.71

/src/Component/Filter/ComparisonFilter/ComparisonFilter.tsx

/* eslint-disable @typescript-eslint/member-ordering */
/* Released under the BSD 2-Clause License
 *
 * Copyright © 2018-present, terrestris GmbH & Co. KG and GeoStyler contributors
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 * * Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright notice,
 *   this list of conditions and the following disclaimer in the documentation
 *   and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

import * as React from 'react';

import AttributeCombo from '../AttributeCombo/AttributeCombo';
import OperatorCombo from '../OperatorCombo/OperatorCombo';
import TextFilterField from '../TextFilterField/TextFilterField';
import NumberFilterField from '../NumberFilterField/NumberFilterField';

import {
  ComparisonFilter as GsComparisonFilter,
  ComparisonOperator,
  PropertyType
} from 'geostyler-style';

import './ComparisonFilter.less';
import BoolFilterField from '../BoolFilterField/BoolFilterField';

import {
  Data as Data
} from 'geostyler-data';

import _get from 'lodash/get';
import _cloneDeep from 'lodash/cloneDeep';
import _isEmpty from 'lodash/isEmpty';
import _isString from 'lodash/isString';

type ValidationResult = {
  isValid: boolean;
  errorMsg: string;
};

interface Validators {
  attribute: (attrName: string) => boolean;
  operator: (operator: string) => boolean;
  value: (value: PropertyType, internalDataDef?: Data, selectedAttribute?: string)
    => ValidationResult;
}

// default props
export interface ComparisonFilterProps {
  /** Initial comparison filter object */
  filter?: GsComparisonFilter;
  /** Set true to hide the attribute's type in the AttributeCombo select options */
  hideAttributeType?: boolean;
  /**
   * A custom filter function which is passed each attribute.
   * Should return true to accept each attribute or false to reject it.
   */
  attributeNameFilter?: (attributeName: string) => boolean;
  /** Mapping function for attribute names of underlying AttributeCombo */
  attributeNameMappingFunction?: (originalAttributeName: string) => string;
  /** Label for the underlying OperatorCombo */
  operatorLabel?: string;
  /** Show title of selected item in underlying OperatorCombo */
  showOperatorTitles?: boolean;
  /** Placeholder for the underlying OperatorCombo */
  operatorPlaceholderString?: string;
  /** Validation help text for the underlying OperatorCombo */
  operatorValidationHelpString?: string;
  /** Mapping function for operator names of underlying OperatorCombo */
  operatorNameMappingFunction?: (originalOperatorName: string) => string;
  /** Mapping function for operator title in underlying OperatorCombo */
  operatorTitleMappingFunction?: (originalOperatorName: string) => string;
  /** Object aggregating validation functions for attribute, operator and value */
  validators?: Validators;
  /** Show ui in micro mode. Which disables labels etc. */
  microUI?: boolean;
  /** Reference to internal data object (holding schema and example features) */
  internalDataDef?: Data;
  /** Callback function for onFilterChange */
  onFilterChange?: ((compFilter: GsComparisonFilter) => void);
}

interface ValidationStatus {
  attribute: 'success' | 'warning' | 'error' | 'validating';
  operator: 'success' | 'warning' | 'error' | 'validating';
  value: 'success' | 'warning' | 'error' | 'validating';
}

export const ComparisonFilterDefaultValidator = (
  newValue: PropertyType,
  internalDataDef: Data,
  selectedAttribute: string
): ValidationResult => {

  let isValid = true;
  let errorMsg = '';
  // read out attribute type
  const attrType = _get(internalDataDef, `schema.properties[${selectedAttribute}].type`);

  switch (attrType) {
    case 'number':
      // detect min / max from schema
      const minVal = _get(internalDataDef, `schema.properties[${selectedAttribute}].minimum`);
      const maxVal = _get(internalDataDef, `schema.properties[${selectedAttribute}].maximum`);

      if (!isNaN(minVal) && !isNaN(maxVal)) {
        if (typeof newValue !== 'number') {
          isValid = false;
          errorMsg = 'Please enter a number';
        } else if (newValue < minVal) {
          isValid = false;
          errorMsg = 'Minimum Value is ' + minVal;
        } else if (newValue > maxVal) {
          isValid = false;
          errorMsg = 'Maximum Value is ' + maxVal;
        }
      }
      break;
    default:
      break;
  }

  return {
    isValid: isValid,
    errorMsg: errorMsg
  };
};

const operatorsMap = {
  'string': ['==', '*=', '!='],
  'number': ['==', '!=', '<', '<=', '>', '>=', '<=x<='],
  'boolean': ['==', '!=']
};

/**
 * UI for a ComparisonFilter consisting of
 *
 *   - A combo to select the attribute
 *   - A combo to select the operator
 *   - An input field for the value
 */
export const ComparisonFilter: React.FC<ComparisonFilterProps> = ({
  attributeNameFilter = () => true,
  attributeNameMappingFunction = n => n,
  filter = ['==', '', null],
  hideAttributeType = false,
  internalDataDef,
  microUI = false,
  onFilterChange,
  operatorLabel,
  operatorNameMappingFunction = n => n,
  operatorPlaceholderString,
  operatorTitleMappingFunction = t => t,
  operatorValidationHelpString,
  showOperatorTitles = true,
  validators = {
    attribute: attributeName => !_isEmpty(attributeName),
    operator: operatorName => !_isEmpty(operatorName),
    value: ComparisonFilterDefaultValidator
  }
}) => {

  /**
   * Handler function, which is executed, when to underlying filter attribute changes.
   *
   * Changes the input field for the filter value and stores the appropriate attribute name as member.
   */
  const onAttributeChange = (newAttrName: string) => {
    let newFilter = _cloneDeep(filter);
    newFilter[1] = newAttrName;
    if (onFilterChange) {
      onFilterChange(newFilter);
    }
  };

  /**
   * Handler function, which is executed, when to underlying filter operator changes.
   *
   * Stores the appropriate operator as member.
   */
  const onOperatorChange = (newOperator: ComparisonOperator) => {
    let newFilter = _cloneDeep(filter);
    newFilter[0] = newOperator;
    if (newOperator !== '<=x<=' && newFilter.length > 3) {
      newFilter.splice(3, 1);
    }
    if (newOperator === '<=x<=' && !newFilter[3]) {
      newFilter[3] = 0;
    }
    if (onFilterChange) {
      onFilterChange(newFilter);
    }
  };

  /**
   * Handler function, which is executed, when to underlying filter value changes.
   *
   * Stores the appropriate filter value as member.
   */
  const onValueChange = (newValue: string | number | boolean, filterIndex = 2) => {
    let newFilter = _cloneDeep(filter);
    newFilter[filterIndex] = newValue;
    if (onFilterChange) {
      onFilterChange(newFilter);
    }
  };

  // TODO: implement strategy to handle FunctionFilter
  const attribute = _isString(filter[1]) ? filter[1] : undefined;
  const attributeType = attribute ? internalDataDef?.schema?.properties[attribute]?.type : undefined;
  const operator = filter[0];
  const value = filter[2];
  const valueValidation = validators.value(value, internalDataDef, attribute);
  const valueValidationHelpString = valueValidation.errorMsg;
  const allowedOperators = attributeType ? operatorsMap[attributeType] : undefined;
  const isNumberBetweenComparison = operator === '<=x<=';
  const isNumberComparison = attributeType === 'number';
  const isBooleanComparison = attributeType === 'boolean';
  const isTextComparison = !isNumberBetweenComparison && !isNumberComparison && !isBooleanComparison;
  const hasFilter = filter && Array.isArray(filter);

  const validateStatus: ValidationStatus = {
    attribute: hasFilter && validators.attribute(attribute) ? 'success' : 'error',
    operator: hasFilter && validators.operator(operator) ? 'success' : 'error',
    value: hasFilter && valueValidation.isValid ? 'success' : 'error'
  };

  function getAttributeCombo(filterIndex = 1) {
    const size = microUI ? 'small' : undefined;
    let val: string;
    if (filter) {
      val = filter[filterIndex] as string;
    }
    return <AttributeCombo
      size={size}
      value={val}
      internalDataDef={internalDataDef}
      onAttributeChange={onAttributeChange}
      attributeNameFilter={attributeNameFilter}
      attributeNameMappingFunction={attributeNameMappingFunction}
      validateStatus={validateStatus.attribute}
      hideAttributeType={hideAttributeType}
    />;
  }

  function getNumberField(filterIndex = 2) {
    const size = microUI ? 'small' : undefined;
    let val: number;
    if (filter) {
      val = filter[filterIndex] as number;
    }
    return <NumberFilterField
      size={size}
      value={val}
      onValueChange={(newValue) => onValueChange(newValue, filterIndex)}
      validateStatus={validateStatus.value}
      help={valueValidationHelpString}
    />;
  }

  function getTextField(filterIndex = 2) {
    const size = microUI ? 'small' : undefined;
    let val: string;
    if (filter) {
      val = filter[filterIndex] as string;
    }
    return <TextFilterField
      size={size}
      value={val}
      internalDataDef={internalDataDef}
      selectedAttribute={attribute}
      onValueChange={onValueChange}
      validateStatus={validateStatus.value}
      help={valueValidationHelpString}
    />;
  }

  function getOperatorCombo(filterIndex = 0) {
    const size = microUI ? 'small' : undefined;
    let val: ComparisonOperator;
    if (filter) {
      val = filter[filterIndex] as ComparisonOperator;
    }
    return <OperatorCombo
      size={size}
      value={val}
      onOperatorChange={onOperatorChange}
      operators={allowedOperators}
      operatorNameMappingFunction={operatorNameMappingFunction}
      placeholder={operatorPlaceholderString}
      label={operatorLabel}
      validateStatus={validateStatus.operator}
      help={operatorValidationHelpString}
      operatorTitleMappingFunction={operatorTitleMappingFunction}
      showTitles={showOperatorTitles}
    />;
  }

  function getBooleanField(filterIndex = 2) {
    const size = microUI ? 'small' : undefined;
    let val: boolean;
    if (filter) {
      val = filter[filterIndex] as boolean;
    }
    return <BoolFilterField
      size={size}
      value={val}
      onValueChange={onValueChange}
    />;
  }

  let className = 'gs-comparison-filter-ui';
  if (microUI) {
    className += ' micro';
  }

  if (isNumberBetweenComparison) {
    return (
      <div className={className}>
        {getAttributeCombo()}
        {getNumberField(2)}
        {getOperatorCombo()}
        {getNumberField(3)}
      </div>
    );
  }

  if (isNumberComparison) {
    return (
      <div className={className}>
        {getAttributeCombo()}
        {getOperatorCombo()}
        {getNumberField()}
      </div>
    );
  }

  if (isBooleanComparison) {
    return (
      <div className={className}>
        {getAttributeCombo()}
        {getOperatorCombo()}
        {getBooleanField()}
      </div>
    );
  }

  if (isTextComparison) {
    return (
      <div className={className}>
        {getAttributeCombo()}
        {getOperatorCombo()}
        {getTextField()}
      </div>
    );
  }

  return (
    <div className={className}>
      Could not create ComparisonFilter.
    </div>
  );
};

export default ComparisonFilter;

1	/* eslint-disable @typescript-eslint/member-ordering */
2	/* Released under the BSD 2-Clause License
3	*
4	* Copyright © 2018-present, terrestris GmbH & Co. KG and GeoStyler contributors
5	* All rights reserved.
6	*
7	* Redistribution and use in source and binary forms, with or without
8	* modification, are permitted provided that the following conditions are met:
9	*
10	* * Redistributions of source code must retain the above copyright notice,
11	* this list of conditions and the following disclaimer.
12	*
13	* * Redistributions in binary form must reproduce the above copyright notice,
14	* this list of conditions and the following disclaimer in the documentation
15	* and/or other materials provided with the distribution.
16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
21	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27	* POSSIBILITY OF SUCH DAMAGE.
28	*/
29
30	import * as React from 'react';
31
32	import AttributeCombo from '../AttributeCombo/AttributeCombo';
33	import OperatorCombo from '../OperatorCombo/OperatorCombo';
34	import TextFilterField from '../TextFilterField/TextFilterField';
35	import NumberFilterField from '../NumberFilterField/NumberFilterField';
36
37	import {
38	ComparisonFilter as GsComparisonFilter,
39	ComparisonOperator,
40	PropertyType
41	} from 'geostyler-style';
42
43	import './ComparisonFilter.less';
44	import BoolFilterField from '../BoolFilterField/BoolFilterField';
45
46	import {
47	Data as Data
48	} from 'geostyler-data';
49
50	import _get from 'lodash/get';
51	import _cloneDeep from 'lodash/cloneDeep';
52	import _isEmpty from 'lodash/isEmpty';
53	import _isString from 'lodash/isString';
54
55	type ValidationResult = {
56	isValid: boolean;
57	errorMsg: string;
58	};
59
60	interface Validators {
61	attribute: (attrName: string) => boolean;
62	operator: (operator: string) => boolean;
63	value: (value: PropertyType, internalDataDef?: Data, selectedAttribute?: string)
64	=> ValidationResult;
65	}
66
67	// default props
68	export interface ComparisonFilterProps {
69	/** Initial comparison filter object */
70	filter?: GsComparisonFilter;
71	/** Set true to hide the attribute's type in the AttributeCombo select options */
72	hideAttributeType?: boolean;
73	/**
74	* A custom filter function which is passed each attribute.
75	* Should return true to accept each attribute or false to reject it.
76	*/
77	attributeNameFilter?: (attributeName: string) => boolean;
78	/** Mapping function for attribute names of underlying AttributeCombo */
79	attributeNameMappingFunction?: (originalAttributeName: string) => string;
80	/** Label for the underlying OperatorCombo */
81	operatorLabel?: string;
82	/** Show title of selected item in underlying OperatorCombo */
83	showOperatorTitles?: boolean;
84	/** Placeholder for the underlying OperatorCombo */
85	operatorPlaceholderString?: string;
86	/** Validation help text for the underlying OperatorCombo */
87	operatorValidationHelpString?: string;
88	/** Mapping function for operator names of underlying OperatorCombo */
89	operatorNameMappingFunction?: (originalOperatorName: string) => string;
90	/** Mapping function for operator title in underlying OperatorCombo */
91	operatorTitleMappingFunction?: (originalOperatorName: string) => string;
92	/** Object aggregating validation functions for attribute, operator and value */
93	validators?: Validators;
94	/** Show ui in micro mode. Which disables labels etc. */
95	microUI?: boolean;
96	/** Reference to internal data object (holding schema and example features) */
97	internalDataDef?: Data;
98	/** Callback function for onFilterChange */
99	onFilterChange?: ((compFilter: GsComparisonFilter) => void);
100	}
101
102	interface ValidationStatus {
103	attribute: 'success' \| 'warning' \| 'error' \| 'validating';
104	operator: 'success' \| 'warning' \| 'error' \| 'validating';
105	value: 'success' \| 'warning' \| 'error' \| 'validating';
106	}
107
108	export const ComparisonFilterDefaultValidator = (	7✔
109	newValue: PropertyType,
110	internalDataDef: Data,
111	selectedAttribute: string
112	): ValidationResult => {
113
114	let isValid = true;	8✔
115	let errorMsg = '';	8✔
116	// read out attribute type
117	const attrType = _get(internalDataDef, `schema.properties[${selectedAttribute}].type`);	8✔
118
119	switch (attrType) {	8!
120	case 'number':
121	// detect min / max from schema
122	const minVal = _get(internalDataDef, `schema.properties[${selectedAttribute}].minimum`);	×
123	const maxVal = _get(internalDataDef, `schema.properties[${selectedAttribute}].maximum`);	×
124
125	if (!isNaN(minVal) && !isNaN(maxVal)) {	×
126	if (typeof newValue !== 'number') {	×
127	isValid = false;	×
128	errorMsg = 'Please enter a number';	×
129	} else if (newValue < minVal) {	×
130	isValid = false;	×
131	errorMsg = 'Minimum Value is ' + minVal;	×
132	} else if (newValue > maxVal) {	×
133	isValid = false;	×
134	errorMsg = 'Maximum Value is ' + maxVal;	×
135	}
136	}
137	break;	×
138	default:
139	break;	8✔
140	}
141
142	return {	8✔
143	isValid: isValid,
144	errorMsg: errorMsg
145	};
146	};
147
148	const operatorsMap = {	7✔
149	'string': ['==', '*=', '!='],
150	'number': ['==', '!=', '<', '<=', '>', '>=', '<=x<='],
151	'boolean': ['==', '!=']
152	};
153
154	/**
155	* UI for a ComparisonFilter consisting of
156	*
157	* - A combo to select the attribute
158	* - A combo to select the operator
159	* - An input field for the value
160	*/
161	export const ComparisonFilter: React.FC<ComparisonFilterProps> = ({	7✔
162	attributeNameFilter = () => true,	✔
163	attributeNameMappingFunction = n => n,	✔
164	filter = ['==', '', null],	1✔
165	hideAttributeType = false,	12✔
166	internalDataDef,
167	microUI = false,	9✔
168	onFilterChange,
169	operatorLabel,
170	operatorNameMappingFunction = n => n,	96✔
171	operatorPlaceholderString,
172	operatorTitleMappingFunction = t => t,	96✔
173	operatorValidationHelpString,
174	showOperatorTitles = true,	12✔
175	validators = {	8✔
176	attribute: attributeName => !_isEmpty(attributeName),	8✔
177	operator: operatorName => !_isEmpty(operatorName),	8✔
178	value: ComparisonFilterDefaultValidator
179	}
180	}) => {
181
182	/**
183	* Handler function, which is executed, when to underlying filter attribute changes.
184	*
185	* Changes the input field for the filter value and stores the appropriate attribute name as member.
186	*/
187	const onAttributeChange = (newAttrName: string) => {	12✔
188	let newFilter = _cloneDeep(filter);	1✔
189	newFilter[1] = newAttrName;	1✔
190	if (onFilterChange) {	1!
191	onFilterChange(newFilter);	1✔
192	}
193	};
194
195	/**
196	* Handler function, which is executed, when to underlying filter operator changes.
197	*
198	* Stores the appropriate operator as member.
199	*/
200	const onOperatorChange = (newOperator: ComparisonOperator) => {	12✔
201	let newFilter = _cloneDeep(filter);	1✔
202	newFilter[0] = newOperator;	1✔
203	if (newOperator !== '<=x<=' && newFilter.length > 3) {	1!
204	newFilter.splice(3, 1);	×
205	}
206	if (newOperator === '<=x<=' && !newFilter[3]) {	1!
207	newFilter[3] = 0;	×
208	}
209	if (onFilterChange) {	1!
210	onFilterChange(newFilter);	1✔
211	}
212	};
213
214	/**
215	* Handler function, which is executed, when to underlying filter value changes.
216	*
217	* Stores the appropriate filter value as member.
218	*/
219	const onValueChange = (newValue: string \| number \| boolean, filterIndex = 2) => {	12✔
220	let newFilter = _cloneDeep(filter);	1✔
221	newFilter[filterIndex] = newValue;	1✔
222	if (onFilterChange) {	1!
223	onFilterChange(newFilter);	1✔
224	}
225	};
226
227	// TODO: implement strategy to handle FunctionFilter
228	const attribute = _isString(filter[1]) ? filter[1] : undefined;	12!
229	const attributeType = attribute ? internalDataDef?.schema?.properties[attribute]?.type : undefined;	12✔
230	const operator = filter[0];	12✔
231	const value = filter[2];	12✔
232	const valueValidation = validators.value(value, internalDataDef, attribute);	12✔
233	const valueValidationHelpString = valueValidation.errorMsg;	12✔
234	const allowedOperators = attributeType ? operatorsMap[attributeType] : undefined;	12!
235	const isNumberBetweenComparison = operator === '<=x<=';	12✔
236	const isNumberComparison = attributeType === 'number';	12✔
237	const isBooleanComparison = attributeType === 'boolean';	12✔
238	const isTextComparison = !isNumberBetweenComparison && !isNumberComparison && !isBooleanComparison;	12✔
239	const hasFilter = filter && Array.isArray(filter);	12✔
240
241	const validateStatus: ValidationStatus = {	12✔
242	attribute: hasFilter && validators.attribute(attribute) ? 'success' : 'error',	36✔
243	operator: hasFilter && validators.operator(operator) ? 'success' : 'error',	36✔
244	value: hasFilter && valueValidation.isValid ? 'success' : 'error'	36✔
245	};
246
247	function getAttributeCombo(filterIndex = 1) {	12✔
248	const size = microUI ? 'small' : undefined;	12✔
249	let val: string;
250	if (filter) {	12!
251	val = filter[filterIndex] as string;	12✔
252	}
253	return <AttributeCombo	12✔
254	size={size}
255	value={val}
256	internalDataDef={internalDataDef}
257	onAttributeChange={onAttributeChange}
258	attributeNameFilter={attributeNameFilter}
259	attributeNameMappingFunction={attributeNameMappingFunction}
260	validateStatus={validateStatus.attribute}
261	hideAttributeType={hideAttributeType}
262	/>;
263	}
264
265	function getNumberField(filterIndex = 2) {	×
266	const size = microUI ? 'small' : undefined;	×
267	let val: number;
268	if (filter) {	×
269	val = filter[filterIndex] as number;	×
270	}
271	return <NumberFilterField	×
272	size={size}
273	value={val}
274	onValueChange={(newValue) => onValueChange(newValue, filterIndex)}	×
275	validateStatus={validateStatus.value}
276	help={valueValidationHelpString}
277	/>;
278	}
279
280	function getTextField(filterIndex = 2) {	12✔
281	const size = microUI ? 'small' : undefined;	12✔
282	let val: string;
283	if (filter) {	12!
284	val = filter[filterIndex] as string;	12✔
285	}
286	return <TextFilterField	12✔
287	size={size}
288	value={val}
289	internalDataDef={internalDataDef}
290	selectedAttribute={attribute}
291	onValueChange={onValueChange}
292	validateStatus={validateStatus.value}
293	help={valueValidationHelpString}
294	/>;
295	}
296
297	function getOperatorCombo(filterIndex = 0) {	12✔
298	const size = microUI ? 'small' : undefined;	12✔
299	let val: ComparisonOperator;
300	if (filter) {	12!
301	val = filter[filterIndex] as ComparisonOperator;	12✔
302	}
303	return <OperatorCombo	12✔
304	size={size}
305	value={val}
306	onOperatorChange={onOperatorChange}
307	operators={allowedOperators}
308	operatorNameMappingFunction={operatorNameMappingFunction}
309	placeholder={operatorPlaceholderString}
310	label={operatorLabel}
311	validateStatus={validateStatus.operator}
312	help={operatorValidationHelpString}
313	operatorTitleMappingFunction={operatorTitleMappingFunction}
314	showTitles={showOperatorTitles}
315	/>;
316	}
317
318	function getBooleanField(filterIndex = 2) {	×
319	const size = microUI ? 'small' : undefined;	×
320	let val: boolean;
321	if (filter) {	×
322	val = filter[filterIndex] as boolean;	×
323	}
324	return <BoolFilterField	×
325	size={size}
326	value={val}
327	onValueChange={onValueChange}
328	/>;
329	}
330
331	let className = 'gs-comparison-filter-ui';	12✔
332	if (microUI) {	12✔
333	className += ' micro';	3✔
334	}
335
336	if (isNumberBetweenComparison) {	12!
337	return (	×
338	<div className={className}>
339	{getAttributeCombo()}
340	{getNumberField(2)}
341	{getOperatorCombo()}
342	{getNumberField(3)}
343	</div>
344	);
345	}
346
347	if (isNumberComparison) {	12!
348	return (	×
349	<div className={className}>
350	{getAttributeCombo()}
351	{getOperatorCombo()}
352	{getNumberField()}
353	</div>
354	);
355	}
356
357	if (isBooleanComparison) {	12!
358	return (	×
359	<div className={className}>
360	{getAttributeCombo()}
361	{getOperatorCombo()}
362	{getBooleanField()}
363	</div>
364	);
365	}
366
367	if (isTextComparison) {	12!
368	return (	12✔
369	<div className={className}>
370	{getAttributeCombo()}
371	{getOperatorCombo()}
372	{getTextField()}
373	</div>
374	);
375	}
376
377	return (	×
378	<div className={className}>
379	Could not create ComparisonFilter.
380	</div>
381	);
382	};
383
384	export default ComparisonFilter;

geostyler / geostyler / 3497075941

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous