-
Notifications
You must be signed in to change notification settings - Fork 49
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
feat: Adjust companion to new designs #3650
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
6947f14
adjust first components to new designs
chriskari 6b6e9aa
Merge branch 'main' of https://github.com/kyma-project/busola into up…
chriskari a8f031e
feat: adjust input alignment
chriskari 62b5ffb
feat: adjusted code panels, implemented syntax highlighting
chriskari 8de2657
temporarily uninstall packages
chriskari e665b6a
Merge branch 'main' of https://github.com/kyma-project/busola into up…
chriskari ab3e85d
reinstall packages
chriskari 97d7d38
directly use ui5 color for styling messages
chriskari 77669f5
feat: add copy to clipboard functionality
chriskari 73547c2
fix: adjust disclaimer
chriskari File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 14 additions & 14 deletions
28
src/components/KymaCompanion/components/Chat/messages/CodePanel.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| .code-response { | ||
| background-color: #484848; | ||
| color: white; | ||
| background-color: var(--sapBaseColor); | ||
| padding: 0.75rem; | ||
| border-radius: 4px; | ||
| position: relative; | ||
|
|
||
| .text { | ||
| color: white; | ||
| #copy-icon { | ||
| position: absolute; | ||
| top: 0.5rem; | ||
| right: 0.75rem; | ||
| } | ||
|
|
||
| #code-text { | ||
| white-space: pre-wrap; | ||
| } | ||
| } | ||
|
|
||
| .code-panel::part(header) { | ||
| background-color: #484848; | ||
| color: white; | ||
| background-color: var(--sapBaseColor); | ||
| border-radius: 4px 4px 0 0; | ||
| font-size: 0.9rem; | ||
| padding: 0.5rem 0.75rem !important; | ||
| } | ||
|
|
||
| .code-panel::part(content) { | ||
| background-color: #484848; | ||
| background-color: var(--sapBaseColor); | ||
| border-radius: 0 0 4px 4px; | ||
| } | ||
|
|
||
| .code-panel { | ||
| .text { | ||
| color: white; | ||
| } | ||
| padding: 0; | ||
| } |
85 changes: 80 additions & 5 deletions
85
src/components/KymaCompanion/components/Chat/messages/CodePanel.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,95 @@ | ||
| import { Text, Panel } from '@ui5/webcomponents-react'; | ||
| import { Text, Panel, Title, Icon, FlexBox } from '@ui5/webcomponents-react'; | ||
| import { formatCodeSegment } from 'components/KymaCompanion/utils/formatMarkdown'; | ||
| import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; | ||
| import { useRecoilValue } from 'recoil'; | ||
| import { | ||
| isCurrentThemeDark, | ||
| Theme, | ||
| themeState, | ||
| } from 'state/preferences/themeAtom'; | ||
| import copyToCliboard from 'copy-to-clipboard'; | ||
| import './CodePanel.scss'; | ||
|
|
||
| function getCustomTheme(theme: Theme) { | ||
| const isDark = isCurrentThemeDark(theme); | ||
| const monacoEditorKeyColorLight = '#008080'; | ||
| const monacoEditorKeyColorDark = '#3dc9b0'; | ||
| const monacoEditorTextColorLight = '#0451a5'; | ||
| const monacoEditorTextColorDark = '#ce9178'; | ||
|
|
||
| return { | ||
| 'code[class*="language-"]': { | ||
| color: isDark ? monacoEditorTextColorDark : monacoEditorTextColorLight, | ||
| background: 'var(--sapBaseColor)', | ||
| fontFamily: 'var(--sapFontFamily)', | ||
| fontSize: '14px', | ||
| }, | ||
| 'pre[class*="language-"]': { | ||
| background: 'var(--sapBaseColor)', | ||
| padding: '0 0.75rem', | ||
| margin: '0.5rem 0', | ||
| borderRadius: '8px', | ||
| }, | ||
| comment: { | ||
| color: isDark ? 'var(--sapLinkColor)' : monacoEditorTextColorDark, | ||
| }, | ||
| keyword: { | ||
| color: isDark ? monacoEditorKeyColorDark : monacoEditorKeyColorLight, | ||
| }, | ||
| key: { | ||
| color: isDark ? monacoEditorKeyColorDark : monacoEditorKeyColorLight, | ||
| }, | ||
| punctuation: { | ||
| color: 'var(--sapTextColor)', | ||
| }, | ||
| operator: { color: 'var(--sapTextColor)' }, | ||
| function: { color: 'var(--sapChart_OrderedColor_4)' }, | ||
| number: { | ||
| color: 'var(--sapChart_OrderedColor_4)', | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| interface CodePanelProps { | ||
| text: string; | ||
| } | ||
|
|
||
| export default function CodePanel({ text }: CodePanelProps): JSX.Element { | ||
| const theme = useRecoilValue(themeState); | ||
| const syntaxTheme = getCustomTheme(theme); | ||
| const { language, code } = formatCodeSegment(text); | ||
| return !language ? ( | ||
| <div className="code-response"> | ||
| <Text className="text">{code}</Text> | ||
| <div className="code-response sap-margin-y-small"> | ||
| <Icon | ||
| id="copy-icon" | ||
| mode="Interactive" | ||
| name="copy" | ||
| design="Information" | ||
| onClick={() => copyToCliboard(code)} | ||
| /> | ||
| <Text id="code-text">{code}</Text> | ||
| </div> | ||
| ) : ( | ||
| <Panel headerText={language} className="code-panel" fixed> | ||
| <Text className="text">{code}</Text> | ||
| <Panel | ||
| className="code-panel sap-margin-y-small" | ||
| header={ | ||
| <FlexBox alignItems="Center" fitContainer justifyContent="SpaceBetween"> | ||
| <Title level="H6" size="H6"> | ||
| {language} | ||
| </Title> | ||
| <Icon | ||
| mode="Interactive" | ||
| name="copy" | ||
| design="Information" | ||
| onClick={() => copyToCliboard(code)} | ||
| /> | ||
| </FlexBox> | ||
| } | ||
| fixed | ||
| > | ||
| <SyntaxHighlighter language={language} style={syntaxTheme} wrapLongLines> | ||
| {code} | ||
| </SyntaxHighlighter> | ||
| </Panel> | ||
| ); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.