Use correct URL for YDoc server on Cloud (#10566)

- Fix https://github.com/enso-org/cloud-v2/issues/1314
- Use correct URL for YDoc server on Cloud

# Important Notes
- Note that Cloud Projects should also be checked on the desktop app.
This commit is contained in:
somebody1234 2024-07-23 17:46:02 +10:00 committed by GitHub
parent ba56f8e89b
commit 7e4c25c167
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions

View File

@ -192,7 +192,7 @@ function EditorInternal(props: EditorInternalProps) {
const appProps = React.useMemo<GraphEditorProps>(() => {
const jsonAddress = openedProject.jsonAddress
const binaryAddress = openedProject.binaryAddress
const ydocAddress = ydocUrl ?? ''
const ydocAddress = openedProject.ydocAddress ?? ydocUrl ?? ''
const backend = backendType === backendModule.BackendType.remote ? remoteBackend : localBackend
if (jsonAddress == null) {

View File

@ -202,6 +202,7 @@ export default class LocalBackend extends Backend {
},
jsonAddress: null,
binaryAddress: null,
ydocAddress: null,
}))
}
@ -285,6 +286,7 @@ export default class LocalBackend extends Backend {
ideVersion: version,
jsonAddress: null,
binaryAddress: null,
ydocAddress: null,
organizationId: backend.OrganizationId(''),
packageName: project.name,
projectId,
@ -305,6 +307,7 @@ export default class LocalBackend extends Backend {
},
jsonAddress: ipWithSocketToAddress(cachedProject.languageServerJsonAddress),
binaryAddress: ipWithSocketToAddress(cachedProject.languageServerBinaryAddress),
ydocAddress: null,
organizationId: backend.OrganizationId(''),
packageName: cachedProject.projectNormalizedName,
projectId,

View File

@ -28,9 +28,7 @@ const STATUS_SUCCESS_LAST = 299
const STATUS_NOT_FOUND = 404
/** HTTP status indicating that the server encountered a fatal exception. */
const STATUS_SERVER_ERROR = 500
/**
* HTTP status indicating that the request was successful, but the user is not authorized to access
*/
/** HTTP status indicating that the request was successful, but the user is not authorized to access. */
const STATUS_NOT_AUTHORIZED = 401
/** The number of milliseconds in one day. */
@ -591,6 +589,7 @@ export default class RemoteBackend extends Backend {
...project,
jsonAddress: project.address != null ? backend.Address(`${project.address}json`) : null,
binaryAddress: project.address != null ? backend.Address(`${project.address}binary`) : null,
ydocAddress: project.address != null ? backend.Address(`${project.address}project`) : null,
}))
}
}
@ -689,6 +688,7 @@ export default class RemoteBackend extends Backend {
engineVersion: project.engine_version,
jsonAddress: project.address != null ? backend.Address(`${project.address}json`) : null,
binaryAddress: project.address != null ? backend.Address(`${project.address}binary`) : null,
ydocAddress: project.address != null ? backend.Address(`${project.address}project`) : null,
}
}
}

View File

@ -260,6 +260,7 @@ export interface ListedProjectRaw extends CreatedProject {
export interface ListedProject extends CreatedProject {
readonly binaryAddress: Address | null
readonly jsonAddress: Address | null
readonly ydocAddress: Address | null
}
/** A `Project` returned by `updateProject`. */