fix ordering of filter options

XingY · XingY · commit 637914ded0a1 · 2026-01-16T16:18:19.000-08:00
diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.test.tsx
@@ -21,7 +21,8 @@ import {
     DOMAIN_FIELD_UNIQUECONSTRAINT,
     DOMAIN_LAST_ENTERED_DEFAULT,
     DOMAIN_NON_EDITABLE_DEFAULT,
-    INT_RANGE_URI, MULTI_CHOICE_RANGE_URI,
+    INT_RANGE_URI,
+    MULTI_CHOICE_RANGE_URI,
     PHILEVEL_FULL_PHI,
     PHILEVEL_LIMITED_PHI,
 } from './constants';
diff --git a/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx b/packages/components/src/internal/components/domainproperties/AdvancedSettings.tsx
@@ -543,7 +543,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                         </LabelHelpTip>
                     </CheckboxLK>
                 )}
-                {!field.isMultiChoiceField() &&
+                {!field.isMultiChoiceField() && (
                     <CheckboxLK
                         checked={recommendedVariable}
                         id={createFormInputId(DOMAIN_FIELD_RECOMMENDEDVARIABLE, domainIndex, index)}
@@ -558,7 +558,7 @@ export class AdvancedSettings extends React.PureComponent<AdvancedSettingsProps,
                             </div>
                         </LabelHelpTip>
                     </CheckboxLK>
-                }
+                )}
                 {PropDescType.isMvEnableable(field.dataType.rangeURI) && !field.isCalculatedField() && !isApp() && (
                     <CheckboxLK
                         checked={mvEnabled}
diff --git a/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx b/packages/components/src/internal/components/domainproperties/CalculatedFieldOptions.test.tsx
@@ -20,10 +20,10 @@ describe('CalculatedFieldOptions', () => {
             renderWithAppContext(
                 <CalculatedFieldOptions
                     domainIndex={0}
+                    field={DomainField.create({ rangeURI: STRING_RANGE_URI })}
                     getDomainFields={jest.fn()}
                     index={0}
                     onChange={jest.fn()}
-                    field={DomainField.create({ rangeURI: STRING_RANGE_URI })}
                 />
             );
         });
@@ -41,10 +41,10 @@ describe('CalculatedFieldOptions', () => {
             renderWithAppContext(
                 <CalculatedFieldOptions
                     domainIndex={0}
+                    field={DomainField.create({ valueExpression: '1=0', rangeURI: INT_RANGE_URI })}
                     getDomainFields={jest.fn()}
                     index={0}
                     onChange={jest.fn()}
-                    field={DomainField.create({ valueExpression: '1=0', rangeURI: INT_RANGE_URI })}
                 />
             );
         });
@@ -62,10 +62,10 @@ describe('CalculatedFieldOptions', () => {
             renderWithAppContext(
                 <CalculatedFieldOptions
                     domainIndex={0}
+                    field={DomainField.create({ valueExpression: '1=0', lockType: DOMAIN_FIELD_PARTIALLY_LOCKED })}
                     getDomainFields={jest.fn()}
                     index={0}
                     onChange={jest.fn()}
-                    field={DomainField.create({ valueExpression: '1=0', lockType: DOMAIN_FIELD_PARTIALLY_LOCKED })}
                 />
             );
         });
diff --git a/packages/components/src/internal/components/domainproperties/DomainRow.tsx b/packages/components/src/internal/components/domainproperties/DomainRow.tsx
@@ -385,10 +385,7 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
         const draggableId = createFormInputId('domaindrag', domainIndex, index);
         // Use undefined instead of false to allow for css to handle the highlight color for hover
         const highlighted = dragging ? true : isDragDisabled ? false : undefined;
-        const showAdvancedSettingsButton =
-            expanded &&
-            !isFieldFullyLocked(field.lockType) &&
-            !appPropertiesOnly;
+        const showAdvancedSettingsButton = expanded && !isFieldFullyLocked(field.lockType) && !appPropertiesOnly;
 
         return (
             <Draggable
@@ -532,17 +529,17 @@ export class DomainRow extends React.PureComponent<DomainRowProps, DomainRowStat
                                         className={expanded ? 'domain-field-buttons-expanded' : 'domain-field-buttons'}
                                     >
                                         {showAdvancedSettingsButton && (
-                                                <button
-                                                    className="domain-row-button btn btn-default"
-                                                    disabled={isFieldFullyLocked(field.lockType)}
-                                                    id={createFormInputId(DOMAIN_FIELD_ADV, domainIndex, index)}
-                                                    name={createFormInputName(DOMAIN_FIELD_ADV)}
-                                                    onClick={this.onShowAdvanced}
-                                                    type="button"
-                                                >
-                                                    Advanced Settings
-                                                </button>
-                                            )}
+                                            <button
+                                                className="domain-row-button btn btn-default"
+                                                disabled={isFieldFullyLocked(field.lockType)}
+                                                id={createFormInputId(DOMAIN_FIELD_ADV, domainIndex, index)}
+                                                name={createFormInputName(DOMAIN_FIELD_ADV)}
+                                                onClick={this.onShowAdvanced}
+                                                type="button"
+                                            >
+                                                Advanced Settings
+                                            </button>
+                                        )}
                                         {isFieldDeletable(field) && (
                                             <DeleteIcon
                                                 iconCls="domain-field-delete-icon"
diff --git a/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.test.tsx b/packages/components/src/internal/components/domainproperties/DomainRowExpandedOptions.test.tsx
@@ -14,7 +14,8 @@ import {
     DATETIME_TYPE,
     DOUBLE_TYPE,
     FLAG_TYPE,
-    INTEGER_TYPE, MULTI_CHOICE_TYPE,
+    INTEGER_TYPE,
+    MULTI_CHOICE_TYPE,
     MULTILINE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     SAMPLE_TYPE,
@@ -142,10 +143,10 @@ describe('DomainRowExpandedOptions', () => {
         render(
             <DomainRowExpandedOptions
                 {...DEFAULT_PROPS}
-                field={field}
                 domainFormDisplayOptions={{
                     hideTextOptions: true,
                 }}
+                field={field}
             />
         );
 
diff --git a/packages/components/src/internal/components/domainproperties/PropDescType.ts b/packages/components/src/internal/components/domainproperties/PropDescType.ts
@@ -134,7 +134,9 @@ export class PropDescType
     }
 
     static isMeasure(rangeURI: string): boolean {
-        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;
+        return (
+            rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI
+        );
     }
 
     static isDimension(rangeURI: string): boolean {
@@ -147,7 +149,12 @@ export class PropDescType
     }
 
     static isMvEnableable(rangeURI: string): boolean {
-        return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTILINE_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;
+        return (
+            rangeURI !== ATTACHMENT_RANGE_URI &&
+            rangeURI !== FILELINK_RANGE_URI &&
+            rangeURI !== MULTILINE_RANGE_URI &&
+            rangeURI !== MULTI_CHOICE_RANGE_URI
+        );
     }
 
     static isAutoIncrement(dataType: PropDescType): boolean {
diff --git a/packages/components/src/internal/components/domainproperties/actions.test.ts b/packages/components/src/internal/components/domainproperties/actions.test.ts
@@ -372,7 +372,7 @@ describe('domain properties actions', () => {
             allowTextChoiceProperties: true,
             allowSampleSubjectProperties: true,
             allowCalculatedFields: true,
-            allowMultiChoiceProperties: true
+            allowMultiChoiceProperties: true,
         });
         const available = getAvailableTypes(domain);
         expect(available.contains(FLAG_TYPE)).toBeTruthy();
diff --git a/packages/components/src/internal/components/domainproperties/actions.ts b/packages/components/src/internal/components/domainproperties/actions.ts
@@ -873,8 +873,8 @@ export function updateDataType(field: DomainField, value: any): DomainField {
             conceptLabelColumn: undefined,
             conceptImportColumn: undefined,
             scannable: undefined,
-            textChoiceValidator: isTextChoice ? field.textChoiceValidator: undefined,
-            valueExpression: isTextChoice ? field.valueExpression: undefined,
+            textChoiceValidator: isTextChoice ? field.textChoiceValidator : undefined,
+            valueExpression: isTextChoice ? field.valueExpression : undefined,
         }) as DomainField;
 
         if (field.isNew()) {
diff --git a/packages/components/src/internal/components/domainproperties/models.test.ts b/packages/components/src/internal/components/domainproperties/models.test.ts
@@ -35,13 +35,13 @@ import {
     FLAG_TYPE,
     INTEGER_TYPE,
     LOOKUP_TYPE,
+    MULTI_CHOICE_TYPE,
     MULTILINE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     PARTICIPANT_TYPE,
     PropDescType,
     SAMPLE_TYPE,
     TEXT_CHOICE_TYPE,
-    MULTI_CHOICE_TYPE,
     TEXT_TYPE,
     TIME_TYPE,
     UNIQUE_ID_TYPE,
diff --git a/packages/components/src/internal/components/domainproperties/models.tsx b/packages/components/src/internal/components/domainproperties/models.tsx
@@ -80,7 +80,8 @@ import {
     FILE_TYPE,
     FLAG_TYPE,
     INTEGER_TYPE,
-    LOOKUP_TYPE, MULTI_CHOICE_TYPE,
+    LOOKUP_TYPE,
+    MULTI_CHOICE_TYPE,
     ONTOLOGY_LOOKUP_TYPE,
     PROP_DESC_TYPES,
     PropDescType,
@@ -814,10 +815,7 @@ export class PropertyValidator
                     const isChoice = type === 'TextChoice';
 
                     // if we are loading a textChoiceValidator from JSON, we need to set the properties.validValues
-                    if (
-                        isChoice &&
-                        !rawPropertyValidator[i]?.properties?.validValues
-                    ) {
+                    if (isChoice && !rawPropertyValidator[i]?.properties?.validValues) {
                         rawPropertyValidator[i].properties.validValues =
                             PropertyValidator.splitValidValues(expressionStr);
                     }
diff --git a/packages/components/src/internal/components/editable/actions.test.ts b/packages/components/src/internal/components/editable/actions.test.ts
@@ -33,7 +33,7 @@ import { CellMessage, EditorModel, ValueDescriptor } from './models';
 import { genCellKey } from './utils';
 import sampleSetQueryInfoJSON from '../../../test/data/sampleSetAllFieldTypes-getQueryDetails.json';
 import { MockEditableGridLoader } from './utils.test';
-import {MULTI_CHOICE_TYPE} from "../domainproperties/PropDescType";
+import { MULTI_CHOICE_TYPE } from '../domainproperties/PropDescType';
 
 describe('column mutation actions', () => {
     const queryInfo = QueryInfo.fromJsonForTests(sampleSet2QueryInfo);
@@ -943,13 +943,13 @@ describe('insertPastedData', () => {
             ]),
             [genCellKey(mvtc, 0)]: List<ValueDescriptor>([
                 {
-                    "raw": "a",
-                    "display": "a"
+                    raw: 'a',
+                    display: 'a',
                 },
                 {
-                    "raw": "cD",
-                    "display": "cD"
-                }
+                    raw: 'cD',
+                    display: 'cD',
+                },
             ]),
         }),
         orderedColumns: List([fkOne, fkTwo, dateFk, mvtc]),
@@ -1153,20 +1153,27 @@ describe('insertPastedData', () => {
         );
         const cellValues = changes.cellValues;
         expect(cellValues.get(genCellKey(mvtc, 0))).toEqual(
-            List([{ display: 'A,B', raw: 'A,B' }, { display: 'cD', raw: 'cD' }])
+            List([
+                { display: 'A,B', raw: 'A,B' },
+                { display: 'cD', raw: 'cD' },
+            ])
         );
         expect(cellValues.get(genCellKey(mvtc, 1))).toEqual(
-            List([{ display: 'cc', raw: 'cc' }, { display: 'de', raw: 'de' }])
+            List([
+                { display: 'cc', raw: 'cc' },
+                { display: 'de', raw: 'de' },
+            ])
         );
         expect(cellValues.get(genCellKey(mvtc, 2))).toEqual(
-            List([{ display: 'ab', raw: 'ab' }, { display: 'bad', raw: 'bad' }])
+            List([
+                { display: 'ab', raw: 'ab' },
+                { display: 'bad', raw: 'bad' },
+            ])
         );
         const cellMessages = changes.cellMessages;
         expect(cellMessages.get(genCellKey(mvtc, 0))).toBeUndefined();
         expect(cellMessages.get(genCellKey(mvtc, 1))).toBeUndefined();
-        expect(cellMessages.get(genCellKey(mvtc, 2))).toEqual(
-            {message: 'Could not find "bad"' }
-        );
+        expect(cellMessages.get(genCellKey(mvtc, 2))).toEqual({ message: 'Could not find "bad"' });
     });
 });
 
diff --git a/packages/components/src/internal/components/editable/actions.ts b/packages/components/src/internal/components/editable/actions.ts
@@ -35,7 +35,7 @@ import {
 
 import { decimalDifference, genCellKey, getLookupFilters, getValidatedEditableGridValue, parseCellKey } from './utils';
 import { SchemaQuery } from '../../../public/SchemaQuery';
-import {naturalSort} from "../../../public/sort";
+import { naturalSort } from '../../../public/sort';
 
 /**
  * Do not use this method directly, use initEditorModel instead.
@@ -1527,7 +1527,7 @@ async function insertPastedData(
                     const parsedValues = parseCsvString(val, ',', true).sort(naturalSort);
 
                     const unmatched: string[] = [];
-                    let values = [];
+                    const values = [];
 
                     parsedValues.forEach(v => {
                         const vt = v.trim();
@@ -1549,8 +1549,7 @@ async function insertPastedData(
                         msg = { message: lookupValidationErrorMessage(valueStr, true) };
                     }
                     cv = List(values);
-                }
-                else {
+                } else {
                     const { message, value } = getValidatedEditableGridValue(val, col);
                     let display = value;
 
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -32,7 +32,7 @@ import {
 } from '../constants';
 import { QueryColumn } from '../../../../public/QueryColumn';
 import { generateId } from '../../../util/utils';
-import {naturalSortByProperty} from "../../../../public/sort";
+import { naturalSortByProperty } from '../../../../public/sort';
 
 const WARN_COLOR = '#8A6D3B';
 const WARN_BG_COLOR = '#FCF8E3';
@@ -268,13 +268,13 @@ export interface SelectInputProps {
     showIndicatorSeparator?: boolean;
     showLabel?: boolean;
     skipJoinValues?: boolean;
+    sortValues?: boolean;
     tabSelectsValue?: boolean;
     toggleDisabledTooltip?: string;
     value?: any;
     valueKey?: string;
     valueRenderer?: any;
     warning?: ReactNode;
-    sortValues?: boolean;
 }
 
 type SelectInputImplProps = FormsyInjectedProps<any> & SelectInputProps;
diff --git a/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx b/packages/components/src/internal/components/forms/input/TextChoiceInput.tsx
@@ -21,9 +21,9 @@ export class TextChoiceInput extends DisableableInput<Props, DisableableInputSta
                 required={queryColumn.required}
                 {...selectInputProps}
                 multiple={queryColumn.isMultiChoice}
-                sortValues={true}
                 options={options}
                 skipJoinValues={true}
+                sortValues={true}
             />
         );
     }
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.test.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.test.tsx
@@ -9,9 +9,9 @@ import { getQueryTestAPIWrapper } from '../../query/APIWrapper';
 import { renderWithAppContext } from '../../test/reactTestLibraryHelpers';
 
 import { FilterFacetedSelector } from './FilterFacetedSelector';
-import {QueryColumn} from "../../../public/QueryColumn";
-import {MULTI_CHOICE_TYPE} from "../domainproperties/PropDescType";
-import {naturalSort} from "../../../public/sort";
+import { QueryColumn } from '../../../public/QueryColumn';
+import { MULTI_CHOICE_TYPE } from '../domainproperties/PropDescType';
+import { naturalSort } from '../../../public/sort';
 
 const valuesListShort = ['ed', 'ned', '', 'ted', 'red', 'bed'];
 const allDisplayValuesShort = ['[All]', '[blank]', 'bed', 'ed', 'ned', 'red', 'ted'];
@@ -348,18 +348,13 @@ describe('FilterFacetedSelector', () => {
 
     test('multi choice field, no filter', async () => {
         await act(async () => {
-            render(
-                <FilterFacetedSelector
-                    {...DEFAULT_PROPS}
-                    field={mvtcField}
-                />
-            );
+            render(<FilterFacetedSelector {...DEFAULT_PROPS} field={mvtcField} />);
         });
 
         expect(document.querySelector('.fa-spinner')).toBeNull();
 
         expect(document.querySelectorAll('.filter-expression__input-select')).toHaveLength(1);
-        expect(document.querySelector('div.select-input__single-value').textContent).toBe("Contains All");
+        expect(document.querySelector('div.select-input__single-value').textContent).toBe('Contains All');
 
         validate([], [], ['[All]', ...mvtcField.validValues].sort(naturalSort), false);
     });
@@ -370,16 +365,14 @@ describe('FilterFacetedSelector', () => {
                 <FilterFacetedSelector
                     {...DEFAULT_PROPS}
                     field={mvtcField}
-                    fieldFilters={[
-                        Filter.create('stringField', ['bed', 'red'], Filter.Types.ARRAY_CONTAINS_ALL),
-                    ]}
+                    fieldFilters={[Filter.create('stringField', ['bed', 'red'], Filter.Types.ARRAY_CONTAINS_ALL)]}
                 />
             );
         });
 
         expect(document.querySelector('.fa-spinner')).toBeNull();
         expect(document.querySelectorAll('.filter-expression__input-select')).toHaveLength(1);
-        expect(document.querySelector('div.select-input__single-value').textContent).toBe("Contains All");
+        expect(document.querySelector('div.select-input__single-value').textContent).toBe('Contains All');
 
         validate(['bed', 'red'], ['bed', 'red'], ['[All]', ...mvtcField.validValues].sort(naturalSort), false);
     });
@@ -399,7 +392,7 @@ describe('FilterFacetedSelector', () => {
 
         expect(document.querySelector('.fa-spinner')).toBeNull();
 
-        expect(document.querySelector('div.select-input__single-value').textContent).toBe("Contains None");
+        expect(document.querySelector('div.select-input__single-value').textContent).toBe('Contains None');
 
         validate(['[All]', ...mvtcField.validValues], [], ['[All]', ...mvtcField.validValues].sort(naturalSort), false);
     });
diff --git a/packages/components/src/internal/components/search/FilterFacetedSelector.tsx b/packages/components/src/internal/components/search/FilterFacetedSelector.tsx
diff --git a/packages/components/src/internal/components/search/QueryFilterPanel.tsx b/packages/components/src/internal/components/search/QueryFilterPanel.tsx
diff --git a/packages/components/src/internal/components/search/utils.test.ts b/packages/components/src/internal/components/search/utils.test.ts
diff --git a/packages/components/src/internal/renderers/MultiValueRenderer.test.tsx b/packages/components/src/internal/renderers/MultiValueRenderer.test.tsx
diff --git a/packages/components/src/internal/util/utils.test.ts b/packages/components/src/internal/util/utils.test.ts

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,9 @@ export class PropDescType`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`static isMeasure(rangeURI: string): boolean {`
`137`		`- return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;`
	`137`	`+ return (`
	`138`	`+ rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI`
	`139`	`+ );`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`static isDimension(rangeURI: string): boolean {`
`@@ -147,7 +149,12 @@ export class PropDescType`
`147`	`149`	`}`
`148`	`150`
`149`	`151`	`static isMvEnableable(rangeURI: string): boolean {`
`150`		`- return rangeURI !== ATTACHMENT_RANGE_URI && rangeURI !== FILELINK_RANGE_URI && rangeURI !== MULTILINE_RANGE_URI && rangeURI !== MULTI_CHOICE_RANGE_URI;`
	`152`	`+ return (`
	`153`	`+ rangeURI !== ATTACHMENT_RANGE_URI &&`
	`154`	`+ rangeURI !== FILELINK_RANGE_URI &&`
	`155`	`+ rangeURI !== MULTILINE_RANGE_URI &&`
	`156`	`+ rangeURI !== MULTI_CHOICE_RANGE_URI`
	`157`	`+ );`
`151`	`158`	`}`
`152`	`159`
`153`	`160`	`static isAutoIncrement(dataType: PropDescType): boolean {`