Merge pull request #205 from RXNT/ED-6474_-_update_collapsible_field_…

…for_bulk_delete

Ed 6474   update collapsible field for bulk delete

package.json

@@ -3,15 +3,15 @@
   "description": "Extra widgets for Mozilla's react-jsonschema-form",
   "private": false,
   "author": "[email protected]",
-  "version": "0.9.67",
+  "version": "0.9.68",
   "scripts": {
     "build:lib": "rimraf lib && cross-env NODE_ENV=production babel -d lib/ src/",
     "build:dist": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.dist.js --optimize-minimize",
     "build:playground": "rimraf build && cross-env NODE_ENV=production webpack --config webpack.config.prod.js --optimize-minimize && cp playground/index.prod.html build/index.html",
     "cs-check": "prettier -l $npm_package_prettierOptions '{playground,src,test}/**/*.js'",
     "cs-format": "prettier $npm_package_prettierOptions '{playground,src,test}/**/*.js' --write",
     "dist": "npm run build:lib && npm run build:dist",
-    "lint": "eslint src test playground",
+    "lint": "eslint --fix src test playground",
     "precommit": "lint-staged",
     "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/",
     "publish-to-npm": "npm run dist &&  npm publish && npm version patch",
@@ -95,6 +95,7 @@
     "istanbul-reports": "1.1.4",
     "jest": "^23.6.0",
     "jsdom": "^11.12.0",
+    "json-rules-engine-simplified": "^0.1.17",
     "lint-staged": "^6.0.0",
     "moment": "^2.20.1",
     "prettier": "^1.7.4",
@@ -104,6 +105,7 @@
     "react-day-picker": "^7.0.5",
     "react-dom": "^16.0.0",
     "react-jsonschema-form": "^1.0.0",
+    "react-jsonschema-form-conditionals": "^0.3.15",
     "react-rte": "^0.15.0",
     "react-test-renderer": "^16.0.0",
     "react-transform-catch-errors": "^1.0.2",

playground/app/App.js

@@ -6,7 +6,6 @@ import Form from "react-jsonschema-form";
 import typeahead from "./order";
 import medications from "./medications";
 import typeaheadNonExpandable from "./typeaheadNonExpandable";
-import rte from "./rte";
 import datePicker from "./react-date-picker";
 import rte2 from "./rte2";
 import dx from "./dx";
@@ -18,6 +17,8 @@ import aTypeahead from "./asyncTypeahead";
 import formContextField from "./formContextField";
 import SignatureCheckbox from "./formContextField/SignatureCheckbox";
 import procedureCodes from "./procedureCodes";
+import applyRules from "react-jsonschema-form-conditionals";
+import Engine from "json-rules-engine-simplified";
 
 const ALL_CONFS = [
   label,
@@ -27,40 +28,45 @@ const ALL_CONFS = [
   typeaheadNonExpandable,
   medications,
   typeahead,
-  rte(),
   dx,
   ros,
   simpleLabel,
   aTypeahead,
   formContextField,
-  procedureCodes,
+  procedureCodes
 ];
 
 export default function App() {
   let handleChange = ({ formData }) => console.log(JSON.stringify(formData));
   let formContext = {
     legends: {
-      LanguageLegend: props => <h1>Expected {props.language} characters</h1>,
+      LanguageLegend: props => <h1>Expected {props.language} characters</h1>
     },
     allActions: {
       SignatureComponent: props => <SignatureCheckbox {...props} />,
       Button: props => (
         <a className="btn btn-info pull-right">Update allergies</a>
-      ),
-    },
+      )
+    }
   };
 
   return (
     <div>
-      {ALL_CONFS.map((conf, i) => (
-        <Form
-          key={i}
-          {...conf}
-          fields={fields}
-          onChange={handleChange}
-          formContext={formContext}
-        />
-      ))}
+      {ALL_CONFS.map((conf, i) => {
+        let { schema, uiSchema, formData, rules = [] } = conf;
+        let FormToDisplay = applyRules(schema, uiSchema, rules, Engine)(Form);
+
+        return (
+          <FormToDisplay
+            key={i}
+            {...conf}
+            fields={fields}
+            onChange={handleChange}
+            formData={formData}
+            formContext={formContext}
+          />
+        );
+      })}
     </div>
   );
 }

playground/app/medications/index.js

@@ -1,17 +1,19 @@
 import schema from "./schema";
 import uiSchema from "./uiSchema";
+import rules from "./rules.json";
 
 export default {
   schema,
   uiSchema,
+  ...rules,
   formData: {
     medicationData: {
       medications: [
         { drugId: 0, quantity: 21, useGeneric: true, isSelected: true },
         { drugId: 1, quantity: 22, useGeneric: true, isSelected: true },
         { drugId: 3, quantity: 23, useGeneric: true, isSelected: true },
-        { drugId: 1, quantity: 24, useGeneric: true, isSelected: true },
-      ],
-    },
-  },
+        { drugId: 1, quantity: 24, useGeneric: true, isSelected: true }
+      ]
+    }
+  }
 };

playground/app/medications/rules.json

@@ -0,0 +1,15 @@
+{
+    "rules": [
+        {
+            "conditions": {
+              "medicationData$medications_no_active": "truthy"
+            },
+            "event": {
+              "type": "remove",
+              "params": {
+                "field": "medicationData.medications"
+              }
+            }
+        }
+    ]
+}