@abidibo/react-cam-roi 0.2.5 → 0.2.7

package/dist/index.cjs.js

@@ -212,11 +212,11 @@ var canDrawShape = function (configuration, shapeType, shapes, notify, message)
     }
     return false;
 };
-var validateParametersForm = function (parameters, fields, setErrors) {
+var validateParametersForm = function (parameters, fields, setErrors, strings) {
     var err = {};
     parameters.forEach(function (p) {
         if (p.required && isEmpty(fields[p.codename])) {
-            err[p.codename] = 'requiredField';
+            err[p.codename] = strings.requiredField;
         }
     });
     if (Object.keys(err).length > 0) {
@@ -250,7 +250,7 @@ var validate = function (configuration, shapes, metadata, strings) {
                 case OperatorEnum.Eq:
                     if ((metadata.rois || []).filter(function (m) { return m.role === roi.role; }).length !== roi.multiplicity.threshold) {
                         errors.push(formatString(strings.shapesOfRoleShouldBeEqualToThreshold, {
-                            role: String(roi.role),
+                            role: String(roi.label),
                             threshold: roi.multiplicity.threshold,
                         }));
                     }
@@ -258,7 +258,7 @@ var validate = function (configuration, shapes, metadata, strings) {
                 case OperatorEnum.Lt:
                     if ((metadata.rois || []).filter(function (m) { return m.role === roi.role; }).length >= roi.multiplicity.threshold) {
                         errors.push(formatString(strings.shapesOfRoleShouldBeLessThanThreshold, {
-                            role: String(roi.role),
+                            role: String(roi.label),
                             threshold: roi.multiplicity.threshold,
                         }));
                     }
@@ -452,12 +452,12 @@ var NumberField = function (_a) {
 var styles$a = {"bool-field":"BoolField-module_bool-field__-Qg7I","bool-field-light":"BoolField-module_bool-field-light__CHITs","bool-field-dark":"BoolField-module_bool-field-dark__gy9uQ","bool-field-error":"BoolField-module_bool-field-error__qJV-E","bool-field-label":"BoolField-module_bool-field-label__LZbjy","bool-field-label-error":"BoolField-module_bool-field-label-error__gBzdk","bool-field-helper-text":"BoolField-module_bool-field-helper-text__fH8fC","bool-field-helper-text-error":"BoolField-module_bool-field-helper-text-error__McdWn"};
 
 var BoolField = function (_a) {
-    var onChange = _a.onChange, value = _a.value, label = _a.label, helperText = _a.helperText, error = _a.error, _b = _a.readOnly, readOnly = _b === void 0 ? false : _b, _c = _a.disabled, disabled = _c === void 0 ? false : _c, _d = _a.required, required = _d === void 0 ? false : _d;
+    var onChange = _a.onChange, checked = _a.checked, label = _a.label, helperText = _a.helperText, error = _a.error, _b = _a.readOnly, readOnly = _b === void 0 ? false : _b, _c = _a.disabled, disabled = _c === void 0 ? false : _c, _d = _a.required, required = _d === void 0 ? false : _d;
     var _e = React.useContext(UiContext), themeMode = _e.themeMode, Typography = _e.Typography;
     var handleChange = function (e) {
         onChange(e.target.checked);
     };
-    return (jsxRuntime.jsxs("div", { className: css('bool-field-wrapper', styles$a, themeMode), children: [jsxRuntime.jsx("label", { className: "".concat(css('bool-field-label', styles$a, themeMode), " ").concat(error ? css('bool-field-label-error', styles$a, null) : ''), children: jsxRuntime.jsxs(Typography, { children: [label, required && ' *'] }) }), jsxRuntime.jsx("input", { type: 'checkbox', className: "".concat(css('bool-field', styles$a, themeMode), " ").concat(error ? css('bool-field-error', styles$a, null) : ''), onChange: handleChange, checked: value, readOnly: readOnly, disabled: disabled }), helperText && (jsxRuntime.jsx(Typography, { component: 'div', className: "".concat(css('bool-field-helper-text', styles$a, themeMode), " ").concat(error ? css('bool-field-helper-text-error', styles$a, null) : ''), children: helperText }))] }));
+    return (jsxRuntime.jsxs("div", { className: css('bool-field-wrapper', styles$a, themeMode), children: [jsxRuntime.jsx("label", { className: "".concat(css('bool-field-label', styles$a, themeMode), " ").concat(error ? css('bool-field-label-error', styles$a, null) : ''), children: jsxRuntime.jsxs(Typography, { children: [label, required && ' *'] }) }), jsxRuntime.jsx("input", { type: 'checkbox', className: "".concat(css('bool-field', styles$a, themeMode), " ").concat(error ? css('bool-field-error', styles$a, null) : ''), onChange: handleChange, checked: checked, readOnly: readOnly, disabled: disabled }), helperText && (jsxRuntime.jsx(Typography, { component: 'div', className: "".concat(css('bool-field-helper-text', styles$a, themeMode), " ").concat(error ? css('bool-field-helper-text-error', styles$a, null) : ''), children: helperText }))] }));
 };
 
 var styles$9 = {"enum-field":"EnumField-module_enum-field__szaEn","enum-field-light":"EnumField-module_enum-field-light__vWmLt","enum-field-dark":"EnumField-module_enum-field-dark__fDZ4K","enum-field-error":"EnumField-module_enum-field-error__Kagoh","enum-field-label":"EnumField-module_enum-field-label__o1dg0","enum-field-label-error":"EnumField-module_enum-field-label-error__O2ayN","enum-field-helper-text":"EnumField-module_enum-field-helper-text__nRzmi","enum-field-helper-text-error":"EnumField-module_enum-field-helper-text-error__ukfl1"};
@@ -1392,7 +1392,7 @@ var ParameterField = function (_a) {
         case 'float':
             return ((_c = parameter.options) === null || _c === void 0 ? void 0 : _c.length) ? (jsxRuntime.jsx(EnumField, __assign({ value: value, onChange: function (v) { return onChange(v); }, options: parameter.options, multiple: parameter.multiple }, props))) : (jsxRuntime.jsx(NumberField, __assign({ value: value, onChange: function (v) { return onChange(v); } }, props)));
         case 'bool':
-            return jsxRuntime.jsx(BoolField, __assign({ value: value, onChange: function (v) { return onChange(v); } }, props));
+            return jsxRuntime.jsx(BoolField, __assign({ checked: value, onChange: function (v) { return onChange(v); } }, props));
         default:
             return null;
     }
@@ -1407,7 +1407,10 @@ var ParametersModalForm = function (_a) {
     var _d = React.useState(shapeRole !== null && shapeRole !== void 0 ? shapeRole : ''), role = _d[0], setRole = _d[1];
     var _e = useParametersForm(data), fields = _e.fields, setField = _e.setField, errors = _e.errors, setErrors = _e.setErrors;
     var handleSubmit = function () {
-        if (validateParametersForm(parameters, fields, setErrors)) {
+        if (shapeType && name === '') {
+            setErrors({ name: strings.requiredField });
+        }
+        else if (validateParametersForm(parameters, fields, setErrors, strings)) {
             var data_1 = __spreadArray([], parameters.map(function (p) { return ({ codename: p.codename, value: fields[p.codename] }); }), true);
             if (shapeType) {
                 onSubmit(data_1, { name: name, role: role });