[#12]: fix error caused by New Entry

Author: florian-riedel-webfleet

src/components/molecules/DeleteWorklogDialog.tsx

@@ -4,32 +4,42 @@ import { DestructiveButton } from '../atoms/Button'
 import { ConfirmDialog } from './ConfirmDialog'
 
 interface DeleteWorklogProps {
-    open: boolean;
-    onDelete: (updateOnly?: boolean) => Promise<void>;
-    onClose: () => void;
+    open: boolean
+    onDelete: (updateOnly?: boolean) => Promise<void>
+    onClose: () => void
     log: Worklog
 }
 export const DeleteWorklogDialog: React.FC<DeleteWorklogProps> = ({ open, onDelete, onClose, log }) => {
     const { data: options } = useOptions()
-    const text = `Do you really want to ${!!log.id && !log.synced ? 'discard the changes for' : 'delete'} the worklog` +
+    const text =
+        `Do you really want to ${!!log.id && !log.synced ? 'discard the changes for' : 'delete'} the worklog` +
         ` from ${timeString(log.start)} till ${timeString(log.end)} for Issue "${options.issues[log.issue.key]?.alias || log.issue.name}".`
-    const buttons = !!log.id && !log.synced ? (
-        <DestructiveButton onClick={() => {
-            onClose()
-            onDelete(true)
-        }}>
-            {!log.delete ? 'Discard Changes' : 'Undo Delete'}
-        </DestructiveButton>
-    ) : (
-        <DestructiveButton onClick={() => {
-            onClose()
-            onDelete()
-        }}>Delete</DestructiveButton>
+    const buttons =
+        !!log.id && !log.synced ? (
+            <DestructiveButton
+                onClick={() => {
+                    onClose()
+                    onDelete(true)
+                }}
+            >
+                {!log.delete ? 'Discard Changes' : 'Undo Delete'}
+            </DestructiveButton>
+        ) : (
+            <DestructiveButton
+                onClick={() => {
+                    onClose()
+                    onDelete()
+                }}
+            >
+                Delete
+            </DestructiveButton>
+        )
+    return (
+        <ConfirmDialog
+            {...{ open, onDelete, onClose }}
+            text={text}
+            title={log.id && log.synced ? 'Confirm Deletion' : 'Confirm Discard'}
+            buttons={buttons}
+        />
     )
-    return <ConfirmDialog
-        {...{ open, onDelete, onClose }}
-        text={text}
-        title={log.id && log.synced ? 'Confirm Deletion' : 'Confirm Discard'}
-        buttons={buttons}
-    />
 }

src/components/views/Tracker.tsx

@@ -72,11 +72,7 @@ export const TrackerView: React.FC = () => {
             <H6 style={{ margin: '0 0 4px 8px', display: 'flex', width: 'calc(100% - 16px)' }}>
                 <span style={{ marginRight: 'auto' }}>Tracking History</span>
                 {!self.error && !hasUnsyncedLog && (
-                    <ActionLink
-                        disabled={!!editIssue.issue}
-                        style={{ marginRight: 4, lineHeight: '16px' }}
-                        onClick={() => worklog.forceFetch()}
-                    >
+                    <ActionLink disabled={!!editIssue.issue} style={{ marginRight: 4, lineHeight: '16px' }} onClick={() => worklog.forceFetch()}>
                         Refresh
                     </ActionLink>
                 )}
@@ -89,15 +85,11 @@ export const TrackerView: React.FC = () => {
                         Synchronize
                     </ActionLink>
                 )}
-                <ActionLink
-                    disabled={!!editIssue.issue}
-                    style={{ marginRight: 4, lineHeight: '16px' }}
-                    onClick={() => setShowPeriodDialog(true)}
-                >
+                <ActionLink disabled={!!editIssue.issue} style={{ marginRight: 4, lineHeight: '16px' }} onClick={() => setShowPeriodDialog(true)}>
                     Log Multiple
                 </ActionLink>
                 <ActionLink
-                    disabled={!!editIssue.issue}
+                    disabled={!!editIssue.issue || !createNewWorklog}
                     style={{ marginRight: 4, lineHeight: '16px' }}
                     onClick={createNewWorklog}
                 >
@@ -111,9 +103,7 @@ export const TrackerView: React.FC = () => {
                 {self.error && (
                     <ErrorTooltipTop content={offlineTooltip}>
                         <WifiOff
-                            onClick={() =>
-                                self.error === 'PERMISSION' && requestPermission(options).then(() => self.refetch())
-                            }
+                            onClick={() => self.error === 'PERMISSION' && requestPermission(options).then(() => self.refetch())}
                             size={16}
                             style={{
                                 color: 'var(--destructive)',

src/hooks/useInsertWorklog.ts

@@ -4,17 +4,19 @@ import { useDispatch, useSelector } from '../utils/atom'
 import { useOptions } from './useOptions'
 import { v4 } from 'uuid'
 import { usePrevious } from './usePrevious'
+import { useJqlQueryResults } from './useJqlQueryResult'
 
 export function useInsertWorklog () {
     const dispatch = useDispatch()
     const editIssue = useSelector(editIssueDuck.selector)
+    const remoteIssues = useJqlQueryResults() as LocalIssue[]
     const {data: options} = useOptions()
     const [newWorklog, setNewWorklog] = useState<TemporaryWorklog>(null)
     const previousIssue = usePrevious(editIssue.issue)
+    const defaultIssue = Object.values(options.issues).concat(remoteIssues)[0]
 
     const createNewWorklog = async () => {
-        const issue = Object.values(options.issues)[0]
-        const newLog: TemporaryWorklog = { issue, start: Date.now(), end: Date.now(), synced: false, tempId: v4() }
+        const newLog: TemporaryWorklog = { issue: defaultIssue, start: Date.now(), end: Date.now(), synced: false, tempId: v4() }
         await dispatch('setEditIssue', { issue: newLog.tempId })
         setNewWorklog(newLog)
     }
@@ -27,6 +29,6 @@ export function useInsertWorklog () {
 
     return {
         newWorklog,
-        createNewWorklog
+        createNewWorklog: defaultIssue ? createNewWorklog : undefined
     }
-}
+}