orc-shared 5.9.1-dev.0 → 5.10.0-dev.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -116,16 +116,6 @@ var useStyles = exports.useStyles = (0, _styles.makeStyles)(function (theme) {
116
116
  "& + $track": {
117
117
  backgroundColor: "".concat(theme.palette.grey.borders, " !important")
118
118
  }
119
- },
120
- container: {
121
- display: "flex",
122
- flexDirection: "column"
123
- },
124
- errorText: {
125
- marginTop: theme.spacing(0.5),
126
- color: theme.palette.error.main,
127
- fontSize: theme.typography.fieldLabelSize,
128
- float: "left"
129
119
  }
130
120
  };
131
121
  });
@@ -140,7 +130,6 @@ var Switch = function Switch(_ref) {
140
130
  var value = (switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.value)) || false;
141
131
  var onCaption = switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.onCaption);
142
132
  var offCaption = switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.offCaption);
143
- var error = switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.error);
144
133
  var disabled = (switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.disabled)) || false;
145
134
  var readOnly = switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.readOnly);
146
135
  var className = (switchProps == null ? void 0 : switchProps.get(_SwitchProps.default.propNames.className)) || "";
@@ -160,7 +149,7 @@ var Switch = function Switch(_ref) {
160
149
  checked: classes.checked,
161
150
  disabled: classes.disabled
162
151
  }, className);
163
- var switchComponent = /*#__PURE__*/_react.default.createElement(_Switch.default, {
152
+ return /*#__PURE__*/_react.default.createElement(_Switch.default, {
164
153
  disabled: disabled,
165
154
  classes: switchClasses,
166
155
  checked: value,
@@ -169,11 +158,6 @@ var Switch = function Switch(_ref) {
169
158
  },
170
159
  color: "primary"
171
160
  });
172
- return error && /*#__PURE__*/_react.default.createElement("div", {
173
- className: classes.container
174
- }, switchComponent, /*#__PURE__*/_react.default.createElement("div", {
175
- className: (0, _classnames.default)(classes.errorText)
176
- }, error)) || switchComponent;
177
161
  };
178
162
  __signature__(Switch, "useIntl{{ formatMessage }}\nuseStyles{classes}", function () {
179
163
  return [_reactIntl.useIntl, useStyles];
@@ -35,7 +35,6 @@ var SwitchProps = /*#__PURE__*/function (_ComponentProps) {
35
35
  _this.componentProps.set(_this.constructor.propNames.readOnly, null);
36
36
  _this.componentProps.set(_this.constructor.propNames.className, null);
37
37
  _this.componentProps.set(_this.constructor.propNames.id, null);
38
- _this.componentProps.set(_this.constructor.propNames.error, null);
39
38
  _this.componentProps.set(_this.constructor.propNames.metadata, null);
40
39
  _this._isSwitchProps = true;
41
40
  return _this;
@@ -58,7 +57,6 @@ _defineProperty(SwitchProps, "propNames", {
58
57
  readOnly: "readOnly",
59
58
  className: "className",
60
59
  id: "id",
61
- error: "error",
62
60
  metadata: "metadata"
63
61
  });
64
62
  var isSwitchProps = exports.isSwitchProps = function isSwitchProps(value) {
@@ -49,14 +49,11 @@ var useMultipleFieldEditState = function useMultipleFieldEditState(entityId, sec
49
49
  var dispatch = (0, _useDispatchWithModulesData.useDispatchWithModulesData)();
50
50
  var mergedValidationRules = _objectSpread(_objectSpread({}, _modelValidationHelper.validationRules), extendedValidationRules);
51
51
  var modifiedStates = (0, _reactRedux.useSelector)((0, _view.getModifiedModels)(entityId))[sectionName] || {};
52
- var useDynamicFieldState = function useDynamicFieldState(id, fieldName, errorTypes, fieldDependencies) {
52
+ var useDynamicFieldState = function useDynamicFieldState(id, fieldName, errorTypes) {
53
53
  var _initialValues$id$fie, _initialValues$id, _modifiedStates$id$fi, _modifiedStates$id, _editState$value;
54
54
  if (errorTypes === void 0) {
55
55
  errorTypes = [];
56
56
  }
57
- if (fieldDependencies === void 0) {
58
- fieldDependencies = {};
59
- }
60
57
  var keys = [id, fieldName];
61
58
  var initialValue = (_initialValues$id$fie = (_initialValues$id = initialValues[id]) == null ? void 0 : _initialValues$id[fieldName]) != null ? _initialValues$id$fie : "";
62
59
  var editState = (_modifiedStates$id$fi = (_modifiedStates$id = modifiedStates[id]) == null ? void 0 : _modifiedStates$id[fieldName]) != null ? _modifiedStates$id$fi : {};
@@ -68,23 +65,17 @@ var useMultipleFieldEditState = function useMultipleFieldEditState(entityId, sec
68
65
  var resetEditState = function resetEditState() {
69
66
  dispatch(_view2.setEditModelField, [keys, initialValue, initialValue, entityId, sectionName]);
70
67
  };
71
- var isEditStateValid = function isEditStateValid(value, dependencies) {
72
- if (dependencies === void 0) {
73
- dependencies = {};
74
- }
68
+ var isEditStateValid = function isEditStateValid(value) {
75
69
  var valueToValidate = value != null ? value : editState.value;
76
70
  var hasAnyValidationErrors = false;
77
71
  errorTypes.forEach(function (errorType) {
78
- var isValid = mergedValidationRules[errorType](valueToValidate, id, fieldName, _objectSpread(_objectSpread({}, fieldDependencies), dependencies));
72
+ var isValid = mergedValidationRules[errorType](valueToValidate, id, fieldName);
79
73
  if (isValid === false) {
80
74
  dispatch(_view2.setEditModelFieldError, [keys, errorType, entityId, sectionName]);
81
75
  hasAnyValidationErrors = true;
82
76
  return;
83
77
  }
84
78
  });
85
- if (!hasAnyValidationErrors) {
86
- dispatch(_view2.removeEditModelFieldError, [keys, entityId, sectionName]);
87
- }
88
79
  return !hasAnyValidationErrors;
89
80
  };
90
81
  return {
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  exports.__esModule = true;
4
- exports.variantPropertyMapKvaSelector = exports.variantPropertyKeyValuesSelector = exports.selectCurrentLookupDetails = exports.profileAttributeGroupsSelector = exports.productPropertyValuesSelector = exports.productPropertyValueSelector = exports.productPropertyMapSelector = exports.orderLookupsNextPageToLoad = exports.orderLookupsListCurrentInfo = exports.newProfileDefinitionNameSelector = exports.newProfileDefinitionInstanceSelector = exports.namedLookupValuesSelector = exports.namedLookupSelector = exports.namedLookupLocalizedValuesSelector = exports.namedLookupLocalizedSelector = exports.mappedOrderLookupsListSelector = exports.mappedLookupsListSelector = exports.mappedLookupListSelector = exports.mappedDefinitionsListSelector = exports.mappedDefinitionEntity = exports.mappedDefinitionAttributesSelector = exports.mappedCustomDefinitionsListSelector = exports.mappedBaseDefinitionsListSelector = exports.lookupsNextPageToLoad = exports.lookupsListSelector = exports.lookupsListCurrentInfo = exports.lookupSelector = exports.lookupExistAndIsActiveSelector = exports.lookupByNameSelector = exports.groupedCustomAttributesDefinitionSelector = exports.definitionEntityCustomAttributesSelector = exports.definitionEntityBaseAttributesSelector = exports.definitionEntity = exports.customProfileTypesSelector = exports.customAttributesSelector = exports.customAttributesDefinitionSelector = exports.baseAttributesSelector = void 0;
4
+ exports.variantPropertyMapKvaSelector = exports.variantPropertyKeyValuesSelector = exports.selectCurrentLookupDetails = exports.profileAttributeGroupsSelector = exports.productPropertyValuesSelector = exports.productPropertyValueSelector = exports.productPropertyMapSelector = exports.orderLookupsNextPageToLoad = exports.orderLookupsListCurrentInfo = exports.newProfileDefinitionNameSelector = exports.newProfileDefinitionInstanceSelector = exports.namedLookupsValuesSelector = exports.namedLookupValuesSelector = exports.namedLookupSelector = exports.namedLookupLocalizedValuesSelector = exports.namedLookupLocalizedSelector = exports.mappedOrderLookupsListSelector = exports.mappedLookupsListSelector = exports.mappedLookupListSelector = exports.mappedDefinitionsListSelector = exports.mappedDefinitionEntity = exports.mappedDefinitionAttributesSelector = exports.mappedCustomDefinitionsListSelector = exports.mappedBaseDefinitionsListSelector = exports.lookupsNextPageToLoad = exports.lookupsListSelector = exports.lookupsListCurrentInfo = exports.lookupSelector = exports.lookupExistAndIsActiveSelector = exports.lookupByNameSelector = exports.groupedCustomAttributesDefinitionSelector = exports.definitionEntityCustomAttributesSelector = exports.definitionEntityBaseAttributesSelector = exports.definitionEntity = exports.customProfileTypesSelector = exports.customAttributesSelector = exports.customAttributesDefinitionSelector = exports.baseAttributesSelector = void 0;
5
5
  var _reselect = require("reselect");
6
6
  var _immutable = _interopRequireDefault(require("immutable"));
7
7
  var _utils = require("../utils");
@@ -77,6 +77,19 @@ var namedLookupValuesSelector = exports.namedLookupValuesSelector = (0, _utils.m
77
77
  });
78
78
  });
79
79
  });
80
+ var namedLookupsValuesSelector = exports.namedLookupsValuesSelector = (0, _utils.memoize)(function (moduleName, lookupNames) {
81
+ return (0, _reselect.createSelector)(lookupSelector(moduleName), _locale.currentLocaleOrDefault, function (lookups, locale) {
82
+ var lookupsValues = {};
83
+ (0, _lodash.each)(lookupNames, function (name) {
84
+ var lookup = lookups.get(name);
85
+ if (!lookup) return;
86
+ lookupsValues[name] = lookup.get("values", _immutable.default.Map()).map(function (lookupValue) {
87
+ return (0, _setTranslationWithFallback.setTranslationWithFallbackField)(locale, lookupValue, "name", "displayName");
88
+ });
89
+ });
90
+ return _immutable.default.fromJS(lookupsValues);
91
+ });
92
+ });
80
93
  var selectCurrentLookupDetails = exports.selectCurrentLookupDetails = (0, _utils.memoize)(function (moduleName, lookupName) {
81
94
  return namedLookupSelector(moduleName, lookupName);
82
95
  });
@@ -364,6 +377,7 @@ var resolveProductPropertyValue = function resolveProductPropertyValue(property,
364
377
  reactHotLoader.register(lookupByNameSelector, "lookupByNameSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
365
378
  reactHotLoader.register(namedLookupSelector, "namedLookupSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
366
379
  reactHotLoader.register(namedLookupValuesSelector, "namedLookupValuesSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
380
+ reactHotLoader.register(namedLookupsValuesSelector, "namedLookupsValuesSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
367
381
  reactHotLoader.register(selectCurrentLookupDetails, "selectCurrentLookupDetails", "/home/vsts/work/1/s/src/selectors/metadata.js");
368
382
  reactHotLoader.register(namedLookupLocalizedSelector, "namedLookupLocalizedSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
369
383
  reactHotLoader.register(lookupExistAndIsActiveSelector, "lookupExistAndIsActiveSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
@@ -422,6 +436,7 @@ var resolveProductPropertyValue = function resolveProductPropertyValue(property,
422
436
  reactHotLoader.register(lookupByNameSelector, "lookupByNameSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
423
437
  reactHotLoader.register(namedLookupSelector, "namedLookupSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
424
438
  reactHotLoader.register(namedLookupValuesSelector, "namedLookupValuesSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
439
+ reactHotLoader.register(namedLookupsValuesSelector, "namedLookupsValuesSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
425
440
  reactHotLoader.register(selectCurrentLookupDetails, "selectCurrentLookupDetails", "/home/vsts/work/1/s/src/selectors/metadata.js");
426
441
  reactHotLoader.register(namedLookupLocalizedSelector, "namedLookupLocalizedSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
427
442
  reactHotLoader.register(lookupExistAndIsActiveSelector, "lookupExistAndIsActiveSelector", "/home/vsts/work/1/s/src/selectors/metadata.js");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "orc-shared",
3
- "version": "5.9.1-dev.0",
3
+ "version": "5.10.0-dev.2",
4
4
  "description": "Shared code for Orckestra applications",
5
5
  "main": "./src/index.js",
6
6
  "exports": {
@@ -25,7 +25,7 @@
25
25
  "prepublishOnly": "npm run build:clean --",
26
26
  "icons": "orc-scripts buildIconsSheet",
27
27
  "extract": "orc-scripts extract-messages",
28
- "generateApi": "orc-scripts generateApi --outputFile src/actions/requestsApi.js"
28
+ "generateApi": "orc-scripts generateApi --outputFile src/actions/requestsApi.js --requestsFile ./src/requests"
29
29
  },
30
30
  "files": [
31
31
  "src",
@@ -55,7 +55,7 @@
55
55
  "@testing-library/react": "^10.4.9"
56
56
  },
57
57
  "dependencies": {
58
- "orc-scripts": "4.0.4",
58
+ "orc-scripts": "4.0.5",
59
59
  "react-number-format": "^5.3.0"
60
60
  },
61
61
  "sideEffects": false,