tenjin-ui-kit 0.2.196 → 0.2.198

package/components/select/SimpleSelect.js

@@ -15,6 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -75,19 +76,44 @@ var SimpleSelect = function SimpleSelect(_ref) {
     return false;
   };
   var displayedOptions = (0, _react.useMemo)(function () {
-    var filteredOptions = options.filter(function (option) {
-      return containsText(option.label, searchText);
+    var filteredOptions = options === null || options === void 0 ? void 0 : options.filter(function (option) {
+      return containsText(option === null || option === void 0 ? void 0 : option.label, searchText);
     });
     if (isSearch) {
-      setNoDataAvailable(filteredOptions.length === 0);
+      setNoDataAvailable((filteredOptions === null || filteredOptions === void 0 ? void 0 : filteredOptions.length) === 0);
     }
-    var sortedOptions = filteredOptions.sort(function (a, b) {
-      return a.label.localeCompare(b.label);
+
+    // const sortedOptions = filteredOptions?.sort((a, b) =>
+    //   a?.label?.localeCompare(b.label)
+    // );
+    var sortedOptions = filteredOptions === null || filteredOptions === void 0 ? void 0 : filteredOptions.slice().sort(function (a, b) {
+      var labelA = typeof a.label === "string" ? a.label : findStringInChildren(a.label.props.children);
+      var labelB = typeof b.label === "string" ? b.label : findStringInChildren(b.label.props.children);
+      return labelA.localeCompare(labelB);
     });
+    function findStringInChildren(children) {
+      var _iterator = _createForOfIteratorHelper(children),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var child = _step.value;
+          if (typeof child === "string") {
+            return child;
+          } else if (child.props && typeof child.props.children === "string") {
+            return child.props.children;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return "";
+    }
     return sortedOptions.map(function (option) {
       return {
-        label: option.label,
-        value: option.value
+        label: option === null || option === void 0 ? void 0 : option.label,
+        value: option === null || option === void 0 ? void 0 : option.value
       };
     });
   }, [options, searchText, isSearch]);

package/http/index.js

@@ -20,7 +20,7 @@ var getApiAccessToken = _authenticationProvider.default.getApiAccessToken;
 var getClient = function getClient() {
   return _axios.default.create({
     headers: {
-      "Content-Type": "application/json"
+      'Content-Type': 'application/json'
     }
   });
 };
@@ -28,7 +28,7 @@ exports.getClient = getClient;
 var getSecureClient = function getSecureClient() {
   return _axios.default.create({
     headers: {
-      "Content-Type": "application/json",
+      'Content-Type': 'application/json',
       Authorization: "Bearer ".concat(getApiAccessToken())
     }
   });
@@ -210,15 +210,14 @@ exports.doDelete = doDelete;
 var parseAxiosError = function parseAxiosError(error) {
   var parsedError = {
     status: 500,
-    statusText: "Internal Server Error",
-    message: "An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support"
+    statusText: 'Internal Server Error',
+    message: 'An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support'
   };
   if (error && error.response) {
-    var _error$response$data$;
     parsedError = _objectSpread(_objectSpread({}, parsedError), {}, {
       status: error.response.status,
       statusText: error.response.statusText,
-      message: error.response.status === 503 ? (_error$response$data$ = error.response.data.message) !== null && _error$response$data$ !== void 0 ? _error$response$data$ : "A network error occurred. Please try again" : error.response.status === 401 ? "Authentication Failed" : error.response.data ? error.response.data.message ? error.response.data.message : "An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support" : "An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support"
+      message: error.response.status === 503 ? 'A network error occurred. Please try again' : error.response.status === 401 ? 'Authentication Failed' : error.response.data ? error.response.data.message ? error.response.data.message : 'An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support' : 'An unexpected error occurred while processing your request. Please try again. If problem persists, please contact Tenjin support'
     });
   }
   return parsedError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tenjin-ui-kit",
-  "version": "0.2.196",
+  "version": "0.2.198",
   "repository": {
     "url": "https://gitlab.com/yethi/react/tenjin-ui-kit.git"
   },