- {handleAutoComplete()}
-
-
- {!clearConsole &&
}
- {newstate.journalBlocks &&
+
+ {handleAutoComplete()}
+
+
+ {!clearConsole &&
}
+ {newstate.journalBlocks &&
newstate.journalBlocks.map((x, index) => {
if (x.name === EMPTY_BLOCK) {
return (
@@ -768,41 +768,41 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
}
}
})}
-
-
- {isOpen && (
-
-
{'>'}
-
onChange(event)}
- onKeyDown={(event) => handleKeyDown(event)}
- value={autoCompletState.userInput}
- onPaste={handlePaste}
- >
+
- )}
+ {isOpen && (
+
+ {'>'}
+ onChange(event)}
+ onKeyDown={(event) => handleKeyDown(event)}
+ value={autoCompletState.userInput}
+ onPaste={handlePaste}
+ >
+
+ )}
+
+
+ {toaster &&
}
+ {toastProvider.show &&
}
-
- {toaster &&
}
- {toastProvider.show &&
}
-
- ))
+ ))
}
const typewrite = (elementsRef, message, callback) => {
diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index c79129f630..7830c108b4 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -597,37 +597,37 @@ export const cloneRepository = async (url: string) => {
dispatch(cloneRepositoryRequest())
promise
.then(async () => {
- const isActive = await plugin.call('manager', 'isActive', 'dgit')
-
- if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
- await fetchWorkspaceDirectory(ROOT_PATH)
- const workspacesPath = plugin.fileProviders.workspace.workspacesPath
- const branches = await getGitRepoBranches(workspacesPath + '/' + repoName)
-
- dispatch(setCurrentWorkspaceBranches(branches))
- const currentBranch = await getGitRepoCurrentBranch(workspacesPath + '/' + repoName)
-
- dispatch(setCurrentWorkspaceCurrentBranch(currentBranch))
- dispatch(cloneRepositorySuccess())
- }).catch(() => {
- const cloneModal = {
- id: 'cloneGitRepository',
- title: 'Clone Git Repository',
- message:
+ const isActive = await plugin.call('manager', 'isActive', 'dgit')
+
+ if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
+ await fetchWorkspaceDirectory(ROOT_PATH)
+ const workspacesPath = plugin.fileProviders.workspace.workspacesPath
+ const branches = await getGitRepoBranches(workspacesPath + '/' + repoName)
+
+ dispatch(setCurrentWorkspaceBranches(branches))
+ const currentBranch = await getGitRepoCurrentBranch(workspacesPath + '/' + repoName)
+
+ dispatch(setCurrentWorkspaceCurrentBranch(currentBranch))
+ dispatch(cloneRepositorySuccess())
+ }).catch(() => {
+ const cloneModal = {
+ id: 'cloneGitRepository',
+ title: 'Clone Git Repository',
+ message:
'An error occurred: Please check that you have the correct URL for the repo. If the repo is private, you need to add your github credentials (with the valid token permissions) in Settings plugin',
- modalType: 'modal',
- okLabel: 'OK',
- okFn: async () => {
- await deleteWorkspace(repoName)
- dispatch(cloneRepositoryFailed())
- },
- hideFn: async () => {
- await deleteWorkspace(repoName)
- dispatch(cloneRepositoryFailed())
+ modalType: 'modal',
+ okLabel: 'OK',
+ okFn: async () => {
+ await deleteWorkspace(repoName)
+ dispatch(cloneRepositoryFailed())
+ },
+ hideFn: async () => {
+ await deleteWorkspace(repoName)
+ dispatch(cloneRepositoryFailed())
+ }
}
- }
- plugin.call('notification', 'modal', cloneModal)
- })
+ plugin.call('notification', 'modal', cloneModal)
+ })
} catch (e) {
dispatch(displayPopUp('An error occured: ' + e))
}