Shipping Rates Pre-Fetch

packages/frontend/lib/common/bridge/mainPreload.js

@@ -58,8 +58,8 @@ const _deregisterForTaskEvents = handler => {
     ipcRenderer.once(IPCKeys.RequestDeregisterTaskEventHandler, (event, eventKey) => {
       // Check and make sure we have a key to deregister from
       if (eventKey) {
+        util.removeEvent(eventKey, taskEventHandler);
         handlers = [];
-        util.removeEvent(event, taskEventHandler);
       } else {
         console.error('Unable to Deregister from Task Events!');
       }
@@ -68,6 +68,13 @@ const _deregisterForTaskEvents = handler => {
   handlers = handlers.filter(h => h !== handler);
 };
 
+/**
+ * Removes all listeners if the window was closed
+ */
+window.onbeforeunload = () => {
+  handlers.forEach(h => _deregisterForTaskEvents(h));
+};
+
 /**
  * Sends task(s) that should be started to launcher.js
  */

packages/frontend/src/__tests__/profiles/shippingRates.test.jsx

@@ -188,8 +188,8 @@ describe('<ShippingRates />', () => {
                 },
               ],
               selectedRate: {
-                label: '5-7 Business Days',
-                value: 'shopify-UPS%20GROUND%20(5-7%20business%20days)-10.00',
+                name: '5-7 Business Days',
+                rate: 'shopify-UPS%20GROUND%20(5-7%20business%20days)-10.00',
               },
             },
           ],
@@ -311,8 +311,8 @@ describe('<ShippingRates />', () => {
               value: 'https://kith.com',
             },
             rate: {
-              label: '5-7 Business Days',
-              value: 'shopify-UPS%20GROUND%20(5-7%20business%20days)-10.00',
+              name: '5-7 Business Days',
+              rate: 'shopify-UPS%20GROUND%20(5-7%20business%20days)-10.00',
             },
           },
         },

packages/frontend/src/__tests__/settings/shippingManager.test.jsx

@@ -158,7 +158,7 @@ describe('<ShippingManager />', () => {
       };
       const wrapper = renderShallowWithProps(customProps);
       const siteSelector = wrapper.find('.settings--shipping-manager__input-group--site');
-      expect(siteSelector.prop('value')).toBeNull();
+      expect(siteSelector.prop('value')).toEqual({ label: null, value: null });
       expect(siteSelector.prop('onChange')).toBeDefined();
       expect(siteSelector.prop('options')).toEqual(getAllSupportedSitesSorted());
 
@@ -285,12 +285,47 @@ describe('<ShippingManager />', () => {
 
   test('map dispatch to props should return correct structure', () => {
     const dispatch = jest.fn();
-    const expectedAction = settingsActions.edit(SETTINGS_FIELDS.EDIT_SHIPPING_PRODUCT, '+data');
+    const task = {
+      ...initialSettingsStates.shipping,
+      product: {
+        ...initialSettingsStates.shipping.product,
+        raw: '+test',
+        pos_keywords: ['test'],
+      },
+      site: {
+        ...initialSettingsStates.shipping.site,
+        name: 'Nebula Bots',
+        url: 'https://nebulabots.com',
+        apiKey: '6526a5b5393b6316a64853cfe091841c',
+        localCheckout: false,
+        special: false,
+        auth: false,
+      },
+      profile: {
+        ...initialSettingsStates.shipping.profile,
+        id: 1,
+        profileName: 'test',
+      },
+    };
+
+    const expectedActions = [
+      settingsActions.edit(SETTINGS_FIELDS.EDIT_SHIPPING_PRODUCT, '+test'),
+      settingsActions.fetch(task),
+      settingsActions.clearShipping(SETTINGS_FIELDS.CLEAR_SHIPPING_FIELDS),
+    ];
+
     const actual = mapDispatchToProps(dispatch);
     actual.onSettingsChange({
       field: SETTINGS_FIELDS.EDIT_SHIPPING_PRODUCT,
-      value: '+data',
+      value: '+test',
+    });
+    actual.onFetchShippingMethods(task);
+    actual.onClearShippingFields(SETTINGS_FIELDS.CLEAR_SHIPPING_FIELDS);
+    expectedActions.forEach((action, n) => {
+      expect(dispatch).toHaveBeenNthCalledWith(
+        n + 1,
+        typeof action !== 'function' ? action : expect.any(Function),
+      );
     });
-    expect(dispatch).toHaveBeenCalledWith(expectedAction);
   });
 });

packages/frontend/src/__tests__/state/actions/taskActions.test.js

@@ -264,7 +264,7 @@ describe('task actions', () => {
   });
 
   describe('should handle copy task action', () => {
-    test('with valid task', async () => {
+    test('with valid task data', async () => {
       const task = {
         ...initialTaskState,
         product: {
@@ -292,7 +292,7 @@ describe('task actions', () => {
       await asyncTaskTests(action, expectedActions);
     });
 
-    test('with invalid task', async () => {
+    test('with no task', async () => {
       const action = taskActions.copy(undefined);
       const expectedActions = [
         {