Merge pull request #65 from performant-software/feature/evq198_duplicate_transmissions

EVQ #198 - Duplicate transmissions

Author: dleadbetter

src/common/EditContainer.js

@@ -202,10 +202,12 @@ const useEditContainer = (WrappedComponent: ComponentType<any>) => (
      */
     onMultiAddChildAssociations(association: string, children: any) {
       const items = this.state.item[association];
-      const childrenToAdd = _.filter(children, (child) => !_.find(items, this.isChild.bind(this, child)));
-      const childrenToRemove = _.filter(items, (item) => !_.find(children, this.isChild.bind(this, item)));
 
-      _.each(childrenToAdd, this.onSaveChildAssociation.bind(this, association));
+      // Add new children or update existing children
+      _.each(children, this.onSaveChildAssociation.bind(this, association));
+
+      // Remove any children that no longer exist
+      const childrenToRemove = _.filter(items, (item) => !_.find(children, this.isChild.bind(this, item)));
       _.each(childrenToRemove, this.onDeleteChildAssociation.bind(this, association));
     }
 

src/semantic-ui/EditModal.js

@@ -23,12 +23,9 @@ type Props = EditContainerProps & {
 const EditModal = (props: Props) => {
   const OuterComponent = props.component;
 
-  const [showToaster, setShowToaster] = useState(true);
+  const [showToaster, setShowToaster] = useState(false);
   const hasErrors = !!(props.errors && props.errors.length);
 
-  // Allow the user to clear the error toaster. If the set of validation errors changes, display the toaster again.
-  useEffect(() => setShowToaster(true), [props.errors]);
-
   return (
     <OuterComponent
       {...props}
@@ -62,7 +59,10 @@ const EditModal = (props: Props) => {
       >
         <Button
           disabled={props.saving}
-          onClick={props.onSave.bind(this)}
+          onClick={() => {
+            setShowToaster(true);
+            return props.onSave();
+          }}
           primary
           size='medium'
           type='submit'

src/semantic-ui/EditPage.js

@@ -50,7 +50,7 @@ export const useEditPage = (WrappedComponent: ComponentType<any>) => (
 
       this.state = {
         currentTab: '',
-        showToaster: true
+        showToaster: false
       };
     }
 
@@ -114,7 +114,10 @@ export const useEditPage = (WrappedComponent: ComponentType<any>) => (
           className='button-container'
         >
           <SaveButton
-            onClick={this.props.onSave.bind(this)}
+            onClick={() => {
+              this.setState({ showToaster: true });
+              return this.props.onSave();
+            }}
             saving={this.props.saving}
           />
           <CancelButton
@@ -188,7 +191,7 @@ export const useEditPage = (WrappedComponent: ComponentType<any>) => (
           >
             <Menu.Item>
               <SaveButton
-                onClick={this.props.onSave.bind(this)}
+                onClick={this.onSave.bind(this)}
                 saving={this.props.saving}
               />
               <CancelButton