Merge pull request #172 from skedify/develop

skedify · Jun 5, 2020 · a5c5ca6 · a5c5ca6
2 parents 7b911a7 + 5cd2463
commit a5c5ca6
Show file tree

Hide file tree

Showing 9 changed files with 3,247 additions and 731 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,17 +43,17 @@
     "semantic-release": "semantic-release"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.9.6",
+    "@babel/preset-env": "^7.10.2",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-polyfills": "^2.3.0",
-    "codecov": "^3.6.5",
+    "codecov": "^3.7.0",
     "commitizen": "^4.1.2",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.2",
     "cz-conventional-changelog": "^3.2.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.1.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-better": "^0.1.5",
     "eslint-plugin-filenames": "^1.3.2",
@@ -65,18 +65,18 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.8.2",
+    "rollup": "^2.13.1",
     "rollup-plugin-alias": "^2.2.0",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-buble": "^0.19.8",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-inject": "^3.0.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-terser": "^6.1.0",
     "rollup-watch": "^4.3.1",
-    "semantic-release": "^17.0.7",
-    "serve": "^11.3.0"
+    "semantic-release": "^17.0.8",
+    "serve": "^11.3.1"
   },
   "config": {
     "commitizen": {

diff --git a/rollup.config.dev.js b/rollup.config.dev.js
@@ -2,7 +2,7 @@ import replace from 'rollup-plugin-replace'
 
 import { createUMDConfig } from './rollup.config.common'
 
-const createBaseConfig = common => specific => {
+const createBaseConfig = (common) => (specific) => {
   const base = Object.assign({}, common, specific)
 
   return Object.assign({}, base, {

diff --git a/rollup.config.prod.js b/rollup.config.prod.js
@@ -3,7 +3,7 @@ import { terser } from 'rollup-plugin-terser'
 
 import { createUMDConfig } from './rollup.config.common'
 
-const createBaseConfig = common => specific => {
+const createBaseConfig = (common) => (specific) => {
   const base = Object.assign({}, common, specific)
   const sourcemap = false
 
@@ -17,9 +17,8 @@ const createBaseConfig = common => specific => {
         'process.env.NODE_ENV': JSON.stringify('production'),
       }),
       terser({
-        sourcemap,
         output: {
-          comments: function(node, comment) {
+          comments: function (node, comment) {
             return (
               comment.type === 'comment2' && /Copyright/i.test(comment.value)
             )

diff --git a/src/__snapshots__/Skedify.test.js.snap b/src/__snapshots__/Skedify.test.js.snap
@@ -1213,6 +1213,9 @@ Object {
   "outcome_lists": Object {
     "toString": [Function],
   },
+  "outcome_outcome_lists": Object {
+    "toString": [Function],
+  },
   "outcomes": Object {
     "toString": [Function],
   },

diff --git a/src/resources/__snapshots__/index.test.js.snap b/src/resources/__snapshots__/index.test.js.snap
@@ -41,6 +41,8 @@ Object {
     ],
     "deprecated": false,
     "filters": Array [
+      "appointment_id",
+      "outcome_id",
       "page",
       "per_page",
     ],
@@ -1137,6 +1139,7 @@ Object {
   },
   "outcomeLists": Object {
     "allowed_includes": Array [
+      "outcome_outcome_lists",
       "outcomes",
     ],
     "allowed_methods": Array [
@@ -1174,6 +1177,7 @@ Object {
     "allowed_includes": Array [
       "appointments",
       "outcome_lists",
+      "outcome_outcome_lists",
     ],
     "allowed_methods": Array [
       "*",

diff --git a/src/resources/appointmentOutcomes.js b/src/resources/appointmentOutcomes.js
@@ -4,5 +4,6 @@ export const appointmentOutcomes = createResourceDescription(
   'appointment_outcomes',
   {
     includes: ['appointment', 'outcome'],
+    filters: ['appointment_id', 'outcome_id'],
   }
 )
diff --git a/src/resources/outcomeLists.js b/src/resources/outcomeLists.js
@@ -1,5 +1,5 @@
 import createResourceDescription from './util/createResourceDescription'
 
 export const outcomeLists = createResourceDescription('outcome_lists', {
-  includes: ['outcomes'],
+  includes: ['outcome_outcome_lists', 'outcomes'],
 })
diff --git a/src/resources/outcomes.js b/src/resources/outcomes.js
@@ -1,5 +1,5 @@
 import createResourceDescription from './util/createResourceDescription'
 
 export const outcomes = createResourceDescription('outcomes', {
-  includes: ['appointments', 'outcome_lists'],
+  includes: ['appointments', 'outcome_lists', 'outcome_outcome_lists'],
 })