Merge pull request #2074 from LucaDev/ping-indicators

New ping-indicator styles

src/components/services/item.jsx

@@ -29,8 +29,6 @@ export default function Item({ service, group }) {
     }
   };
 
-
-
   return (
     <li key={service.name} id={service.id} className="service" data-name={service.name || ""}>
       <div
@@ -81,7 +79,7 @@ export default function Item({ service, group }) {
           <div className="absolute top-0 right-0 flex flex-row justify-end gap-2 mr-2 z-30 service-tags">
               {service.ping && (
                 <div className="flex-shrink-0 flex items-center justify-center service-tag service-ping">
-                  <Ping group={group} service={service.name} />
+                  <Ping group={group} service={service.name} style={service.statusStyle} />
                   <span className="sr-only">Ping status</span>
                 </div>
               )}

src/components/services/ping.jsx

@@ -1,42 +1,58 @@
 import { useTranslation } from "react-i18next";
 import useSWR from "swr";
 
-export default function Ping({ group, service }) {
+export default function Ping({ group, service, style }) {
   const { t } = useTranslation();
   const { data, error } = useSWR(`/api/ping?${new URLSearchParams({ group, service }).toString()}`, {
     refreshInterval: 30000
   });
 
+  let textSize = "text-[8px]";
+  let colorClass = ""
+  let backgroundClass = "bg-theme-500/10 dark:bg-theme-900/50";
+  let statusTitle = "HTTP status";
+  let statusText;
+
   if (error) {
-    return (
-      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden ping-error">
-        <div className="text-[8px] font-bold text-rose-500 uppercase">{t("ping.error")}</div>
-      </div>
-    );
-  }
-  
-  if (!data) {
-    return (
-      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden ping-ping">
-        <div className="text-[8px] font-bold text-black/20 dark:text-white/40 uppercase">{t("ping.ping")}</div>
-      </div>
-    );
-  }
+    colorClass = "text-rose-500"
+    statusText = t("ping.error")
+    statusTitle += " error"
+  } else if (!data) {
+    colorClass = "text-black/20 dark:text-white/40"
+    statusText = t("ping.ping")
+    statusTitle += " not available"
+  } else if (data.status > 403) {
+    colorClass = "text-rose-500/80"
+    statusTitle += ` ${data.status}`
 
-  const statusText = `${service}: HTTP status ${data.status}`;
-  
-  if (data.status > 403) {
-    return (
-      <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden ping-status-invalid" title={statusText}>
-        <div className="text-[8px] font-bold text-rose-500/80">{data.status}</div>
-      </div>
-    );
+    if (style === "basic") {
+      statusText = t("docker.offline")
+    } else if (style === "dot") {
+      statusText = "◉"
+      textSize = "text-[14px]"
+      backgroundClass = ""
+    } else {
+      statusText = data.status
+    }
+  } else {
+    const ping = t("common.ms", { value: data.latency, style: "unit", unit: "millisecond", maximumFractionDigits: 0 })
+    statusTitle += ` ${data.status} (${ping})`;
+    colorClass = "text-emerald-500/80"
+
+    if (style === "basic") {
+      statusText = t("docker.running")
+    } else if (style === "dot") {
+      statusText = "◉"
+      textSize = "text-[14px]"
+      backgroundClass = ""
+    } else {
+      statusText = ping
+    }
   }
-  
+
   return (
-    <div className="w-auto px-1.5 py-0.5 text-center bg-theme-500/10 dark:bg-theme-900/50 rounded-b-[3px] overflow-hidden ping-status-valid" title={statusText}>
-      <div className="text-[8px] font-bold text-emerald-500/80">{t("common.ms", { value: data.latency, style: "unit", unit: "millisecond", maximumFractionDigits: 0 })}</div>
+    <div className={`w-auto px-1.5 py-0.5 text-center rounded-b-[3px] overflow-hidden ping-status-invalid ${backgroundClass}`} title={statusTitle}>
+      <div className={`font-bold uppercase ${textSize} ${colorClass}`}>{statusText}</div>
     </div>
   );
-
 }