Use QueryKey.decodePart

Author: labkey-susanh

packages/components/src/internal/query/filter.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { List } from 'immutable';
-import { Filter } from '@labkey/api';
+import { Filter, QueryKey } from '@labkey/api';
 
 import { JsonType } from '../components/domainproperties/PropDescType';
 import {
@@ -24,10 +24,6 @@ import {
     isRelativeDateFilterValue,
 } from '../util/Date';
 
-// N.B. the dollar sign should always be last here to avoid double-decoding (see getLegalIdentifier)
-const QUERY_KEY_CHAR_DECODED = ['/', '&', '}', '~', ',', '.', '$'];
-const QUERY_KEY_CHAR_ENCODED = ['$S', '$A', '$B', '$T', '$C', '$P', '$D'];
-
 export const CONCEPT_COLUMN_FILTER_TYPES = [
     Filter.Types.HAS_ANY_VALUE,
     Filter.Types.EQUAL,
@@ -78,10 +74,7 @@ export function getLegalIdentifier(columnName: string, tableAlias?: string): str
     columnNameParts.forEach(part => {
         if (part) {
             let decodedPart = part.replace(/"/g, '""');
-            QUERY_KEY_CHAR_ENCODED.forEach((encoded, ind) => {
-                const reg = new RegExp('\\' + encoded, 'g');
-                decodedPart = decodedPart.replace(reg, QUERY_KEY_CHAR_DECODED[ind]);
-            });
+            decodedPart = QueryKey.decodePart(decodedPart);
             formattedParts.push('"' + decodedPart + '"');
         }
     });