@rh-support/utils 2.0.7 → 2.0.8

package/lib/cjs/urlUtils.js

@@ -1,32 +1,21 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidUrl = exports.getUpdatedQueryString = exports.getDrupalResIdIfTypeFromUrl = exports.getDrupalResIdFromUrl = exports.getResTypeFromUrl = exports.getRedhatDotComHost = exports.REDHAT_DOT_COM_HOSTNAMES = exports.getStringifiedParams = exports.getUrlParsedParams = void 0;
-var pickBy_1 = __importDefault(require("lodash/pickBy"));
-var qs_1 = __importDefault(require("qs"));
+const pickBy_1 = __importDefault(require("lodash/pickBy"));
+const qs_1 = __importDefault(require("qs"));
 // parses url query params to an obj
 function getUrlParsedParams(urlParams, options) {
-    var defaultOptions = { ignoreQueryPrefix: true };
-    return qs_1.default.parse(urlParams, __assign(__assign({}, defaultOptions), options));
+    const defaultOptions = { ignoreQueryPrefix: true };
+    return qs_1.default.parse(urlParams, Object.assign(Object.assign({}, defaultOptions), options));
 }
 exports.getUrlParsedParams = getUrlParsedParams;
 // converts an obj to url query params
 function getStringifiedParams(object, options) {
-    var defaultOptions = { arrayFormat: 'repeat', encode: false };
-    return qs_1.default.stringify(object, __assign(__assign({}, defaultOptions), options));
+    const defaultOptions = { arrayFormat: 'repeat', encode: false };
+    return qs_1.default.stringify(object, Object.assign(Object.assign({}, defaultOptions), options));
 }
 exports.getStringifiedParams = getStringifiedParams;
 exports.REDHAT_DOT_COM_HOSTNAMES = {
@@ -35,7 +24,7 @@ exports.REDHAT_DOT_COM_HOSTNAMES = {
     DEV: 'https://www.dev.redhat.com',
     PROD: 'https://www.redhat.com',
 };
-var getRedhatDotComHost = function (env) {
+const getRedhatDotComHost = (env) => {
     switch (env) {
         case 'QA':
             return exports.REDHAT_DOT_COM_HOSTNAMES.QA;
@@ -48,42 +37,40 @@ var getRedhatDotComHost = function (env) {
     }
 };
 exports.getRedhatDotComHost = getRedhatDotComHost;
-var drupalUrlRegexp = /^(https:\/\/access?.?\w+.redhat.com)?\/(\w+)\/(\d+)\S*$/;
-var openshiftDocUrlRegexp = /^https:\/\/docs.openshift.com\//;
-var getResTypeFromUrl = function (url) {
-    var drupalUrl = drupalUrlRegexp.exec(url);
-    var isOpenshiftDocUrl = openshiftDocUrlRegexp.test(url);
+const drupalUrlRegexp = /^(https:\/\/access?.?\w+.redhat.com)?\/(\w+)\/(\d+)\S*$/;
+const openshiftDocUrlRegexp = /^https:\/\/docs.openshift.com\//;
+const getResTypeFromUrl = (url) => {
+    const drupalUrl = drupalUrlRegexp.exec(url);
+    const isOpenshiftDocUrl = openshiftDocUrlRegexp.test(url);
     return (drupalUrl === null || drupalUrl === void 0 ? void 0 : drupalUrl[2]) ? drupalUrl === null || drupalUrl === void 0 ? void 0 : drupalUrl[2] : isOpenshiftDocUrl ? 'documentation' : 'unknown';
 };
 exports.getResTypeFromUrl = getResTypeFromUrl;
-var getDrupalResIdFromUrl = function (url) {
-    var m = drupalUrlRegexp.exec(url);
+const getDrupalResIdFromUrl = (url) => {
+    let m = drupalUrlRegexp.exec(url);
     return m === null || m === void 0 ? void 0 : m[2];
 };
 exports.getDrupalResIdFromUrl = getDrupalResIdFromUrl;
-var getDrupalResIdIfTypeFromUrl = function (url, resourceTypes) {
+const getDrupalResIdIfTypeFromUrl = (url, resourceTypes = ['solutions', 'articles']) => {
     var _a;
-    if (resourceTypes === void 0) { resourceTypes = ['solutions', 'articles']; }
-    var m = drupalUrlRegexp.exec(url);
-    var resourceType = (_a = m === null || m === void 0 ? void 0 : m[2]) !== null && _a !== void 0 ? _a : '';
-    var resourceId = m === null || m === void 0 ? void 0 : m[3];
+    let m = drupalUrlRegexp.exec(url);
+    const resourceType = (_a = m === null || m === void 0 ? void 0 : m[2]) !== null && _a !== void 0 ? _a : '';
+    const resourceId = m === null || m === void 0 ? void 0 : m[3];
     return resourceTypes.includes(resourceType) && !isNaN(parseInt(resourceId)) ? parseInt(resourceId) : undefined;
 };
 exports.getDrupalResIdIfTypeFromUrl = getDrupalResIdIfTypeFromUrl;
-var isFieldValueEmpty = function (value) {
+const isFieldValueEmpty = function (value) {
     return value === '' || value === undefined || value === null;
 };
-var getUpdatedQueryString = function (currentQuery, newQuery, _a) {
-    var _b = _a.resetSearchParams, resetSearchParams = _b === void 0 ? false : _b, _c = _a.removeEmptyParams, removeEmptyParams = _c === void 0 ? false : _c;
-    var currentQueryObj = typeof currentQuery === 'string' ? getUrlParsedParams(currentQuery) : currentQuery;
-    var mergedQueryObject = __assign(__assign({}, currentQueryObj), newQuery);
-    var updatedQuery = removeEmptyParams
-        ? pickBy_1.default(mergedQueryObject, function (item) { return !isFieldValueEmpty(item); })
+const getUpdatedQueryString = (currentQuery, newQuery, { resetSearchParams = false, removeEmptyParams = false }) => {
+    const currentQueryObj = typeof currentQuery === 'string' ? getUrlParsedParams(currentQuery) : currentQuery;
+    const mergedQueryObject = Object.assign(Object.assign({}, currentQueryObj), newQuery);
+    const updatedQuery = removeEmptyParams
+        ? pickBy_1.default(mergedQueryObject, (item) => !isFieldValueEmpty(item))
         : mergedQueryObject;
     return !resetSearchParams ? getStringifiedParams(updatedQuery) : getStringifiedParams(newQuery);
 };
 exports.getUpdatedQueryString = getUpdatedQueryString;
-var isValidUrl = function (url) {
+const isValidUrl = (url) => {
     return /^(http(s)?:\/\/)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/.test(url);
 };
 exports.isValidUrl = isValidUrl;

package/lib/cjs/userUtils.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortHydraContacts = void 0;
-var sortBy_1 = __importDefault(require("lodash/sortBy"));
-var sortHydraContacts = function (hydraContacts) {
+const sortBy_1 = __importDefault(require("lodash/sortBy"));
+const sortHydraContacts = (hydraContacts) => {
     return sortBy_1.default(hydraContacts, 'firstName', 'lastName');
 };
 exports.sortHydraContacts = sortHydraContacts;

package/lib/cjs/validatorUtils.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isImageFile = exports.isValidGuid = exports.mailformat = exports.emojiPattern = exports.isEmojiPattern = exports.isValidRHEmail = exports.isRegularVersion = exports.isNumber = exports.isEmailValid = void 0;
-var emojiPattern = /[\u{1f300}-\u{1f5ff}\u{1f900}-\u{1f9ff}\u{1f600}-\u{1f64f}\u{1f680}-\u{1f6ff}\u{2600}-\u{26ff}\u{2700}-\u{27bf}\u{1f1e6}-\u{1f1ff}\u{1f191}-\u{1f251}\u{1f004}\u{1f0cf}\u{1f170}-\u{1f171}\u{1f17e}-\u{1f17f}\u{1f18e}\u{3030}\u{2b50}\u{2b55}\u{2934}-\u{2935}\u{2b05}-\u{2b07}\u{2b1b}-\u{2b1c}\u{3297}\u{3299}\u{303d}\u{00a9}\u{00ae}\u{2122}\u{23f3}\u{24c2}\u{23e9}-\u{23ef}\u{25b6}\u{23f8}-\u{23fa}]/gu;
+const emojiPattern = /[\u{1f300}-\u{1f5ff}\u{1f900}-\u{1f9ff}\u{1f600}-\u{1f64f}\u{1f680}-\u{1f6ff}\u{2600}-\u{26ff}\u{2700}-\u{27bf}\u{1f1e6}-\u{1f1ff}\u{1f191}-\u{1f251}\u{1f004}\u{1f0cf}\u{1f170}-\u{1f171}\u{1f17e}-\u{1f17f}\u{1f18e}\u{3030}\u{2b50}\u{2b55}\u{2934}-\u{2935}\u{2b05}-\u{2b07}\u{2b1b}-\u{2b1c}\u{3297}\u{3299}\u{303d}\u{00a9}\u{00ae}\u{2122}\u{23f3}\u{24c2}\u{23e9}-\u{23ef}\u{25b6}\u{23f8}-\u{23fa}]/gu;
 exports.emojiPattern = emojiPattern;
-var mailformat = new RegExp(
+const mailformat = new RegExp(
 // eslint-disable-next-line no-control-regex
 "([!#-'*+/-9=?A-Z^-~-]+(.[!#-'*+/-9=?A-Z^-~-]+)*|\"([]!#-[^-~ \t]|(\\[\t -~]))+\")@([!#-'*+/-9=?A-Z^-~-]+(.[!#-'*+/-9=?A-Z^-~-]+)*|[[\t -Z^-~]*])");
 exports.mailformat = mailformat;
-var imageRegex = /^image\/(gif|png|jpeg)$/;
+const imageRegex = /^image\/(gif|png|jpeg)$/;
 // To check if email is valid
 function isEmailValid(object) {
     if (object.match(mailformat)) {
@@ -38,7 +38,7 @@ function isEmojiPattern(object) {
 }
 exports.isEmojiPattern = isEmojiPattern;
 function isValidGuid(object) {
-    var guidFormat = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+    const guidFormat = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
     if (object.match(guidFormat)) {
         return true;
     }
@@ -53,10 +53,10 @@ function isNumber(str) {
 exports.isNumber = isNumber;
 function isRegularVersion(version) {
     // splits the version into its parts because some versions can have words in front of them (e.g. Red Hat Build of Thorntail - Thorntail 1.x)
-    var versionPartsArray = version.split(' ');
+    const versionPartsArray = version.split(' ');
     // find the index that has the version and split it into its pars
-    var indexOfVersion = versionPartsArray.findIndex(function (p) { return p.includes('.'); });
-    var splitArray = indexOfVersion > -1 ? versionPartsArray[indexOfVersion].split('.') : version.split('.');
+    const indexOfVersion = versionPartsArray.findIndex((p) => p.includes('.'));
+    const splitArray = indexOfVersion > -1 ? versionPartsArray[indexOfVersion].split('.') : version.split('.');
     // if the length of the split array is not 2, or 3 it is not a regular version
     // b/c version === major.minor.patch (patch === component in the request body)
     if (splitArray.length !== 2 && splitArray.length !== 3 && splitArray.length !== 4)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/utils",
-    "version": "2.0.7",
+    "version": "2.0.8",
     "description": "> TODO: description",
     "author": "Vikas Rathee <vrathee@redhat.com>",
     "license": "ISC",
@@ -84,5 +84,9 @@
         "@types/react-dom": "^17.0.9",
         "moment-timezone": "^0.5.40"
     },
-    "gitHead": "c05aa6c2542ab83bfc1984ec113a116f0885d123"
+    "browserslist": [
+        "defaults and supports es6-module",
+        "maintained node versions"
+    ],
+    "gitHead": "96d084116beaf1eb2d7c2d6a89a2f44118ed01a5"
 }