Skip to content

Commit

Permalink
fixes #204 update Checkbox to functional component with default value…
Browse files Browse the repository at this point in the history 
… handling
  • Loading branch information
@stevehu
stevehu committed Jul 29, 2020
1 parent 4efc6f1 commit eae5775
Show file tree
Hide file tree
Showing 30 changed files with 2,424 additions and 2,043 deletions.
1 change: 1 addition & 0 deletions example/ExamplePage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class ExamplePage extends React.Component<void, State> {
{label : "Conditional Array", value: "data/conditionalarray.json"},
{label : "Test - Date Capture", value: "data/tests/datecapture.json"},
{label : "Test - Localizer", value: "localizer"},
{label : "Portal Config", value: "data/portal/config-detail.json"},
{label : "MapRoot Restaurant", value: "data/maproot/restaurant.json"},
{label : "MapRoot Payment", value: "data/maproot/payment.json"},
{label : "MapRoot Pickup", value: "data/maproot/pickup.json"}
Expand Down
145 changes: 145 additions & 0 deletions example/data/portal/config-detail.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"schema": {
"type": "object",
"title": "Config Detail",
"properties": {
"name": {
"title": "API Name",
"type": "string"
},
"version": {
"title": "API Version",
"type": "string"
},
"group": {
"title": "Maven Group",
"type": "string"
},
"artifactId": {
"title": "Artifact Id",
"type": "string"
},
"rootPackage": {
"title": "Root Package",
"type": "string"
},
"handlerPackage": {
"title": "Handler Package",
"type": "string"
},
"modelPackage": {
"title": "Model Package",
"type": "string"
},
"overwriteHandler": {
"title": "Overwrite Handler",
"type": "boolean",
"default": true
},
"overwriteHandlerTest": {
"title": "Overwrite Handler Test",
"type": "boolean",
"default": true
},
"overwriteModel": {
"title": "Overwrite Model",
"type": "boolean",
"default": true
},
"httpPort": {
"title": "HTTP Port",
"type": "integer",
"default": 8080
},
"enableHttp": {
"title": "Enable HTTP",
"type": "boolean",
"default": false
},
"httpsPort": {
"title": "HTTPS Port",
"type": "integer",
"default": 8443
},
"enableHttps": {
"title": "Enable HTTPS",
"type": "boolean",
"default": true
},
"enableRegistry": {
"title": "Enable Registry",
"type": "boolean",
"default": false
},
"eclipseIDE": {
"title": "Eclipse IDE",
"type": "boolean",
"default": false
},
"supportDb": {
"title": "Support Database",
"type": "boolean",
"default": false
},
"supportH2ForTest": {
"title": "Support H2 Test",
"type": "boolean",
"default": false
},
"supportClient": {
"title": "Support Client",
"type": "boolean",
"default": false
},
"dockerOrganization": {
"title": "Docker Organization",
"type": "string",
"default": "networknt"
}
},
"required": [
"name",
"version",
"groupId",
"artifactId",
"rootPackage",
"handlerPackage",
"modelPackage",
"overwriteHandler",
"overwriteHandlerTest",
"overwriteModel",
"httpPort",
"enableHttp",
"httpsPort",
"enableHttps",
"enableRegistry",
"eclipseIDE",
"supportDb",
"supportH2ForTest",
"supportClient",
"dockerOrganization"
]
},
"form": [
"name",
"version",
"groupId",
"artifactId",
"rootPackage",
"handlerPackage",
"modelPackage",
"overwriteHandler",
"overwriteHandlerTest",
"overwriteModel",
"httpPort",
"enableHttp",
"httpsPort",
"enableHttps",
"enableRegistry",
"eclipseIDE",
"supportDb",
"supportH2ForTest",
"supportClient",
"dockerOrganization"
]
}
56 changes: 32 additions & 24 deletions lib/Array.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,21 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }

function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }

function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }

function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }

function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }

function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }

function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }

function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }

Expand All @@ -63,6 +61,16 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"

function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }

function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }

function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }

function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }

function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }

function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }

function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

var styles = function styles(theme) {
Expand All @@ -89,11 +97,11 @@ var styles = function styles(theme) {
};
};

var ArrayComponent =
/*#__PURE__*/
function (_Component) {
var ArrayComponent = /*#__PURE__*/function (_Component) {
_inherits(ArrayComponent, _Component);

var _super = _createSuper(ArrayComponent);

_createClass(ArrayComponent, null, [{
key: "assignItemId",
value: function assignItemId(item) {
Expand Down Expand Up @@ -125,7 +133,7 @@ function (_Component) {

_classCallCheck(this, ArrayComponent);

_this = _possibleConstructorReturn(this, _getPrototypeOf(ArrayComponent).call(this, _props));
_this = _super.call(this, _props);

_defineProperty(_assertThisInitialized(_this), "SEQUENCE", 1);

Expand Down Expand Up @@ -200,14 +208,14 @@ function (_Component) {
classes = _this$props2.classes;

var AddButton = form.AddButton || function (props) {
return _react["default"].createElement(_Button["default"], _extends({
return /*#__PURE__*/_react["default"].createElement(_Button["default"], _extends({
className: classes.addButton,
variant: "contained",
color: "primary"
}, props));
};

return _react["default"].createElement(AddButton, {
return /*#__PURE__*/_react["default"].createElement(AddButton, {
onClick: _this.onAppend
}, form.add || "Add");
});
Expand Down Expand Up @@ -258,15 +266,15 @@ function (_Component) {
arrayIndex: i
});
});
arrays.push(_react["default"].createElement(_Card["default"], {
arrays.push( /*#__PURE__*/_react["default"].createElement(_Card["default"], {
className: classes.arrayItem,
key: item && item[ArrayComponent.ITEM_ID] || i
}, _react["default"].createElement("div", {
}, /*#__PURE__*/_react["default"].createElement("div", {
className: classes.elementsContainer
}, forms), _react["default"].createElement(_IconButton["default"], {
}, forms), /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
onClick: _this2.onDelete(i),
className: classes.deleteItemButton
}, _react["default"].createElement(_Close["default"], {
}, /*#__PURE__*/_react["default"].createElement(_Close["default"], {
fontSize: "small"
}))));
};
Expand All @@ -275,16 +283,16 @@ function (_Component) {
_loop(i);
}

return _react["default"].createElement("div", {
return /*#__PURE__*/_react["default"].createElement("div", {
className: classes.root
}, _react["default"].createElement("div", {
}, /*#__PURE__*/_react["default"].createElement("div", {
style: {
display: "flex"
}
}, _react["default"].createElement(_FormLabel["default"], {
}, /*#__PURE__*/_react["default"].createElement(_FormLabel["default"], {
required: form.required,
className: classes.title
}, form.title && getLocalizedString(form.title)), this.getAddButton()), _react["default"].createElement("div", null, arrays));
}, form.title && getLocalizedString(form.title)), this.getAddButton()), /*#__PURE__*/_react["default"].createElement("div", null, arrays));
}
}], [{
key: "getDerivedStateFromProps",
Expand Down
32 changes: 24 additions & 8 deletions lib/Checkbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ exports["default"] = void 0;

var _react = _interopRequireDefault(require("react"));

var _propTypes = _interopRequireDefault(require("prop-types"));

var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox"));

var _FormGroup = _interopRequireDefault(require("@material-ui/core/FormGroup"));
Expand All @@ -19,24 +21,38 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d

function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }

var FormCheckbox = function FormCheckbox(_ref) {
var form = _ref.form,
value = _ref.value,
getLocalizedString = _ref.localization.getLocalizedString,
onChangeValidate = _ref.onChangeValidate;
return _react["default"].createElement(_FormGroup["default"], {
function FormCheckbox(props) {
var model = props.model,
form = props.form,
value = props.value,
setDefault = props.setDefault,
getLocalizedString = props.localization.getLocalizedString,
onChangeValidate = props.onChangeValidate;
var key = form.key;
setDefault(key, model, form, value);
return /*#__PURE__*/_react["default"].createElement(_FormGroup["default"], {
row: true
}, _react["default"].createElement(_FormControlLabel["default"], _extends({
}, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], _extends({
className: form.className,
label: form.title && getLocalizedString(form.title),
control: _react["default"].createElement(_Checkbox["default"], {
control: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
name: form.key.slice(-1)[0],
value: form.key.slice(-1)[0],
checked: value || false,
disabled: form.readonly,
onChange: onChangeValidate
})
}, form.otherProps)));
}

FormCheckbox.propTypes = {
model: _propTypes["default"].objectOf(_propTypes["default"].object).isRequired,
form: _propTypes["default"].objectOf(_propTypes["default"].object).isRequired,
setDefault: _propTypes["default"].func.isRequired,
value: _propTypes["default"].bool.isRequired,
localization: _propTypes["default"].objectOf(_propTypes["default"].object).isRequired,
getLocalizedString: _propTypes["default"].func.isRequired,
onChangeValidate: _propTypes["default"].func.isRequired
};

var _default = (0, _ComposedComponent["default"])(FormCheckbox);
Expand Down
Loading

0 comments on commit eae5775

Please sign in to comment.