From 3d897f33f668f16bcb34c0ae0b1a61bb33ad5051 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sat, 22 Jun 2024 10:50:02 +0300 Subject: [PATCH 1/8] Sort headers, fix overflowing, copy curl --- src/Renderer/HtmlRenderer.php | 14 +++++++----- templates/_call-stack-item.php | 2 +- templates/development.css | 22 ++++++++++-------- templates/development.php | 41 +++++++++++++++++++++++++--------- 4 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php index b3449d5..5f56ff3 100644 --- a/src/Renderer/HtmlRenderer.php +++ b/src/Renderer/HtmlRenderer.php @@ -341,17 +341,19 @@ public function renderRequest(ServerRequestInterface $request): string { $output = $request->getMethod() . ' ' . $request->getUri() . "\n"; - foreach ($request->getHeaders() as $name => $values) { - if ($name === 'Host') { - continue; - } + $headers = $request->getHeaders(); + unset($headers['Host']); + ksort($headers); + foreach ($headers as $name => $values) { foreach ($values as $value) { $output .= "$name: $value\n"; } } - $output .= "\n" . $request->getBody() . "\n\n"; + if (!empty($request->getBody())) { + $output .= "\n" . $request->getBody() . "\n\n"; + } return '
' . $this->htmlEncode(rtrim($output, "\n")) . '
'; } @@ -371,7 +373,7 @@ public function renderCurl(ServerRequestInterface $request): string return $this->htmlEncode('Error generating curl command: ' . $e->getMessage()); } - return '
' . $this->htmlEncode($output) . '
'; + return $output; } /** diff --git a/templates/_call-stack-item.php b/templates/_call-stack-item.php index 4a55ff5..d94380a 100644 --- a/templates/_call-stack-item.php +++ b/templates/_call-stack-item.php @@ -21,7 +21,7 @@
  • -
    +
    htmlEncode($file)}" ?> diff --git a/templates/development.css b/templates/development.css index 2a5ca02..2da71c9 100644 --- a/templates/development.css +++ b/templates/development.css @@ -3,12 +3,6 @@ html, body, div, span, -h1, -h2, -h3, -h4, -h5, -h6, p, pre, a, @@ -344,13 +338,13 @@ header .previous h3 { height: 150px; } -#copy-stacktrace { +.copy-clipboard { position: absolute; right: 40px; top: 44px; } -#copy-stacktrace:hover svg path { +.copy-clipboard:hover svg path { fill: var(--icon-hover-color); } @@ -387,6 +381,10 @@ main { flex: 1; } +.mw-100 { + max-width: 100%; +} + /* call stack */ .call-stack ul li, .request { @@ -460,6 +458,9 @@ main { .call-stack ul li .element-wrap .function-info { display: inline-block; + line-break: normal; + overflow-wrap: break-word; + word-break: break-word; } .call-stack ul li.application .element-wrap { @@ -557,12 +558,15 @@ main { /* request */ .request { - padding: 20px 30px; + position: relative; font-size: 14px; line-height: 18px; overflow-x: auto; font-family: JetBrains Mono, Consolas, monospace; } +.request .body { + overflow: auto; +} /* end request */ /* footer */ diff --git a/templates/development.php b/templates/development.php index 5b61714..896dea1 100644 --- a/templates/development.php +++ b/templates/development.php @@ -87,7 +87,7 @@ Copied! - + @@ -101,12 +101,25 @@
    renderRequest($request)) !== ''): ?>
    - +

    Request info

    +
    + +
    renderCurl($request)) !== 'curl'): ?>
    - + + Copied! +

    cURL

    +     + + + + +
    +
    htmlEncode($curlInfo) ?>
    +
    @@ -248,29 +261,37 @@ } // handle copy stacktrace action on clipboard button - document.getElementById('copy-stacktrace').onclick = function(e) { + const copyIntoClipboard = function(e) { e.preventDefault(); - var textarea = document.getElementById('clipboard'); + const parentContainer = e.currentTarget.parentElement; + console.log('parentContainer',parentContainer) + const textarea = parentContainer.querySelector('#clipboard'); textarea.focus(); textarea.select(); - var succeeded; + let succeeded; try { succeeded = document.execCommand('copy'); } catch (err) { succeeded = false; } if (succeeded) { - var hint = document.getElementById('copied'); + const hint = parentContainer.querySelector('#copied'); + if (!hint) { + return + } hint.style.display = 'block'; - setTimeout(function () { - hint.style.display = 'none'; - }, 2000); + setTimeout(() => hint.style.display = 'none', 2000); } else { // fallback: show textarea if browser does not support copying directly textarea.style.top = 0; } } + const elements = document.querySelectorAll('.copy-clipboard') + for (let element of elements) { + element.onclick = copyIntoClipboard; + } + // handle theme change document.getElementById('dark-mode').onclick = function(e) { From 55f6420fcdba05e6c72cbe9c361a15adf919cc62 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sat, 22 Jun 2024 07:50:21 +0000 Subject: [PATCH 2/8] Apply fixes from StyleCI --- src/Exception/ErrorException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Exception/ErrorException.php b/src/Exception/ErrorException.php index e79db27..02a2451 100644 --- a/src/Exception/ErrorException.php +++ b/src/Exception/ErrorException.php @@ -113,7 +113,7 @@ private function addXDebugTraceToFatalIfAvailable(): void $trace[] = $frame; } - $ref = new ReflectionProperty(\Exception::class, 'trace'); + $ref = new ReflectionProperty(Exception::class, 'trace'); $ref->setAccessible(true); $ref->setValue($this, $trace); } From 32f73523253ffd2d6e39ab49483e2b2dd319868f Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sun, 23 Jun 2024 13:12:37 +0300 Subject: [PATCH 3/8] Apply code review changes --- src/Renderer/HtmlRenderer.php | 10 +++++----- templates/development.php | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php index aaf68a0..b8b5808 100644 --- a/src/Renderer/HtmlRenderer.php +++ b/src/Renderer/HtmlRenderer.php @@ -40,7 +40,6 @@ use function ob_implicit_flush; use function ob_start; use function realpath; -use function rtrim; use function str_replace; use function stripos; use function strlen; @@ -357,11 +356,12 @@ public function renderRequest(ServerRequestInterface $request): string } } - if (!empty($request->getBody())) { - $output .= "\n" . $request->getBody() . "\n\n"; + $body = (string)$request->getBody(); + if (!empty($body)) { + $output .= "\n" . $body . "\n\n"; } - return '
    ' . $this->htmlEncode(rtrim($output, "\n")) . '
    '; + return $output; } /** @@ -376,7 +376,7 @@ public function renderCurl(ServerRequestInterface $request): string ->setRequest($request) ->build(); } catch (Throwable $e) { - return $this->htmlEncode('Error generating curl command: ' . $e->getMessage()); + return 'Error generating curl command: ' . $e; } return $output; diff --git a/templates/development.php b/templates/development.php index 0cffe1e..dd3500f 100644 --- a/templates/development.php +++ b/templates/development.php @@ -88,7 +88,11 @@ Copied! - + @@ -109,7 +113,9 @@

    Request info

    - + 
    +                    htmlEncode(rtrim($requestInfo, "\n")) ?>
+
    @@ -118,7 +124,12 @@ Copied!

    cURL

    -     + @@ -270,7 +281,6 @@ const copyIntoClipboard = function(e) { e.preventDefault(); const parentContainer = e.currentTarget.parentElement; - console.log('parentContainer',parentContainer) const textarea = parentContainer.querySelector('#clipboard'); textarea.focus(); textarea.select(); From e8c2395292e11cf527084d453b4a3943a5695886 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sun, 23 Jun 2024 13:33:53 +0300 Subject: [PATCH 4/8] Revert changes --- src/Renderer/HtmlRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Renderer/HtmlRenderer.php b/src/Renderer/HtmlRenderer.php index b8b5808..48ad936 100644 --- a/src/Renderer/HtmlRenderer.php +++ b/src/Renderer/HtmlRenderer.php @@ -376,7 +376,7 @@ public function renderCurl(ServerRequestInterface $request): string ->setRequest($request) ->build(); } catch (Throwable $e) { - return 'Error generating curl command: ' . $e; + return 'Error generating curl command: ' . $e->getMessage(); } return $output; From 0492a1370d0debbd8f7d3c047a1328eb66a073de Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sun, 23 Jun 2024 13:33:58 +0300 Subject: [PATCH 5/8] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb96398..7ca624f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.2.2 under development -- no changes in this release. +- Enh #112: Add copy cURL button, fix UI (@xepozz) ## 3.2.1 March 07, 2024 From aec6ff87f93e2ea4a6b5aa0d9858072ca4ef6eb2 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sun, 23 Jun 2024 13:38:29 +0300 Subject: [PATCH 6/8] Fix test --- tests/Renderer/HtmlRendererTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Renderer/HtmlRendererTest.php b/tests/Renderer/HtmlRendererTest.php index 20de834..6e9e7c8 100644 --- a/tests/Renderer/HtmlRendererTest.php +++ b/tests/Renderer/HtmlRendererTest.php @@ -149,7 +149,7 @@ public function testRenderRequest(): void $output = $renderer->renderRequest($this->createServerRequestMock()); $this->assertSame( - "
    GET https:/example.com\nAccept: text/html
    ", + "GET https:/example.com\nAccept: text/html\n", $output ); } From e3d109a5972698bb978f0675a6435792feba6e01 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Sun, 23 Jun 2024 13:54:03 +0300 Subject: [PATCH 7/8] Fix html --- templates/development.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/development.php b/templates/development.php index dd3500f..28efcbd 100644 --- a/templates/development.php +++ b/templates/development.php @@ -113,9 +113,7 @@ class="copy-clipboard"

    Request info

    - 
    -                    htmlEncode(rtrim($requestInfo, "\n")) ?>
-
    + 
    htmlEncode(rtrim($requestInfo, "\n")) ?>
    From f48be8cd9c9c5d13e25311eca8a06bda74b3e95b Mon Sep 17 00:00:00 2001 From: Dmitriy Derepko Date: Mon, 24 Jun 2024 19:58:15 +0300 Subject: [PATCH 8/8] Update CHANGELOG.md Co-authored-by: Sergei Predvoditelev --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ca624f..ab20d95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 3.2.2 under development -- Enh #112: Add copy cURL button, fix UI (@xepozz) +- Enh #112: Add copy cURL button, sort request headers, fix UI (@xepozz) ## 3.2.1 March 07, 2024