Fix template preview markup #2304
Merged
Conversation
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
teodosii
reviewed
Jun 22, 2023
| }} | ||
| /> | ||
| ); | ||
| } |
There was a problem hiding this comment.
If just the class differs we could reuse the same block for both html and plain
function renderHTMLOrPlainResult() {
return (
<div
className={cx('message', { 'display-linebreak': templateType === 'plain' })}
dangerouslySetInnerHTML={{
__html: sanitize(result.preview),
}}
/>
);
}There was a problem hiding this comment.
I also use it as a fallback option
https://github.com/grafana/oncall/pull/2304/files#diff-3c6030802a721e3eb3d2709e36949200052f283d912f7add6135ff2ba0fd7290R100
teodosii
approved these changes
Jun 22, 2023
iskhakov
added
pr:no changelog
pr:no public docs
joeyorlando
pushed a commit
that referenced
this pull request
Nov 28, 2023
…3436) Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.6 to 3.9.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/aio-libs/aiohttp/releases">aiohttp's releases</a>.</em></p> <blockquote> <h2>3.9.0</h2> <h2>Features</h2> <ul> <li> <p>Introduced <code>AppKey</code> for static typing support of <code>Application</code> storage. See <a href="https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config">https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config</a></p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/5864">#5864</a>)</p> </li> <li> <p>Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the <code>shutdown_timeout</code> parameter. -- by :user:<code>Dreamsorcerer</code>. See <a href="https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown">https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown</a></p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7188">#7188</a>)</p> </li> <li> <p>Added <code>handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation></code>_ parameter to cancel web handler on client disconnection. -- by :user:<code>mosquito</code> This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7056">#7056</a>)</p> </li> <li> <p>Added support for setting response header parameters <code>max_line_size</code> and <code>max_field_size</code>.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/2304">#2304</a>)</p> </li> <li> <p>Added <code>auto_decompress</code> parameter to <code>ClientSession.request</code> to override <code>ClientSession._auto_decompress</code>. -- by :user:<code>Daste745</code></p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/3751">#3751</a>)</p> </li> <li> <p>Changed <code>raise_for_status</code> to allow a coroutine.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/3892">#3892</a>)</p> </li> <li> <p>Added client brotli compression support (optional with runtime check).</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/5219">#5219</a>)</p> </li> <li> <p>Added <code>client_max_size</code> to <code>BaseRequest.clone()</code> to allow overriding the request body size. -- :user:<code>anesabml</code>.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/5704">#5704</a>)</p> </li> <li> <p>Added a middleware type alias <code>aiohttp.typedefs.Middleware</code>.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/5898">#5898</a>)</p> </li> <li> <p>Exported <code>HTTPMove</code> which can be used to catch any redirection request that has a location -- :user:<code>dreamsorcerer</code>.</p> <p>(<a href="https://redirect.github.com/aio-libs/aiohttp/issues/6594">#6594</a>)</p> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst">aiohttp's changelog</a>.</em></p> <blockquote> <h1>3.9.0 (2023-11-18)</h1> <h2>Features</h2> <ul> <li> <p>Introduced <code>AppKey</code> for static typing support of <code>Application</code> storage. See <a href="https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config">https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config</a></p> <p><code>[#5864](aio-libs/aiohttp#5864) <https://github.com/aio-libs/aiohttp/issues/5864></code>_</p> </li> <li> <p>Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the <code>shutdown_timeout</code> parameter. -- by :user:<code>Dreamsorcerer</code>. See <a href="https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown">https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown</a></p> <p><code>[#7188](aio-libs/aiohttp#7188) <https://github.com/aio-libs/aiohttp/issues/7188></code>_</p> </li> <li> <p>Added <code>handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation></code>_ parameter to cancel web handler on client disconnection. -- by :user:<code>mosquito</code> This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks.</p> <p><code>[#7056](aio-libs/aiohttp#7056) <https://github.com/aio-libs/aiohttp/issues/7056></code>_</p> </li> <li> <p>Added support for setting response header parameters <code>max_line_size</code> and <code>max_field_size</code>.</p> <p><code>[#2304](aio-libs/aiohttp#2304) <https://github.com/aio-libs/aiohttp/issues/2304></code>_</p> </li> <li> <p>Added <code>auto_decompress</code> parameter to <code>ClientSession.request</code> to override <code>ClientSession._auto_decompress</code>. -- by :user:<code>Daste745</code></p> <p><code>[#3751](aio-libs/aiohttp#3751) <https://github.com/aio-libs/aiohttp/issues/3751></code>_</p> </li> <li> <p>Changed <code>raise_for_status</code> to allow a coroutine.</p> <p><code>[#3892](aio-libs/aiohttp#3892) <https://github.com/aio-libs/aiohttp/issues/3892></code>_</p> </li> <li> <p>Added client brotli compression support (optional with runtime check).</p> <p><code>[#5219](aio-libs/aiohttp#5219) <https://github.com/aio-libs/aiohttp/issues/5219></code>_</p> </li> <li> <p>Added <code>client_max_size</code> to <code>BaseRequest.clone()</code> to allow overriding the request body size. -- :user:<code>anesabml</code>.</p> <p><code>[#5704](aio-libs/aiohttp#5704) <https://github.com/aio-libs/aiohttp/issues/5704></code>_</p> </li> <li> <p>Added a middleware type alias <code>aiohttp.typedefs.Middleware</code>.</p> <p><code>[#5898](aio-libs/aiohttp#5898) <https://github.com/aio-libs/aiohttp/issues/5898></code>_</p> </li> <li> <p>Exported <code>HTTPMove</code> which can be used to catch any redirection request that has a location -- :user:<code>dreamsorcerer</code>.</p> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiohttp/commit/45b2c2c5773f0ee0d35fce8ff5716c78e91d9135"><code>45b2c2c</code></a> Release v3.9.0 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7843">#7843</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/5d59d3d6ac073a7db5e5d2234e03a67da5dec48a"><code>5d59d3d</code></a> Release v3.9.0rc0 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7840">#7840</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/c806814a8aaad1661d75e6e2b8d619d6c44d331d"><code>c806814</code></a> Release v3.9.0rc0 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7838">#7838</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/e07a1bdaacfb83fda3ea8f668edacb36c6c125df"><code>e07a1bd</code></a> Use timestamp instead of datetime to achieve faster cookie expiration… (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7837">#7837</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/53476dfd4ef4fb1bb74a267714bbc39eda71b403"><code>53476df</code></a> Disallow arbitrary sequence types in version (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7835">#7835</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7836">#7836</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/9d712f2f9c06f71d48e98374938813643503bc34"><code>9d712f2</code></a> Bump mypy from 1.6.1 to 1.7.0 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7833">#7833</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/63a805e1d8360fd388b6e6443cd9bdfb139e90ea"><code>63a805e</code></a> Bump python-on-whales from 0.66.0 to 0.67.0 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7832">#7832</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/cb94533dd50426809b7fcbb8bbad0ef17509de5c"><code>cb94533</code></a> Ensure writer is always reset on completion (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7815">#7815</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7826">#7826</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/c0f9017a9a34a7823e1ea9b9abb393bd6c10777b"><code>c0f9017</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7821">#7821</a>/366ba40f backport][3.9] Only check origin if insecure scheme and th...</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/9d498ca1e632fe1976ea1dae0ea083b29b0cc4c0"><code>9d498ca</code></a> Bump sphinx from 7.1.1 to 7.2.6 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7606">#7606</a>)</li> <li>Additional commits viewable in <a href="https://github.com/aio-libs/aiohttp/compare/v3.8.6...v3.9.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/grafana/oncall/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
# What this PR does ## Which issue(s) this PR fixes ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does
Which issue(s) this PR fixes
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)