Remove the need for base Action Creators to be thunks

src/api/generic/linodes.js

@@ -8,28 +8,6 @@ export const config = addParentRefs({
   primaryKey: 'id',
   endpoint: id => `/linode/instances/${id}`,
   supports: [ONE, MANY, PUT, DELETE, POST],
-  properties: {
-    type: (linode) => function (_, getState) {
-      const types = getState().api.types.types || {};
-
-      return {
-        label: 'Unknown',
-        id: linode.type,
-        ...types[linode.type] || {},
-        ...linode.specs,
-      };
-    },
-    image: (linode) => function (_, getState) {
-      const images = getState().api.images.images || {};
-
-      return {
-        vendor: 'Unknown',
-        label: 'Unknown',
-        id: linode.image,
-        ...images[linode.image],
-      };
-    },
-  },
   subresources: {
     _configs: {
       name: 'configs',

src/api/internal.js

@@ -47,23 +47,23 @@ function parseIntIfActualInt(string) {
 }
 
 const actionCreatorGenerators = {
-  // These functions take a config and return Redux Action Creators
-  [ONE]: config => (resource, ...ids) => (dispatch) =>
-    dispatch({
+  [ONE]: c => (resource, ...ids) =>
+    ({
       resource,
-      dispatch,
-      type: `GEN@${fullyQualified(config)}/ONE`,
+      type: `GEN@${fullyQualified(c)}/ONE`,
       ids: ids.map(parseIntIfActualInt),
     }),
-  [MANY]: config => (page, ...ids) => (dispatch) =>
-    dispatch({
+  [MANY]: c => (page, ...ids) =>
+    ({
       page,
-      dispatch,
-      type: `GEN@${fullyQualified(config)}/MANY`,
+      type: `GEN@${fullyQualified(c)}/MANY`,
+      ids: ids.map(parseIntIfActualInt),
+    }),
+  [DELETE]: c => (...ids) =>
+    ({
+      type: `GEN@${fullyQualified(c)}/DELETE`,
       ids: ids.map(parseIntIfActualInt),
     }),
-  [DELETE]: config => (...ids) =>
-    ({ type: `GEN@${fullyQualified(config)}/DELETE`, ids: ids.map(parseIntIfActualInt) }),
 };
 
 /**
@@ -129,23 +129,6 @@ export class ReducerGenerator {
 
     const combinedStateOne = { ...oldStateOne, ...newStateOne, __updatedAt: new Date() };
 
-    if (config.properties && action.dispatch) {
-      Object.keys(config.properties).forEach(function (property) {
-        const accessor = config.properties[property];
-
-        const stateWithoutPropertyDefined = newStateOne;
-        if (typeof stateWithoutPropertyDefined[property] !== 'undefined') {
-          Object.defineProperty(combinedStateOne, property, {
-            get: () => action.dispatch(accessor(newStateOne)),
-          });
-        }
-      });
-    }
-
-    (config.properiesMasks || []).forEach(function (property) {
-      delete combinedStateOne[property];
-    });
-
     const newStateMany = {
       ...oldStateMany,
       [config.name]: {

src/api/internal.spec.js

@@ -5,39 +5,35 @@ import { resource, page } from '~/data/reduxGen';
 
 describe('internal', () => {
   it('generates an action to update one resource', function () {
-    const dispatch = jest.fn();
-
     const config = testConfigOne;
 
     const actions = genActions(config);
-    const oneThunk = actions.one(resource, '23');
-    oneThunk(dispatch);
+    const actionOne = actions.one(resource, '23');
 
-    expect(dispatch.mock.calls[0][0].resource.label).toBe('nodebalancer-1');
-    expect(dispatch.mock.calls[0][0].type).toBe('GEN@nodebalancers/ONE');
-    expect(dispatch.mock.calls[0][0].ids[0]).toBe(23);
+    expect(actionOne.resource.label).toBe('nodebalancer-1');
+    expect(actionOne.type).toBe('GEN@nodebalancers/ONE');
+    expect(actionOne.ids[0]).toBe(23);
   });
 
   it('generates an action to update many resources', function () {
-    const dispatch = jest.fn();
-
     const config = testConfigMany;
 
     const actions = genActions(config);
-    const manyThunk = actions.many(page);
-    manyThunk(dispatch);
-    expect(dispatch.mock.calls[0][0].page.nodebalancers[0].label)
+    const actionMany = actions.many(page);
+
+    expect(actionMany.page.nodebalancers[0].label)
       .toBe('nodebalancer-1');
-    expect(dispatch.mock.calls[0][0].page.nodebalancers[1].label)
+    expect(actionMany.page.nodebalancers[1].label)
       .toBe('nodebalancer-2');
-    expect(dispatch.mock.calls[0][0].type).toBe('GEN@nodebalancers/MANY');
+    expect(actionMany.type).toBe('GEN@nodebalancers/MANY');
   });
 
   it('generates an action to delete a resource', function () {
     const config = testConfigDelete;
 
     const actions = genActions(config);
     const deleteAction = actions.delete('23');
+
     expect(deleteAction.ids[0]).toBe(23);
     expect(deleteAction.type).toBe('GEN@nodebalancers/DELETE');
   });

src/data/linodes.js

@@ -1,5 +1,6 @@
 import { testType } from './types';
 import { apiTestRegion } from './regions';
+import { apiTestImage } from './images';
 
 const stats = {
   netv6: {
@@ -94,17 +95,13 @@ function createTestLinode(id) {
     ipv4: [ipv4.address, secondIPv4.address],
     ipv6: ipv6.address,
     created: '2016-07-06T16:47:27',
-    type: testType,
+    type: testType.id,
     status: 'running',
     region: apiTestRegion.id,
     memory: 2048,
     disk: 20480,
     vcpus: 2,
-    image: {
-      id: 'linode/ubuntu15.10',
-      vendor: 'Ubuntu',
-      label: 'Ubuntu 15.10',
-    },
+    image: apiTestImage.id,
     alerts: {
       cpu: 90,
       io: 5000,
@@ -479,11 +476,7 @@ export const testLinode1245 = {
 
 export const testLinode1246 = {
   ...createTestLinode(1246),
-  image: {
-    id: null,
-    label: 'Unknown',
-    vendor: 'unknown',
-  },
+  image: null,
 };
 
 const rdnsIP1247 = { ...createTestIPv4(1247), rdns: 'host.rdns.tld' };

src/linodes/components/DistroStyle.js

@@ -6,26 +6,26 @@ import { distros as distroAssets } from '~/assets';
 
 
 export default function DistroStyle(props) {
-  const { linode } = props;
+  const { image } = props;
 
-  if (!linode || !linode.image || !linode.image.vendor) {
+  if (!image.vendor) {
     return <span className="distro-style">Unknown</span>;
   }
 
-  const src = distroAssets[lowerCase(linode.image.vendor)];
+  const src = distroAssets[lowerCase(image.vendor)];
 
   return (
     <span className="distro-style">
       {src ? <img
         src={src}
-        alt={linode.image.vendor}
+        alt={image.vendor}
         width="15" height="15"
       /> : ''}
-      <span>{linode.image.label}</span>
+      <span>{image.label}</span>
     </span>
   );
 }
 
 DistroStyle.propTypes = {
-  linode: PropTypes.object,
+  image: PropTypes.object.isRequired,
 };

src/linodes/components/__snapshots__/ConfigSelectModalBody.spec.js.snap

@@ -321,11 +321,7 @@ ShallowWrapper {
         "group": "Test Group",
         "hypervisor": "kvm",
         "id": 1238,
-        "image": Object {
-          "id": "linode/ubuntu15.10",
-          "label": "Ubuntu 15.10",
-          "vendor": "Ubuntu",
-        },
+        "image": "linode/arch2016.05",
         "ipv4": Array [
           "97.107.143.15",
           "97.107.143.16",
@@ -335,29 +331,7 @@ ShallowWrapper {
         "memory": 2048,
         "region": "us-east-1a",
         "status": "offline",
-        "type": Object {
-          "_polling": false,
-          "addons": Object {
-            "backups": Object {
-              "price": Object {
-                "monthly": 2.5,
-              },
-            },
-          },
-          "class": "standard",
-          "disk": 24576,
-          "id": "linode2048.5",
-          "label": "Linode 2048",
-          "memory": 2048,
-          "network_out": 125,
-          "price": Object {
-            "hourly": 0.015,
-            "monthly": 10,
-          },
-          "service_type": "linode",
-          "transfer": 2000,
-          "vcpus": 2,
-        },
+        "type": "linode2048.5",
         "vcpus": 2,
       }
     }

src/linodes/components/__snapshots__/StatusDropdown.spec.js.snap

@@ -237,11 +237,7 @@ ShallowWrapper {
         "group": "Test Group",
         "hypervisor": "kvm",
         "id": 1236,
-        "image": Object {
-          "id": "linode/ubuntu15.10",
-          "label": "Ubuntu 15.10",
-          "vendor": "Ubuntu",
-        },
+        "image": "linode/arch2016.05",
         "ipv4": Array [
           "97.107.143.9",
           "97.107.143.10",
@@ -251,29 +247,7 @@ ShallowWrapper {
         "memory": 2048,
         "region": "us-east-1a",
         "status": "offline",
-        "type": Object {
-          "_polling": false,
-          "addons": Object {
-            "backups": Object {
-              "price": Object {
-                "monthly": 2.5,
-              },
-            },
-          },
-          "class": "standard",
-          "disk": 24576,
-          "id": "linode2048.5",
-          "label": "Linode 2048",
-          "memory": 2048,
-          "network_out": 125,
-          "price": Object {
-            "hourly": 0.015,
-            "monthly": 10,
-          },
-          "service_type": "linode",
-          "transfer": 2000,
-          "vcpus": 2,
-        },
+        "type": "linode2048.5",
         "vcpus": 2,
       }
     }

src/linodes/layouts/ListLinodes.js

@@ -97,7 +97,7 @@ export class ListLinodesPage extends Component {
   powerOn = (linodes) => this.genericAction(powerOnLinode, linodes)
   reboot = (linodes) => this.genericAction(rebootLinode, linodes, 'Reboot')
 
-  renderLinodes(linodes) {
+  renderLinodes(linodes, types) {
     const { dispatch, selectedMap } = this.props;
     const { filter } = this.state;
 
@@ -150,7 +150,7 @@ export class ListLinodesPage extends Component {
                       headerClassName: 'LabelColumn',
                       hrefFn: (linode) => `/linodes/${linode.label}`,
                       tooltipEnabled: true,
-                      subtitleFn: linode => planStyle(linode.type),
+                      subtitleFn: linode => planStyle(types[linode.type]),
                     },
                     { cellComponent: IPAddressCell, headerClassName: 'LinodeIPAddressColumn' },
                     {
@@ -214,7 +214,7 @@ export class ListLinodesPage extends Component {
           </div>
         </header>
         <div className="PrimaryPage-body">
-          {Object.keys(linodes).length ? this.renderLinodes(linodes) : (
+          {Object.keys(linodes).length ? this.renderLinodes(linodes, types) : (
             <CreateHelper
               label="Linodes"
               linkText="Add a Linode"