orc-shared 5.8.0-dev.3 → 5.8.0-dev.4

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.
Files changed (4) hide show
  1. package/dist/utils/filterHelper.js +4 -2
  2. package/package.json +1 -1
  3. package/src/utils/filterHelper.js +4 -2
  4. package/src/utils/filterHelper.test.js +6 -6
package/dist/utils/filterHelper.js CHANGED
@@ -4,6 +4,7 @@ exports.__esModule = true;
4
4
  exports.substituteAllForNull = exports.getValueWithAll = exports.extractDropboxOptionsMemo = exports.extractDropboxOptions = void 0;
5
5
  var _constants = require("../constants");
6
6
  var _index = require("./index");
7
+ var _localizationHelper = require("./localizationHelper");
7
8
  (function () {
8
9
  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
9
10
  enterModule && enterModule(module);
@@ -45,9 +46,10 @@ var extractDropboxOptionsMemo = exports.extractDropboxOptionsMemo = function ext
45
46
  var options = [];
46
47
  items.forEach(function (v) {
47
48
  if (!activeKey || v.get(activeKey)) {
49
+ var value = v.get(valueKey);
48
50
  options.push({
49
- value: v.get(valueKey),
50
- label: v.get(labelKey) || fallbackLabelKey && v.get(fallbackLabelKey),
51
+ value: value,
52
+ label: v.get(labelKey) || fallbackLabelKey && v.get(fallbackLabelKey) || (0, _localizationHelper.getNotLocalizedString)(value),
51
53
  sortOrder: v.get(sortOrderKey)
52
54
  });
53
55
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "orc-shared",
3
- "version": "5.8.0-dev.3",
3
+ "version": "5.8.0-dev.4",
4
4
  "description": "Shared code for Orckestra applications",
5
5
  "main": "./src/index.js",
6
6
  "exports": {
package/src/utils/filterHelper.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { allValue } from "../constants";
2
2
  import { memoize } from "./index";
3
+ import { getNotLocalizedString } from "./localizationHelper";
3
4
 
4
5
  export const getValueWithAll = value => {
5
6
  if (!value) return allValue;
@@ -20,9 +21,10 @@ export const extractDropboxOptionsMemo = (data, config = undefined) => {
20
21
  let options = [];
21
22
  items.forEach(v => {
22
23
  if (!activeKey || v.get(activeKey)) {
24
+ const value = v.get(valueKey);
23
25
  options.push({
24
- value: v.get(valueKey),
25
- label: v.get(labelKey) || (fallbackLabelKey && v.get(fallbackLabelKey)),
26
+ value: value,
27
+ label: v.get(labelKey) || (fallbackLabelKey && v.get(fallbackLabelKey)) || getNotLocalizedString(value),
26
28
  sortOrder: v.get(sortOrderKey),
27
29
  });
28
30
  }
package/src/utils/filterHelper.test.js CHANGED
@@ -43,8 +43,8 @@ describe("extractDropboxOptions", () => {
43
43
  const result = extractDropboxOptions(lookup);
44
44
 
45
45
  expect(result, "to equal", [
46
- { value: "value1", label: undefined, sortOrder: 0 },
47
- { value: "value3", label: undefined, sortOrder: 3 },
46
+ { value: "value1", label: "[value1]", sortOrder: 0 },
47
+ { value: "value3", label: "[value3]", sortOrder: 3 },
48
48
  ]);
49
49
  });
50
50
 
@@ -60,8 +60,8 @@ describe("extractDropboxOptions", () => {
60
60
  const result = extractDropboxOptions(lookups);
61
61
 
62
62
  expect(result, "to equal", [
63
- { value: "value4", label: undefined, sortOrder: 0 },
64
- { value: "value6", label: undefined, sortOrder: 3 },
63
+ { value: "value4", label: "[value4]", sortOrder: 0 },
64
+ { value: "value6", label: "[value6]", sortOrder: 3 },
65
65
  ]);
66
66
  });
67
67
 
@@ -77,8 +77,8 @@ describe("extractDropboxOptions", () => {
77
77
  const result = extractDropboxOptions(lookup);
78
78
 
79
79
  expect(result, "to equal", [
80
- { value: "value1", label: undefined, sortOrder: 0 },
81
- { value: "value3", label: undefined, sortOrder: 3 },
80
+ { value: "value1", label: "[value1]", sortOrder: 0 },
81
+ { value: "value3", label: "[value3]", sortOrder: 3 },
82
82
  ]);
83
83
  });
84
84