@hubspot/cli 8.0.8-experimental.0 → 8.0.8-experimental.1

package/ui/components/getStarted/GetStartedFlow.js

@@ -1,15 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { sanitizeFileName, untildify } from '@hubspot/local-dev-lib/path';
 import { useApp, useFocus, useInput } from 'ink';
-import open from 'open';
 import { useCallback, useEffect, useReducer } from 'react';
 import { commands } from '../../../lang/en.js';
-import { createProjectAction, pollAppInstallation, trackGetStartedUsage, uploadAndDeployAction, } from '../../../lib/getStartedV2Actions.js';
-import { validateProjectDirectory } from '../../../lib/prompts/projectNameAndDestPrompt.js';
+import { createProjectAction, trackGetStartedUsage, uploadAndDeployAction, } from '../../../lib/getStartedV2Actions.js';
 import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { ACTION_STATUSES, GET_STARTED_FLOW_STEPS, } from '../../lib/constants.js';
 import { flowReducer } from './reducer.js';
-import { InstallationScreen } from './screens/InstallationScreen.js';
 import { ProjectSetupScreen } from './screens/ProjectSetupScreen.js';
 import { UploadScreen } from './screens/UploadScreen.js';
 import { getProject } from './selectors.js';
@@ -47,7 +44,6 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         statuses: {
             create: initialName ? ACTION_STATUSES.RUNNING : ACTION_STATUSES.IDLE,
             upload: ACTION_STATUSES.IDLE,
-            installApp: ACTION_STATUSES.IDLE,
         },
     });
     const [state, dispatch] = useReducer(flowReducer, getInitialState());
@@ -72,16 +68,6 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         dispatch({ type: 'SET_STEP', payload: GET_STARTED_FLOW_STEPS.DEST_INPUT });
     }, []);
     const handleDestSubmit = useCallback(async () => {
-        const validationResult = validateProjectDirectory(project.destination);
-        if (validationResult !== true) {
-            dispatch({
-                type: 'SET_DEST_ERROR',
-                payload: typeof validationResult === 'string'
-                    ? validationResult
-                    : commands.getStarted.v2.unknownError,
-            });
-            return;
-        }
         dispatch({ type: 'SET_STEP', payload: GET_STARTED_FLOW_STEPS.CREATING });
         try {
             await createProjectAction({
@@ -122,57 +108,6 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
             dispatch({ type: 'UPLOAD_ERROR', payload: errorMessage });
         }
     }, [derivedAccountId, project.destination]);
-    const handlePollInstallation = useCallback(async () => {
-        const uploadApp = project.uploadResult?.app;
-        const projectId = project.uploadResult?.projectId;
-        if (!projectId || !uploadApp?.uid) {
-            dispatch({
-                type: 'INSTALL_APP_ERROR',
-                payload: commands.getStarted.v2.unknownError,
-            });
-            return;
-        }
-        try {
-            await pollAppInstallation({
-                accountId: derivedAccountId,
-                projectId,
-                appUid: uploadApp.uid,
-                requiredScopes: uploadApp.config?.auth?.requiredScopes,
-                optionalScopes: uploadApp.config?.auth?.optionalScopes,
-                onTimeout: () => {
-                    dispatch({ type: 'SET_POLLING_TIMED_OUT', payload: true });
-                },
-            });
-            dispatch({ type: 'INSTALL_APP_DONE' });
-        }
-        catch (error) {
-            dispatch({
-                type: 'INSTALL_APP_ERROR',
-                payload: error instanceof Error
-                    ? error.message
-                    : commands.getStarted.v2.unknownError,
-            });
-        }
-    }, [project.uploadResult, derivedAccountId]);
-    const handleBrowserOpen = useCallback(async (shouldOpen) => {
-        await trackGetStartedUsage({
-            step: 'open-install-page',
-            type: shouldOpen ? 'opened' : 'declined',
-        }, derivedAccountId);
-        if (shouldOpen && project.uploadResult?.installUrl) {
-            try {
-                await open(project.uploadResult.installUrl, { url: true });
-            }
-            catch (error) {
-                dispatch({
-                    type: 'SET_BROWSER_FAILED_URL',
-                    payload: project.uploadResult.installUrl,
-                });
-            }
-        }
-        dispatch({ type: 'START_INSTALL_APP' });
-        await handlePollInstallation();
-    }, [project.uploadResult, derivedAccountId, handlePollInstallation]);
     const handleNameChange = useCallback((value) => {
         dispatch({ type: 'SET_PROJECT_NAME', payload: value });
     }, []);
@@ -181,8 +116,7 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
     }, []);
     useInput((_, key) => {
         const hasError = state.statuses.create === ACTION_STATUSES.ERROR ||
-            state.statuses.upload === ACTION_STATUSES.ERROR ||
-            state.statuses.installApp === ACTION_STATUSES.ERROR;
+            state.statuses.upload === ACTION_STATUSES.ERROR;
         if (hasError) {
             exit();
             return;
@@ -192,22 +126,11 @@ export function GetStartedFlow({ derivedAccountId, initialName, initialDest, })
         if (state.step === GET_STARTED_FLOW_STEPS.COMPLETE) {
             handleUploadStart();
         }
-        else if (state.step === GET_STARTED_FLOW_STEPS.OPEN_APP_PROMPT) {
-            handleBrowserOpen(true);
-        }
-        else if (state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP &&
-            state.statuses.installApp === ACTION_STATUSES.DONE) {
-            // Ready for card setup - will be handled in PR3
-            exit();
-        }
     });
     if (state.step === GET_STARTED_FLOW_STEPS.UPLOADING ||
         state.step === GET_STARTED_FLOW_STEPS.OPEN_APP_PROMPT) {
         return _jsx(UploadScreen, { state: state, accountName: accountName });
     }
-    if (state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP) {
-        return _jsx(InstallationScreen, { state: state, accountName: accountName });
-    }
     // Show project setup screen for initial flow
     return (_jsx(ProjectSetupScreen, { state: state, onSelectOption: handleSelect, onNameChange: handleNameChange, onNameSubmit: handleNameSubmit, onDestChange: handleDestChange, onDestSubmit: handleDestSubmit }));
 }

package/ui/components/getStarted/reducer.d.ts

@@ -14,7 +14,6 @@ export type AppState = {
 export type ActionStatuses = {
     create: ActionStatus;
     upload: ActionStatus;
-    installApp: ActionStatus;
 };
 export type FlowState = {
     step: FlowStep;
@@ -22,9 +21,6 @@ export type FlowState = {
     app: AppState;
     statuses: ActionStatuses;
     error?: string;
-    destError?: string;
-    browserFailedUrl?: string;
-    pollingTimedOut?: boolean;
 };
 type FlowAction = {
     type: 'SET_STEP';
@@ -41,9 +37,6 @@ type FlowAction = {
 } | {
     type: 'SET_ERROR';
     payload: string;
-} | {
-    type: 'SET_DEST_ERROR';
-    payload: string;
 } | {
     type: 'CLEAR_ERROR';
 } | {
@@ -61,19 +54,6 @@ type FlowAction = {
 } | {
     type: 'UPLOAD_ERROR';
     payload: string;
-} | {
-    type: 'START_INSTALL_APP';
-} | {
-    type: 'INSTALL_APP_DONE';
-} | {
-    type: 'INSTALL_APP_ERROR';
-    payload: string;
-} | {
-    type: 'SET_BROWSER_FAILED_URL';
-    payload: string;
-} | {
-    type: 'SET_POLLING_TIMED_OUT';
-    payload: boolean;
 };
 export declare function flowReducer(state: FlowState, action: FlowAction): FlowState;
 export {};

package/ui/components/getStarted/reducer.js

@@ -17,13 +17,6 @@ export function flowReducer(state, action) {
             return {
                 ...state,
                 project: { ...state.project, destination: action.payload },
-                destError: undefined,
-            };
-        case 'SET_DEST_ERROR':
-            return {
-                ...state,
-                step: GET_STARTED_FLOW_STEPS.DEST_INPUT,
-                destError: action.payload,
             };
         case 'SET_ERROR':
             return { ...state, error: action.payload };
@@ -73,35 +66,6 @@ export function flowReducer(state, action) {
                 statuses: { ...state.statuses, upload: ACTION_STATUSES.ERROR },
                 error: action.payload,
             };
-        case 'START_INSTALL_APP':
-            return {
-                ...state,
-                step: GET_STARTED_FLOW_STEPS.INSTALLING_APP,
-                statuses: { ...state.statuses, installApp: ACTION_STATUSES.RUNNING },
-                error: undefined,
-                pollingTimedOut: false,
-            };
-        case 'INSTALL_APP_DONE':
-            return {
-                ...state,
-                statuses: { ...state.statuses, installApp: ACTION_STATUSES.DONE },
-            };
-        case 'INSTALL_APP_ERROR':
-            return {
-                ...state,
-                statuses: { ...state.statuses, installApp: ACTION_STATUSES.ERROR },
-                error: action.payload,
-            };
-        case 'SET_BROWSER_FAILED_URL':
-            return {
-                ...state,
-                browserFailedUrl: action.payload,
-            };
-        case 'SET_POLLING_TIMED_OUT':
-            return {
-                ...state,
-                pollingTimedOut: action.payload,
-            };
         default:
             return state;
     }

package/ui/components/getStarted/screens/ProjectSetupScreen.js

@@ -35,6 +35,5 @@ export function ProjectSetupScreen({ state, onSelectOption, onNameChange, onName
     return (_jsx(BoxWithTitle, { flexGrow: 1, title: "hs get-started", borderColor: INK_COLORS.HUBSPOT_ORANGE, titleBackgroundColor: INK_COLORS.HUBSPOT_ORANGE, children: _jsxs(Box, { flexDirection: "column", rowGap: 1, children: [_jsx(Text, { bold: true, children: titleText }), state.step === GET_STARTED_FLOW_STEPS.SELECT ? (_jsxs(_Fragment, { children: [_jsx(Text, { children: overviewText }), _jsx(Text, { children: projectsText }), _jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: selectPrompt })] }), _jsx(SelectInput, { items: GET_STARTED_FLOW_OPTIONS, onSelect: onSelectOption })] })) : (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: `${selectPrompt}` }), _jsx(Text, { color: INK_COLORS.INFO_BLUE, children: state.app.selectedLabel })] })), _jsxs(ActionSection, { status: state.statuses.create, statusText: runningProjectCreateText, errorMessage: state.statuses.create === ACTION_STATUSES.ERROR
                         ? `${state.error}\n\n${commands.getStarted.v2.pressKeyToExit}`
                         : undefined, children: [state.step !== GET_STARTED_FLOW_STEPS.SELECT && (_jsx(InputField, { flag: "name", prompt: "Enter your project name", value: project.name, isEditing: state.step === GET_STARTED_FLOW_STEPS.NAME_INPUT, onChange: onNameChange, onSubmit: onNameSubmit })), state.step !== GET_STARTED_FLOW_STEPS.SELECT &&
-                            state.step !== GET_STARTED_FLOW_STEPS.NAME_INPUT && (_jsxs(_Fragment, { children: [_jsx(InputField, { flag: "dest", prompt: "Choose where to create the project", value: project.destination, isEditing: state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT, onChange: onDestChange, onSubmit: onDestSubmit }), state.destError &&
-                                    state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT && (_jsx(Text, { color: INK_COLORS.ALERT_RED, children: state.destError }))] }))] }), state.step === GET_STARTED_FLOW_STEPS.COMPLETE && (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueDeploy(state.app.selectedLabel) })] }))] }) }));
+                            state.step !== GET_STARTED_FLOW_STEPS.NAME_INPUT && (_jsx(InputField, { flag: "dest", prompt: "Choose where to create the project", value: project.destination, isEditing: state.step === GET_STARTED_FLOW_STEPS.DEST_INPUT, onChange: onDestChange, onSubmit: onDestSubmit }))] }), state.step === GET_STARTED_FLOW_STEPS.COMPLETE && (_jsxs(Box, { flexDirection: "row", flexWrap: "wrap", columnGap: 1, children: [_jsx(Text, { color: INK_COLORS.HUBSPOT_TEAL, children: "?" }), _jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueDeploy(state.app.selectedLabel) })] }))] }) }));
 }

package/ui/lib/constants.d.ts

@@ -12,6 +12,5 @@ export declare const GET_STARTED_FLOW_STEPS: {
     readonly INSTALLING: "installing";
     readonly UPLOADING: "uploading";
     readonly OPEN_APP_PROMPT: "open-app-prompt";
-    readonly INSTALLING_APP: "installing-app";
     readonly COMPLETE: "complete";
 };

package/ui/lib/constants.js

@@ -12,6 +12,5 @@ export const GET_STARTED_FLOW_STEPS = {
     INSTALLING: 'installing',
     UPLOADING: 'uploading',
     OPEN_APP_PROMPT: 'open-app-prompt',
-    INSTALLING_APP: 'installing-app',
     COMPLETE: 'complete',
 };

package/ui/components/getStarted/screens/InstallationScreen.d.ts

@@ -1,7 +0,0 @@
-import { FlowState } from '../reducer.js';
-type InstallationScreenProps = {
-    state: FlowState;
-    accountName: string;
-};
-export declare function InstallationScreen({ state, accountName, }: InstallationScreenProps): import("react/jsx-runtime").JSX.Element;
-export {};

package/ui/components/getStarted/screens/InstallationScreen.js

@@ -1,16 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text } from 'ink';
-import { commands } from '../../../../lang/en.js';
-import { ActionSection } from '../../ActionSection.js';
-import { BoxWithTitle } from '../../BoxWithTitle.js';
-import { INK_COLORS } from '../../../styles.js';
-import { getProject } from '../selectors.js';
-import { ACTION_STATUSES, GET_STARTED_FLOW_STEPS, } from '../../../lib/constants.js';
-export function InstallationScreen({ state, accountName, }) {
-    const project = getProject(state);
-    const titleText = commands.getStarted.v2.startTitle;
-    // If we get to the installation screen, the app is uploaded and we have the name
-    const appName = project.uploadResult?.app?.config.name;
-    return (_jsx(BoxWithTitle, { flexGrow: 1, title: "hs get-started", borderColor: INK_COLORS.HUBSPOT_ORANGE, titleBackgroundColor: INK_COLORS.HUBSPOT_ORANGE, children: _jsxs(Box, { flexDirection: "column", rowGap: 1, children: [_jsx(Text, { bold: true, children: titleText }), _jsx(Text, { children: commands.getStarted.v2.installInstructions }), _jsx(ActionSection, { status: state.statuses.installApp, statusText: commands.getStarted.v2.installingApp(appName, accountName) }), state.browserFailedUrl && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: INK_COLORS.WARNING_YELLOW, children: commands.getStarted.v2.browserFailedToOpen(state.browserFailedUrl) }) })), state.pollingTimedOut && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: INK_COLORS.WARNING_YELLOW, children: commands.getStarted.v2.pollingTimeout(2) }) })), state.step === GET_STARTED_FLOW_STEPS.INSTALLING_APP &&
-                    state.statuses.installApp === ACTION_STATUSES.DONE && (_jsx(Text, { children: commands.getStarted.v2.pressEnterToContinueSetup }))] }) }));
-}