Merge branch 'master' of https://github.com/dblythy/parse-dashboard

Author: dblythy

src/components/SaveButton/SaveButton.example.js

@@ -55,6 +55,9 @@ export const demos = [
         <div style={{padding: 10}}>
           <SaveButton state={SaveButton.States.FAILED} />
         </div>
+        <div style={{padding: 10}}>
+          <SaveButton state={SaveButton.States.WAITING} />
+        </div>
       </div>
     )
   }, {

src/components/SaveButton/SaveButton.react.js

@@ -52,7 +52,7 @@ let SaveButton = ({
   </span>;
 };
 
-SaveButton.States = keyMirror(['SAVING', 'SUCCEEDED', 'FAILED']);
+SaveButton.States = keyMirror(['SAVING', 'SUCCEEDED', 'FAILED', 'WAITING']);
 
 let {...forwardedButtonProps} = Button.propTypes;
 delete forwardedButtonProps.value;

src/dashboard/Data/CloudCode/CloudCode.react.js

@@ -5,17 +5,19 @@
  * This source code is licensed under the license found in the LICENSE file in
  * the root directory of this source tree.
  */
-import CodeSnippet   from 'components/CodeSnippet/CodeSnippet.react';
+import CodeEditor from 'components/CodeEditor/CodeEditor.react';
 import DashboardView from 'dashboard/DashboardView.react';
 import EmptyState    from 'components/EmptyState/EmptyState.react';
 import FileTree      from 'components/FileTree/FileTree.react';
 import history       from 'dashboard/history';
 import React         from 'react';
 import styles        from 'dashboard/Data/CloudCode/CloudCode.scss';
 import Toolbar       from 'components/Toolbar/Toolbar.react';
+import SaveButton from 'components/SaveButton/SaveButton.react';
 
 function getPath(params) {
-  return params.splat;
+  const last = params.location.pathname.split('cloud_code/')[1]
+  return last;
 }
 
 export default class CloudCode extends DashboardView {
@@ -26,17 +28,19 @@ export default class CloudCode extends DashboardView {
 
     this.state = {
       files: undefined,
-      source: undefined
+      source: undefined,
+      saveState: SaveButton.States.WAITING,
+      saveError: '',
     };
   }
 
   componentWillMount() {
-    this.fetchSource(this.context.currentApp, getPath(this.props.params));
+    this.fetchSource(this.context.currentApp, getPath(this.props));
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (this.context !== nextContext) {
-      this.fetchSource(nextContext.currentApp, getPath(nextProps.params));
+      this.fetchSource(nextContext.currentApp, getPath(nextProps));
     }
   }
 
@@ -52,11 +56,17 @@ export default class CloudCode extends DashboardView {
 
         if (!fileName || release.files[fileName] === undefined) {
           // Means we're still in /cloud_code/. Let's redirect to /cloud_code/main.js
-          history.replace(this.context.generatePath('cloud_code/main.js'))
+          history.replace(this.context.generatePath(`cloud_code/${Object.keys(release.files)[0]}`))
         } else {
           // Means we can load /cloud_code/<fileName>
+          this.setState({ source: undefined })
           app.getSource(fileName).then(
-            (source) => this.setState({ source: source }),
+            (source) => {
+              this.setState({ source: source })
+              if (this.editor) {
+                this.editor.value = source;
+              }
+            },
             () => this.setState({ source: undefined })
           );
         }
@@ -66,7 +76,7 @@ export default class CloudCode extends DashboardView {
   }
 
   renderSidebar() {
-    let current = getPath(this.props.params) || '';
+    let current = getPath(this.props) || '';
     let files = this.state.files;
     if (!files) {
       return null;
@@ -86,11 +96,27 @@ export default class CloudCode extends DashboardView {
       </div>
     );
   }
-
+  async getCode() { 
+    if (!this.editor) {
+      return;
+    }
+    this.setState({ saveState: SaveButton.States.SAVING });
+    let fileName = getPath(this.props);
+    try {
+      await this.context.currentApp.saveSource(fileName,this.editor.value);
+      this.setState({ saveState: SaveButton.States.SUCCEEDED });
+      setTimeout(()=> {
+        this.setState({ saveState: SaveButton.States.WAITING });
+      },2000);
+    } catch (e) {
+      this.setState({ saveState: SaveButton.States.FAILED });
+      this.setState({ saveError: e.message || e });
+    }
+  }
   renderContent() {
     let toolbar = null;
     let content = null;
-    let fileName = getPath(this.props.params);
+    let fileName = getPath(this.props);
 
     if (!this.state.files || Object.keys(this.state.files).length === 0) {
       content = (
@@ -110,10 +136,20 @@ export default class CloudCode extends DashboardView {
           subsection={fileName} />;
 
         let source = this.state.files[fileName];
-        if (source && source.source) {
+        if ((source && source.source) || this.state.source) {
           content = (
             <div className={styles.content}>
-              <CodeSnippet source={source.source} language='javascript' />
+              <CodeEditor
+                placeHolder={this.state.source || source.source}
+                ref={editor => (this.editor = editor)}
+                fontSize={'14px'}
+              />
+               <SaveButton 
+               state={this.state.saveState}
+               waitingText={this.state.submitText}
+               savingText={this.state.inProgressText}
+               failedText={this.state.saveError}
+               onClick={() => this.getCode(this)}></SaveButton>
             </div>
           );
         }

src/lib/ParseApp.js

@@ -119,6 +119,15 @@ export default class ParseApp {
     return this.apiRequest('GET', path, {}, { useMasterKey: true });
   }
 
+  /**
+   * Saves source of a Cloud Code hosted file from api.parse.com
+   * fileName - the name of the file to be fetched
+   * data - the text to save to the cloud file
+   */
+  saveSource(fileName,data) {
+    return this.apiRequest('POST', `scripts/${fileName}`, {data}, { useMasterKey: true });
+  }
+
   /**
    * Fetches source of a Cloud Code hosted file from api.parse.com
    * fileName - the name of the file to be fetched
@@ -129,22 +138,11 @@ export default class ParseApp {
         // No release yet
         return Promise.resolve(null);
       }
-
-      let fileMetaData = release.files[fileName];
-      if (fileMetaData && fileMetaData.source) {
-        return Promise.resolve(fileMetaData.source);
-      }
-
-      let params = {
-        version: fileMetaData.version,
-        checksum: fileMetaData.checksum
-      }
-      return this.apiRequest('GET', `scripts/${fileName}`, params, { useMasterKey: true });
+      return this.apiRequest('GET', `scripts/${fileName}`, {}, { useMasterKey: true });
     }).then((source) => {
       if (this.latestRelease.files) {
         this.latestRelease.files[fileName].source = source;
       }
-
       return Promise.resolve(source);
     });
   }