Refresh createWorkspace, ensure that path is set before resolving workspace

pull/1575/head
ioedeveloper 3 years ago
parent 1db046b139
commit b38ca31a24
  1. 8
      libs/remix-ui/workspace/src/lib/actions/workspace.ts

@ -46,9 +46,9 @@ export const createWorkspace = async (workspaceName: string, isEmpty = false, cb
dispatch(createWorkspaceRequest(promise)) dispatch(createWorkspaceRequest(promise))
promise.then(async () => { promise.then(async () => {
dispatch(createWorkspaceSuccess(workspaceName)) dispatch(createWorkspaceSuccess(workspaceName))
if (!isEmpty) await loadWorkspacePreset('default-template')
plugin.setWorkspace({ name: workspaceName, isLocalhost: false }) plugin.setWorkspace({ name: workspaceName, isLocalhost: false })
plugin.setWorkspaces(await getWorkspaces()) plugin.setWorkspaces(await getWorkspaces())
if (!isEmpty) await loadWorkspacePreset('default-template')
cb && cb(null, workspaceName) cb && cb(null, workspaceName)
}).catch((error) => { }).catch((error) => {
dispatch(createWorkspaceError({ error })) dispatch(createWorkspaceError({ error }))
@ -153,6 +153,7 @@ export const workspaceExists = async (name: string) => {
} }
export const fetchWorkspaceDirectory = async (path: string) => { export const fetchWorkspaceDirectory = async (path: string) => {
if (!path) return
const provider = plugin.fileManager.currentFileProvider() const provider = plugin.fileManager.currentFileProvider()
const promise = new Promise((resolve) => { const promise = new Promise((resolve) => {
provider.resolveDirectory(path, (error, fileTree) => { provider.resolveDirectory(path, (error, fileTree) => {
@ -266,7 +267,6 @@ export const getWorkspaces = async (): Promise<string[]> | undefined => {
plugin.fileProviders.browser.resolveDirectory('/' + workspacesPath, (error, items) => { plugin.fileProviders.browser.resolveDirectory('/' + workspacesPath, (error, items) => {
if (error) { if (error) {
console.error(error)
return reject(error) return reject(error)
} }
resolve(Object.keys(items) resolve(Object.keys(items)
@ -277,7 +277,5 @@ export const getWorkspaces = async (): Promise<string[]> | undefined => {
plugin.setWorkspaces(workspaces) plugin.setWorkspaces(workspaces)
return workspaces return workspaces
} catch (e) { } catch (e) {}
console.log(e)
}
} }

Loading…
Cancel
Save