From c30fa2aafbb1e052e6bba3193eee3b5f00c04481 Mon Sep 17 00:00:00 2001
From: Enrico Ros <enrico.ros@gmail.com>
Date: Wed, 7 Aug 2024 15:03:16 -0700
Subject: [PATCH] LFS: improvements

---
 src/common/livefile/LiveFileControlButton.tsx |  1 -
 src/common/livefile/liveFile.icons.ts         |  8 +++-
 src/common/livefile/store-live-file.ts        |  3 +-
 src/common/livefile/useLiveFileComparison.tsx | 42 ++++++++++---------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/common/livefile/LiveFileControlButton.tsx b/src/common/livefile/LiveFileControlButton.tsx
index 8941ee389..d8fed0cc9 100644
--- a/src/common/livefile/LiveFileControlButton.tsx
+++ b/src/common/livefile/LiveFileControlButton.tsx
@@ -84,7 +84,6 @@ export function LiveFileControlButton(props: {
               : 'Set up live file pairing'
         }
         color='success'
-        variant='outlined'
         placement='top-end'
       >
         <Button
diff --git a/src/common/livefile/liveFile.icons.ts b/src/common/livefile/liveFile.icons.ts
index e65825f86..52f835cce 100644
--- a/src/common/livefile/liveFile.icons.ts
+++ b/src/common/livefile/liveFile.icons.ts
@@ -1,13 +1,17 @@
 import { styled } from '@mui/joy';
+// import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
 import FileOpenOutlinedIcon from '@mui/icons-material/FileOpenOutlined';
+import MobiledataOffIcon from '@mui/icons-material/MobiledataOff';
 import MultipleStopIcon from '@mui/icons-material/MultipleStop';
+import SaveIcon from '@mui/icons-material/SaveOutlined';
 import SystemUpdateAltIcon from '@mui/icons-material/SystemUpdateAlt';
-import UploadFileIcon from '@mui/icons-material/UploadFile';
+// import UploadFileIcon from '@mui/icons-material/UploadFile';
 
 export const LiveFileIcon = styled(MultipleStopIcon)({
   rotate: '90deg',
 });
 
 export { FileOpenOutlinedIcon as LiveFileChooseIcon };
+export { MobiledataOffIcon as LiveFileCloseIcon };
+export { SaveIcon as LiveFileSaveIcon };
 export { SystemUpdateAltIcon as LiveFileReloadIcon };
-export { UploadFileIcon as LiveFileSaveIcon };
diff --git a/src/common/livefile/store-live-file.ts b/src/common/livefile/store-live-file.ts
index fffa682e6..1ad88c7a8 100644
--- a/src/common/livefile/store-live-file.ts
+++ b/src/common/livefile/store-live-file.ts
@@ -134,8 +134,9 @@ export const useLiveFileStore = create<LiveFileState & LiveFileActions>()(persis
             [fileId]: {
               ...file,
               content,
-              isLoading: false,
               lastModified: fileData.lastModified,
+              isLoading: false,
+              error: null,
             },
           },
         }));
diff --git a/src/common/livefile/useLiveFileComparison.tsx b/src/common/livefile/useLiveFileComparison.tsx
index 635599f1f..cf09ca12a 100644
--- a/src/common/livefile/useLiveFileComparison.tsx
+++ b/src/common/livefile/useLiveFileComparison.tsx
@@ -3,14 +3,13 @@ import { fileOpen } from 'browser-fs-access';
 import { cleanupEfficiency, makeDiff } from '@sanity/diff-match-patch';
 
 import { Box, Button, ColorPaletteProp, IconButton, Sheet } from '@mui/joy';
-import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
 import WarningRoundedIcon from '@mui/icons-material/WarningRounded';
 
 import { TooltipOutlined } from '~/common/components/TooltipOutlined';
 import { WindowFocusObserver } from '~/common/util/windowUtils';
 
 import type { LiveFileId } from './liveFile.types';
-import { LiveFileChooseIcon, LiveFileIcon, LiveFileReloadIcon, LiveFileSaveIcon } from './liveFile.icons';
+import { LiveFileChooseIcon, LiveFileCloseIcon, LiveFileIcon, LiveFileReloadIcon, LiveFileSaveIcon } from './liveFile.icons';
 import { LiveFileControlButton } from './LiveFileControlButton';
 import { liveFileCreateOrThrow } from './store-live-file';
 import { useLiveFile } from './liveFile.hooks';
@@ -85,7 +84,7 @@ export function useLiveFileComparison(
     // Same content: no diff
     if (fileContent === bufferText) {
       setDiffSummary({ insertions: 0, deletions: 0 });
-      setStatus({ message: isMobile ? 'Identical to File.' : 'The File is identical to this Document.', mtype: 'info' });
+      setStatus({ message: isMobile ? 'Identical to File.' : 'No changes.' /* 'The File is identical to this Document.'*/, mtype: 'info' });
       return;
     }
 
@@ -114,7 +113,7 @@ export function useLiveFileComparison(
 
   // callbacks
 
-  const handleCloseFile = React.useCallback(async () => {
+  const handleStopLiveFile = React.useCallback(async () => {
     await closeFileContent();
     setDiffSummary(null);
     setStatus(null);
@@ -193,8 +192,10 @@ export function useLiveFileComparison(
   const liveFileActionBox = React.useMemo(() => {
     if (!status && !fileHasContent) return null;
 
+    const isError = status?.mtype === 'error';
+
     const statusColor: ColorPaletteProp =
-      status?.mtype === 'error' ? 'warning'
+      isError ? 'warning'
         : status?.mtype === 'success' ? 'success'
           : status?.mtype === 'changes' ? 'neutral'
             : 'neutral';
@@ -205,7 +206,7 @@ export function useLiveFileComparison(
         color={statusColor}
         sx={{
           display: 'flex',
-          flexFlow: 'row wrap',
+          flexWrap: 'wrap',
           alignItems: 'center',
           borderRadius: 'sm',
           fontSize: 'sm',
@@ -218,21 +219,24 @@ export function useLiveFileComparison(
 
           {/* Refresh Content Button */}
           {isPairingValid && (
-            <IconButton size='sm' onClick={() => _handleReloadFileContent()}>
-              <LiveFileIcon />
-            </IconButton>
+            <TooltipOutlined title='Reload and compare File' placement='top-start' color='success'>
+              <IconButton size='sm' variant='plain' onClick={() => _handleReloadFileContent()}>
+                <LiveFileIcon color='success' />
+              </IconButton>
+            </TooltipOutlined>
           )}
 
           {/* Alert Decorator (startDecorator will have it messy) */}
           {status?.mtype === 'error' && <WarningRoundedIcon sx={{ mr: 1 }} />}
 
           {' '}<span>{status?.message}</span>
+
         </Box>
 
 
         <Box sx={{ ml: 'auto', display: 'flex', gap: 1 }}>
-          {/* Load from File */}
-          {fileIsDifferent && (
+          {/* Load from file */}
+          {fileIsDifferent && !isError && (
             <Button
               variant={isMobile ? 'outlined' : 'plain'}
               color='neutral'
@@ -242,12 +246,12 @@ export function useLiveFileComparison(
               startDecorator={<LiveFileReloadIcon />}
               aria-label='Load content from disk'
             >
-              {isMobile ? 'Update' : 'Load from File'}
+              {isMobile ? 'Update' : 'Replace with file'}
             </Button>
           )}
 
           {/* Save to File */}
-          {fileIsDifferent && (
+          {fileIsDifferent && !isError && (
             <Button
               variant={isMobile ? 'outlined' : 'plain'}
               color='danger'
@@ -257,27 +261,27 @@ export function useLiveFileComparison(
               startDecorator={<LiveFileSaveIcon />}
               aria-label='Save content to disk'
             >
-              {isMobile ? 'Save' : 'Save to File'}
+              {isMobile ? 'Save' : 'Save to file'}
             </Button>
           )}
 
           {/* Reassign File button */}
-          <TooltipOutlined title='Pair a different File.' placement='top-end'>
+          <TooltipOutlined title='Pair a different file' placement='top-end'>
             <IconButton size='sm' onClick={handlePairNewFileWithPicker}>
               <LiveFileChooseIcon />
             </IconButton>
           </TooltipOutlined>
 
           {/* Close button */}
-          <TooltipOutlined title='Close LiveFile.' placement='top-end'>
-            <IconButton size='sm' onClick={handleCloseFile}>
-              <CloseRoundedIcon />
+          <TooltipOutlined title='Disable LiveFile sync' placement='top-end'>
+            <IconButton size='sm' onClick={handleStopLiveFile}>
+              <LiveFileCloseIcon />
             </IconButton>
           </TooltipOutlined>
         </Box>
       </Sheet>
     );
-  }, [fileHasContent, fileIsDifferent, handleCloseFile, handleLoadFromDisk, handlePairNewFileWithPicker, handleSaveToDisk, _handleReloadFileContent, isMobile, isPairingValid, isSavingFile, status]);
+  }, [fileHasContent, fileIsDifferent, handleStopLiveFile, handleLoadFromDisk, handlePairNewFileWithPicker, handleSaveToDisk, _handleReloadFileContent, isMobile, isPairingValid, isSavingFile, status]);
 
 
   // Auto-click on 'refresh' on window focus