diff --git a/app/applicationgroups/isolationpolicydirective.ts b/app/applicationgroups/isolationpolicydirective.ts index 0dd12b1f..24c17946 100644 --- a/app/applicationgroups/isolationpolicydirective.ts +++ b/app/applicationgroups/isolationpolicydirective.ts @@ -16,7 +16,6 @@ export class IsolationPolicySelectionComponent implements OnChanges { incomingRules:any[] = []; outgoingRules:any[] = []; - selectedPolicies:any[] = []; // To Store policies selected by user to display isolationPolicies:any[] = []; // To Get all isolation policies of tenant isolationPolicySearchText:string = ''; @@ -77,9 +76,11 @@ export class IsolationPolicySelectionComponent implements OnChanges { var component = this; var currentPolicyName = policyName; - if (currentPolicyName !== undefined && _.includes(component.selectedPolicies, currentPolicyName) == false) { + if (currentPolicyName !== undefined && _.includes(component.applicationgroup.policies, currentPolicyName) == false) { //To display selected policies - component.selectedPolicies.push(currentPolicyName); + //To be added to application group and saved to the server + component.applicationgroup.policies + .push(currentPolicyName); //To display rules of selected policies component.rulesModel.getIncomingRules(currentPolicyName, component.applicationgroup.tenantName) @@ -91,9 +92,6 @@ export class IsolationPolicySelectionComponent implements OnChanges { Array.prototype.push.apply(component.outgoingRules, rules); }); - //To be added to application group and saved to the server - component.applicationgroup.policies - .push(currentPolicyName); } }; @@ -101,9 +99,6 @@ export class IsolationPolicySelectionComponent implements OnChanges { * Remove policy from application group */ removeIsolationPolicy(policyName) { - _.remove(this.selectedPolicies, function (policy) { - return policy === policyName; - }); _.remove(this.applicationgroup.policies, function (policy) { return policy === policyName; }); diff --git a/app/main.bundle.js b/app/main.bundle.js index a501c23d..5d38fb51 100644 --- a/app/main.bundle.js +++ b/app/main.bundle.js @@ -2509,7 +2509,8 @@ webpackJsonp([2],[ if (value == null) { return value === undefined ? undefinedTag : nullTag; } - return (symToStringTag && symToStringTag in Object(value)) + value = Object(value); + return (symToStringTag && symToStringTag in value) ? getRawTag(value) : objectToString(value); } @@ -7953,7 +7954,6 @@ webpackJsonp([2],[ this.rulesModel = rulesModel; this.incomingRules = []; this.outgoingRules = []; - this.selectedPolicies = []; // To Store policies selected by user to display this.isolationPolicies = []; // To Get all isolation policies of tenant this.isolationPolicySearchText = ''; } @@ -8004,9 +8004,11 @@ webpackJsonp([2],[ IsolationPolicySelectionComponent.prototype.addIsolationPolicy = function (policyName) { var component = this; var currentPolicyName = policyName; - if (currentPolicyName !== undefined && _.includes(component.selectedPolicies, currentPolicyName) == false) { + if (currentPolicyName !== undefined && _.includes(component.applicationgroup.policies, currentPolicyName) == false) { //To display selected policies - component.selectedPolicies.push(currentPolicyName); + //To be added to application group and saved to the server + component.applicationgroup.policies + .push(currentPolicyName); //To display rules of selected policies component.rulesModel.getIncomingRules(currentPolicyName, component.applicationgroup.tenantName) .then(function (rules) { @@ -8016,9 +8018,6 @@ webpackJsonp([2],[ .then(function (rules) { Array.prototype.push.apply(component.outgoingRules, rules); }); - //To be added to application group and saved to the server - component.applicationgroup.policies - .push(currentPolicyName); } }; ; @@ -8026,9 +8025,6 @@ webpackJsonp([2],[ * Remove policy from application group */ IsolationPolicySelectionComponent.prototype.removeIsolationPolicy = function (policyName) { - _.remove(this.selectedPolicies, function (policy) { - return policy === policyName; - }); _.remove(this.applicationgroup.policies, function (policy) { return policy === policyName; }); diff --git a/app/vendor.bundle.js b/app/vendor.bundle.js index eeb65e55..80e104fd 100644 --- a/app/vendor.bundle.js +++ b/app/vendor.bundle.js @@ -35356,7 +35356,7 @@ webpackJsonp([1],[ var undefined; /** Used as the semantic version number. */ - var VERSION = '4.17.4'; + var VERSION = '4.17.2'; /** Used as the size to enable large array optimizations. */ var LARGE_ARRAY_SIZE = 200; @@ -36911,9 +36911,9 @@ webpackJsonp([1],[ * Shortcut fusion is an optimization to merge iteratee calls; this avoids * the creation of intermediate arrays and can greatly reduce the number of * iteratee executions. Sections of a chain sequence qualify for shortcut - * fusion if the section is applied to an array and iteratees accept only - * one argument. The heuristic for whether a section qualifies for shortcut - * fusion is subject to change. + * fusion if the section is applied to an array of at least `200` elements + * and any iteratees accept only one argument. The heuristic for whether a + * section qualifies for shortcut fusion is subject to change. * * Chaining is supported in custom builds as long as the `_#value` method is * directly or indirectly included in the build. @@ -37072,8 +37072,8 @@ webpackJsonp([1],[ /** * By default, the template delimiters used by lodash are like those in - * embedded Ruby (ERB) as well as ES2015 template strings. Change the - * following template settings to use alternative delimiters. + * embedded Ruby (ERB). Change the following template settings to use + * alternative delimiters. * * @static * @memberOf _ @@ -37220,7 +37220,8 @@ webpackJsonp([1],[ resIndex = 0, takeCount = nativeMin(length, this.__takeCount__); - if (!isArr || (!isRight && arrLength == length && takeCount == length)) { + if (!isArr || arrLength < LARGE_ARRAY_SIZE || + (arrLength == length && takeCount == length)) { return baseWrapperValue(array, this.__actions__); } var result = []; @@ -37334,7 +37335,7 @@ webpackJsonp([1],[ */ function hashHas(key) { var data = this.__data__; - return nativeCreate ? (data[key] !== undefined) : hasOwnProperty.call(data, key); + return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key); } /** @@ -37807,6 +37808,24 @@ webpackJsonp([1],[ return shuffleSelf(copyArray(array)); } + /** + * Used by `_.defaults` to customize its `_.assignIn` use. + * + * @private + * @param {*} objValue The destination value. + * @param {*} srcValue The source value. + * @param {string} key The key of the property to assign. + * @param {Object} object The parent object of `objValue`. + * @returns {*} Returns the value to assign. + */ + function assignInDefaults(objValue, srcValue, key, object) { + if (objValue === undefined || + (eq(objValue, objectProto[key]) && !hasOwnProperty.call(object, key))) { + return srcValue; + } + return objValue; + } + /** * This function is like `assignValue` except that it doesn't assign * `undefined` values. @@ -38419,7 +38438,8 @@ webpackJsonp([1],[ if (value == null) { return value === undefined ? undefinedTag : nullTag; } - return (symToStringTag && symToStringTag in Object(value)) + value = Object(value); + return (symToStringTag && symToStringTag in value) ? getRawTag(value) : objectToString(value); } @@ -38623,7 +38643,7 @@ webpackJsonp([1],[ if (value === other) { return true; } - if (value == null || other == null || (!isObjectLike(value) && !isObjectLike(other))) { + if (value == null || other == null || (!isObject(value) && !isObjectLike(other))) { return value !== value && other !== other; } return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack); @@ -38646,12 +38666,17 @@ webpackJsonp([1],[ function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) { var objIsArr = isArray(object), othIsArr = isArray(other), - objTag = objIsArr ? arrayTag : getTag(object), - othTag = othIsArr ? arrayTag : getTag(other); - - objTag = objTag == argsTag ? objectTag : objTag; - othTag = othTag == argsTag ? objectTag : othTag; + objTag = arrayTag, + othTag = arrayTag; + if (!objIsArr) { + objTag = getTag(object); + objTag = objTag == argsTag ? objectTag : objTag; + } + if (!othIsArr) { + othTag = getTag(other); + othTag = othTag == argsTag ? objectTag : othTag; + } var objIsObj = objTag == objectTag, othIsObj = othTag == objectTag, isSameTag = objTag == othTag; @@ -39099,6 +39124,7 @@ webpackJsonp([1],[ * @returns {Object} Returns the new object. */ function basePick(object, paths) { + object = Object(object); return basePickBy(object, paths, function(value, path) { return hasIn(object, path); }); @@ -40491,7 +40517,8 @@ webpackJsonp([1],[ var args = arguments, value = args[0]; - if (wrapper && args.length == 1 && isArray(value)) { + if (wrapper && args.length == 1 && + isArray(value) && value.length >= LARGE_ARRAY_SIZE) { return wrapper.plant(value).value(); } var index = 0, @@ -40798,7 +40825,7 @@ webpackJsonp([1],[ var func = Math[methodName]; return function(number, precision) { number = toNumber(number); - precision = precision == null ? 0 : nativeMin(toInteger(precision), 292); + precision = nativeMin(toInteger(precision), 292); if (precision) { // Shift with exponential notation to avoid floating-point issues. // See [MDN](https://mdn.io/round#Examples) for more details. @@ -40903,7 +40930,7 @@ webpackJsonp([1],[ thisArg = newData[2]; partials = newData[3]; holders = newData[4]; - arity = newData[9] = newData[9] === undefined + arity = newData[9] = newData[9] == null ? (isBindKey ? 0 : func.length) : nativeMax(newData[9] - length, 0); @@ -40923,63 +40950,6 @@ webpackJsonp([1],[ return setWrapToString(setter(result, newData), func, bitmask); } - /** - * Used by `_.defaults` to customize its `_.assignIn` use to assign properties - * of source objects to the destination object for all destination properties - * that resolve to `undefined`. - * - * @private - * @param {*} objValue The destination value. - * @param {*} srcValue The source value. - * @param {string} key The key of the property to assign. - * @param {Object} object The parent object of `objValue`. - * @returns {*} Returns the value to assign. - */ - function customDefaultsAssignIn(objValue, srcValue, key, object) { - if (objValue === undefined || - (eq(objValue, objectProto[key]) && !hasOwnProperty.call(object, key))) { - return srcValue; - } - return objValue; - } - - /** - * Used by `_.defaultsDeep` to customize its `_.merge` use to merge source - * objects into destination objects that are passed thru. - * - * @private - * @param {*} objValue The destination value. - * @param {*} srcValue The source value. - * @param {string} key The key of the property to merge. - * @param {Object} object The parent object of `objValue`. - * @param {Object} source The parent object of `srcValue`. - * @param {Object} [stack] Tracks traversed source values and their merged - * counterparts. - * @returns {*} Returns the value to assign. - */ - function customDefaultsMerge(objValue, srcValue, key, object, source, stack) { - if (isObject(objValue) && isObject(srcValue)) { - // Recursively merge objects and arrays (susceptible to call stack limits). - stack.set(srcValue, objValue); - baseMerge(objValue, srcValue, undefined, customDefaultsMerge, stack); - stack['delete'](srcValue); - } - return objValue; - } - - /** - * Used by `_.omit` to customize its `_.cloneDeep` use to only clone plain - * objects. - * - * @private - * @param {*} value The value to inspect. - * @param {string} key The key of the property to inspect. - * @returns {*} Returns the uncloned value or `undefined` to defer cloning to `_.cloneDeep`. - */ - function customOmitClone(value) { - return isPlainObject(value) ? undefined : value; - } - /** * A specialized version of `baseIsEqualDeep` for arrays with support for * partial deep comparisons. @@ -41151,9 +41121,9 @@ webpackJsonp([1],[ */ function equalObjects(object, other, bitmask, customizer, equalFunc, stack) { var isPartial = bitmask & COMPARE_PARTIAL_FLAG, - objProps = getAllKeys(object), + objProps = keys(object), objLength = objProps.length, - othProps = getAllKeys(other), + othProps = keys(other), othLength = othProps.length; if (objLength != othLength && !isPartial) { @@ -41391,15 +41361,7 @@ webpackJsonp([1],[ * @param {Object} object The object to query. * @returns {Array} Returns the array of symbols. */ - var getSymbols = !nativeGetSymbols ? stubArray : function(object) { - if (object == null) { - return []; - } - object = Object(object); - return arrayFilter(nativeGetSymbols(object), function(symbol) { - return propertyIsEnumerable.call(object, symbol); - }); - }; + var getSymbols = nativeGetSymbols ? overArg(nativeGetSymbols, Object) : stubArray; /** * Creates an array of the own and inherited enumerable symbols of `object`. @@ -41885,6 +41847,29 @@ webpackJsonp([1],[ return data; } + /** + * Used by `_.defaultsDeep` to customize its `_.merge` use. + * + * @private + * @param {*} objValue The destination value. + * @param {*} srcValue The source value. + * @param {string} key The key of the property to merge. + * @param {Object} object The parent object of `objValue`. + * @param {Object} source The parent object of `srcValue`. + * @param {Object} [stack] Tracks traversed source values and their merged + * counterparts. + * @returns {*} Returns the value to assign. + */ + function mergeDefaults(objValue, srcValue, key, object, source, stack) { + if (isObject(objValue) && isObject(srcValue)) { + // Recursively merge objects and arrays (susceptible to call stack limits). + stack.set(srcValue, objValue); + baseMerge(objValue, srcValue, undefined, mergeDefaults, stack); + stack['delete'](srcValue); + } + return objValue; + } + /** * This function is like * [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys) @@ -43627,7 +43612,7 @@ webpackJsonp([1],[ * * var users = [ * { 'user': 'barney', 'active': false }, - * { 'user': 'fred', 'active': false }, + * { 'user': 'fred', 'active': false}, * { 'user': 'pebbles', 'active': true } * ]; * @@ -46196,7 +46181,7 @@ webpackJsonp([1],[ if (typeof func != 'function') { throw new TypeError(FUNC_ERROR_TEXT); } - start = start == null ? 0 : nativeMax(toInteger(start), 0); + start = start === undefined ? 0 : nativeMax(toInteger(start), 0); return baseRest(function(args) { var array = args[start], otherArgs = castSlice(args, 0, start); @@ -46866,7 +46851,7 @@ webpackJsonp([1],[ * date objects, error objects, maps, numbers, `Object` objects, regexes, * sets, strings, symbols, and typed arrays. `Object` objects are compared * by their own, not inherited, enumerable properties. Functions and DOM - * nodes are compared by strict equality, i.e. `===`. + * nodes are **not** supported. * * @static * @memberOf _ @@ -47886,9 +47871,7 @@ webpackJsonp([1],[ * // => 3 */ function toSafeInteger(value) { - return value - ? baseClamp(toInteger(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER) - : (value === 0 ? value : 0); + return baseClamp(toInteger(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER); } /** @@ -48142,7 +48125,7 @@ webpackJsonp([1],[ * // => { 'a': 1, 'b': 2 } */ var defaults = baseRest(function(args) { - args.push(undefined, customDefaultsAssignIn); + args.push(undefined, assignInDefaults); return apply(assignInWith, undefined, args); }); @@ -48166,7 +48149,7 @@ webpackJsonp([1],[ * // => { 'a': { 'b': 2, 'c': 3 } } */ var defaultsDeep = baseRest(function(args) { - args.push(undefined, customDefaultsMerge); + args.push(undefined, mergeDefaults); return apply(mergeWith, undefined, args); }); @@ -48828,7 +48811,7 @@ webpackJsonp([1],[ }); copyObject(object, getAllKeysIn(object), result); if (isDeep) { - result = baseClone(result, CLONE_DEEP_FLAG | CLONE_FLAT_FLAG | CLONE_SYMBOLS_FLAG, customOmitClone); + result = baseClone(result, CLONE_DEEP_FLAG | CLONE_FLAT_FLAG | CLONE_SYMBOLS_FLAG); } var length = paths.length; while (length--) { @@ -49977,10 +49960,7 @@ webpackJsonp([1],[ */ function startsWith(string, target, position) { string = toString(string); - position = position == null - ? 0 - : baseClamp(toInteger(position), 0, string.length); - + position = baseClamp(toInteger(position), 0, string.length); target = baseToString(target); return string.slice(position, position + target.length) == target; } @@ -50099,9 +50079,9 @@ webpackJsonp([1],[ options = undefined; } string = toString(string); - options = assignInWith({}, options, settings, customDefaultsAssignIn); + options = assignInWith({}, options, settings, assignInDefaults); - var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn), + var imports = assignInWith({}, options.imports, settings.imports, assignInDefaults), importsKeys = keys(imports), importsValues = baseValues(imports, importsKeys); @@ -52185,13 +52165,14 @@ webpackJsonp([1],[ // Add `LazyWrapper` methods for `_.drop` and `_.take` variants. arrayEach(['drop', 'take'], function(methodName, index) { LazyWrapper.prototype[methodName] = function(n) { + var filtered = this.__filtered__; + if (filtered && !index) { + return new LazyWrapper(this); + } n = n === undefined ? 1 : nativeMax(toInteger(n), 0); - var result = (this.__filtered__ && !index) - ? new LazyWrapper(this) - : this.clone(); - - if (result.__filtered__) { + var result = this.clone(); + if (filtered) { result.__takeCount__ = nativeMin(n, result.__takeCount__); } else { result.__views__.push({