From 60f2b0d9997092c3489bc3879ec7d7c0003e7900 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Sat, 19 Feb 2022 23:34:07 +1100
Subject: [PATCH] Add update button and tooltips to IconButtons

---
 src/components/generic/Modal.tsx             |  7 +++-
 src/components/generic/button/IconButton.tsx | 42 ++++++++++++--------
 src/components/menu/BottomNavItem.tsx        |  2 +-
 src/components/modals/VersionInfo.tsx        | 19 +++++++--
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/components/generic/Modal.tsx b/src/components/generic/Modal.tsx
index b48f35af..0eabe2e8 100644
--- a/src/components/generic/Modal.tsx
+++ b/src/components/generic/Modal.tsx
@@ -11,12 +11,14 @@ import { Card } from './Card';
 export interface ModalProps {
   title: string;
   onClose: () => void;
+  actions?: React.ReactNode;
   children: React.ReactNode;
 }
 
 export const Modal = ({
   title,
   onClose,
+  actions,
   children,
 }: ModalProps): JSX.Element => {
   const darkMode = useAppSelector((state) => state.app.darkMode);
@@ -43,7 +45,10 @@ export const Modal = ({
               <div className="text-2xl font-medium dark:text-white">
                 {title}
               </div>
-              <IconButton icon={<FiX />} onClick={onClose} />
+              <div className="flex gap-2">
+                {actions}
+                <IconButton tooltip="Close" icon={<FiX />} onClick={onClose} />
+              </div>
             </div>
             {children}
           </Card>
diff --git a/src/components/generic/button/IconButton.tsx b/src/components/generic/button/IconButton.tsx
index 2b645f99..b63bfe85 100644
--- a/src/components/generic/button/IconButton.tsx
+++ b/src/components/generic/button/IconButton.tsx
@@ -1,35 +1,43 @@
 import type React from 'react';
 
+import { Tooltip } from '@components/generic/Tooltip';
+
 type DefaulButtonProps = JSX.IntrinsicElements['button'];
 
 export interface IconButtonProps extends DefaulButtonProps {
   icon: React.ReactNode;
+  tooltip?: string;
   active?: boolean;
 }
 
 export const IconButton = ({
   icon,
   active,
+  tooltip,
   disabled,
   ...props
 }: IconButtonProps): JSX.Element => {
   return (
-    <div className="my-auto text-gray-500 dark:text-gray-400">
-      <button
-        type="button"
-        disabled={disabled}
-        className={`rounded-md p-2 transition duration-200 ease-in-out active:scale-95 ${
-          active
-            ? 'bg-gray-200 dark:bg-gray-600'
-            : 'hover:bg-gray-200 dark:hover:bg-gray-600'
-        } ${
-          disabled ? 'cursor-not-allowed text-gray-400 dark:text-gray-700' : ''
-        }`}
-        {...props}
-      >
-        {icon}
-        <span className="sr-only">Refresh</span>
-      </button>
-    </div>
+    <Tooltip disabled={!tooltip} content={tooltip}>
+      <div className="my-auto text-gray-500 dark:text-gray-400">
+        <button
+          type="button"
+          disabled={disabled}
+          className={`rounded-md p-2 transition duration-200 ease-in-out active:scale-95 ${
+            active
+              ? 'bg-gray-200 dark:bg-gray-600'
+              : 'hover:bg-gray-200 dark:hover:bg-gray-600'
+          } ${
+            disabled
+              ? 'cursor-not-allowed text-gray-400 dark:text-gray-700'
+              : ''
+          }`}
+          {...props}
+        >
+          {icon}
+          <span className="sr-only">Refresh</span>
+        </button>
+      </div>
+    </Tooltip>
   );
 };
diff --git a/src/components/menu/BottomNavItem.tsx b/src/components/menu/BottomNavItem.tsx
index 65cb62c2..a37f97d7 100644
--- a/src/components/menu/BottomNavItem.tsx
+++ b/src/components/menu/BottomNavItem.tsx
@@ -18,7 +18,7 @@ export const BottomNavItem = ({
   children,
 }: BottomNavItemProps) => {
   return (
-    <Tooltip content={tooltip}>
+    <Tooltip disabled={!tooltip} content={tooltip}>
       <div
         onClick={onClick}
         className={`group flex h-full cursor-pointer select-none p-1 hover:bg-gray-200 dark:text-white dark:hover:bg-primaryDark ${className}`}
diff --git a/src/components/modals/VersionInfo.tsx b/src/components/modals/VersionInfo.tsx
index d5c8bbb6..9bdf3377 100644
--- a/src/components/modals/VersionInfo.tsx
+++ b/src/components/modals/VersionInfo.tsx
@@ -1,13 +1,18 @@
 import React from 'react';
 
 import { AnimatePresence } from 'framer-motion';
+import { MdUpgrade } from 'react-icons/md';
 import useSWR from 'swr';
 
-import { setUpdateAvaliable } from '@app/core/slices/appSlice.js';
-import { fetcher } from '@app/core/utils/fetcher.js';
-import { useAppDispatch } from '@app/hooks/useAppDispatch.js';
+import { connectionUrl } from '@app/core/connection.js';
+import { setUpdateAvaliable } from '@app/core/slices/appSlice';
+import { fetcher } from '@app/core/utils/fetcher';
+import { useAppDispatch } from '@app/hooks/useAppDispatch';
+import { useAppSelector } from '@app/hooks/useAppSelector';
 import { Modal } from '@components/generic/Modal';
 
+import { IconButton } from '../generic/button/IconButton';
+
 export interface Commit {
   sha: string;
   node_id: string;
@@ -36,6 +41,7 @@ export const VersionInfo = ({
   visible,
   onClose,
 }: VersionInfoProps): JSX.Element => {
+  const appState = useAppSelector((state) => state.app);
   const dispatch = useAppDispatch();
 
   const { data } = useSWR<Commit[]>(
@@ -63,6 +69,13 @@ export const VersionInfo = ({
       {visible && (
         <Modal
           title="Version Info"
+          actions={
+            appState.updateAvaliable && (
+              <a href={`http://${connectionUrl}/admin/spiffs`}>
+                <IconButton tooltip="Update now" icon={<MdUpgrade />} />
+              </a>
+            )
+          }
           onClose={(): void => {
             onClose();
           }}