-
Notifications
You must be signed in to change notification settings - Fork 154
[REF] runbot: tracking_value revamp #1253
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
Draft
pparidans
wants to merge
1
commit into
19.0
Choose a base branch
from
19.0-ref-stuff-app
base: 19.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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
This file contains hidden or 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,74 +1,78 @@ | ||
| /** @odoo-module **/ | ||
| import { patch } from "@web/core/utils/patch"; | ||
| import { Message } from "@mail/core/common/message"; | ||
| import { CopyButton } from "@web/core/copy_button/copy_button"; | ||
| import { memoize } from "@web/core/utils/functions"; | ||
|
|
||
| const diffMatchPatch = new diff_match_patch(); | ||
|
|
||
| function makeDiff(text1, text2) { | ||
| const { chars1, chars2, lineArray } = diffMatchPatch.diff_linesToChars_(text1, text2); | ||
| const diffs = diffMatchPatch.diff_main(chars1, chars2, false); | ||
| diffMatchPatch.diff_charsToLines_(diffs, lineArray); | ||
| diffMatchPatch.diff_cleanupSemantic(diffs); | ||
| return diffs; | ||
| } | ||
|
|
||
| function prepareForRendering(diffs) { | ||
| const lines = []; | ||
| let preLineCounter = 0; | ||
| let postLineCounter = 0; | ||
| for (const { 0: diffType, 1: data } of diffs) { | ||
| for (let line of data.split("\n")) { | ||
| line = line.replace(/&/g, "&"); | ||
| line = line.replace(/</g, "<"); | ||
| line = line.replace(/>/g, ">"); | ||
| //text = text.replace(/\n/g, "<br>"); | ||
| //text = text.replace(/ /g, "  "); | ||
| let type; | ||
| if (diffType === -1) { | ||
| type = "removed"; | ||
| preLineCounter += 1; | ||
| } else if (diffType === 0) { | ||
| type = "kept"; | ||
| preLineCounter += 1; | ||
| postLineCounter += 1; | ||
| } else if (diffType === 1) { | ||
| type = "added"; | ||
| postLineCounter += 1; | ||
| } | ||
| lines.push({ type, preLineCounter, postLineCounter, line }); | ||
| } | ||
| } | ||
| return lines; | ||
| } | ||
|
|
||
| function computeDiff({ oldValue, newValue }) { | ||
| const diff = makeDiff(oldValue, newValue); | ||
| return prepareForRendering(diff); | ||
| } | ||
|
|
||
| patch(Message, { | ||
| components: { | ||
| ...Message.components, | ||
| CopyButton, | ||
| }, | ||
| }); | ||
|
|
||
| patch(Message.prototype, { | ||
| setup() { | ||
| super.setup(...arguments); | ||
| this.kept = false; | ||
| this.state.showKept = false; | ||
| }, | ||
| isMultiline(trackingValue) { | ||
| const oldValue = trackingValue.oldValue; | ||
| const newValue = trackingValue.newValue; | ||
| return ((oldValue && typeof oldValue=== 'string' && oldValue.includes('\n')) && (newValue && typeof oldValue=== 'string' && newValue.includes('\n'))) | ||
| }, | ||
| formatTracking(trackingFieldInfo, trackingValue) { | ||
| return super.formatTracking(trackingFieldInfo, trackingValue) | ||
|
|
||
| lines: memoize(computeDiff), | ||
|
|
||
| isMultiline({ oldValue, newValue }) { | ||
| return ( | ||
| typeof oldValue === "string" && | ||
| oldValue.includes("\n") && | ||
| typeof oldValue === "string" && | ||
| newValue.includes("\n") | ||
| ); | ||
| }, | ||
|
|
||
| toggleKept() { | ||
| this.kept = !this.kept; | ||
| }, | ||
| copyToClipboard(trackingValue) { | ||
| return function () { | ||
| navigator.clipboard.writeText(trackingValue); | ||
| }; | ||
| this.state.showKept = !this.state.showKept; | ||
| }, | ||
| lines(trackingValue) { | ||
| const oldValue = trackingValue.oldValue; | ||
| const newValue = trackingValue.newValue; | ||
| const diff = this.makeDiff(oldValue, newValue); | ||
| const lines = this.prepareForRendering(diff); | ||
| return lines; | ||
| }, | ||
| makeDiff(text1, text2) { | ||
| var dmp = new diff_match_patch(); | ||
| var a = dmp.diff_linesToChars_(text1, text2); | ||
| var lineText1 = a.chars1; | ||
| var lineText2 = a.chars2; | ||
| var lineArray = a.lineArray; | ||
| var diffs = dmp.diff_main(lineText1, lineText2, false); | ||
| dmp.diff_charsToLines_(diffs, lineArray); | ||
| dmp.diff_cleanupSemantic(diffs); | ||
| return diffs; | ||
| }, | ||
| prepareForRendering(diffs) { | ||
| var lines = []; | ||
| var pre_line_counter = 0 | ||
| var post_line_counter = 0 | ||
| for (var x = 0; x < diffs.length; x++) { | ||
| var diff_type = diffs[x][0]; | ||
| var data = diffs[x][1]; | ||
| var data_lines = data.split('\n'); | ||
| for (var line_index in data_lines) { | ||
| var line = data_lines[line_index]; | ||
| line = line.replace(/&/g, '&'); | ||
| line = line.replace(/</g, '<'); | ||
| line = line.replace(/>/g, '>'); | ||
| //text = text.replace(/\n/g, '<br>'); | ||
| //text = text.replace(/ /g, '  '); | ||
| if (diff_type == -1) { | ||
| lines.push({type:'removed', pre_line_counter: pre_line_counter, post_line_counter: '-', line: line}) | ||
| pre_line_counter += 1 | ||
| } else if (diff_type == 0) { | ||
| lines.push({type:'kept', pre_line_counter: '', post_line_counter: post_line_counter, line: line}) | ||
| pre_line_counter += 1 | ||
| post_line_counter +=1 | ||
| } else if (diff_type == 1) { | ||
| lines.push({type:'added', pre_line_counter: '+', post_line_counter: post_line_counter, line: line}) | ||
| post_line_counter +=1 | ||
| } | ||
| } | ||
| } | ||
| return lines; | ||
| }, | ||
| }); | ||
This file contains hidden or 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,29 +1,43 @@ | ||
| .code_diff { | ||
| white-space: nowrap; | ||
| overflow-x: auto; | ||
| font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; | ||
| .code-diff { | ||
| .table { | ||
| > tbody { | ||
| font-family: var(--font-monospace); | ||
| font-size: 0.75rem; | ||
| line-height: 1; | ||
| white-space: nowrap; | ||
| } | ||
|
|
||
| .col_number { | ||
| background-color: #EEE; | ||
| } | ||
| > :not(caption) > * { | ||
| border-width: 0 var(--border-width); | ||
|
|
||
| .added { | ||
| background:#a1f1a1; | ||
| } | ||
|
|
||
| .removed { | ||
| background:#f3a3a3; | ||
| &:first-child { | ||
| border-top-width: var(--border-width); | ||
| } | ||
|
|
||
| &:last-child { | ||
| border-bottom-width: var(--border-width); | ||
| } | ||
|
|
||
| > * { | ||
| border-width: 0; | ||
| padding: 0.3rem; | ||
|
|
||
| &.diff-line-sign { | ||
| border-left-width: var(--border-width); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .code { | ||
| white-space: pre-wrap; | ||
|
|
||
| .diff-line-number { | ||
| width: 4ch; | ||
| } | ||
| .diff_line { | ||
| background-color: #FFF; | ||
|
|
||
| .diff-line-sign { | ||
| width: 2ch; | ||
| } | ||
|
|
||
| .diff_line:hover { | ||
| filter: brightness(92%); | ||
| .diff-line-code { | ||
| white-space: pre-wrap; | ||
| } | ||
|
|
||
| } |
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.