Skip to content

Commit 49ca09a

Browse files
ci-botAniket-Engg
authored andcommitted
Add connect to Remixd. Fix comments from @Aniket-Engg
1 parent 03deffe commit 49ca09a

File tree

2 files changed

+34
-19
lines changed

2 files changed

+34
-19
lines changed

libs/remix-ui/top-bar/src/components/WorkspaceDropdown.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ interface WorkspacesDropdownProps {
4848
deleteAllWorkspaces: () => void
4949
setCurrentMenuItemName: (workspaceName: string) => void
5050
setMenuItems: (menuItems: MenuItem[]) => void
51+
connectToLocalhost: () => void
5152
}
5253

5354
function useClickOutside(refs: React.RefObject<HTMLElement>[], handler: () => void) {
@@ -63,7 +64,7 @@ function useClickOutside(refs: React.RefObject<HTMLElement>[], handler: () => vo
6364
}, [refs, handler])
6465
}
6566

66-
export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItems, NO_WORKSPACE, switchWorkspace, CustomToggle, createWorkspace, downloadCurrentWorkspace, restoreBackup, deleteAllWorkspaces, setCurrentMenuItemName, setMenuItems, renameCurrentWorkspace, deleteCurrentWorkspace }) => {
67+
export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItems, NO_WORKSPACE, switchWorkspace, CustomToggle, createWorkspace, downloadCurrentWorkspace, restoreBackup, deleteAllWorkspaces, setCurrentMenuItemName, setMenuItems, renameCurrentWorkspace, deleteCurrentWorkspace, downloadWorkspaces, connectToLocalhost }) => {
6768
const [showMain, setShowMain] = useState(false)
6869
const [openSub, setOpenSub] = useState<number | null>(null)
6970
const global = useContext(TopbarContext)
@@ -351,12 +352,12 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
351352
</span>
352353
</Dropdown.Item>
353354
<Dropdown.Item onClick={() => {
354-
downloadCurrentWorkspace()
355+
downloadWorkspaces()
355356
setShowMain(false)
356357
setOpenSub(null)
357358
}}>
358359
<span className="pl-2" onClick={() => {
359-
downloadCurrentWorkspace()
360+
downloadWorkspaces()
360361
setShowMain(false)
361362
setOpenSub(null)
362363
}}>
@@ -378,6 +379,20 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
378379
Restore
379380
</span>
380381
</Dropdown.Item>
382+
<Dropdown.Item onClick={() => {
383+
connectToLocalhost()
384+
setShowMain(false)
385+
setOpenSub(null)
386+
}}>
387+
<span className="pl-2" onClick={() => {
388+
connectToLocalhost()
389+
setShowMain(false)
390+
setOpenSub(null)
391+
}}>
392+
<i className="fas fa-desktop mr-2"></i>
393+
Connect to Localhost
394+
</span>
395+
</Dropdown.Item>
381396
<li className="w-100 btn btn-danger font-weight-light text-decoration-none" onClick={() => {
382397
deleteAllWorkspaces()
383398
setShowMain(false)

libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { FormattedMessage, useIntl } from 'react-intl'
1010
import { TopbarContext } from '../context/topbarContext'
1111
import { WorkspacesDropdown } from '../components/WorkspaceDropdown'
1212
import { useOnClickOutside } from 'libs/remix-ui/remix-ai-assistant/src/components/onClickOutsideHook'
13-
import { cloneRepository, deleteWorkspace, fetchWorkspaceDirectory, getWorkspaces, handleDownloadFiles, handleDownloadWorkspace, handleExpandPath, publishToGist, renameWorkspace, restoreBackupZip, switchToWorkspace } from 'libs/remix-ui/workspace/src/lib/actions'
13+
import { cloneRepository, deleteWorkspace, fetchWorkspaceDirectory, deleteAllWorkspaces as deleteAllWorkspacesAction, handleDownloadFiles, handleDownloadWorkspace, handleExpandPath, publishToGist, renameWorkspace, restoreBackupZip, switchToWorkspace } from 'libs/remix-ui/workspace/src/lib/actions'
1414
import { gitUIPanels } from 'libs/remix-ui/git/src/types'
1515
import { loginWithGitHub, setPlugin } from 'libs/remix-ui/git/src/lib/pluginActions'
1616
import { GitHubUser } from 'libs/remix-api/src/lib/types/git'
@@ -131,21 +131,6 @@ export function RemixUiTopbar () {
131131
setMenuItems(menuItems)
132132
}
133133

134-
const onFinishDeleteAllWorkspaces = async () => {
135-
try {
136-
await deleteAllWorkspaces()
137-
} catch (e) {
138-
global.modal(
139-
intl.formatMessage({ id: 'filePanel.workspace.deleteAll' }),
140-
e.message,
141-
intl.formatMessage({ id: 'filePanel.ok' }),
142-
() => {},
143-
intl.formatMessage({ id: 'filePanel.cancel' })
144-
)
145-
console.error(e)
146-
}
147-
}
148-
149134
const onFinishRenameWorkspace = async (currMenuName?: string) => {
150135
if (workspaceRenameInput.current === undefined) return
151136
// @ts-ignore: Object is possibly 'null'.
@@ -218,6 +203,20 @@ export function RemixUiTopbar () {
218203
console.error(e)
219204
}
220205
}
206+
const onFinishDeleteAllWorkspaces = async () => {
207+
try {
208+
await deleteAllWorkspacesAction()
209+
} catch (e) {
210+
global.modal(
211+
intl.formatMessage({ id: 'filePanel.workspace.deleteAll' }),
212+
e.message,
213+
intl.formatMessage({ id: 'filePanel.ok' }),
214+
() => {},
215+
intl.formatMessage({ id: 'filePanel.cancel' })
216+
)
217+
console.error(e)
218+
}
219+
}
221220

222221
const deleteAllWorkspaces = () => {
223222
global.modal(
@@ -488,6 +487,7 @@ export function RemixUiTopbar () {
488487
deleteAllWorkspaces={deleteAllWorkspaces}
489488
setCurrentMenuItemName={setCurrentMenuItemName}
490489
setMenuItems={setMenuItems}
490+
connectToLocalhost={() => switchWorkspace(LOCALHOST)}
491491
/>
492492
</div>
493493
<div

0 commit comments

Comments
 (0)