[4.x] QoL & Polish (#1145)

* wip

* background consistency

Author: RichardAnderson

app/Actions/Server/GetServiceLogs.php

@@ -24,6 +24,9 @@ public function handle(Server $server): array
 
         foreach ($services as $service) {
             $service->setRelation('server', $server);
+            if (! $service->hasHandler()) {
+                continue;
+            }
             $handler = $service->handler();
             if (! $handler instanceof HasLogs) {
                 continue;

app/Http/Controllers/ConsoleController.php

@@ -26,6 +26,7 @@ public function index(Server $server): Response
 
         return Inertia::render('servers/console', [
             'server' => ServerResource::make($server),
+            'ssh_users' => $server->sshLoginUsers(),
         ]);
     }
 

app/Http/Controllers/CronJobController.php

@@ -118,7 +118,6 @@ public function site(Server $server, Site $site): Response
             'cronjobs' => CronJobResource::collection(
                 $site->cronJobs()->latest()->simplePaginate(config('web.pagination_size'))
             ),
-            'site' => $site,
             'sites' => $server->sites()->select('id', 'domain')->get(),
             'ssh_users' => $site->getSshUsers(),
         ]);

app/Http/Resources/ServerResource.php

@@ -22,7 +22,7 @@ public function toArray(Request $request): array
             'provider_id' => $this->provider_id,
             'name' => $this->name,
             'ssh_user' => $this->ssh_user,
-            'ssh_users' => $this->sshLoginUsers(),
+            'ssh_users' => $this->getSshUsers(),
             'ip' => $this->ip,
             'local_ip' => $this->local_ip,
             'port' => $this->port,

app/Models/Service.php

@@ -75,6 +75,11 @@ public function log(): BelongsTo
         return $this->belongsTo(ServerLog::class, 'log_id');
     }
 
+    public function hasHandler(): bool
+    {
+        return (bool) config("service.services.{$this->name}.handler");
+    }
+
     public function handler(): ServiceInterface|Webserver|PHP|Firewall|Database|ProcessManager
     {
         $name = $this->name;

resources/js/components/breadcrumb-header.tsx

@@ -0,0 +1,24 @@
+import { Button } from '@/components/ui/button';
+import { type BreadcrumbItem } from '@/types';
+import { cn } from '@/lib/utils';
+import { Link } from '@inertiajs/react';
+import { ArrowLeftIcon } from 'lucide-react';
+import { type PropsWithChildren } from 'react';
+
+export function BreadcrumbHeader({ breadcrumbs, children, className }: PropsWithChildren<{ breadcrumbs: BreadcrumbItem[]; className?: string }>) {
+  const parent = breadcrumbs.length > 1 ? breadcrumbs[breadcrumbs.length - 2] : undefined;
+
+  return (
+    <div className={cn('flex flex-col items-start gap-4', className)}>
+      {parent && (
+        <Button variant="outline" size="sm" className="text-muted-foreground hover:text-foreground h-7 px-2.5" asChild>
+          <Link href={parent.href}>
+            <ArrowLeftIcon />
+            {parent.title}
+          </Link>
+        </Button>
+      )}
+      {children}
+    </div>
+  );
+}

resources/js/components/breadcrumbs.tsx

@@ -1,4 +1,4 @@
-import { type BreadcrumbItem, type NavItem } from '@/types';
+import { type NavItem } from '@/types';
 import { GithubIcon, PlugIcon, UsersIcon } from 'lucide-react';
 import { ReactNode } from 'react';
 import Layout from '@/layouts/app/layout';
@@ -27,14 +27,14 @@ const sidebarNavItems: NavItem[] = [
   },
 ];
 
-export default function SettingsLayout({ children, breadcrumbs }: { children: ReactNode; breadcrumbs?: BreadcrumbItem[] }) {
+export default function SettingsLayout({ children }: { children: ReactNode }) {
   // When server-side rendering, we only render the layout on the client...
   if (typeof window === 'undefined') {
     return null;
   }
 
   return (
-    <Layout breadcrumbs={breadcrumbs} secondNavItems={sidebarNavItems} secondNavTitle="Admin">
+    <Layout secondNavItems={sidebarNavItems} secondNavTitle="Admin">
       {children}
     </Layout>
   );

resources/js/layouts/admin/layout.tsx

@@ -1,14 +1,13 @@
 import { AppSidebar } from '@/components/app-sidebar';
 import { AppHeader } from '@/components/app-header';
-import { type BreadcrumbItem, NavItem, SharedData } from '@/types';
+import { NavItem, SharedData } from '@/types';
 import { type PropsWithChildren, useCallback, useEffect, useState } from 'react';
 import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
 import { usePage } from '@inertiajs/react';
 import { Toaster } from '@/components/ui/sonner';
 import { toast } from 'sonner';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { TooltipProvider } from '@/components/ui/tooltip';
-import { Breadcrumbs } from '@/components/breadcrumbs';
 import { type SocketEventData, useSocketEvents, useSocketListener } from '@/hooks/use-socket-events';
 import { useBootstrapStore } from '@/stores/bootstrap-store';
 import { Button } from '@/components/ui/button';
@@ -19,9 +18,7 @@ export default function Layout({
   children,
   secondNavItems,
   secondNavTitle,
-  breadcrumbs,
 }: PropsWithChildren<{
-  breadcrumbs?: BreadcrumbItem[];
   secondNavItems?: NavItem[];
   secondNavTitle?: string;
 }>) {
@@ -80,13 +77,6 @@ export default function Layout({
           <AppSidebar secondNavItems={secondNavItems} secondNavTitle={secondNavTitle} />
           <SidebarInset>
             <AppHeader socketStatus={socketStatus} socketReconnect={socketReconnect} />
-            {breadcrumbs && breadcrumbs.length > 1 && (
-              <div className="border-sidebar-border/70 flex w-full border-b">
-                <div className="mx-auto flex h-12 w-full items-center justify-start px-4 text-neutral-500">
-                  <Breadcrumbs breadcrumbs={breadcrumbs} />
-                </div>
-              </div>
-            )}
             <div className="flex flex-1 flex-col">
               {showBootstrapError ? (
                 <div className="flex flex-1 items-center justify-center p-6">

resources/js/layouts/app/layout.tsx

@@ -1,4 +1,4 @@
-import { type BreadcrumbItem, type NavItem } from '@/types';
+import { type NavItem } from '@/types';
 import { BellIcon, CloudIcon, CodeIcon, CommandIcon, DatabaseIcon, GlobeIcon, KeyIcon, ListIcon, UserIcon } from 'lucide-react';
 import { ReactNode } from 'react';
 import Layout from '@/layouts/app/layout';
@@ -51,14 +51,14 @@ const sidebarNavItems: NavItem[] = [
   },
 ];
 
-export default function SettingsLayout({ children, breadcrumbs }: { children: ReactNode; breadcrumbs?: BreadcrumbItem[] }) {
+export default function SettingsLayout({ children }: { children: ReactNode }) {
   // When server-side rendering, we only render the layout on the client...
   if (typeof window === 'undefined') {
     return null;
   }
 
   return (
-    <Layout breadcrumbs={breadcrumbs} secondNavItems={sidebarNavItems} secondNavTitle="Settings">
+    <Layout secondNavItems={sidebarNavItems} secondNavTitle="Settings">
       {children}
     </Layout>
   );