altered payloads for allState reducers

Author: mdunnmon

app/src/components/main/AddLink.tsx

@@ -39,7 +39,7 @@ function AddLink({ id, onClickHandler, linkDisplayed }) {
         state.childId = id;
         state.attributes.compLink = event.target.value;
         // dispatch({type: 'UPDATE ATTRIBUTES', payload: state})
-        dispatch(updateAttributes({attributes: state}))
+        dispatch(updateAttributes(state))
         return true;
       }
     });

app/src/components/main/DemoRender.tsx

@@ -68,7 +68,7 @@ const DemoRender = (): JSX.Element => {
         return el.name.toLowerCase() === component.toLowerCase();
       }).id;
     componentId &&
-    dispatch(changeFocus({ componentId: state.canvasFocus.componentId, childId: state.canvasFocus.childId}));
+    dispatch(changeFocus({ componentId: state.canvasFocus.componentId, childId: null}));
       // dispatch({
       //   type: 'CHANGE FOCUS',
       //   payload: { componentId, childId: null }

app/src/components/main/IndirectChild.tsx

@@ -27,7 +27,7 @@ function IndirectChild({
     //   type: 'CHANGE FOCUS',
     //   payload: { componentId: linkId, childId: null }
     // });
-    dispatch(changeFocus({ componentId: linkId, childId: state.canvasFocus.childId}));
+    dispatch(changeFocus({ componentId: linkId, childId: null}));
   }
   let linkName: string;
   // if there's a link in this component, then include a link

app/src/components/main/RouteLink.tsx

@@ -45,7 +45,8 @@ function RouteLink({ childId, type, typeId, style }: ChildElement) {
   function onClickHandlerRoute(event) {
     event.stopPropagation();
     // changeFocus(typeId, null);
-    dispatch(changeFocus({ componentId:typeId, childId: null}));
+    // dispatch(changeFocus({ componentId:typeId, childId: null}));
+    dispatch(changeFocus(typeId));
   }
   // combine all styles so that higher priority style specifications overrule lower priority style specifications
   // priority order is 1) style directly set for this child (style), 2) style for the routeLink component, and 3) default styling

app/src/components/main/SeparatorChild.tsx

@@ -109,7 +109,8 @@ function DirectChildHTMLNestable({
   function onClickHandler(event) {
     event.stopPropagation();
     // changeFocus(state.canvasFocus.componentId, childId);
-    dispatch(changeFocus({ componentId: state.canvasFocus.componentId, childId: state.canvasFocus.childId}));
+    // dispatch(changeFocus({ componentId: state.canvasFocus.componentId, childId: state.canvasFocus.childId}));
+    dispatch(changeFocus(state.canvasFocus.componentId));
   }
 
   // combine all styles so that higher priority style specifications overrule lower priority style specifications

app/src/components/right/ComponentPanel.tsx

@@ -104,7 +104,11 @@ const dispatch = useDispatch();
     //   type: 'ADD COMPONENT',
     //   payload: { componentName: formattedName, root: isRoot }
     // });
-    dispatch(addComponent({ componentName: formattedName, root: isRoot }));
+    
+    // dispatch(addComponent( { componentName: formattedName, root: isRoot }));
+    const component = addComponent({ componentName: formattedName, root: isRoot });
+    dispatch(component);
+    console.log('component:', component);
     // reset root toggle back to default position
     setIsRoot(false);
     // reset name field

app/src/components/right/DeleteProjects.tsx

@@ -46,7 +46,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
     deleteProject(selectedProject);
     localforage.removeItem(window.localStorage.getItem('ssid'));
     // dispatch({ type: 'SET INITIAL STATE', payload: initialState });
-    dispatch(setInitialState({}))
+    dispatch(setInitialState(initialState))
     onClose();
   };
 

app/src/components/right/OpenProjects.tsx

@@ -37,7 +37,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
       (project: any) => project.name === value
     )[0];
     // dispatch({ type: 'OPEN PROJECT', payload: selectedProject });
-    dispatch(openProject({selectedProject}))
+    dispatch(openProject(selectedProject))
     onClose();
   };
   return (