Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/MoneyRequestConfirmationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ function MoneyRequestConfirmationList({
if (enabledTags.length !== 1 || getTag(transaction, index)) {
return;
}
updatedTagsString = insertTagIntoTransactionTagsString(updatedTagsString, enabledTags.at(0)?.name ?? '', index);
updatedTagsString = insertTagIntoTransactionTagsString(updatedTagsString, enabledTags.at(0)?.name ?? '', index, policy?.hasMultipleTagLists ?? false);
});
if (updatedTagsString !== getTag(transaction) && updatedTagsString) {
setMoneyRequestTag(transactionID, updatedTagsString);
Expand Down
7 changes: 6 additions & 1 deletion src/libs/IOUUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,14 @@ function isValidMoneyRequestType(iouType: string): boolean {
* @param transactionTags - currently selected tags for a report
* @param tag - a newly selected tag, that should be added to the transactionTags
* @param tagIndex - the index of a tag list
* @param hasMultipleTagLists - whether the policy has multiple levels tag
* @returns
*/
function insertTagIntoTransactionTagsString(transactionTags: string, tag: string, tagIndex: number): string {
function insertTagIntoTransactionTagsString(transactionTags: string, tag: string, tagIndex: number, hasMultipleTagLists: boolean): string {
Comment thread
grgia marked this conversation as resolved.
if (!hasMultipleTagLists) {
return tag;
}

const tagArray = getTagArrayFromName(transactionTags);
tagArray[tagIndex] = tag;

Expand Down
5 changes: 3 additions & 2 deletions src/pages/Debug/DebugTagPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@ function DebugTagPicker({policyID, tagName = '', onSubmit}: DebugTagPickerProps)
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {canBeMissing: true});
const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);

const [hasMultipleTagLists] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true, selector: (policy) => policy?.hasMultipleTagLists});
const updateTagName = useCallback(
(index: number) =>
({text}: ListItem) => {
const newTag = text === selectedTags.at(index) ? undefined : text;
const updatedTagName = insertTagIntoTransactionTagsString(newTagName, newTag ?? '', index);
const updatedTagName = insertTagIntoTransactionTagsString(newTagName, newTag ?? '', index, hasMultipleTagLists ?? false);
if (policyTagLists.length === 1) {
return onSubmit({text: updatedTagName});
}
setNewTagName(updatedTagName);
},
[newTagName, onSubmit, policyTagLists.length, selectedTags],
[newTagName, onSubmit, policyTagLists.length, selectedTags, hasMultipleTagLists],
);

const submitTag = useCallback(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/iou/request/step/IOURequestStepTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function IOURequestStepTag({
updatedTag = tagParts.join(':');
} else {
// Independent tags (fallback): use comma-separated list
updatedTag = insertTagIntoTransactionTagsString(transactionTag, isSelectedTag ? '' : searchText, tagListIndex);
updatedTag = insertTagIntoTransactionTagsString(transactionTag, isSelectedTag ? '' : searchText, tagListIndex, policy?.hasMultipleTagLists ?? false);
}

if (isEditingSplit) {
Expand Down
16 changes: 12 additions & 4 deletions tests/unit/IOUUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,27 @@ describe('IOUUtils', () => {

describe('insertTagIntoTransactionTagsString', () => {
test('Inserting a tag into tag string should update the tag', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString(':NY:Texas', 'California', 2)).toBe(':NY:California');
expect(IOUUtils.insertTagIntoTransactionTagsString(':NY:Texas', 'California', 2, true)).toBe(':NY:California');
});

test('Inserting a tag into an index with no tags should update the tag', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString('::California', 'NY', 1)).toBe(':NY:California');
expect(IOUUtils.insertTagIntoTransactionTagsString('::California', 'NY', 1, true)).toBe(':NY:California');
});

test('Inserting a tag with colon in name into tag string should keep the colon in tag', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'City \\: \\:', 1)).toBe('East:City \\: \\::California');
expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'City \\: \\:', 1, true)).toBe('East:City \\: \\::California');
});

test('Remove a tag from tagString', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString('East:City \\: \\::California', '', 1)).toBe('East::California');
expect(IOUUtils.insertTagIntoTransactionTagsString('East:City \\: \\::California', '', 1, true)).toBe('East::California');
});

test('Return single tag directly when hasMultipleTagLists is false', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'NewTag', 1, false)).toBe('NewTag');
});

test('Return multiple tags when hasMultipleTagLists is true', () => {
expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'NewTag', 1, true)).toBe('East:NewTag:California');
});
});
});
Expand Down
Loading