Merge pull request #70 from ShlomoPorges/development

Development

Author: ShlomoPorges

src/components/xxxSnackbars.jsx

@@ -0,0 +1,60 @@
+// import React from 'react';
+// import PropTypes from 'prop-types';
+// import Button from '@material-ui/core/Button';
+// import Snackbar from '@material-ui/core/Snackbar';
+// import SnackbarContentWrapper from './SnackbarContentWrapper.jsx';
+
+// const Snackbars = (props) => {
+//   const {
+//     successOpen, errorOpen, handleNotificationClose, msg, viewAppDir,
+//   } = props;
+//   const successMsg = <div>Your files were successfully created. <Button
+//       variant='fab'
+//       mini
+//       aria-label='View app directory'
+//       onClick={viewAppDir}
+//     >View</Button></div>;
+//   const errMsg = `There was an error while creating your files. ${msg}`;
+//   return (
+//     <div>
+//       <Snackbar
+//         anchorOrigin={{
+//           vertical: 'bottom',
+//           horizontal: 'left',
+//         }}
+//         open={successOpen}
+//         autoHideDuration={5000}
+//       >
+//         <SnackbarContentWrapper
+//           onClose={handleNotificationClose}
+//           variant="success"
+//           message={successMsg}
+//         />
+//       </Snackbar>
+//       <Snackbar
+//         anchorOrigin={{
+//           vertical: 'bottom',
+//           horizontal: 'left',
+//         }}
+//         open={errorOpen}
+//         autoHideDuration={5000}
+//       >
+//         <SnackbarContentWrapper
+//           onClose={handleNotificationClose}
+//           variant="error"
+//           message={errMsg}
+//         />
+//       </Snackbar>
+//     </div>
+//   );
+// };
+
+// Snackbars.propTypes = {
+//   successOpen: PropTypes.bool.isRequired,
+//   errorOpen: PropTypes.bool.isRequired,
+//   msg: PropTypes.string.isRequired,
+//   viewAppDir: PropTypes.func.isRequired,
+//   handleNotificationClose: PropTypes.func.isRequired,
+// };
+
+// export default Snackbars;

src/containers/AppContainer.tsx

@@ -6,7 +6,7 @@ import LinearProgress from '@material-ui/core/LinearProgress';
 import LeftContainer from './LeftContainer.jsx';
 import MainContainer from './MainContainer.jsx';
 // import RightContainer from './RightContainer.jsx';
-import convertIdsToObjs from '../utils/convertIdsToObjs.util';
+// import convertIdsToObjs from '../utils/convertIdsToObjs.util';
 import theme from '../components/theme.ts';
 import { loadInitData } from '../actions/components';
 
@@ -46,28 +46,28 @@ class AppContainer extends Component {
 
   render() {
     const {
-      components, totalComponents, focusComponent, loading, selectableChildren,
+      components, focusComponent, loading, selectableChildren,
     } = this.props;
     const { width, rightColumnOpen } = this.state;
 
     // uses component childIds and parentIds arrays (numbers) to build component-filled children and parents arrays
-    const updatedComponents = convertIdsToObjs(components);
+    //const updatedComponents = convertIdsToObjs(components);
 
     return (
       <MuiThemeProvider theme={theme}>
         <div className="app-container">
           <LeftContainer
-            components={updatedComponents}
-            totalComponents={totalComponents}
+            components={components}
+            // totalComponents={totalComponents}
             focusComponent={focusComponent}
             selectableChildren={selectableChildren}
           />
           <MainContainer
-            components={updatedComponents}
+            components={components}
             collapseColumn={this.collapseColumn}
             width={width}
             rightColumnOpen={rightColumnOpen}
-            totalComponents={totalComponents}
+            // totalComponents={totalComponents}
           />
           {/* <RightContainer
             width={width}

src/containers/LeftContainer.jsx

@@ -60,10 +60,8 @@ class LeftContainer extends Component {
   render() {
     const {
       components,
-      updateComponent,
       deleteComponent,
       focusComponent,
-      totalComponents,
       classes,
       addChild,
       changeFocusComponent,

src/containers/MainContainer.jsx

@@ -48,7 +48,7 @@ const mapDispatchToProps = dispatch => ({
 });
 
 const mapStateToProps = store => ({
-  totalComponents: store.workspace.totalComponents,
+ // totalComponents: store.workspace.totalComponents,
   focusComponent: store.workspace.focusComponent,
   focusChild: store.workspace.focusChild,
   stateComponents: store.workspace.components,

src/reducers/componentReducer.js

@@ -169,10 +169,10 @@ const componentReducer = (state = initialApplicationState, action) => {
     case HANDLE_TRANSFORM:
       return handleTransform(state, action.payload);
 
-    case MOVE_TO_BOTTOM:
-      return moveToBottom(state, action.payload);
-    case MOVE_TO_TOP:
-      return moveToTop(state, action.payload);
+    // case MOVE_TO_BOTTOM:
+    //   return moveToBottom(state, action.payload);
+    // case MOVE_TO_TOP:
+    //   return moveToTop(state, action.payload);
     case OPEN_EXPANSION_PANEL:
       return openExpansionPanel(state, action.payload);
     case DELETE_ALL_DATA:

src/utils/findComponentById.ts

@@ -31,9 +31,9 @@ interface Component {
   parentIds: number[];
   color: string;
   draggable: boolean;
-  childrenIds: number[];
-  selectableParents?: any[]; // unused
-  expanded?: boolean; // unused
+  // childrenIds: number[];
+  // selectableParents?: any[]; // unused
+  // expanded?: boolean; // unused
   props: Prop[];
   nextPropId: number;
   position: Position;