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

package/dist/components/AppFrame/About.js

@@ -17,6 +17,7 @@ var _close = _interopRequireDefault(require("../../content/close.png"));
 var _versionInfo = require("../../selectors/versionInfo");
 var _locale = require("../../selectors/locale");
 var _sharedMessages = _interopRequireDefault(require("./../../sharedMessages"));
+var _lodash = require("lodash");
 var _templateObject;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -116,7 +117,7 @@ var About = exports.About = function About(_ref2) {
     key: "orc-shared-version",
     message: _objectSpread(_objectSpread({}, _sharedMessages.default.orcSharedVersion), {}, {
       values: {
-        version: DEPENDENCIES["orc-shared"]
+        version: (0, _lodash.trimStart)(DEPENDENCIES["orc-shared"], "^")
       }
     })
   })] : null, DEPENDENCIES && DEPENDENCIES["orc-scripts"] ? [/*#__PURE__*/_react.default.createElement("br", {
@@ -125,7 +126,7 @@ var About = exports.About = function About(_ref2) {
     key: "orc-scripts-version",
     message: _objectSpread(_objectSpread({}, _sharedMessages.default.orcScriptsVersion), {}, {
       values: {
-        version: DEPENDENCIES["orc-scripts"]
+        version: (0, _lodash.trimStart)(DEPENDENCIES["orc-scripts"], "^")
       }
     })
   })] : null, DEPENDENCIES && DEPENDENCIES["orc-secret"] ? [/*#__PURE__*/_react.default.createElement("br", {
@@ -134,7 +135,7 @@ var About = exports.About = function About(_ref2) {
     key: "orc-secret-version",
     message: _objectSpread(_objectSpread({}, _sharedMessages.default.orcSecretVersion), {}, {
       values: {
-        version: DEPENDENCIES["orc-secret"]
+        version: (0, _lodash.trimStart)(DEPENDENCIES["orc-secret"], "^")
       }
     })
   })] : null), /*#__PURE__*/_react.default.createElement(AboutParagraph, {

package/dist/utils/filterHelper.js

@@ -4,6 +4,7 @@ exports.__esModule = true;
 exports.substituteAllForNull = exports.getValueWithAll = exports.extractDropboxOptionsMemo = exports.extractDropboxOptions = void 0;
 var _constants = require("../constants");
 var _index = require("./index");
+var _localizationHelper = require("./localizationHelper");
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
@@ -45,9 +46,10 @@ var extractDropboxOptionsMemo = exports.extractDropboxOptionsMemo = function ext
   var options = [];
   items.forEach(function (v) {
     if (!activeKey || v.get(activeKey)) {
+      var value = v.get(valueKey);
       options.push({
-        value: v.get(valueKey),
-        label: v.get(labelKey) || fallbackLabelKey && v.get(fallbackLabelKey),
+        value: value,
+        label: v.get(labelKey) || fallbackLabelKey && v.get(fallbackLabelKey) || (0, _localizationHelper.getNotLocalizedString)(value),
         sortOrder: v.get(sortOrderKey)
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.8.0-dev.3",
+	"version": "5.8.0-dev.5",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/components/AppFrame/About.js

@@ -13,6 +13,7 @@ import close from "../../content/close.png";
 import { getVersionSelector } from "../../selectors/versionInfo";
 import { currentLocaleOrDefault } from "../../selectors/locale";
 import sharedMessages from "./../../sharedMessages";
+import { trimStart } from "lodash";
 
 export const ABOUT_NAME = "__aboutBox";
 
@@ -125,7 +126,7 @@ export const About = ({ currentApplication }) => {
 								key="orc-shared-version"
 								message={{
 									...sharedMessages.orcSharedVersion,
-									values: { version: DEPENDENCIES["orc-shared"] },
+									values: { version: trimStart(DEPENDENCIES["orc-shared"], "^") },
 								}}
 							/>,
 					  ]
@@ -137,7 +138,7 @@ export const About = ({ currentApplication }) => {
 								key="orc-scripts-version"
 								message={{
 									...sharedMessages.orcScriptsVersion,
-									values: { version: DEPENDENCIES["orc-scripts"] },
+									values: { version: trimStart(DEPENDENCIES["orc-scripts"], "^") },
 								}}
 							/>,
 					  ]
@@ -149,7 +150,7 @@ export const About = ({ currentApplication }) => {
 								key="orc-secret-version"
 								message={{
 									...sharedMessages.orcSecretVersion,
-									values: { version: DEPENDENCIES["orc-secret"] },
+									values: { version: trimStart(DEPENDENCIES["orc-secret"], "^") },
 								}}
 							/>,
 					  ]

package/src/components/AppFrame/About.test.js

@@ -88,6 +88,67 @@ describe("About", () => {
 		);
 	});
 
+	it("renders an about box with normalized JS version", () => {
+		const orcSharedVersion = "^2.9.0";
+		const orcScriptsVersion = "^1.2.3";
+		const orcSecretVersion = "^5.1.7";
+
+		global.DEPENDENCIES = {
+			"orc-scripts": orcScriptsVersion,
+			"orc-secret": orcSecretVersion,
+			"orc-shared": orcSharedVersion,
+		};
+		global.BUILD_NUMBER = "2.3.2";
+		expect(
+			<Provider store={store}>
+				<IntlProvider locale="en-US" messages={messages}>
+					<About viewState={{ show: true }} currentApplication={{ displayName: "An application" }} />
+				</IntlProvider>
+			</Provider>,
+			"when mounted",
+			"to satisfy",
+			<IntlProvider locale="en-US" messages={messages}>
+				<AboutBox in>
+					<CloseButton>
+						<img src={close} alt="X" />
+					</CloseButton>
+					<img src={logoImage} alt="Orckestra" />
+					<AboutParagraph>
+						{stringifyWithoutQuotes(messages["orc-shared.ccVersion"]).replace("{version}", ccVersion)}
+						<br />
+						An application 2.3.2
+						<br />
+						{stringifyWithoutQuotes(messages["orc-shared.orcSharedVersion"]).replace(
+							"{version}",
+							orcSharedVersion.replace("^", ""),
+						)}
+						<br />
+						{stringifyWithoutQuotes(messages["orc-shared.orcScriptsVersion"]).replace(
+							"{version}",
+							orcScriptsVersion.replace("^", ""),
+						)}
+						<br />
+						{stringifyWithoutQuotes(messages["orc-shared.orcSecretVersion"]).replace(
+							"{version}",
+							orcSecretVersion.replace("^", ""),
+						)}
+					</AboutParagraph>
+					<AboutParagraph long>{stringifyWithoutQuotes(messages["orc-shared.copyrightTermsNotice"])}</AboutParagraph>
+					<AboutParagraph>
+						<AboutLink href="https://www.orckestra.com">
+							{stringifyWithoutQuotes(messages["orc-shared.ccName"])}
+						</AboutLink>
+					</AboutParagraph>
+					<AboutParagraph>
+						{stringifyWithoutQuotes(messages["orc-shared.copyright"]).replace("{year}", new Date().getFullYear())}
+						<br />
+						{stringifyWithoutQuotes(messages["orc-shared.allRightsReserved"])}
+					</AboutParagraph>
+				</AboutBox>
+			</IntlProvider>,
+		);
+	});
+
 	it("view state handler update show value when clicking on close button", () =>
 		expect(
 			<Provider store={store}>

package/src/utils/filterHelper.js

@@ -1,5 +1,6 @@
 import { allValue } from "../constants";
 import { memoize } from "./index";
+import { getNotLocalizedString } from "./localizationHelper";
 
 export const getValueWithAll = value => {
 	if (!value) return allValue;
@@ -20,9 +21,10 @@ export const extractDropboxOptionsMemo = (data, config = undefined) => {
 	let options = [];
 	items.forEach(v => {
 		if (!activeKey || v.get(activeKey)) {
+			const value = v.get(valueKey);
 			options.push({
-				value: v.get(valueKey),
-				label: v.get(labelKey) || (fallbackLabelKey && v.get(fallbackLabelKey)),
+				value: value,
+				label: v.get(labelKey) || (fallbackLabelKey && v.get(fallbackLabelKey)) || getNotLocalizedString(value),
 				sortOrder: v.get(sortOrderKey),
 			});
 		}

package/src/utils/filterHelper.test.js

@@ -43,8 +43,8 @@ describe("extractDropboxOptions", () => {
 		const result = extractDropboxOptions(lookup);
 
 		expect(result, "to equal", [
-			{ value: "value1", label: undefined, sortOrder: 0 },
-			{ value: "value3", label: undefined, sortOrder: 3 },
+			{ value: "value1", label: "[value1]", sortOrder: 0 },
+			{ value: "value3", label: "[value3]", sortOrder: 3 },
 		]);
 	});
 
@@ -60,8 +60,8 @@ describe("extractDropboxOptions", () => {
 		const result = extractDropboxOptions(lookups);
 
 		expect(result, "to equal", [
-			{ value: "value4", label: undefined, sortOrder: 0 },
-			{ value: "value6", label: undefined, sortOrder: 3 },
+			{ value: "value4", label: "[value4]", sortOrder: 0 },
+			{ value: "value6", label: "[value6]", sortOrder: 3 },
 		]);
 	});
 
@@ -77,8 +77,8 @@ describe("extractDropboxOptions", () => {
 		const result = extractDropboxOptions(lookup);
 
 		expect(result, "to equal", [
-			{ value: "value1", label: undefined, sortOrder: 0 },
-			{ value: "value3", label: undefined, sortOrder: 3 },
+			{ value: "value1", label: "[value1]", sortOrder: 0 },
+			{ value: "value3", label: "[value3]", sortOrder: 3 },
 		]);
 	});