-
Notifications
You must be signed in to change notification settings - Fork 82
[ADD] util/report: util.add_report #360
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
Open
diagnoza
wants to merge
1
commit into
odoo:master
Choose a base branch
from
odoo-dev:master-add_report-owi
base: master
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.
Open
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
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 |
|---|---|---|
|
|
@@ -106,7 +106,7 @@ def html_escape(text): | |
| } | ||
|
|
||
|
|
||
| def add_to_migration_reports(message, category="Other", format="text"): | ||
| def report(message, category="Other", format="text"): | ||
| assert format in {"text", "html", "md", "rst"} | ||
| if format == "md": | ||
| message = md2html(dedent(message)) | ||
|
|
@@ -126,6 +126,89 @@ def add_to_migration_reports(message, category="Other", format="text"): | |
| _logger.warning("Upgrade report is growing suspiciously long: %s characters so far.", migration_reports_length) | ||
|
|
||
|
|
||
| add_to_migration_reports = report | ||
|
|
||
|
|
||
| def report_with_summary(summary, details, category="Other"): | ||
| """Append the upgrade report with a new entry. | ||
|
|
||
| :param str summary: Description of a report entry. | ||
| :param str details: Detailed description that is going to be folded by default. | ||
| :param str category: Title of a report entry. | ||
| """ | ||
| msg = ( | ||
| "<summary>{}<details>{}</details></summary>".format(summary, details) | ||
| if details | ||
| else "<summary>{}</summary>".format(summary) | ||
| ) | ||
| report(message=msg, category=category, format="html") | ||
| return msg | ||
|
|
||
|
|
||
| def report_with_list(summary, data, columns, row_format, links=None, total=None, limit=100, category="Other"): | ||
| """Append the upgrade report with a new entry that displays a list of records. | ||
|
|
||
| The entry consists of a category (title) and a summary (body). | ||
| The entry displays a list of records previously returned by SQL query, or any list. | ||
|
|
||
| .. example:: | ||
|
|
||
| .. code-block:: python | ||
|
|
||
| total = cr.rowcount | ||
| data = cr.fetchmany(20) | ||
| util.report_with_list( | ||
| summary="The following records were altered.", | ||
| data=data, | ||
| columns=("id", "name", "city", "comment", "company_id", "company_name"), | ||
| row_format="Partner with id {partner_link} works at company {company_link} in {city}, ({comment})", | ||
| links={"company_link": ("res.company", "company_id", "company_name"), "partner_link": ("res.partner", "id", "name")}, | ||
| total=total, | ||
| category="Accounting" | ||
| ) | ||
|
|
||
| :param str summary: description of a report entry. | ||
| :param list(tuple) data: data to report, each entry would be a row in the report. | ||
| It could be empty, in which case only the summary is rendered. | ||
| :param tuple(str) columns: columns in `data`, can be referenced in `row_format`. | ||
| :param str row_format: format for rows, can use any name from `columns` or `links`, e.g.: | ||
| "Partner {partner_link} that lives in {city} works at company {company_link}." | ||
| :param dict(str, tuple(str, str, str)) links: optional model/record links spec, | ||
| the keys can be referenced in `row_format`. | ||
| :param int total: optional, total number of records. | ||
| Taken as `len(data)` when `None` is passed. | ||
| Useful when `data` was limited by the caller. | ||
| :param int limit: maximum number of records to list in the report. | ||
| If `data` contains more records the `total` number would be | ||
| included in the report as well. | ||
| :param str category: title of a report entry. | ||
| """ | ||
|
|
||
| def row_to_html(row): | ||
| row_dict = dict(zip(columns, row)) | ||
| if links: | ||
| row_dict.update( | ||
| { | ||
| link: get_anchor_link_to_record(rec_model, row_dict[id_col], row_dict[name_col]) | ||
| for link, (rec_model, id_col, name_col) in links.items() | ||
| } | ||
| ) | ||
| return "<li>{}</li>".format(row_format.format(**row_dict)) | ||
|
|
||
| if not data: | ||
| row_to_html(columns) # Validate the format is correct, including links | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It will fail. (a.k.a tests are missing) |
||
| return report_with_summary(summary=summary, details="", category=category) | ||
|
|
||
| limit = min(limit, len(data)) | ||
| total = len(data) if total is None else total | ||
| disclaimer = "The total number of affected records is {}.".format(total) | ||
| if total > limit: | ||
| disclaimer += " This list is limited to {} records.".format(limit) | ||
|
|
||
| rows = "<ul>\n" + "\n".join([row_to_html(row) for row in data[:limit]]) + "\n</ul>" | ||
| return report_with_summary(summary, "<i>{}</i>{}".format(disclaimer, rows), category) | ||
|
|
||
|
|
||
| def announce_release_note(cr): | ||
| filepath = os.path.join(os.path.dirname(__file__), "release-note.xml") | ||
| with open(filepath, "rb") as fp: | ||
|
|
||
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.
I had to pass the default arguments as regular ones, because of how the tested method is called in
test_report_with_list. Simply leaving them out would obviously result inPassing them as
Nonealso wouldn't work, because since Python differentiates between "no argument passed" andNone, they would actually be set toNoneinstead of taking the default value. And if we passcategory=None, thenadd_to_migration_reportswill break on runninglen(None).