Clean up patterns and logs (#36)

* minor fixes * remove enabled and clean select root branch pattern * lint
levelbreaded · Oct 18, 2024 · 8bb8b5d · 8bb8b5d
1 parent e3e832a
commit 8bb8b5d
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 63 deletions.
diff --git a/src/commands/branch/new.tsx b/src/commands/branch/new.tsx
@@ -1,5 +1,5 @@
 import ErrorDisplay from '../../components/error-display.js';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback } from 'react';
 import { Action, useAction } from '../../hooks/use-action.js';
 import {
     CommandConfig,
@@ -14,23 +14,26 @@ import { safeBranchNameFromCommitMessage } from '../../utils/naming.js';
 import { useGit } from '../../hooks/use-git.js';
 import { useTree } from '../../hooks/use-tree.js';
 
-function BranchNew(props: CommandProps) {
+const BranchNew = (props: CommandProps) => {
+    const { rootBranchName } = useTree();
+
+    if (!rootBranchName) {
+        return <SelectRootBranch />;
+    }
+
+    return <DoBranchNew {...props} />;
+};
+
+const DoBranchNew = (props: CommandProps) => {
     const args = branchNewConfig.getProps(props) as Valid<
         PropSanitationResult<CommandArgs>
     >;
     const { commitMessage } = args.props;
 
-    const { rootBranchName } = useTree();
-
     const result = useBranchNew({
         message: commitMessage,
-        enabled: Boolean(rootBranchName),
     });
 
-    if (!result.isEnabled) {
-        return <SelectRootBranch />;
-    }
-
     if (result.isError) {
         return <ErrorDisplay error={result.error} />;
     }
@@ -44,19 +47,13 @@ function BranchNew(props: CommandProps) {
             New branch created - <Text bold>{result.branchName}</Text>
         </Text>
     );
-}
+};
 
 type UseBranchNewAction = Action & {
     branchName: string;
 };
 
-const useBranchNew = ({
-    message,
-    enabled,
-}: {
-    message: string;
-    enabled: boolean;
-}): UseBranchNewAction => {
+const useBranchNew = ({ message }: { message: string }): UseBranchNewAction => {
     const git = useGit();
 
     const branchName = safeBranchNameFromCommitMessage(message);
@@ -70,11 +67,9 @@ const useBranchNew = ({
 
     const action = useAction({
         asyncAction: performAction,
-        enabled,
     });
 
     return {
-        isEnabled: action.isEnabled,
         isLoading: action.isLoading,
         isError: action.isError,
         error: action.error,

diff --git a/src/commands/changes/add.tsx b/src/commands/changes/add.tsx
@@ -6,7 +6,7 @@ import { Loading } from '../../components/loading.js';
 import { Text } from 'ink';
 import { useGit } from '../../hooks/use-git.js';
 
-function ChangedAdd({}: CommandProps) {
+const ChangedAdd = ({}: CommandProps) => {
     const result = useChangesAdd();
 
     if (result.isError) {
@@ -22,7 +22,7 @@ function ChangedAdd({}: CommandProps) {
             Staged all changes
         </Text>
     );
-}
+};
 
 const useChangesAdd = (): Action => {
     const git = useGit();

diff --git a/src/commands/changes/commit.tsx b/src/commands/changes/commit.tsx
@@ -13,22 +13,25 @@ import { Text } from 'ink';
 import { useGit } from '../../hooks/use-git.js';
 import { useTree } from '../../hooks/use-tree.js';
 
-function ChangesCommit(props: CommandProps) {
+const ChangesCommit = (props: CommandProps) => {
+    const { rootBranchName } = useTree();
+
+    if (!rootBranchName) {
+        return <SelectRootBranch />;
+    }
+
+    return <DoChangesCommit {...props} />;
+};
+
+const DoChangesCommit = (props: CommandProps) => {
     const args = changesCommitConfig.getProps(props) as Valid<
         PropSanitationResult<CommandArgs>
     >;
 
-    const { rootBranchName } = useTree();
-
     const result = useChangesCommit({
         message: args.props.message,
-        enabled: Boolean(rootBranchName),
     });
 
-    if (!result.isEnabled) {
-        return <SelectRootBranch />;
-    }
-
     if (result.isError) {
         return <ErrorDisplay error={result.error} />;
     }
@@ -42,15 +45,9 @@ function ChangesCommit(props: CommandProps) {
             Committed all changes
         </Text>
     );
-}
+};
 
-const useChangesCommit = ({
-    message,
-    enabled,
-}: {
-    message: string;
-    enabled: boolean;
-}): Action => {
+const useChangesCommit = ({ message }: { message: string }): Action => {
     const git = useGit();
 
     const performAction = useCallback(async () => {
@@ -60,7 +57,6 @@ const useChangesCommit = ({
 
     return useAction({
         asyncAction: performAction,
-        enabled,
     });
 };
 

diff --git a/src/commands/help.tsx b/src/commands/help.tsx
@@ -12,7 +12,7 @@ import {
 import { REGISTERED_COMMANDS } from '../command-registry.js';
 import { findCommand, findCommandGroup } from '../utils/commands.js';
 
-function Help(props: CommandProps) {
+const Help = (props: CommandProps) => {
     const args = helpConfig.getProps(props) as Valid<
         PropSanitationResult<CommandArgs>
     >;
@@ -52,7 +52,7 @@ function Help(props: CommandProps) {
             <Text>Usage - {command.config.usage}</Text>
         </Box>
     );
-}
+};
 
 const CommandList = ({
     title,

diff --git a/src/commands/hop.tsx b/src/commands/hop.tsx
@@ -11,7 +11,7 @@ import {
 } from '../types.js';
 import { useGit } from '../hooks/use-git.js';
 
-function Hop(props: CommandProps) {
+const Hop = (props: CommandProps) => {
     const args = hopConfig.getProps(props) as Valid<
         PropSanitationResult<CommandArgs>
     >;
@@ -115,7 +115,7 @@ function Hop(props: CommandProps) {
             limit={10}
         />
     );
-}
+};
 
 interface CommandArgs {
     searchTerm?: string;

diff --git a/src/commands/sync.tsx b/src/commands/sync.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import { CommandConfig, CommandProps } from '../types.js';
 import { Text } from 'ink';
 
-function Sync({ cli, input }: CommandProps) {
+const Sync = ({ cli, input }: CommandProps) => {
     console.log('Rendered', { cli, input });
     return <Text>Sync command</Text>;
-}
+};
 
 export const syncConfig: CommandConfig = {
     description: 'Sync your local changes with the remote server',

diff --git a/src/components/confirm-statement.tsx b/src/components/confirm-statement.tsx
@@ -55,15 +55,15 @@ export const ConfirmStatement = ({
             <Text>
                 {statement}
                 <Text>
-                    &nbsp;(
+                    &nbsp;[
                     <Text underline={intent.accept} bold={intent.accept}>
                         Y
                     </Text>
                     /
                     <Text underline={intent.deny} bold={intent.deny}>
                         n
                     </Text>
-                    )
+                    ]:
                 </Text>
             </Text>
             <Text>{userInput.length ? userInput : '_'}</Text>

diff --git a/src/hooks/use-action.ts b/src/hooks/use-action.ts
@@ -2,38 +2,29 @@ import { useEffect, useState } from 'react';
 
 export const useAction = ({
     asyncAction,
-    enabled = true,
 }: {
     asyncAction: () => Promise<void>;
-    enabled?: boolean;
 }): Action => {
     const [state, setState] = useState<State>({ type: 'LOADING' });
 
     useEffect(() => {
-        if (!enabled) {
-            setState({ type: 'NOT_ENABLED' });
-            return;
-        }
-
         setState({ type: 'LOADING' });
         asyncAction()
             .then(() => setState({ type: 'COMPLETE' }))
             .catch((e: Error) => {
                 setState({ type: 'ERROR', error: e });
             });
-    }, [asyncAction, enabled]);
+    }, [asyncAction]);
 
     if (state.type === 'ERROR') {
         return {
-            isEnabled: true,
             isLoading: false,
             isError: true,
             error: state.error,
         };
     }
 
     return {
-        isEnabled: state.type !== 'NOT_ENABLED',
         isLoading: state.type === 'LOADING',
         isError: false,
         error: undefined,
@@ -42,22 +33,17 @@ export const useAction = ({
 
 export type Action =
     | {
-          isEnabled: boolean;
           isLoading: boolean;
           isError: false;
           error: undefined;
       }
     | {
-          isEnabled: true;
           isLoading: boolean;
           isError: true;
           error: Error;
       };
 
 export type State =
-    | {
-          type: 'NOT_ENABLED';
-      }
     | {
           type: 'LOADING';
       }

diff --git a/src/services/store.ts b/src/services/store.ts
@@ -26,8 +26,6 @@ const preflight = (config: ServiceConfig): PreflightResult => {
     const dir = isDev ? path.join(projectRootDir, '.local-config') : paths.data;
     const dataFilePath = path.join(dir, config.filename);
 
-    console.log({ dir });
-
     if (!existsSync(dataFilePath)) {
         mkdirSync(dir, { recursive: true });
     }