Skip to content

Commit 443a955

Browse files
authored
Update composer dependencies (#940)
* Update composer dependencies * update log-viewer assets * fix disabled sidebars
1 parent e34d432 commit 443a955

File tree

7 files changed

+419
-396
lines changed

7 files changed

+419
-396
lines changed

composer.lock

Lines changed: 408 additions & 389 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/log-viewer/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/log-viewer/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/vendor/log-viewer/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"/app.js": "/app.js?id=74d3e481ad3e8fa14f1daaa0aa46e109",
3-
"/app.css": "/app.css?id=5593a0331dd40729ff41e32a6035d872",
2+
"/app.js": "/app.js?id=b5eb6497b80ecd00237a857b35fcc1d6",
3+
"/app.css": "/app.css?id=bf9e77abce3da8caacd004d57e4e8429",
44
"/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
55
"/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",
66
"/img/log-viewer-64.png": "/img/log-viewer-64.png?id=8902d596fc883ca9eb8105bb683568c6"

resources/js/components/app-sidebar.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,18 @@ export function AppSidebar({ secondNavItems, secondNavTitle }: { secondNavItems?
232232

233233
return (
234234
<SidebarMenuItem key={`${item.title}-${item.href}`} hidden={item.hidden}>
235-
<SidebarMenuButton isActive={isActive} disabled={item.isDisabled || false} asChild>
235+
<SidebarMenuButton isActive={isActive} asChild>
236236
{item.external ? (
237237
<a href={item.href} target="_blank">
238238
{item.icon && <item.icon />}
239239
<span>{item.title}</span>
240240
</a>
241241
) : (
242-
<Link href={item.href} disabled={item.isDisabled || false}>
242+
<Link
243+
href={item.isDisabled ? '#' : item.href}
244+
disabled={item.isDisabled || false}
245+
className={item.isDisabled ? 'pointer-events-none opacity-50' : ''}
246+
>
243247
{item.icon && <item.icon />}
244248
<span>{item.title}</span>
245249
</Link>

resources/js/layouts/server/layout.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ export default function ServerLayout({ children }: { children: ReactNode }) {
211211
title: 'Features',
212212
href: route('server-features', { server: page.props.server.id }),
213213
icon: BoxIcon,
214+
isDisabled: isMenuDisabled,
214215
},
215216
{
216217
title: 'Settings',

tests/Feature/ApiDocsTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public function test_api_docs_endpoint_returns_html_documentation(): void
1414
$response = $this->get('/api/docs');
1515

1616
$response->assertSuccessful();
17-
$response->assertHeader('content-type', 'text/html; charset=UTF-8');
1817

1918
// For BinaryFileResponse, we can't easily get the content in tests
2019
// but we can verify the response is successful and has correct headers

0 commit comments

Comments
 (0)