Merge pull request #142 from oslabs-beta/fixBug/DeleteField

Fix bug/delete field

Author: geofflin

.DS_Store

@@ -8,7 +8,7 @@
     "build": "webpack -p",
     "dev": "webpack-dev-server --mode=development",
     "test": "test",
-    "package": "sudo electron-forge make",
+    "package": "electron-forge make",
     "package-linux": "electron-packager . --linux --asar",
     "package-mac": "electron-packager . --darwin --asar",
     "package-win": "electron-packager . --platform win32 --arch x64 --asar"
@@ -64,7 +64,6 @@
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
     "@electron-forge/maker-deb": "^6.0.0-beta.39",
-    "@electron-forge/maker-dmg": "^6.0.0-beta.39",
     "@electron-forge/maker-squirrel": "^6.0.0-beta.39",
     "@material-ui/core": "^4.0.2",
     "awesome-typescript-loader": "^5.2.1",

package.json

@@ -109,11 +109,17 @@ function DraggableDialog(props) {
           <StartButton onClick={handleClose} color="primary" >Start</StartButton>
         </DialogActionsDiv>
 
-        <ContentDiv style={{ marginTop: "15px", marginBottom: "25px" }}>
-          Please prepare your credit card.
+        <ContentDiv style={{ marginTop: "15px", marginBottom: "25px", textAlign: "left" }}>
+          <ol>
+            <li>Add Table - create tables that mimic psql tables</li>
+            <li>Schema - view, edit, or delete table you add</li>
+            <li>Code - view generated GraphQL and SQL code before export</li>
+            <li>Visualize - view the GraphQL schema intuitively as a simple tree</li>
+            <li>Export - export project to interact with database</li>
+          </ol>
         </ContentDiv>
       </Dialog>
-    </div>
+    </div >
   );
 }
 

src/components/popup/welcome.jsx

@@ -112,7 +112,7 @@ function NavSideBar() {
           borderTop: '1px solid rgba(0, 0, 0, 0.08)',
           width: '100%'
         }}
-      />} 
+      />}
     </SideBar>
   )
 }

src/components/sideBar/navSidebar.jsx

@@ -35,8 +35,8 @@ function reducer(state, action) {
       return { ...state, selectedTable: newState.selectedTable };
 
     case "EDIT_TABLE":
-      selectedTable = newState.tables[action.payload];
-      return { ...state, selectedTable };
+      newState.selectedTable = newState.tables[action.payload];
+      return { ...state, selectedTable: newState.selectedTable };
 
     case "EDIT_FIELD":
       const { fieldKey, fieldProperty, value } = action.payload;
@@ -58,11 +58,12 @@ function reducer(state, action) {
     // This case will increment tableIndex regardless whether we're adding a new table or editing an existing one
     case "SAVE_TABLE":
       newState.tables[newState.selectedTable.tableID] = newState.selectedTable;
+
       return {
         ...state,
         tables: newState.tables,
         tableIndex: newState.tableIndex + 1,
-        visualizeJSON: buildVisualizerJson(newState.tables),
+        visualizeJSON: buildVisualizerJson(deepClone(newState.tables)),
         gqlSchema: buildGQLSchema(newState.tables),
         gqlResolvers: buildGQLResolvers(newState.tables),
         sqlScripts: buildSQLScripts(newState.tables)
@@ -86,7 +87,7 @@ function reducer(state, action) {
       return {
         ...state,
         tables: newState.tables,
-        visualizeJSON: buildVisualizerJson(newState.tables),
+        visualizeJSON: buildVisualizerJson(deepClone(newState.tables)),
         gqlSchema: buildGQLSchema(newState.tables),
         gqlResolvers: buildGQLResolvers(newState.tables),
         sqlScripts: buildSQLScripts(newState.tables)