From d7093abb217a8b7debafa63a920074631cf4afd3 Mon Sep 17 00:00:00 2001 From: Jack Senyitko <49812749+JS00001@users.noreply.github.com> Date: Wed, 14 Jan 2026 07:59:28 -0500 Subject: [PATCH] Revert "Fix custom columns search syntax" --- src/CONST/index.ts | 49 +- src/components/Search/types.ts | 2 +- src/libs/SearchAutocompleteUtils.ts | 11 +- src/libs/SearchParser/autocompleteParser.js | 788 ++++---------------- src/libs/SearchParser/baseRules.peggy | 44 +- src/libs/SearchParser/searchParser.js | 788 ++++---------------- src/libs/SearchQueryUtils.ts | 13 +- src/libs/SearchUIUtils.ts | 2 +- src/pages/Search/SearchColumnsPage.tsx | 77 +- tests/unit/SearchParserTest.ts | 26 - 10 files changed, 356 insertions(+), 1444 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 79a6c40c91e0..b225d8f8a7d9 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -6962,6 +6962,7 @@ const CONST = { BANK_ACCOUNT: 'bankAccount', REPORT_ID: 'reportID', BASE_62_REPORT_ID: 'base62ReportID', + TAX: 'tax', EXPORTED_TO: 'exportedto', EXCHANGE_RATE: 'exchangeRate', REIMBURSABLE_TOTAL: 'reimbursableTotal', @@ -7106,54 +7107,6 @@ const CONST = { return { [this.TRANSACTION_TYPE.PER_DIEM]: 'per-diem', [this.STATUS.EXPENSE.DRAFTS]: 'draft', - [this.TABLE_COLUMNS.RECEIPT]: 'receipt', - [this.TABLE_COLUMNS.DATE]: 'date', - [this.TABLE_COLUMNS.SUBMITTED]: 'submitted', - [this.TABLE_COLUMNS.APPROVED]: 'approved', - [this.TABLE_COLUMNS.POSTED]: 'posted', - [this.TABLE_COLUMNS.EXPORTED]: 'exported', - [this.TABLE_COLUMNS.MERCHANT]: 'merchant', - [this.TABLE_COLUMNS.DESCRIPTION]: 'description', - [this.TABLE_COLUMNS.FROM]: 'from', - [this.TABLE_COLUMNS.TO]: 'to', - [this.TABLE_COLUMNS.CATEGORY]: 'category', - [this.TABLE_COLUMNS.TAG]: 'tag', - [this.TABLE_COLUMNS.ORIGINAL_AMOUNT]: 'original-amount', - [this.TABLE_COLUMNS.REIMBURSABLE]: 'reimbursable', - [this.TABLE_COLUMNS.BILLABLE]: 'billable', - [this.TABLE_COLUMNS.TAX_RATE]: 'tax-rate', - [this.TABLE_COLUMNS.TOTAL_AMOUNT]: 'amount', - [this.TABLE_COLUMNS.TOTAL]: 'total', - [this.TABLE_COLUMNS.TYPE]: 'type', - [this.TABLE_COLUMNS.ACTION]: 'action', - [this.TABLE_COLUMNS.TAX_AMOUNT]: 'tax', - [this.TABLE_COLUMNS.TITLE]: 'title', - [this.TABLE_COLUMNS.ASSIGNEE]: 'assignee', - [this.TABLE_COLUMNS.IN]: 'in', - [this.TABLE_COLUMNS.COMMENTS]: 'comments', - [this.TABLE_COLUMNS.CARD]: 'card', - [this.TABLE_COLUMNS.POLICY_NAME]: 'policy-name', - [this.TABLE_COLUMNS.WITHDRAWAL_ID]: 'withdrawal-id', - [this.TABLE_COLUMNS.AVATAR]: 'avatar', - [this.TABLE_COLUMNS.STATUS]: 'status', - [this.TABLE_COLUMNS.EXPENSES]: 'expenses', - [this.TABLE_COLUMNS.FEED]: 'feed', - [this.TABLE_COLUMNS.WITHDRAWN]: 'withdrawn', - [this.TABLE_COLUMNS.BANK_ACCOUNT]: 'bank-account', - [this.TABLE_COLUMNS.REPORT_ID]: 'long-report-id', - [this.TABLE_COLUMNS.BASE_62_REPORT_ID]: 'report-id', - [this.TABLE_COLUMNS.EXPORTED_TO]: 'exported-to', - [this.TABLE_COLUMNS.EXCHANGE_RATE]: 'exchange-rate', - [this.TABLE_COLUMNS.REIMBURSABLE_TOTAL]: 'reimbursable-total', - [this.TABLE_COLUMNS.NON_REIMBURSABLE_TOTAL]: 'non-reimbursable-total', - [this.TABLE_COLUMNS.GROUP_FROM]: 'group-from', - [this.TABLE_COLUMNS.GROUP_EXPENSES]: 'group-expenses', - [this.TABLE_COLUMNS.GROUP_TOTAL]: 'group-total', - [this.TABLE_COLUMNS.GROUP_CARD]: 'group-card', - [this.TABLE_COLUMNS.GROUP_FEED]: 'group-feed', - [this.TABLE_COLUMNS.GROUP_BANK_ACCOUNT]: 'group-bank-account', - [this.TABLE_COLUMNS.GROUP_WITHDRAWN]: 'group-withdrawn', - [this.TABLE_COLUMNS.GROUP_WITHDRAWAL_ID]: 'group-withdrawal-id', }; }, NOT_MODIFIER: 'Not', diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts index cc1fddf94507..289d2a889634 100644 --- a/src/components/Search/types.ts +++ b/src/components/Search/types.ts @@ -236,11 +236,11 @@ type SearchQueryAST = { status: SearchStatus; sortBy: SearchColumnType; sortOrder: SortOrder; + columns?: SearchCustomColumnIds[]; groupBy?: SearchGroupBy; filters: ASTNode; policyID?: string[]; rawFilterList?: RawQueryFilter[]; - columns?: SearchCustomColumnIds | SearchCustomColumnIds[]; }; type SearchQueryJSON = { diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts index 11a0b8db52da..633869f628e2 100644 --- a/src/libs/SearchAutocompleteUtils.ts +++ b/src/libs/SearchAutocompleteUtils.ts @@ -1,8 +1,9 @@ import type {MarkdownRange} from '@expensify/react-native-live-markdown'; import type {OnyxCollection} from 'react-native-onyx'; import type {SharedValue} from 'react-native-reanimated/lib/typescript/commonTypes'; +import type {ValueOf} from 'type-fest'; import type {SubstitutionMap} from '@components/Search/SearchRouter/getQueryWithSubstitutions'; -import type {SearchAutocompleteQueryRange, SearchAutocompleteResult, SearchColumnType} from '@components/Search/types'; +import type {SearchAutocompleteQueryRange, SearchAutocompleteResult} from '@components/Search/types'; import CONST from '@src/CONST'; import type {PolicyCategories, PolicyTagLists, RecentlyUsedCategories, RecentlyUsedTags} from '@src/types/onyx'; import {getTagNamesFromTagsLists} from './PolicyUtils'; @@ -134,12 +135,6 @@ const userFriendlyStatusList = Object.values({ ...CONST.SEARCH.STATUS.TASK, }).map((value) => getUserFriendlyValue(value)); -const userFriendlyColumnList = new Set( - Object.entries(CONST.SEARCH.SEARCH_USER_FRIENDLY_VALUES_MAP) - .filter(([key]) => Object.values(CONST.SEARCH.TABLE_COLUMNS).includes(key as SearchColumnType)) - .map(([, value]) => value), -); - /** * @private * Determines if a specific value in the search syntax can/should be highlighted as valid or not @@ -234,7 +229,7 @@ function filterOutRangesWithCorrectValue( // This uses the same regex as the AmountWithoutCurrencyInput component (allowing for 3 digit decimals as some currencies support that) return /^-?(?!.*[.,].*[.,])\d{0,8}(?:[.,]\d{0,2})?$/.test(range.value); case CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS: - return userFriendlyColumnList.has(range.value); + return Object.values(CONST.SEARCH.TYPE_CUSTOM_COLUMNS).includes(range.value as ValueOf); case CONST.SEARCH.SYNTAX_FILTER_KEYS.IS: return isList.includes(range.value); default: diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js index 123877df3925..742f854ddcef 100644 --- a/src/libs/SearchParser/autocompleteParser.js +++ b/src/libs/SearchParser/autocompleteParser.js @@ -247,34 +247,18 @@ function peg$parse(input, options) { var peg$c61 = "purchasecurrency"; var peg$c62 = "purchase-currency"; var peg$c63 = "columns"; - var peg$c64 = "per-diem"; - var peg$c65 = "drafts"; - var peg$c66 = "draft"; - var peg$c67 = "original-amount"; - var peg$c68 = "tax"; - var peg$c69 = "policy-name"; - var peg$c70 = "bank-account"; - var peg$c71 = "long-report-id"; - var peg$c72 = "exported-to"; - var peg$c73 = "exchange-rate"; - var peg$c74 = "reimbursable-total"; - var peg$c75 = "non-reimbursable-total"; - var peg$c76 = "group-from"; - var peg$c77 = "group-expenses"; - var peg$c78 = "group-total"; - var peg$c79 = "group-card"; - var peg$c80 = "group-feed"; - var peg$c81 = "group-bank-account"; - var peg$c82 = "group-withdrawn"; - var peg$c83 = "group-withdrawal-id"; - var peg$c84 = "!="; - var peg$c85 = ">="; - var peg$c86 = ">"; - var peg$c87 = "<="; - var peg$c88 = "<"; - var peg$c89 = "\u201C"; - var peg$c90 = "\u201D"; - var peg$c91 = "\""; + var peg$c64 = "perdiem"; + var peg$c65 = "per-diem"; + var peg$c66 = "drafts"; + var peg$c67 = "draft"; + var peg$c68 = "!="; + var peg$c69 = ">="; + var peg$c70 = ">"; + var peg$c71 = "<="; + var peg$c72 = "<"; + var peg$c73 = "\u201C"; + var peg$c74 = "\u201D"; + var peg$c75 = "\""; var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/; var peg$r1 = /^[:=]/; @@ -356,49 +340,33 @@ function peg$parse(input, options) { var peg$e64 = peg$literalExpectation("purchaseCurrency", true); var peg$e65 = peg$literalExpectation("purchase-currency", true); var peg$e66 = peg$literalExpectation("columns", true); - var peg$e67 = peg$literalExpectation("per-diem", true); - var peg$e68 = peg$literalExpectation("drafts", true); - var peg$e69 = peg$literalExpectation("draft", true); - var peg$e70 = peg$literalExpectation("original-amount", true); - var peg$e71 = peg$literalExpectation("tax", true); - var peg$e72 = peg$literalExpectation("policy-name", true); - var peg$e73 = peg$literalExpectation("bank-account", true); - var peg$e74 = peg$literalExpectation("long-report-id", true); - var peg$e75 = peg$literalExpectation("exported-to", true); - var peg$e76 = peg$literalExpectation("exchange-rate", true); - var peg$e77 = peg$literalExpectation("reimbursable-total", true); - var peg$e78 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e79 = peg$literalExpectation("group-from", true); - var peg$e80 = peg$literalExpectation("group-expenses", true); - var peg$e81 = peg$literalExpectation("group-total", true); - var peg$e82 = peg$literalExpectation("group-card", true); - var peg$e83 = peg$literalExpectation("group-feed", true); - var peg$e84 = peg$literalExpectation("group-bank-account", true); - var peg$e85 = peg$literalExpectation("group-withdrawn", true); - var peg$e86 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e87 = peg$otherExpectation("operator"); - var peg$e88 = peg$classExpectation([":", "="], false, false); - var peg$e89 = peg$literalExpectation("!=", false); - var peg$e90 = peg$literalExpectation(">=", false); - var peg$e91 = peg$literalExpectation(">", false); - var peg$e92 = peg$literalExpectation("<=", false); - var peg$e93 = peg$literalExpectation("<", false); - var peg$e94 = peg$otherExpectation("word"); - var peg$e95 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e96 = peg$otherExpectation("whitespace"); - var peg$e97 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e98 = peg$otherExpectation("quote"); - var peg$e99 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e100 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e101 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e102 = peg$literalExpectation("\u201C", false); - var peg$e103 = peg$literalExpectation("\u201D", false); - var peg$e104 = peg$literalExpectation("\"", false); - var peg$e105 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e106 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e107 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e108 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e109 = peg$classExpectation([","], false, false); + var peg$e67 = peg$literalExpectation("perDiem", true); + var peg$e68 = peg$literalExpectation("per-diem", true); + var peg$e69 = peg$literalExpectation("drafts", true); + var peg$e70 = peg$literalExpectation("draft", true); + var peg$e71 = peg$otherExpectation("operator"); + var peg$e72 = peg$classExpectation([":", "="], false, false); + var peg$e73 = peg$literalExpectation("!=", false); + var peg$e74 = peg$literalExpectation(">=", false); + var peg$e75 = peg$literalExpectation(">", false); + var peg$e76 = peg$literalExpectation("<=", false); + var peg$e77 = peg$literalExpectation("<", false); + var peg$e78 = peg$otherExpectation("word"); + var peg$e79 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e80 = peg$otherExpectation("whitespace"); + var peg$e81 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e82 = peg$otherExpectation("quote"); + var peg$e83 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e84 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e85 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e86 = peg$literalExpectation("\u201C", false); + var peg$e87 = peg$literalExpectation("\u201D", false); + var peg$e88 = peg$literalExpectation("\"", false); + var peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e90 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e91 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e92 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e93 = peg$classExpectation([","], false, false); var peg$f0 = function(ranges) { return { autocomplete, ranges }; }; var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); }; @@ -509,48 +477,29 @@ function peg$parse(input, options) { var peg$f51 = function() {return "purchaseCurrency"}; var peg$f52 = function() {return "columns"}; var peg$f53 = function() { return "perDiem"; }; - var peg$f54 = function() { return "drafts"; }; - var peg$f55 = function() { return "originalamount"; }; - var peg$f56 = function() { return "taxAmount"; }; - var peg$f57 = function() { return "policyname"; }; - var peg$f58 = function() { return "withdrawalID"; }; - var peg$f59 = function() { return "bankAccount"; }; - var peg$f60 = function() { return "reportID"; }; - var peg$f61 = function() { return "base62ReportID"; }; - var peg$f62 = function() { return "exportedto"; }; - var peg$f63 = function() { return "exchangeRate"; }; - var peg$f64 = function() { return "reimbursableTotal"; }; - var peg$f65 = function() { return "nonReimbursableTotal"; }; - var peg$f66 = function() { return "groupFrom"; }; - var peg$f67 = function() { return "groupExpenses"; }; - var peg$f68 = function() { return "groupTotal"; }; - var peg$f69 = function() { return "groupCard"; }; - var peg$f70 = function() { return "groupFeed"; }; - var peg$f71 = function() { return "groupBankAccount"; }; - var peg$f72 = function() { return "groupWithdrawn"; }; - var peg$f73 = function() { return "groupWithdrawalID"; }; - var peg$f74 = function() { return "eq"; }; - var peg$f75 = function() { return "neq"; }; - var peg$f76 = function() { return "gte"; }; - var peg$f77 = function() { return "gt"; }; - var peg$f78 = function() { return "lte"; }; - var peg$f79 = function() { return "lt"; }; - var peg$f80 = function(o) { + var peg$f54 = function() {return "drafts"; }; + var peg$f55 = function() { return "eq"; }; + var peg$f56 = function() { return "neq"; }; + var peg$f57 = function() { return "gte"; }; + var peg$f58 = function() { return "gt"; }; + var peg$f59 = function() { return "lte"; }; + var peg$f60 = function() { return "lt"; }; + var peg$f61 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } return o; }; - var peg$f81 = function(chars) { return chars.join("").trim(); }; - var peg$f82 = function() { return "and"; }; - var peg$f83 = function() { return expectingNestedQuote; }; - var peg$f84 = function(start, inner, end) { //handle no-breaking space + var peg$f62 = function(chars) { return chars.join("").trim(); }; + var peg$f63 = function() { return "and"; }; + var peg$f64 = function() { return expectingNestedQuote; }; + var peg$f65 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f85 = function(start) {return "“"}; - var peg$f86 = function(start) {return "”"}; - var peg$f87 = function(start) {return "\""}; - var peg$f88 = function(start, inner, end) { + var peg$f66 = function(start) {return "“"}; + var peg$f67 = function(start) {return "”"}; + var peg$f68 = function(start) {return "\""}; + var peg$f69 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -2236,66 +2185,6 @@ function peg$parse(input, options) { s0 = peg$parseperDiem(); if (s0 === peg$FAILED) { s0 = peg$parsedraft(); - if (s0 === peg$FAILED) { - s0 = peg$parseoriginalAmount(); - if (s0 === peg$FAILED) { - s0 = peg$parsetaxRate(); - if (s0 === peg$FAILED) { - s0 = peg$parsetaxAmount(); - if (s0 === peg$FAILED) { - s0 = peg$parsepolicyName(); - if (s0 === peg$FAILED) { - s0 = peg$parsewithdrawalId(); - if (s0 === peg$FAILED) { - s0 = peg$parsebankAccount(); - if (s0 === peg$FAILED) { - s0 = peg$parsereportId(); - if (s0 === peg$FAILED) { - s0 = peg$parsebase62ReportId(); - if (s0 === peg$FAILED) { - s0 = peg$parseexportedTo(); - if (s0 === peg$FAILED) { - s0 = peg$parseexchangeRate(); - if (s0 === peg$FAILED) { - s0 = peg$parsereimbursableTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsenonReimbursableTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupFrom(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupExpenses(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupCard(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupFeed(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupBankAccount(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupWithdrawn(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupWithdrawalId(); - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } } return s0; @@ -2304,19 +2193,28 @@ function peg$parse(input, options) { function peg$parseperDiem() { var s0, s1; - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c64) { - peg$currPos += 8; + s0 = input.substr(peg$currPos, 7); + if (s0.toLowerCase() === peg$c64) { + peg$currPos += 7; } else { - s1 = peg$FAILED; + s0 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$e67); } } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f53(); + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = input.substr(peg$currPos, 8); + if (s1.toLowerCase() === peg$c65) { + peg$currPos += 8; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e68); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f53(); + } + s0 = s1; } - s0 = s1; return s0; } @@ -2325,20 +2223,20 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 6); - if (s0.toLowerCase() === peg$c65) { + if (s0.toLowerCase() === peg$c66) { peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c66) { + if (s1.toLowerCase() === peg$c67) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; @@ -2350,386 +2248,6 @@ function peg$parse(input, options) { return s0; } - function peg$parseoriginalAmount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c67) { - peg$currPos += 15; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f55(); - } - s0 = s1; - - return s0; - } - - function peg$parsetaxAmount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c68) { - peg$currPos += 3; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f56(); - } - s0 = s1; - - return s0; - } - - function peg$parsepolicyName() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c69) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f57(); - } - s0 = s1; - - return s0; - } - - function peg$parsewithdrawalId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c31) { - peg$currPos += 13; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f58(); - } - s0 = s1; - - return s0; - } - - function peg$parsebankAccount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c70) { - peg$currPos += 12; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f59(); - } - s0 = s1; - - return s0; - } - - function peg$parsereportId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c71) { - peg$currPos += 14; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f60(); - } - s0 = s1; - - return s0; - } - - function peg$parsebase62ReportId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c9) { - peg$currPos += 9; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f61(); - } - s0 = s1; - - return s0; - } - - function peg$parseexportedTo() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c72) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f62(); - } - s0 = s1; - - return s0; - } - - function peg$parseexchangeRate() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c73) { - peg$currPos += 13; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f63(); - } - s0 = s1; - - return s0; - } - - function peg$parsereimbursableTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c74) { - peg$currPos += 18; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f64(); - } - s0 = s1; - - return s0; - } - - function peg$parsenonReimbursableTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c75) { - peg$currPos += 22; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f65(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupFrom() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c76) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f66(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupExpenses() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c77) { - peg$currPos += 14; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f67(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c78) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f68(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupCard() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c79) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f69(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupFeed() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c80) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f70(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupBankAccount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c81) { - peg$currPos += 18; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f71(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupWithdrawn() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c82) { - peg$currPos += 15; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f72(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupWithdrawalId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c83) { - peg$currPos += 19; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f73(); - } - s0 = s1; - - return s0; - } - function peg$parseoperator() { var s0, s1; @@ -2740,81 +2258,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f74(); + s1 = peg$f55(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c84) { - s1 = peg$c84; + if (input.substr(peg$currPos, 2) === peg$c68) { + s1 = peg$c68; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f75(); + s1 = peg$f56(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c85) { - s1 = peg$c85; + if (input.substr(peg$currPos, 2) === peg$c69) { + s1 = peg$c69; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f76(); + s1 = peg$f57(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c86; + s1 = peg$c70; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f77(); + s1 = peg$f58(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c87) { - s1 = peg$c87; + if (input.substr(peg$currPos, 2) === peg$c71) { + s1 = peg$c71; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f78(); + s1 = peg$f59(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c88; + s1 = peg$c72; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f79(); + s1 = peg$f60(); } s0 = s1; } @@ -2825,7 +2343,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } return s0; @@ -2838,7 +2356,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f80(s1); + s1 = peg$f61(s1); } s0 = s1; @@ -2856,7 +2374,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { @@ -2866,7 +2384,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } } } else { @@ -2874,13 +2392,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f81(s1); + s1 = peg$f62(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } return s0; @@ -2892,7 +2410,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f82(); + s1 = peg$f63(); s0 = s1; return s0; @@ -2908,7 +2426,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -2917,12 +2435,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } return s0; } @@ -2932,7 +2450,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f83(); + s1 = peg$f64(); if (s1) { s1 = undefined; } else { @@ -2969,7 +2487,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -2978,7 +2496,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } } s2 = input.charAt(peg$currPos); @@ -2986,7 +2504,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s2 !== peg$FAILED) { s3 = []; @@ -2995,7 +2513,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3004,7 +2522,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } } s4 = input.charAt(peg$currPos); @@ -3012,7 +2530,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s4 !== peg$FAILED) { s5 = []; @@ -3021,7 +2539,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -3030,11 +2548,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } } peg$savedPos = s0; - s0 = peg$f84(s1, s3, s5); + s0 = peg$f65(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3046,7 +2564,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } return s0; @@ -3063,7 +2581,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3072,7 +2590,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } } s2 = input.charAt(peg$currPos); @@ -3080,7 +2598,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3089,7 +2607,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -3105,15 +2623,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c89; + s6 = peg$c73; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f85(s1); + s4 = peg$f66(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3136,15 +2654,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c90; + s6 = peg$c74; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f86(s1); + s4 = peg$f67(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3167,15 +2685,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c91; + s6 = peg$c75; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f87(s1); + s4 = peg$f68(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3194,7 +2712,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -3210,15 +2728,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c89; + s6 = peg$c73; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f85(s1); + s4 = peg$f66(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3241,15 +2759,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c90; + s6 = peg$c74; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f86(s1); + s4 = peg$f67(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3272,15 +2790,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c91; + s6 = peg$c75; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f87(s1); + s4 = peg$f68(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3296,7 +2814,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f88(s1, s3, s4); + s0 = peg$f69(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3308,7 +2826,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } } return s0; @@ -3323,7 +2841,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3361,7 +2879,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3370,7 +2888,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } } s2 = []; @@ -3379,7 +2897,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -3388,7 +2906,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } } s3 = []; @@ -3397,7 +2915,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3406,7 +2924,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } } s4 = peg$parseoperator(); @@ -3425,7 +2943,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3434,7 +2952,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } } s2 = peg$currPos; @@ -3481,7 +2999,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } } } diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy index b793dbdeb53d..d9662ad6d2d9 100644 --- a/src/libs/SearchParser/baseRules.peggy +++ b/src/libs/SearchParser/baseRules.peggy @@ -84,49 +84,9 @@ columns = "columns"i {return "columns"} values = perDiem / draft - / originalAmount - / taxRate - / taxAmount - / policyName - / withdrawalId - / bankAccount - / reportId - / base62ReportId - / exportedTo - / exchangeRate - / reimbursableTotal - / nonReimbursableTotal - / groupFrom - / groupExpenses - / groupTotal - / groupCard - / groupFeed - / groupBankAccount - / groupWithdrawn - / groupWithdrawalId - -perDiem = "per-diem"i { return "perDiem"; } -draft = "drafts"i / "draft"i { return "drafts"; } -originalAmount = "original-amount"i { return "originalamount"; } -taxAmount = "tax"i { return "taxAmount"; } -policyName = "policy-name"i { return "policyname"; } -withdrawalId = "withdrawal-id"i { return "withdrawalID"; } -bankAccount = "bank-account"i { return "bankAccount"; } -reportId = "long-report-id"i { return "reportID"; } -base62ReportId = "report-id"i { return "base62ReportID"; } -exportedTo = "exported-to"i { return "exportedto"; } -exchangeRate = "exchange-rate"i { return "exchangeRate"; } -reimbursableTotal = "reimbursable-total"i { return "reimbursableTotal"; } -nonReimbursableTotal = "non-reimbursable-total"i { return "nonReimbursableTotal"; } -groupFrom = "group-from"i { return "groupFrom"; } -groupExpenses = "group-expenses"i { return "groupExpenses"; } -groupTotal = "group-total"i { return "groupTotal"; } -groupCard = "group-card"i { return "groupCard"; } -groupFeed = "group-feed"i { return "groupFeed"; } -groupBankAccount = "group-bank-account"i { return "groupBankAccount"; } -groupWithdrawn = "group-withdrawn"i { return "groupWithdrawn"; } -groupWithdrawalId = "group-withdrawal-id"i { return "groupWithdrawalID"; } +perDiem = "perDiem"i / "per-diem"i { return "perDiem"; } +draft = "drafts"i / "draft"i {return "drafts"; } operator "operator" = (":" / "=") { return "eq"; } diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js index 97164fb5a655..020427d414a9 100644 --- a/src/libs/SearchParser/searchParser.js +++ b/src/libs/SearchParser/searchParser.js @@ -248,34 +248,18 @@ function peg$parse(input, options) { var peg$c61 = "purchasecurrency"; var peg$c62 = "purchase-currency"; var peg$c63 = "columns"; - var peg$c64 = "per-diem"; - var peg$c65 = "drafts"; - var peg$c66 = "draft"; - var peg$c67 = "original-amount"; - var peg$c68 = "tax"; - var peg$c69 = "policy-name"; - var peg$c70 = "bank-account"; - var peg$c71 = "long-report-id"; - var peg$c72 = "exported-to"; - var peg$c73 = "exchange-rate"; - var peg$c74 = "reimbursable-total"; - var peg$c75 = "non-reimbursable-total"; - var peg$c76 = "group-from"; - var peg$c77 = "group-expenses"; - var peg$c78 = "group-total"; - var peg$c79 = "group-card"; - var peg$c80 = "group-feed"; - var peg$c81 = "group-bank-account"; - var peg$c82 = "group-withdrawn"; - var peg$c83 = "group-withdrawal-id"; - var peg$c84 = "!="; - var peg$c85 = ">="; - var peg$c86 = ">"; - var peg$c87 = "<="; - var peg$c88 = "<"; - var peg$c89 = "\u201C"; - var peg$c90 = "\u201D"; - var peg$c91 = "\""; + var peg$c64 = "perdiem"; + var peg$c65 = "per-diem"; + var peg$c66 = "drafts"; + var peg$c67 = "draft"; + var peg$c68 = "!="; + var peg$c69 = ">="; + var peg$c70 = ">"; + var peg$c71 = "<="; + var peg$c72 = "<"; + var peg$c73 = "\u201C"; + var peg$c74 = "\u201D"; + var peg$c75 = "\""; var peg$r0 = /^[^ \t\r\n\xA0]/; var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/; @@ -360,49 +344,33 @@ function peg$parse(input, options) { var peg$e66 = peg$literalExpectation("purchaseCurrency", true); var peg$e67 = peg$literalExpectation("purchase-currency", true); var peg$e68 = peg$literalExpectation("columns", true); - var peg$e69 = peg$literalExpectation("per-diem", true); - var peg$e70 = peg$literalExpectation("drafts", true); - var peg$e71 = peg$literalExpectation("draft", true); - var peg$e72 = peg$literalExpectation("original-amount", true); - var peg$e73 = peg$literalExpectation("tax", true); - var peg$e74 = peg$literalExpectation("policy-name", true); - var peg$e75 = peg$literalExpectation("bank-account", true); - var peg$e76 = peg$literalExpectation("long-report-id", true); - var peg$e77 = peg$literalExpectation("exported-to", true); - var peg$e78 = peg$literalExpectation("exchange-rate", true); - var peg$e79 = peg$literalExpectation("reimbursable-total", true); - var peg$e80 = peg$literalExpectation("non-reimbursable-total", true); - var peg$e81 = peg$literalExpectation("group-from", true); - var peg$e82 = peg$literalExpectation("group-expenses", true); - var peg$e83 = peg$literalExpectation("group-total", true); - var peg$e84 = peg$literalExpectation("group-card", true); - var peg$e85 = peg$literalExpectation("group-feed", true); - var peg$e86 = peg$literalExpectation("group-bank-account", true); - var peg$e87 = peg$literalExpectation("group-withdrawn", true); - var peg$e88 = peg$literalExpectation("group-withdrawal-id", true); - var peg$e89 = peg$otherExpectation("operator"); - var peg$e90 = peg$classExpectation([":", "="], false, false); - var peg$e91 = peg$literalExpectation("!=", false); - var peg$e92 = peg$literalExpectation(">=", false); - var peg$e93 = peg$literalExpectation(">", false); - var peg$e94 = peg$literalExpectation("<=", false); - var peg$e95 = peg$literalExpectation("<", false); - var peg$e96 = peg$otherExpectation("word"); - var peg$e97 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e98 = peg$otherExpectation("whitespace"); - var peg$e99 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); - var peg$e100 = peg$otherExpectation("quote"); - var peg$e101 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); - var peg$e102 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); - var peg$e103 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); - var peg$e104 = peg$literalExpectation("\u201C", false); - var peg$e105 = peg$literalExpectation("\u201D", false); - var peg$e106 = peg$literalExpectation("\"", false); - var peg$e107 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e108 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); - var peg$e109 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); - var peg$e110 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); - var peg$e111 = peg$classExpectation([","], false, false); + var peg$e69 = peg$literalExpectation("perDiem", true); + var peg$e70 = peg$literalExpectation("per-diem", true); + var peg$e71 = peg$literalExpectation("drafts", true); + var peg$e72 = peg$literalExpectation("draft", true); + var peg$e73 = peg$otherExpectation("operator"); + var peg$e74 = peg$classExpectation([":", "="], false, false); + var peg$e75 = peg$literalExpectation("!=", false); + var peg$e76 = peg$literalExpectation(">=", false); + var peg$e77 = peg$literalExpectation(">", false); + var peg$e78 = peg$literalExpectation("<=", false); + var peg$e79 = peg$literalExpectation("<", false); + var peg$e80 = peg$otherExpectation("word"); + var peg$e81 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e82 = peg$otherExpectation("whitespace"); + var peg$e83 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false); + var peg$e84 = peg$otherExpectation("quote"); + var peg$e85 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false); + var peg$e86 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false); + var peg$e87 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false); + var peg$e88 = peg$literalExpectation("\u201C", false); + var peg$e89 = peg$literalExpectation("\u201D", false); + var peg$e90 = peg$literalExpectation("\"", false); + var peg$e91 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e92 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false); + var peg$e93 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false); + var peg$e94 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false); + var peg$e95 = peg$classExpectation([","], false, false); var peg$f0 = function(filters) { return applyDefaults(filters); }; var peg$f1 = function(head, tail) { @@ -536,48 +504,29 @@ function peg$parse(input, options) { var peg$f52 = function() {return "purchaseCurrency"}; var peg$f53 = function() {return "columns"}; var peg$f54 = function() { return "perDiem"; }; - var peg$f55 = function() { return "drafts"; }; - var peg$f56 = function() { return "originalamount"; }; - var peg$f57 = function() { return "taxAmount"; }; - var peg$f58 = function() { return "policyname"; }; - var peg$f59 = function() { return "withdrawalID"; }; - var peg$f60 = function() { return "bankAccount"; }; - var peg$f61 = function() { return "reportID"; }; - var peg$f62 = function() { return "base62ReportID"; }; - var peg$f63 = function() { return "exportedto"; }; - var peg$f64 = function() { return "exchangeRate"; }; - var peg$f65 = function() { return "reimbursableTotal"; }; - var peg$f66 = function() { return "nonReimbursableTotal"; }; - var peg$f67 = function() { return "groupFrom"; }; - var peg$f68 = function() { return "groupExpenses"; }; - var peg$f69 = function() { return "groupTotal"; }; - var peg$f70 = function() { return "groupCard"; }; - var peg$f71 = function() { return "groupFeed"; }; - var peg$f72 = function() { return "groupBankAccount"; }; - var peg$f73 = function() { return "groupWithdrawn"; }; - var peg$f74 = function() { return "groupWithdrawalID"; }; - var peg$f75 = function() { return "eq"; }; - var peg$f76 = function() { return "neq"; }; - var peg$f77 = function() { return "gte"; }; - var peg$f78 = function() { return "gt"; }; - var peg$f79 = function() { return "lte"; }; - var peg$f80 = function() { return "lt"; }; - var peg$f81 = function(o) { + var peg$f55 = function() {return "drafts"; }; + var peg$f56 = function() { return "eq"; }; + var peg$f57 = function() { return "neq"; }; + var peg$f58 = function() { return "gte"; }; + var peg$f59 = function() { return "gt"; }; + var peg$f60 = function() { return "lte"; }; + var peg$f61 = function() { return "lt"; }; + var peg$f62 = function(o) { if (nameOperator) { expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found } return o; }; - var peg$f82 = function(chars) { return chars.join("").trim(); }; - var peg$f83 = function() { return "and"; }; - var peg$f84 = function() { return expectingNestedQuote; }; - var peg$f85 = function(start, inner, end) { //handle no-breaking space + var peg$f63 = function(chars) { return chars.join("").trim(); }; + var peg$f64 = function() { return "and"; }; + var peg$f65 = function() { return expectingNestedQuote; }; + var peg$f66 = function(start, inner, end) { //handle no-breaking space return [...start, '"', ...inner, '"', ...end].join(""); }; - var peg$f86 = function(start) {return "“"}; - var peg$f87 = function(start) {return "”"}; - var peg$f88 = function(start) {return "\""}; - var peg$f89 = function(start, inner, end) { + var peg$f67 = function(start) {return "“"}; + var peg$f68 = function(start) {return "”"}; + var peg$f69 = function(start) {return "\""}; + var peg$f70 = function(start, inner, end) { return [...start, '"', ...inner, '"'].join(""); }; var peg$currPos = options.peg$currPos | 0; @@ -2420,66 +2369,6 @@ function peg$parse(input, options) { s0 = peg$parseperDiem(); if (s0 === peg$FAILED) { s0 = peg$parsedraft(); - if (s0 === peg$FAILED) { - s0 = peg$parseoriginalAmount(); - if (s0 === peg$FAILED) { - s0 = peg$parsetaxRate(); - if (s0 === peg$FAILED) { - s0 = peg$parsetaxAmount(); - if (s0 === peg$FAILED) { - s0 = peg$parsepolicyName(); - if (s0 === peg$FAILED) { - s0 = peg$parsewithdrawalId(); - if (s0 === peg$FAILED) { - s0 = peg$parsebankAccount(); - if (s0 === peg$FAILED) { - s0 = peg$parsereportId(); - if (s0 === peg$FAILED) { - s0 = peg$parsebase62ReportId(); - if (s0 === peg$FAILED) { - s0 = peg$parseexportedTo(); - if (s0 === peg$FAILED) { - s0 = peg$parseexchangeRate(); - if (s0 === peg$FAILED) { - s0 = peg$parsereimbursableTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsenonReimbursableTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupFrom(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupExpenses(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupTotal(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupCard(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupFeed(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupBankAccount(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupWithdrawn(); - if (s0 === peg$FAILED) { - s0 = peg$parsegroupWithdrawalId(); - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } - } } return s0; @@ -2488,19 +2377,28 @@ function peg$parse(input, options) { function peg$parseperDiem() { var s0, s1; - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 8); - if (s1.toLowerCase() === peg$c64) { - peg$currPos += 8; + s0 = input.substr(peg$currPos, 7); + if (s0.toLowerCase() === peg$c64) { + peg$currPos += 7; } else { - s1 = peg$FAILED; + s0 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$e69); } } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f54(); + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = input.substr(peg$currPos, 8); + if (s1.toLowerCase() === peg$c65) { + peg$currPos += 8; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e70); } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f54(); + } + s0 = s1; } - s0 = s1; return s0; } @@ -2509,20 +2407,20 @@ function peg$parse(input, options) { var s0, s1; s0 = input.substr(peg$currPos, 6); - if (s0.toLowerCase() === peg$c65) { + if (s0.toLowerCase() === peg$c66) { peg$currPos += 6; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } if (s0 === peg$FAILED) { s0 = peg$currPos; s1 = input.substr(peg$currPos, 5); - if (s1.toLowerCase() === peg$c66) { + if (s1.toLowerCase() === peg$c67) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; @@ -2534,386 +2432,6 @@ function peg$parse(input, options) { return s0; } - function peg$parseoriginalAmount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c67) { - peg$currPos += 15; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f56(); - } - s0 = s1; - - return s0; - } - - function peg$parsetaxAmount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 3); - if (s1.toLowerCase() === peg$c68) { - peg$currPos += 3; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f57(); - } - s0 = s1; - - return s0; - } - - function peg$parsepolicyName() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c69) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f58(); - } - s0 = s1; - - return s0; - } - - function peg$parsewithdrawalId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c31) { - peg$currPos += 13; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f59(); - } - s0 = s1; - - return s0; - } - - function peg$parsebankAccount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 12); - if (s1.toLowerCase() === peg$c70) { - peg$currPos += 12; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f60(); - } - s0 = s1; - - return s0; - } - - function peg$parsereportId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c71) { - peg$currPos += 14; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e76); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f61(); - } - s0 = s1; - - return s0; - } - - function peg$parsebase62ReportId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 9); - if (s1.toLowerCase() === peg$c9) { - peg$currPos += 9; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e14); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f62(); - } - s0 = s1; - - return s0; - } - - function peg$parseexportedTo() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c72) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e77); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f63(); - } - s0 = s1; - - return s0; - } - - function peg$parseexchangeRate() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 13); - if (s1.toLowerCase() === peg$c73) { - peg$currPos += 13; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e78); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f64(); - } - s0 = s1; - - return s0; - } - - function peg$parsereimbursableTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c74) { - peg$currPos += 18; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e79); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f65(); - } - s0 = s1; - - return s0; - } - - function peg$parsenonReimbursableTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 22); - if (s1.toLowerCase() === peg$c75) { - peg$currPos += 22; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e80); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f66(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupFrom() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c76) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e81); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f67(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupExpenses() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 14); - if (s1.toLowerCase() === peg$c77) { - peg$currPos += 14; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e82); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f68(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupTotal() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 11); - if (s1.toLowerCase() === peg$c78) { - peg$currPos += 11; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e83); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f69(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupCard() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c79) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e84); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f70(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupFeed() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 10); - if (s1.toLowerCase() === peg$c80) { - peg$currPos += 10; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e85); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f71(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupBankAccount() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 18); - if (s1.toLowerCase() === peg$c81) { - peg$currPos += 18; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e86); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f72(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupWithdrawn() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 15); - if (s1.toLowerCase() === peg$c82) { - peg$currPos += 15; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e87); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f73(); - } - s0 = s1; - - return s0; - } - - function peg$parsegroupWithdrawalId() { - var s0, s1; - - s0 = peg$currPos; - s1 = input.substr(peg$currPos, 19); - if (s1.toLowerCase() === peg$c83) { - peg$currPos += 19; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e88); } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f74(); - } - s0 = s1; - - return s0; - } - function peg$parseoperator() { var s0, s1; @@ -2924,81 +2442,81 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e90); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f75(); + s1 = peg$f56(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c84) { - s1 = peg$c84; + if (input.substr(peg$currPos, 2) === peg$c68) { + s1 = peg$c68; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e91); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f76(); + s1 = peg$f57(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c85) { - s1 = peg$c85; + if (input.substr(peg$currPos, 2) === peg$c69) { + s1 = peg$c69; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e92); } + if (peg$silentFails === 0) { peg$fail(peg$e76); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f77(); + s1 = peg$f58(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 62) { - s1 = peg$c86; + s1 = peg$c70; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e93); } + if (peg$silentFails === 0) { peg$fail(peg$e77); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f78(); + s1 = peg$f59(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c87) { - s1 = peg$c87; + if (input.substr(peg$currPos, 2) === peg$c71) { + s1 = peg$c71; peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e94); } + if (peg$silentFails === 0) { peg$fail(peg$e78); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f79(); + s1 = peg$f60(); } s0 = s1; if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 60) { - s1 = peg$c88; + s1 = peg$c72; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e95); } + if (peg$silentFails === 0) { peg$fail(peg$e79); } } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f80(); + s1 = peg$f61(); } s0 = s1; } @@ -3009,7 +2527,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e89); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } return s0; @@ -3022,7 +2540,7 @@ function peg$parse(input, options) { s1 = peg$parseoperator(); if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f81(s1); + s1 = peg$f62(s1); } s0 = s1; @@ -3040,7 +2558,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { @@ -3050,7 +2568,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } } } else { @@ -3058,13 +2576,13 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f82(s1); + s1 = peg$f63(s1); } s0 = s1; peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e96); } + if (peg$silentFails === 0) { peg$fail(peg$e80); } } return s0; @@ -3076,7 +2594,7 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = peg$parse_(); peg$savedPos = s0; - s1 = peg$f83(); + s1 = peg$f64(); s0 = s1; return s0; @@ -3092,7 +2610,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } while (s1 !== peg$FAILED) { s0.push(s1); @@ -3101,12 +2619,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e99); } + if (peg$silentFails === 0) { peg$fail(peg$e83); } } } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e98); } + if (peg$silentFails === 0) { peg$fail(peg$e82); } return s0; } @@ -3116,7 +2634,7 @@ function peg$parse(input, options) { s0 = peg$currPos; peg$savedPos = peg$currPos; - s1 = peg$f84(); + s1 = peg$f65(); if (s1) { s1 = undefined; } else { @@ -3153,7 +2671,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3162,7 +2680,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } } s2 = input.charAt(peg$currPos); @@ -3170,7 +2688,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3179,7 +2697,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3188,7 +2706,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } } s4 = input.charAt(peg$currPos); @@ -3196,7 +2714,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s4 !== peg$FAILED) { s5 = []; @@ -3205,7 +2723,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } while (s6 !== peg$FAILED) { s5.push(s6); @@ -3214,11 +2732,11 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e97); } + if (peg$silentFails === 0) { peg$fail(peg$e81); } } } peg$savedPos = s0; - s0 = peg$f85(s1, s3, s5); + s0 = peg$f66(s1, s3, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3230,7 +2748,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } return s0; @@ -3247,7 +2765,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3256,7 +2774,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e101); } + if (peg$silentFails === 0) { peg$fail(peg$e85); } } } s2 = input.charAt(peg$currPos); @@ -3264,7 +2782,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3273,7 +2791,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -3289,15 +2807,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c89; + s6 = peg$c73; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f86(s1); + s4 = peg$f67(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3320,15 +2838,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c90; + s6 = peg$c74; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f87(s1); + s4 = peg$f68(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3351,15 +2869,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c91; + s6 = peg$c75; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f88(s1); + s4 = peg$f69(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3378,7 +2896,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e103); } + if (peg$silentFails === 0) { peg$fail(peg$e87); } } if (s4 === peg$FAILED) { s4 = peg$currPos; @@ -3394,15 +2912,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8220) { - s6 = peg$c89; + s6 = peg$c73; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e104); } + if (peg$silentFails === 0) { peg$fail(peg$e88); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f86(s1); + s4 = peg$f67(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3425,15 +2943,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 8221) { - s6 = peg$c90; + s6 = peg$c74; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e105); } + if (peg$silentFails === 0) { peg$fail(peg$e89); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f87(s1); + s4 = peg$f68(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3456,15 +2974,15 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s6 = peg$c91; + s6 = peg$c75; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e106); } + if (peg$silentFails === 0) { peg$fail(peg$e90); } } if (s6 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f88(s1); + s4 = peg$f69(s1); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -3480,7 +2998,7 @@ function peg$parse(input, options) { s4 = peg$parseclosingQuote(); if (s4 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f89(s1, s3, s4); + s0 = peg$f70(s1, s3, s4); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3492,7 +3010,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e100); } + if (peg$silentFails === 0) { peg$fail(peg$e84); } } return s0; @@ -3507,7 +3025,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e102); } + if (peg$silentFails === 0) { peg$fail(peg$e86); } } if (s1 !== peg$FAILED) { s2 = peg$currPos; @@ -3545,7 +3063,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3554,7 +3072,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e107); } + if (peg$silentFails === 0) { peg$fail(peg$e91); } } } s2 = []; @@ -3563,7 +3081,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -3572,7 +3090,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e108); } + if (peg$silentFails === 0) { peg$fail(peg$e92); } } } s3 = []; @@ -3581,7 +3099,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3590,7 +3108,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e109); } + if (peg$silentFails === 0) { peg$fail(peg$e93); } } } s4 = peg$parseoperator(); @@ -3609,7 +3127,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } while (s2 !== peg$FAILED) { s1.push(s2); @@ -3618,7 +3136,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e110); } + if (peg$silentFails === 0) { peg$fail(peg$e94); } } } s2 = peg$currPos; @@ -3665,7 +3183,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e111); } + if (peg$silentFails === 0) { peg$fail(peg$e95); } } } } diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts index cd1652b59ad9..d9242bb1d300 100644 --- a/src/libs/SearchQueryUtils.ts +++ b/src/libs/SearchQueryUtils.ts @@ -1203,7 +1203,7 @@ function buildUserReadableQueryString( currentUserAccountID: number, autoCompleteWithSpace = false, ) { - const {type, status, groupBy, columns, policyID, rawFilterList, flatFilters: filters = []} = queryJSON; + const {type, status, groupBy, policyID, rawFilterList, flatFilters: filters = []} = queryJSON; if (rawFilterList && rawFilterList.length > 0) { const segments: string[] = []; @@ -1213,6 +1213,10 @@ function buildUserReadableQueryString( continue; } + if (rawFilter.key === CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS) { + continue; + } + if (rawFilter.isDefault) { const defaultSegment = formatDefaultRawFilterSegment(rawFilter, policies, reports); if (defaultSegment) { @@ -1264,11 +1268,6 @@ function buildUserReadableQueryString( title += ` workspace:${policyID.map((id) => sanitizeSearchValue(getPolicyNameWithFallback(id, policies, reports))).join(',')}`; } - if (columns && columns.length > 0) { - const columnValue = Array.isArray(columns) ? columns.map((column) => getUserFriendlyValue(column)).join(',') : getUserFriendlyValue(columns); - title += ` columns:${columnValue}`; - } - for (const filterObject of filters) { const key = filterObject.key; const displayQueryFilters = getDisplayQueryFiltersForKey(key, filterObject.filters, PersonalDetails, reports, taxRates, cardList, cardFeeds, policies, currentUserAccountID); @@ -1330,7 +1329,7 @@ function buildCannedSearchQuery({ * For example: "type:trip" is a canned query. */ function isCannedSearchQuery(queryJSON: SearchQueryJSON) { - const selectedColumns = [queryJSON.columns ?? []].flat(); + const selectedColumns = queryJSON.columns ?? []; const defaultColumns = Object.values(CONST.SEARCH.TYPE_DEFAULT_COLUMNS.EXPENSE_REPORT); const hasCustomColumns = !arraysEqual(defaultColumns, selectedColumns) && selectedColumns.length > 0; return !queryJSON.filters && !queryJSON.policyID && !queryJSON.status && !hasCustomColumns; diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 01415c68c99a..21eacc585270 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -3289,7 +3289,7 @@ function getColumnsToShow( }); if (!arraysEqual(Object.values(CONST.SEARCH.TYPE_DEFAULT_COLUMNS.EXPENSE), filteredVisibleColumns) && filteredVisibleColumns.length > 0) { - const requiredColumns = new Set([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TYPE, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]); + const requiredColumns = new Set([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]); const result: SearchColumnType[] = []; // Add required columns that aren't in visibleColumns at the start diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx index a0e4b181d35d..3371887504cb 100644 --- a/src/pages/Search/SearchColumnsPage.tsx +++ b/src/pages/Search/SearchColumnsPage.tsx @@ -25,13 +25,8 @@ import ROUTES from '@src/ROUTES'; import type {SearchAdvancedFiltersForm} from '@src/types/form'; type ColumnItem = { - text: string; - value: SearchCustomColumnIds; - keyForList: SearchCustomColumnIds; + columnId: SearchCustomColumnIds; isSelected: boolean; - isDisabled: boolean; - isDragDisabled: boolean; - leftElement: React.JSX.Element; }; function SearchColumnsPage() { @@ -68,19 +63,21 @@ function SearchColumnsPage() { const unselected = columnsToSort .filter((col) => !col.isSelected) .sort((a, b) => { - const textA = translate(getSearchColumnTranslationKey(a.value)); - const textB = translate(getSearchColumnTranslationKey(b.value)); + const textA = translate(getSearchColumnTranslationKey(a.columnId)); + const textB = translate(getSearchColumnTranslationKey(b.columnId)); return localeCompare(textA, textB); }); return [...selected, ...unselected]; }; - const defaultColumns = allCustomColumns.map((columnId) => ({ - columnId, - isSelected: defaultCustomColumns.has(columnId), - })); + const defaultColumns = sortColumns( + allCustomColumns.map((columnId) => ({ + columnId, + isSelected: defaultCustomColumns.has(columnId), + })), + ); - const [columns, setColumns] = useState(() => { + const [columns, setColumns] = useState(() => { const selectedColumnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => allCustomColumns.includes(columnId)) ?? []; if (!selectedColumnIds.length) { @@ -90,35 +87,33 @@ function SearchColumnsPage() { const selected = selectedColumnIds.map((columnId) => ({columnId, isSelected: true})); const unselected = allCustomColumns.filter((columnId) => !selectedColumnIds.includes(columnId)).map((columnId) => ({columnId, isSelected: false})); - return [...selected, ...unselected]; + return sortColumns([...selected, ...unselected]); }); const selectedColumnIds = columns.filter((col) => col.isSelected).map((col) => col.columnId); - const allColumnsList = sortColumns( - columns.map(({columnId, isSelected}) => { - const isRequired = requiredColumns.has(columnId); - const isEffectivelySelected = isRequired || isSelected; - const isDragDisabled = !isEffectivelySelected; - return { - text: translate(getSearchColumnTranslationKey(columnId)), - value: columnId, - keyForList: columnId, - isSelected: isEffectivelySelected, - isDisabled: isRequired, - isDragDisabled, - leftElement: ( - - - - ), - }; - }), - ); + const allColumnsList = columns.map(({columnId, isSelected}) => { + const isRequired = requiredColumns.has(columnId); + const isEffectivelySelected = isRequired || isSelected; + const isDragDisabled = !isEffectivelySelected; + return { + text: translate(getSearchColumnTranslationKey(columnId)), + value: columnId, + keyForList: columnId, + isSelected: isEffectivelySelected, + isDisabled: isRequired, + isDragDisabled, + leftElement: ( + + + + ), + }; + }); const typeColumnsList = allColumnsList.filter((column) => allTypeCustomColumns.includes(column.keyForList)); const groupColumnsList = allColumnsList.filter((column) => allGroupCustomColumns.includes(column.keyForList)); @@ -155,7 +150,7 @@ function SearchColumnsPage() { } const updatedColumns = prevColumns.map((col) => (col.columnId === updatedColumnId ? {...col, isSelected: false} : col)); - return updatedColumns; + return sortColumns(updatedColumns); }); }; @@ -163,14 +158,14 @@ function SearchColumnsPage() { const newGroupColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected})); const existingTypeColumns = typeColumnsList.map((item) => ({columnId: item.value, isSelected: item.isSelected})); const newColumns = [...existingTypeColumns, ...newGroupColumns]; - setColumns(newColumns); + setColumns(sortColumns(newColumns)); }; const onTypeDragEnd = ({data}: {data: typeof allColumnsList}) => { const newTypeColumns = data.map((item) => ({columnId: item.value, isSelected: item.isSelected})); const existingGroupColumns = groupColumnsList.map((item) => ({columnId: item.value, isSelected: item.isSelected})); const newColumns = [...existingGroupColumns, ...newTypeColumns]; - setColumns(newColumns); + setColumns(sortColumns(newColumns)); }; const resetColumns = () => { diff --git a/tests/unit/SearchParserTest.ts b/tests/unit/SearchParserTest.ts index 2bf637fd9189..b248fc4576d2 100644 --- a/tests/unit/SearchParserTest.ts +++ b/tests/unit/SearchParserTest.ts @@ -779,32 +779,6 @@ const keywordTests = [ }, }, }, - { - query: 'columns:original-amount,tax,report-id', - expected: { - type: 'expense', - status: CONST.SEARCH.STATUS.EXPENSE.ALL, - sortBy: 'date', - sortOrder: 'desc', - columns: ['originalamount', 'taxAmount', 'base62ReportID'], - filters: null, - }, - }, - { - query: 'type:expense action:submit columns:group-bank-account,group-from', - expected: { - type: 'expense', - status: CONST.SEARCH.STATUS.EXPENSE.ALL, - sortBy: 'date', - sortOrder: 'desc', - columns: ['groupBankAccount', 'groupFrom'], - filters: { - left: 'action', - operator: 'eq', - right: 'submit', - }, - }, - }, ]; describe('search parser', () => {