fix: Ensure property filter prefers case-sensitive match (#575)

cloudscape-design · Dec 14, 2022 · 3bd8f6e · 3bd8f6e
1 parent deb99d9
commit 3bd8f6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/property-filter/__tests__/utils.test.ts b/src/property-filter/__tests__/utils.test.ts
@@ -42,6 +42,14 @@ describe('matchFilteringProperty', () => {
     const property = matchFilteringProperty(filteringProperties, ' Averange latency');
     expect(property).toBe(null);
   });
+  test('should prefer an exact match to non-exact', () => {
+    const properties: FilteringProperty[] = [
+      { key: 'Test', propertyLabel: 'Test', groupValuesLabel: '' },
+      { key: 'test', propertyLabel: 'test', groupValuesLabel: '' },
+    ];
+    const property = matchFilteringProperty(properties, 'test');
+    expect(property).toBe(properties[1]);
+  });
 });
 
 describe('matchOperator', () => {

diff --git a/src/property-filter/utils.ts b/src/property-filter/utils.ts
@@ -8,13 +8,18 @@ export function matchFilteringProperty(
   filteringProperties: readonly FilteringProperty[],
   filteringText: string
 ): null | FilteringProperty {
-  filteringText = filteringText.toLowerCase();
-
   let maxLength = 0;
   let matchedProperty: null | FilteringProperty = null;
 
   for (const property of filteringProperties) {
-    if (property.propertyLabel.length > maxLength && startsWith(filteringText, property.propertyLabel.toLowerCase())) {
+    if (property.propertyLabel === filteringText) {
+      matchedProperty = property;
+      break;
+    }
+    if (
+      property.propertyLabel.length > maxLength &&
+      startsWith(filteringText.toLowerCase(), property.propertyLabel.toLowerCase())
+    ) {
       maxLength = property.propertyLabel.length;
       matchedProperty = property;
     }