Share modal can now display different projects

Author: LakshSingla

client/modules/App/components/Overlay.jsx

@@ -37,7 +37,6 @@ class Overlay extends React.Component {
   }
 
   handleClickOutside() {
-    console.log(this.node);
     this.close();
   }
 

client/modules/IDE/actions/ide.js

@@ -134,9 +134,17 @@ export function closeNewFolderModal() {
   };
 }
 
-export function showShareModal() {
-  return {
-    type: ActionTypes.SHOW_SHARE_MODAL
+export function showShareModal(projectId, projectName, ownerUsername) {
+  return (dispatch, getState) => {
+    const { project, user } = getState();
+    dispatch({
+      type: ActionTypes.SHOW_SHARE_MODAL,
+      payload: {
+        shareModalProjectId: projectId || project.id,
+        shareModalProjectName: projectName || project.name,
+        shareModalOwnerUsername: ownerUsername || user.username
+      }
+    });
   };
 }
 

client/modules/IDE/actions/project.js

@@ -223,7 +223,6 @@ export function cloneProject(id) {
       if (!id) {
         resolve(getState());
       } else {
-        console.log(id);
         fetch(`${ROOT_URL}/projects/${id}`)
           .then(res => res.json())
           .then(data => resolve({
@@ -234,8 +233,6 @@ export function cloneProject(id) {
           }));
       }
     }).then((state) => {
-      console.log('Huuray');
-      console.log(state);
       const newFiles = state.files.map((file) => { // eslint-disable-line
         return { ...file };
       });

client/modules/IDE/components/SketchList.jsx

@@ -8,10 +8,9 @@ import { browserHistory, Link } from 'react-router';
 import { bindActionCreators } from 'redux';
 import * as ProjectActions from '../actions/project';
 import * as SketchActions from '../actions/projects';
-import * as ToastActions from '../actions/toast';
 import * as IdeActions from '../actions/ide';
+import * as ToastActions from '../actions/toast';
 
-// const trashCan = require('../../../images/trash-can.svg');
 const downFilledTriangle = require('../../../images/down-filled-triangle.svg');
 const btnUpTriangleDivot = require('../../../images/btn-up-triangle-divot.svg');
 
@@ -220,16 +219,15 @@ class SketchList extends React.Component {
                         >
                             Duplicate
                         </div> }
-                        { this.props.project.id &&
                         <div
                           role="presentation"
                           className="sketch-list__action-option"
                           onClick={() => {
-                            this.props.showShareModal();
+                            this.props.showShareModal(sketch.id, sketch.name);
                           }}
                         >
                             Share
-                        </div> }
+                        </div>
                         <div
                           role="presentation"
                           className="sketch-list__action-option"

client/modules/IDE/pages/IDEView.jsx

@@ -434,9 +434,9 @@ class IDEView extends React.Component {
             closeOverlay={this.props.closeShareModal}
           >
             <ShareModal
-              projectId={this.props.project.id}
-              projectName={this.props.project.name}
-              ownerUsername={this.props.project.owner.username}
+              projectId={this.props.ide.shareModalProjectId}
+              projectName={this.props.ide.shareModalProjectName}
+              ownerUsername={this.props.ide.shareModalProjectUsername}
             />
           </Overlay>
         }
@@ -501,6 +501,9 @@ IDEView.propTypes = {
     projectOptionsVisible: PropTypes.bool.isRequired,
     newFolderModalVisible: PropTypes.bool.isRequired,
     shareModalVisible: PropTypes.bool.isRequired,
+    shareModalProjectId: PropTypes.string.isRequired,
+    shareModalProjectName: PropTypes.string.isRequired,
+    shareModalProjectUsername: PropTypes.string.isRequired,
     editorOptionsVisible: PropTypes.bool.isRequired,
     keyboardShortcutVisible: PropTypes.bool.isRequired,
     unsavedChanges: PropTypes.bool.isRequired,

client/modules/IDE/reducers/ide.js

@@ -10,6 +10,9 @@ const initialState = {
   projectOptionsVisible: false,
   newFolderModalVisible: false,
   shareModalVisible: false,
+  shareModalProjectId: null,
+  shareModalProjectName: null,
+  shareModalOwnerUsername: null,
   editorOptionsVisible: false,
   keyboardShortcutVisible: false,
   unsavedChanges: false,
@@ -61,7 +64,12 @@ const ide = (state = initialState, action) => {
     case ActionTypes.CLOSE_NEW_FOLDER_MODAL:
       return Object.assign({}, state, { newFolderModalVisible: false });
     case ActionTypes.SHOW_SHARE_MODAL:
-      return Object.assign({}, state, { shareModalVisible: true });
+      return Object.assign({}, state, {
+        shareModalVisible: true,
+        shareModalProjectId: action.payload.shareModalProjectId,
+        shareModalProjectName: action.payload.shareModalProjectName,
+        shareModalOwnerUsername: action.payload.shareModalOwnerUsername,
+      });
     case ActionTypes.CLOSE_SHARE_MODAL:
       return Object.assign({}, state, { shareModalVisible: false });
     case ActionTypes.SHOW_EDITOR_OPTIONS: