@phoenix-cg/v-filters 0.1.16 → 0.2.0-beta.10

package/dist/v-filters.common.js

@@ -539,39 +539,6 @@ $({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') },
 });
 
 
-/***/ }),
-
-/***/ "25f0":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var redefine = __webpack_require__("6eeb");
-var anObject = __webpack_require__("825a");
-var fails = __webpack_require__("d039");
-var flags = __webpack_require__("ad6d");
-
-var TO_STRING = 'toString';
-var RegExpPrototype = RegExp.prototype;
-var nativeToString = RegExpPrototype[TO_STRING];
-
-var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) != '/a/b'; });
-// FF44- RegExp#toString has a wrong name
-var INCORRECT_NAME = nativeToString.name != TO_STRING;
-
-// `RegExp.prototype.toString` method
-// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-if (NOT_GENERIC || INCORRECT_NAME) {
-  redefine(RegExp.prototype, TO_STRING, function toString() {
-    var R = anObject(this);
-    var p = String(R.source);
-    var rf = R.flags;
-    var f = String(rf === undefined && R instanceof RegExp && !('flags' in RegExpPrototype) ? flags.call(R) : rf);
-    return '/' + p + '/' + f;
-  }, { unsafe: true });
-}
-
-
 /***/ }),
 
 /***/ "2a62":
@@ -1908,6 +1875,35 @@ module.exports = Object.create || function create(O, Properties) {
 };
 
 
+/***/ }),
+
+/***/ "7db0":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__("23e7");
+var $find = __webpack_require__("b727").find;
+var addToUnscopables = __webpack_require__("44d2");
+
+var FIND = 'find';
+var SKIPS_HOLES = true;
+
+// Shouldn't skip holes
+if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
+
+// `Array.prototype.find` method
+// https://tc39.es/ecma262/#sec-array.prototype.find
+$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  find: function find(callbackfn /* , that = undefined */) {
+    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  }
+});
+
+// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables(FIND);
+
+
 /***/ }),
 
 /***/ "7dd0":
@@ -4378,7 +4374,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1743846e-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/VFilters.vue?vue&type=template&id=134a7b01&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"690fa3be-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/VFilters.vue?vue&type=template&id=09b8e269&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"v-filters"},[_c('div',{staticClass:"v-filters_fields"},[_vm._t("before-fields"),_vm._l((_vm.fields),function(field){return _c(_vm.fieldComponentName,{key:field._name,tag:"component",attrs:{"title":field.title}},[_c(_vm.componentsMap[field._type],_vm._b({key:_vm.fieldKey,tag:"component",on:{"input":function($event){return _vm.handleFieldChange(field._name)}},model:{value:(_vm.filters[field._name]),callback:function ($$v) {_vm.$set(_vm.filters, field._name, $$v)},expression:"filters[field._name]"}},'component',field._fieldProps || {},false))],1)}),_vm._t("after-fields"),_vm._t("actions",[_c(_vm.fieldComponentName,{tag:"component"},[(!_vm.immediate)?_c('button',{staticClass:"v-button v-filters_button",on:{"click":_vm.showResult}},[_vm._v(" "+_vm._s(_vm.actionTitle)+" ")]):_vm._e(),(_vm.edited)?_c('button',{staticClass:"v-button v-filters_button __reset",on:{"click":_vm.resetFilters}},[_vm._v(" Сбросить параметры ")]):_vm._e()])],null,{
         showResult: _vm.showResult,
         resetFilters: _vm.resetFilters,
@@ -4395,7 +4391,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=134a7b01&
+// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=09b8e269&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
 var es_object_keys = __webpack_require__("b64b");
@@ -4574,6 +4570,35 @@ function _nonIterableRest() {
 function _slicedToArray(arr, i) {
   return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js
+
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/iterableToArray.js
+
+
+
+
+
+
+
+
+function _iterableToArray(iter) {
+  if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/nonIterableSpread.js
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js
+
+
+
+
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
 
@@ -4589,12 +4614,12 @@ var es_string_includes = __webpack_require__("2532");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
 var es_array_map = __webpack_require__("d81d");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.to-string.js
-var es_regexp_to_string = __webpack_require__("25f0");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.reduce.js
 var es_array_reduce = __webpack_require__("13d5");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
+var es_array_find = __webpack_require__("7db0");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.search.js
 var es_string_search = __webpack_require__("841c");
 
@@ -5099,6 +5124,7 @@ _curry2(function equals(a, b) {
 
 
 
+
 //
 //
 //
@@ -5220,7 +5246,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       default: false
     },
     humanLink: {
-      type: String
+      type: Object
     },
     editedOutside: {
       type: Boolean,
@@ -5233,12 +5259,23 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     fieldKey: {
       type: [String, Number],
       default: '1'
+    },
+    alwaysSendFields: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
+    paramsToInclude: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
     }
   },
   data: function data() {
     return {
       filters: {},
-      editedInside: false,
       editedFields: []
     };
   },
@@ -5246,6 +5283,9 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     edited: function edited() {
       return this.editedInside || this.editedOutside;
     },
+    editedInside: function editedInside() {
+      return this.editedFields.length > 0;
+    },
     actionTitle: function actionTitle() {
       var title = this.notFoundTitle;
 
@@ -5261,27 +5301,38 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       var _this = this;
 
       var filters = {};
+      var fieldsToInclude = [].concat(_toConsumableArray(this.editedFields), _toConsumableArray(this.alwaysSendFields));
       Object.keys(this.filters).forEach(function (name) {
-        if (_this.editedFields.includes(name)) {
+        if (fieldsToInclude.includes(name)) {
           var filtersValue = _this.filters[name];
           var wrappedValue = getType(filtersValue) === 'Object' ? [filtersValue] : filtersValue;
           filters[name] = wrappedValue.map(function (value) {
-            return value._id && value._id.toString() || value;
+            return value._id || value;
           });
         }
       });
       return filters;
     }
   },
+  watch: {
+    fields: {
+      deep: true,
+      handler: function handler() {
+        this.setFilters(true);
+      }
+    },
+    paramsToInclude: function paramsToInclude() {
+      this.setUrlParams();
+    }
+  },
   created: function created() {
     this.setFilters();
   },
   methods: {
-    setFilters: function setFilters(isReset, query) {
+    setFilters: function setFilters(isUpdate) {
       var _this2 = this;
 
-      var params = query || this.getUrlParams();
-      var editedInside = false;
+      var params = this.getUrlParams();
       this.fields.forEach(function (field) {
         var value = field._type === 'range' ? field.value : [];
         var valueNotArray = ['select', 'tab'].includes(field._type);
@@ -5292,7 +5343,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
           value = _field$value[0];
         }
 
-        if (params[field._name] && !isReset) {
+        if (params[field._name] && !isUpdate) {
           var paramsValue = params[field._name];
 
           if (field._type !== 'range') {
@@ -5310,11 +5361,33 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
           }
 
           _this2.addEditedField(field._name);
-        } else if ((!params[field._name] || isReset) && valueNotArray) {
+        } else if (params[field._name] && isUpdate && field._type !== 'range') {
+          if (valueNotArray) {
+            var isValueInData = field.data.some(function (dataValue) {
+              return dataValue._id === value._id || dataValue._id === value;
+            });
+
+            if (!isValueInData) {
+              value = field.data[0];
+            }
+          } else {
+            value = field.value.reduce(function (acc, currentValue) {
+              var isValueInData = field.data.some(function (dataValue) {
+                return dataValue._id === currentValue._id || dataValue._id === currentValue;
+              });
+
+              if (isValueInData) {
+                acc.push(currentValue);
+              }
+
+              return acc;
+            }, []);
+          }
+        } else if ((!params[field._name] || isUpdate) && valueNotArray) {
           var _field$value2 = _slicedToArray(field.value, 1);
 
           value = _field$value2[0];
-        } else if (!params[field._name] || isReset) {
+        } else if (!params[field._name] || isUpdate) {
           value = field.value;
         } // Detect changed fields
 
@@ -5344,24 +5417,44 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
 
         _this2.$set(_this2.filters, field._name, value);
       });
-      this.setUrlParams(isReset);
-      this.editedInside = editedInside;
-      this.doAction();
+      this.setUrlParams(isUpdate);
+      !isUpdate && this.doAction(true);
     },
-    resetFilters: function resetFilters(isOutside) {
-      this.$emit('reset-filters', isOutside);
-      this.setFilters(true);
+    resetFilters: function resetFilters() {
       this.editedFields = [];
-      this.editedInside = false;
-      this.doAction();
+      this.setUrlParams(true, {});
+      this.$emit('reset-filters', this.flatFilters);
     },
     addEditedField: function addEditedField(name) {
       if (!this.editedFields.includes(name)) {
         this.editedFields.push(name);
       }
     },
+    removeDependentFieldsFromEdited: function removeDependentFieldsFromEdited(name) {
+      var field = this.fields.find(function (field) {
+        return field._name === name;
+      });
+
+      if (field.reset) {
+        var dependentFields = this.fields.filter(function (field) {
+          return !field.reset;
+        }).map(function (field) {
+          return field._name;
+        });
+        this.editedFields = this.editedFields.filter(function (fieldName) {
+          return !dependentFields.includes(fieldName);
+        });
+      }
+    },
     doAction: function doAction() {
-      this.immediate ? this.showResult() : this.requestCount();
+      var both = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+      if (both) {
+        this.requestCount();
+        this.showResult();
+      } else {
+        this.immediate ? this.showResult() : this.requestCount();
+      }
     },
     requestCount: function requestCount() {
       this.$emit('request-count', this.flatFilters);
@@ -5372,31 +5465,14 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     getUrlParams: function getUrlParams() {
       return VFiltersvue_type_script_lang_js_unserialize(window.location.search);
     },
-    setUrlParams: function setUrlParams(reset) {
+    setUrlParams: function setUrlParams(isUpdate, rewriteParams) {
       if (this.showParams) {
-        var params = this.getUrlParams();
-
-        for (var name in this.filters) {
-          var filterValue = this.filters[name];
-
-          if (this.editedFields.includes(name)) {
-            if (Array.isArray(filterValue) && filterValue.length > 0) {
-              params[name] = filterValue.map(function (val) {
-                return val._id || val;
-              });
-            } else if (filterValue instanceof Object) {
-              filterValue = _objectSpread2({}, filterValue);
-              params[name] = [filterValue._id];
-            }
-          } else {
-            delete params[name];
-          }
-        }
+        var params = rewriteParams || _objectSpread2(_objectSpread2({}, this.flatFilters), this.paramsToInclude);
 
         var currentParams = this.getUrlParams();
         var newParamsLength = Object.keys(params).length;
 
-        if ((newParamsLength && !es_equals(params, currentParams) || reset) && !this.humanLink) {
+        if ((newParamsLength && !es_equals(params, currentParams) || isUpdate || rewriteParams) && !this.humanLink) {
           var query = VFiltersvue_type_script_lang_js_serialize(params);
           var url = window.location.origin + window.location.pathname + "".concat(newParamsLength ? '?' : '').concat(query);
           history.replaceState({
@@ -5407,7 +5483,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     },
     handleFieldChange: function handleFieldChange(name) {
       this.addEditedField(name);
-      this.editedInside = true;
+      this.removeDependentFieldsFromEdited(name);
       this.setUrlParams();
       this.doAction();
     }