Merge branch 'master' into orders

Author: tb

app/controllers/employees_controller.rb

@@ -0,0 +1,3 @@
+class EmployeesController < AuthorizedController
+  
+end

app/models/customer.rb

@@ -1,2 +1,3 @@
 class Customer < ApplicationRecord
+  scope :company_name_contains, -> (value) { where('company_name ILIKE ?', "%#{value.join}%") }
 end

app/models/employee.rb

@@ -0,0 +1,2 @@
+class Employee < ApplicationRecord
+end

app/resources/customer_resource.rb

@@ -1,12 +1,17 @@
 class CustomerResource < JSONAPI::Resource
+  extend ModelFilter
   attributes :company_name,
-             :contact_name
-             :contact_title
-             :address
-             :city
-             :region
-             :postal_code
-             :country
-             :phone
-             :fax
+             :contact_name,
+             :contact_title,
+             :address,
+             :city,
+             :region,
+             :postal_code,
+             :country,
+             :phone,
+             :fax,
+             :created_at
+
+  paginator :paged
+  model_filters :company_name_contains
 end

app/resources/employee_resource.rb

@@ -0,0 +1,3 @@
+class EmployeeResource < JSONAPI::Resource
+  attributes :title, :created_at, :first_name
+end

app/resources/product_resource.rb

@@ -1,3 +1,5 @@
 class ProductResource < JSONAPI::Resource
-  attributes :product_name
+  attributes :product_name, :created_at
+
+  paginator :paged
 end

client/.eslintrc.yml

@@ -1,30 +1,16 @@
 ---
-parser: babel-eslint
+extends: react-app
 
 env:
   browser: true
   es6: true
-  jasmine: true
+  jest: true
   node: true
 
-ecmaFeatures:
-  jsx: true
-
-plugins:
-- react
-
-extends:
-- airbnb-base
-
 globals:
   context: false
   jest: true
 
 rules:
-  import/no-named-as-default: 0
-  import/prefer-default-export: 0
-  no-console: 0
-  no-param-reassign: 0
-  no-shadow: 0 # FIXME extract generic Edit component
-  no-unused-vars: 0 # FIXME
-  react/jsx-uses-react: 2
+  jsx-a11y/href-no-hash: 0
+  jsx-a11y/alt-text: 0

client/package.json

@@ -21,13 +21,14 @@
     "jsonapi-serializer": "^3.5.2",
     "lodash": "^4.17.4",
     "object-path-immutable": "^0.5.1",
+    "prop-types": "^15.5.10",
     "qs": "^6.4.0",
     "react": "^15.4.2",
     "react-addons-css-transition-group": "^15.5.2",
     "react-addons-transition-group": "^15.5.2",
     "react-dom": "^15.4.2",
     "react-redux": "^5.0.3",
-    "react-router": "~3.0.2",
+    "react-router": "^4.1.1",
     "react-router-redux": "^4.0.8",
     "react-ultimate-pagination": "^1.0.1",
     "reactstrap": "^4.5.0",
@@ -48,15 +49,16 @@
     "enzyme": "^2.7.1",
     "enzyme-to-json": "^1.5.0",
     "eslint": "^3.19.0",
-    "eslint-config-airbnb": "^14.1.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.10.3",
+    "eslint-config-react-app": "^1.0.4",
+    "eslint-plugin-flowtype": "^2.33.0",
+    "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-jsx-a11y": "^5.0.3",
+    "eslint-plugin-react": "^7.0.1",
     "extract-text-webpack-plugin": "^2.1.0",
     "html-webpack-plugin": "^2.28.0",
     "jest": "^19.0.2",
     "node-sass": "^4.5.0",
-    "react-addons-test-utils": "^15.4.2",
+    "react-test-renderer": "^15.5.4",
     "sass-loader": "^6.0.3",
     "shx": "^0.2.2",
     "style-loader": "^0.13.2",

client/src/api/client.js

@@ -5,7 +5,6 @@ import {
   get,
   groupBy,
   keys,
-  pick,
   set,
   values,
   zipObject,
@@ -21,6 +20,7 @@ export const client = axios.create({
     Accept: 'application/vnd.api+json',
     'Content-Type': 'application/vnd.api+json',
   },
+  paramsSerializer: params => qs.stringify(params, { format: 'RFC1738', arrayFormat: 'brackets' }),
 });
 
 client.interceptors.response.use(
@@ -47,10 +47,6 @@ client.interceptors.request.use(
   error => Promise.reject(error),
 );
 
-const stringifyParams = params => qs.stringify(params, { format: 'RFC1738', arrayFormat: 'brackets' });
-
-export const withParams = (url, params) => `${url}?${stringifyParams(params)}`;
-
 export const normalizeResponse = (response) => {
   const { data = [], included = [] } = response.data;
   const dataByType = groupBy(castArray(data).concat(included), 'type');

client/src/api/normalize.js

@@ -57,7 +57,29 @@ const serializers = {
       },
     }),
   },
-
+  products: {
+    serializer: new Serializer('products', {
+      keyForAttribute: 'camelCase',
+      attributes: [
+        'productName',
+        'createdAt'
+      ],
+    }),
+    deserializer: new Deserializer({
+      keyForAttribute: 'camelCase',
+    }),
+  },
+  customers: {
+    serializer: new Serializer('customers', {
+      keyForAttribute: 'camelCase',
+      attributes: [
+        'companyName'
+      ],
+    }),
+    deserializer: new Deserializer({
+      keyForAttribute: 'camelCase'
+    }),
+  },
   roles: {
     serializer: new Serializer('roles', {
       keyForAttribute: 'camelCase',