enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-22 22:10:15 +03:00
Code Issues Projects Releases Wiki Activity

Fix startup.project (#7393)

Browse Source
This commit is contained in:
somebody1234 2023-08-01 03:52:28 +10:00 committed by GitHub
parent 8416e19eef
commit c1e24629b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/driveView.tsx
View File

@ -83,7 +83,7 @@ export default function DirectoryView(props: DirectoryViewProps) {
const { backend } = backendProvider.useBackend()
const toastAndLog = hooks.useToastAndLog()
const [initialized, setInitialized] = React.useState(false)
const [assets, setAssets] = React.useState<backendModule.AnyAsset[]>([])
const [assets, rawSetAssets] = React.useState<backendModule.AnyAsset[]>([])
const [isLoadingAssets, setIsLoadingAssets] = React.useState(true)
const [directoryStack, setDirectoryStack] = React.useState<backendModule.DirectoryAsset[]>([])
const [isFileBeingDragged, setIsFileBeingDragged] = React.useState(false)
@ -144,6 +144,40 @@ export default function DirectoryView(props: DirectoryViewProps) {
}
}, [directoryStack, directoryId, organization])
const setAssets = React.useCallback(
(newAssets: backendModule.AnyAsset[]) => {
rawSetAssets(newAssets)
if (nameOfProjectToImmediatelyOpen != null) {
const projectToLoad = newAssets.find(
projectAsset => projectAsset.title === nameOfProjectToImmediatelyOpen
)
if (projectToLoad != null) {
dispatchAssetEvent({
type: assetEventModule.AssetEventType.openProject,
id: projectToLoad.id,
})
}
setNameOfProjectToImmediatelyOpen(null)
}
if (!initialized && initialProjectName != null) {
setInitialized(true)
if (!newAssets.some(asset => asset.title === initialProjectName)) {
const errorMessage = `No project named '${initialProjectName}' was found.`
toastify.toast.error(errorMessage)
logger.error(`Error opening project on startup: ${errorMessage}`)
}
}
},
[
initialized,
initialProjectName,
logger,
nameOfProjectToImmediatelyOpen,
/* should never change */ setNameOfProjectToImmediatelyOpen,
/* should never change */ dispatchAssetEvent,
]
)
hooks.useAsyncEffect(
null,
async signal => {
@ -182,38 +216,6 @@ export default function DirectoryView(props: DirectoryViewProps) {
[accessToken, directoryId, backend]
)
React.useEffect(() => {
if (nameOfProjectToImmediatelyOpen != null) {
const projectToLoad = assets.find(
projectAsset => projectAsset.title === nameOfProjectToImmediatelyOpen
)
if (projectToLoad != null) {
dispatchAssetEvent({
type: assetEventModule.AssetEventType.openProject,
id: projectToLoad.id,
})
}
setNameOfProjectToImmediatelyOpen(null)
}
if (!initialized && initialProjectName != null) {
setInitialized(true)
if (!assets.some(asset => asset.title === initialProjectName)) {
const errorMessage = `No project named '${initialProjectName}' was found.`
toastify.toast.error(errorMessage)
logger.error(`Error opening project on startup: ${errorMessage}`)
}
}
// `nameOfProjectToImmediatelyOpen` must NOT trigger this effect.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
assets,
initialized,
initialProjectName,
logger,
/* should never change */ setNameOfProjectToImmediatelyOpen,
/* should never change */ dispatchAssetEvent,
])
const doUploadFiles = React.useCallback(
(files: FileList) => {
if (backend.type === backendModule.BackendType.local) {