Skip to content

Modify mention user and mention report extras field names in ExpensiMark htmlToText and htmlToMarkdown rules #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luacmartins merged 5 commits into from
May 28, 2024
Merged

Modify mention user and mention report extras field names in ExpensiMark htmlToText and htmlToMarkdown rules #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9353c93
Modify mention user and mention report extras field names
tsa321 May 28, 2024
01bdce7
Retrigger checks
tsa321 May 28, 2024
50e7c5d
Change extras field names in tests
tsa321 May 28, 2024
1137c3f
revert some changes
tsa321 May 28, 2024
0cf9492
Merge main and resolve conflict
tsa321 May 28, 2024
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
4 changes: 2 additions & 2 deletions __tests__/ExpensiMark-HTMLToText-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ test('Mention user html to text', () => {
expect(parser.htmlToText(testString)).toBe('@Hidden');

const extras = {
accountIdToName: {
accountIDToName: {
'1234': 'user@domain.com',
},
};
Expand Down Expand Up @@ -180,7 +180,7 @@ test('Mention report html to text', () => {
expect(parser.htmlToText(testString)).toBe('#Hidden');

const extras = {
reportIdToName: {
reportIDToName: {
'1234': '#room-name',
},
};
Expand Down
4 changes: 2 additions & 2 deletions __tests__/ExpensiMark-Markdown-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ test('Mention user html to markdown', () => {
expect(parser.htmlToMarkdown(testString)).toBe('@Hidden');

const extras = {
accountIdToName: {
accountIDToName: {
'1234': 'user@domain.com',
},
};
Expand Down Expand Up @@ -794,7 +794,7 @@ test('Mention report html to markdown', () => {
expect(parser.htmlToText(testString)).toBe('#Hidden');

const extras = {
reportIdToName: {
reportIDToName: {
'1234': '#room-name',
},
};
Expand Down
2 changes: 1 addition & 1 deletion lib/ExpensiMark.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ declare type Rule = {
};

declare type ExtrasObject = {
reportIdToName?: Record<string, string>;
reportIDToName?: Record<string, string>;
accountIDToName?: Record<string, string>;
};
export default class ExpensiMark {
Expand Down
13 changes: 6 additions & 7 deletions lib/ExpensiMark.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ export default class ExpensiMark {
name: 'reportMentions',
regex: /<mention-report reportID="(\d+)" *\/>/gi,
replacement: (match, g1, offset, string, extras) => {
const reportToNameMap = extras.reportIdToName;
const reportToNameMap = extras.reportIDToName;
if (!reportToNameMap || !reportToNameMap[g1]) {
Log.alert('[ExpensiMark] Missing report name', {reportID: g1});
return '#Hidden';
Expand All @@ -478,13 +478,13 @@ export default class ExpensiMark {
regex: /(?:<mention-user accountID="(\d+)" *\/>)|(?:<mention-user>(.*?)<\/mention-user>)/gi,
replacement: (match, g1, g2, offset, string, extras) => {
if (g1) {
const accountToNameMap = extras.accountIdToName;
const accountToNameMap = extras.accountIDToName;
if (!accountToNameMap || !accountToNameMap[g1]) {
Log.alert('[ExpensiMark] Missing account name', {accountID: g1});
return '@Hidden';
}

return `@${extras.accountIdToName[g1]}`;
return `@${extras.accountIDToName[g1]}`;
}
return Str.removeSMSDomain(g2);
},
Expand Down Expand Up @@ -536,7 +536,7 @@ export default class ExpensiMark {
name: 'reportMentions',
regex: /<mention-report reportID="(\d+)" *\/>/gi,
replacement: (match, g1, offset, string, extras) => {
const reportToNameMap = extras.reportIdToName;
const reportToNameMap = extras.reportIDToName;
if (!reportToNameMap || !reportToNameMap[g1]) {
Log.alert('[ExpensiMark] Missing report name', {reportID: g1});
return '#Hidden';
Expand All @@ -549,13 +549,12 @@ export default class ExpensiMark {
name: 'userMention',
regex: /<mention-user accountID="(\d+)" *\/>/gi,
replacement: (match, g1, offset, string, extras) => {
const accountToNameMap = extras.accountIdToName;
const accountToNameMap = extras.accountIDToName;
if (!accountToNameMap || !accountToNameMap[g1]) {
Log.alert('[ExpensiMark] Missing account name', {accountID: g1});
return '@Hidden';
}

return `@${extras.accountIdToName[g1]}`;
return `@${extras.accountIDToName[g1]}`;
},
},
{
Expand Down