Skip to content
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.

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

Smart report actions #56545

Draft
wants to merge 43 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
49d2c43
Initial work
blazejkustra Feb 7, 2025
a66088f
Initial implementation of the list of composer commands
fabioh8010 Feb 7, 2025
5d4b00d
Merge pull request #11 from fabioh8010/hackaton/commands/list
blazejkustra Feb 7, 2025
67f0833
Add translations
blazejkustra Feb 7, 2025
b61309a
Fix available commands
blazejkustra Feb 7, 2025
f27ce61
suggestCommands util
blazejkustra Feb 7, 2025
b82ab34
Fix one type
blazejkustra Feb 7, 2025
c680a82
Finish styling suggestions
blazejkustra Feb 7, 2025
7b21cd8
Update size of the icon
blazejkustra Feb 7, 2025
b2e694d
Merge pull request #12 from fabioh8010/hackathon/suggestions-impl
blazejkustra Feb 7, 2025
5ba93da
Initial API integration with commands in composer
fabioh8010 Feb 7, 2025
7c236c9
Add optional arguments!
blazejkustra Feb 7, 2025
49c54ac
Merge remote-tracking branch 'fork/hackathon/commands' into composer-…
fabioh8010 Feb 7, 2025
801ccc2
Merge pull request #13 from fabioh8010/hackathon/suggestions-impl
blazejkustra Feb 7, 2025
12d2e61
Minor fixes
fabioh8010 Feb 7, 2025
1ed0b48
Merge remote-tracking branch 'fork/hackathon/commands' into composer-…
fabioh8010 Feb 7, 2025
5a5377a
Merge pull request #14 from fabioh8010/composer-commands-api-integration
fabioh8010 Feb 7, 2025
ea28ae9
Handle disabled commands
blazejkustra Feb 7, 2025
1a6c3e8
Merge pull request #15 from fabioh8010/hackathon/suggestions-impl
fabioh8010 Feb 7, 2025
28f0ad0
Fixes optimistically composer command messages order
fabioh8010 Feb 7, 2025
5b2e646
Fix API parameters to send the whole text
fabioh8010 Feb 7, 2025
ad1c2ac
Do not group whisper report actions
fabioh8010 Feb 7, 2025
446af90
Merge pull request #16 from fabioh8010/composer-commands-api-fixes
blazejkustra Feb 7, 2025
d602635
Add background for /summarize command
blazejkustra Feb 7, 2025
b248304
workaround for comments
blazejkustra Feb 8, 2025
cc12888
Merge branch 'hackathon/commands' into hackathon/suggestions-impl
blazejkustra Feb 8, 2025
7798210
Remove workaround
blazejkustra Feb 8, 2025
76a72e3
Add new patch
blazejkustra Feb 8, 2025
607d8c3
Merge pull request #17 from fabioh8010/hackathon/suggestions-impl
blazejkustra Feb 8, 2025
db7feec
Implement Concierge AI button
fabioh8010 Feb 8, 2025
8e740b6
Merge pull request #18 from fabioh8010/composer-commands-concierge-ai…
blazejkustra Feb 8, 2025
b8f1248
Fix patch
blazejkustra Feb 8, 2025
5175457
Dont allow command suggestion during editing
fabioh8010 Feb 8, 2025
6061212
Merge pull request #19 from fabioh8010/composer-commands-dont-allow-s…
fabioh8010 Feb 8, 2025
d5c3bbd
minor fix to command suggestion icon
fabioh8010 Feb 8, 2025
1d2a333
Change the color of summarize to green
blazejkustra Feb 8, 2025
2230ba1
Add regex to identify commands in comments before removing leading co…
blazejkustra Feb 8, 2025
79a8b31
Merge branch 'hackathon/commands' of github.com:fabioh8010/expensify-…
blazejkustra Feb 8, 2025
910053c
Fixes to command suggestions
fabioh8010 Feb 8, 2025
6329365
Merge remote-tracking branch 'refs/remotes/fork/hackathon/commands' i…
fabioh8010 Feb 8, 2025
d5e6d2e
Fix clicking on disabled commands
blazejkustra Feb 8, 2025
c1a1b03
pie chart icon
fabioh8010 Feb 8, 2025
b0f1305
Add new font and make the loading state more awesome
blazejkustra Feb 11, 2025
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
7 changes: 7 additions & 0 deletions assets/css/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@
src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
}

@font-face {
font-family: Revelation Regular;
font-weight: 500;
font-style: normal;
src: url('/fonts/Font-Revelation-Regular.woff2') format('woff2'), url('/fonts/Font-Revelation-Regular.woff') format('woff');
}

@font-face {
font-family: Windows Segoe UI Emoji;
src: url('/fonts/seguiemj.ttf');
Expand Down
Binary file added assets/fonts/web/Font-Revelation-Regular.woff
Binary file not shown.
Binary file added assets/fonts/web/Font-Revelation-Regular.woff2
Binary file not shown.
7 changes: 7 additions & 0 deletions assets/images/pie-chart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions patches/@expensify+react-native-live-markdown+0.1.230.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff --git a/node_modules/@expensify/react-native-live-markdown/lib/module/parseExpensiMark.js b/node_modules/@expensify/react-native-live-markdown/lib/module/parseExpensiMark.js
index f492c22..f31996c 100644
--- a/node_modules/@expensify/react-native-live-markdown/lib/module/parseExpensiMark.js
+++ b/node_modules/@expensify/react-native-live-markdown/lib/module/parseExpensiMark.js
@@ -142,6 +142,8 @@ function parseTreeToTextAndRanges(tree) {
addChildrenWithStyle(node, 'mention-user');
} else if (node.tag === '<mention-short>') {
addChildrenWithStyle(node, 'mention-short');
+ } else if (node.tag === '<command>') {
+ addChildrenWithStyle(node, 'command');
} else if (node.tag === '<mention-report>') {
addChildrenWithStyle(node, 'mention-report');
} else if (node.tag === '<blockquote>') {
diff --git a/node_modules/@expensify/react-native-live-markdown/lib/module/styleUtils.js b/node_modules/@expensify/react-native-live-markdown/lib/module/styleUtils.js
index 1ab9c63..74a89d2 100644
--- a/node_modules/@expensify/react-native-live-markdown/lib/module/styleUtils.js
+++ b/node_modules/@expensify/react-native-live-markdown/lib/module/styleUtils.js
@@ -47,6 +47,10 @@ function makeDefaultMarkdownStyle() {
color: 'red',
backgroundColor: 'pink'
},
+ command: {
+ color: 'green',
+ backgroundColor: 'lime'
+ },
inlineImage: {
minWidth: 50,
minHeight: 50,
diff --git a/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/blockUtils.js b/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/blockUtils.js
index ad119d2..a47fce9 100644
--- a/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/blockUtils.js
+++ b/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/blockUtils.js
@@ -34,6 +34,9 @@ function addStyleToBlock(targetElement, type, markdownStyle, isMultiline = true)
case 'mention-here':
Object.assign(node.style, markdownStyle.mentionHere);
break;
+ case 'command':
+ Object.assign(node.style, markdownStyle.command);
+ break;
case 'mention-user':
Object.assign(node.style, markdownStyle.mentionUser);
break;
diff --git a/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/parserUtils.js b/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/parserUtils.js
index dcbe8fa..c096d8f 100644
--- a/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/parserUtils.js
+++ b/node_modules/@expensify/react-native-live-markdown/lib/module/web/utils/parserUtils.js
@@ -76,7 +76,7 @@ function addTextToElement(node, text, isMultiline = true) {
span.appendChild(document.createTextNode(line));
appendNode(span, node, 'text', line.length);
const parentType = (_span$parentElement = span.parentElement) === null || _span$parentElement === void 0 ? void 0 : _span$parentElement.dataset.type;
- if (!isMultiline && parentType && ['pre', 'code', 'mention-here', 'mention-user', 'mention-report'].includes(parentType)) {
+ if (!isMultiline && parentType && ['pre', 'code', 'mention-here', 'mention-user', 'mention-report', 'command'].includes(parentType)) {
// this is a fix to background colors being shifted downwards in a singleline input
addStyleToBlock(span, 'text', {}, false);
}
Loading