Add a workaround when getting a file with JSON contents

I still don't like this workaround because you're not getting the raw file contents. Needs an upstream fix: perry-mitchell/webdav-client#267
mofojed · Aug 9, 2021 · c5a6ef1 · c5a6ef1
1 parent 2334c53
commit c5a6ef1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/code-studio/src/dashboard/DashboardContainer.jsx b/packages/code-studio/src/dashboard/DashboardContainer.jsx
@@ -644,7 +644,7 @@ DashboardContainer.contextType = ReactReduxContext;
 
 const mapStateToProps = state => ({
   activeTool: getActiveTool(state),
-  session: getSession(state),
+  session: getSession(state).session,
 });
 
 export default connect(mapStateToProps, {

diff --git a/packages/file-explorer/src/WebdavFileStorage.ts b/packages/file-explorer/src/WebdavFileStorage.ts
@@ -52,9 +52,17 @@ export class WebdavFileStorage implements FileStorage {
   }
 
   async loadFile(name: string): Promise<File> {
-    const content = await this.client.getFileContents(name, {
+    let content = await this.client.getFileContents(name, {
       format: 'text',
     });
+
+    // There appears to be a bug where data is returned as an object instead of a string
+    // Work around for now
+    // https://github.com/perry-mitchell/webdav-client/issues/267
+    if (typeof content === 'object') {
+      content = JSON.stringify(content, null, 2);
+    }
+
     return {
       filename: name,
       basename: FileUtils.getBaseName(name),