aloha-vue 1.2.170 → 1.2.172

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.170",
+  "version": "1.2.172",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/AFilters/AFilterCenter/AFilterCenter.js

@@ -1,125 +1,125 @@
-import {
-  h,
-} from "vue";
-
-import AButton from "../../AButton/AButton";
-import AFilterCenterItem from "./AFilterCenterItem/AFilterCenterItem";
-import ASpinner from "../../ASpinner/ASpinner";
-
-import LoadingFiltersAPI from "./compositionAPI/LoadingFiltersAPI";
-import VisibleFiltersAPI from "./compositionAPI/VisibleFiltersAPI";
-
-export default {
-  name: "AFilterCenter",
-  props: {
-    appliedModel: {
-      type: Object,
-      required: true,
-    },
-    closeAllFilters: {
-      type: Function,
-      required: true,
-    },
-    closeFilterValue: {
-      type: Function,
-      required: true,
-    },
-    dataKeyByKeyIdPerFilter: {
-      type: Object,
-      required: true,
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-    },
-    filtersGroup: {
-      type: Object,
-      required: true,
-      default: () => ({
-        alwaysVisible: [],
-        filters: [],
-      }),
-    },
-    filtersKeyById: {
-      type: Object,
-      required: true,
-    },
-    filtersVisibleAll: {
-      type: Array,
-      required: true,
-    },
-    id: {
-      type: String,
-      required: true,
-    },
-  },
-  setup(props) {
-    const {
-      hasFilters,
-      styleHide,
-      updateVisibleChildFilters,
-    } = VisibleFiltersAPI(props);
-
-    const {
-      isLeastOneChildFilterLoading,
-      updateLoadingChildFilters,
-    } = LoadingFiltersAPI(props);
-
-    return {
-      hasFilters,
-      isLeastOneChildFilterLoading,
-      styleHide,
-      updateLoadingChildFilters,
-      updateVisibleChildFilters,
-    };
-  },
-  render() {
-    if (!this.hasFilters) {
-      return null;
-    }
-
-    return h("div", {
-      class: "a_filters_center",
-    }, [
-      h("div", {
-        class: "a_filters_center__item",
-      }, [
-        this.$slots.filtersHorizontal ?
-          this.$slots.filtersHorizontal() :
-          "",
-      ]),
-      this.filtersVisibleAll.map(filter => {
-        return h(AFilterCenterItem, {
-          key: filter.id,
-          id: this.id,
-          disabled: this.disabled,
-          filter,
-          closeFilterValue: this.closeFilterValue,
-          dataKeyByKeyIdPerFilter: this.dataKeyByKeyIdPerFilter,
-          model: this.appliedModel[filter.modelId || filter.id],
-          onUpdateVisibleChildFilters: this.updateVisibleChildFilters,
-          onUpdateLoadingChildFilters: this.updateLoadingChildFilters,
-        }, this.$slots);
-      }),
-      this.isLeastOneChildFilterLoading ? h("div", {
-        style: this.styleHide,
-        class: "a_filters_center__item",
-      }, [
-        h(ASpinner, {
-          class: "a_spinner_small",
-        }),
-      ]) : "",
-      h("div", {
-        class: "a_filters_center__item",
-        style: this.styleHide,
-      }, [
-        h(AButton, {
-          class: "a_btn a_btn_link a_btn_small",
-          iconLeft: "Reset",
-          text: "_A_FILTERS_DESELECT_ALL_",
-          onClick: this.closeAllFilters,
-        }),
-      ]),
-    ]);
-  },
-};
+import {
+  h,
+} from "vue";
+
+import AButton from "../../AButton/AButton";
+import AFilterCenterItem from "./AFilterCenterItem/AFilterCenterItem";
+import ASpinner from "../../ASpinner/ASpinner";
+
+import LoadingFiltersAPI from "./compositionAPI/LoadingFiltersAPI";
+import VisibleFiltersAPI from "./compositionAPI/VisibleFiltersAPI";
+
+export default {
+  name: "AFilterCenter",
+  props: {
+    appliedModel: {
+      type: Object,
+      required: true,
+    },
+    closeAllFilters: {
+      type: Function,
+      required: true,
+    },
+    closeFilterValue: {
+      type: Function,
+      required: true,
+    },
+    dataKeyByKeyIdPerFilter: {
+      type: Object,
+      required: true,
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+    },
+    filtersGroup: {
+      type: Object,
+      required: true,
+      default: () => ({
+        alwaysVisible: [],
+        filters: [],
+      }),
+    },
+    filtersKeyById: {
+      type: Object,
+      required: true,
+    },
+    filtersVisibleAll: {
+      type: Array,
+      required: true,
+    },
+    id: {
+      type: String,
+      required: true,
+    },
+  },
+  setup(props) {
+    const {
+      hasFilters,
+      styleHide,
+      updateVisibleChildFilters,
+    } = VisibleFiltersAPI(props);
+
+    const {
+      isLeastOneChildFilterLoading,
+      updateLoadingChildFilters,
+    } = LoadingFiltersAPI(props);
+
+    return {
+      hasFilters,
+      isLeastOneChildFilterLoading,
+      styleHide,
+      updateLoadingChildFilters,
+      updateVisibleChildFilters,
+    };
+  },
+  render() {
+    if (!this.hasFilters) {
+      return null;
+    }
+
+    return h("div", {
+      class: "a_filters_center",
+    }, [
+      h("div", {
+        class: "a_filters_center__item",
+      }, [
+        this.$slots.filtersHorizontal ?
+          this.$slots.filtersHorizontal() :
+          "",
+      ]),
+      this.filtersVisibleAll.map(filter => {
+        return h(AFilterCenterItem, {
+          key: filter.modelId || filter.id,
+          id: this.id,
+          disabled: this.disabled,
+          filter,
+          closeFilterValue: this.closeFilterValue,
+          dataKeyByKeyIdPerFilter: this.dataKeyByKeyIdPerFilter,
+          model: this.appliedModel[filter.modelId || filter.id],
+          onUpdateVisibleChildFilters: this.updateVisibleChildFilters,
+          onUpdateLoadingChildFilters: this.updateLoadingChildFilters,
+        }, this.$slots);
+      }),
+      this.isLeastOneChildFilterLoading ? h("div", {
+        style: this.styleHide,
+        class: "a_filters_center__item",
+      }, [
+        h(ASpinner, {
+          class: "a_spinner_small",
+        }),
+      ]) : "",
+      h("div", {
+        class: "a_filters_center__item",
+        style: this.styleHide,
+      }, [
+        h(AButton, {
+          class: "a_btn a_btn_link a_btn_small",
+          iconLeft: "Reset",
+          text: "_A_FILTERS_DESELECT_ALL_",
+          onClick: this.closeAllFilters,
+        }),
+      ]),
+    ]);
+  },
+};

package/src/AFilters/AFilterCenter/AFilterCenterItem/compositionAPI/IsDataLoadingAPI.js

@@ -1,42 +1,42 @@
-import {
-  computed,
-  toRef,
-} from "vue";
-
-import {
-  typesWithData,
-} from "../../../../ui/const/AUiTypes";
-import {
-  isEmpty,
-} from "lodash-es";
-
-export default function IsDataLoadingAPI(props, { emit }, {
-  hasCurrentFilter = computed(() => false),
-}) {
-  const dataKeyByKeyIdPerFilter = toRef(props, "dataKeyByKeyIdPerFilter");
-  const filter = toRef(props, "filter");
-
-  const isFilterLoading = computed(() => {
-    if (!hasCurrentFilter.value) {
-      return false;
-    }
-    if (typesWithData.value[filter.value.type]) {
-      return isEmpty(dataKeyByKeyIdPerFilter.value[filter.value.id]);
-    }
-    return false;
-  });
-
-  const updateLoadingChildFilters = (newValue, altValue) => {
-    if (newValue !== altValue) {
-      emit("updateLoadingChildFilters", {
-        id: filter.value.id,
-        isLoading: isFilterLoading.value,
-      });
-    }
-  };
-
-  return {
-    isFilterLoading,
-    updateLoadingChildFilters,
-  };
-}
+import {
+  computed,
+  toRef,
+} from "vue";
+
+import {
+  typesWithData,
+} from "../../../../ui/const/AUiTypes";
+import {
+  isEmpty,
+} from "lodash-es";
+
+export default function IsDataLoadingAPI(props, { emit }, {
+  hasCurrentFilter = computed(() => false),
+}) {
+  const dataKeyByKeyIdPerFilter = toRef(props, "dataKeyByKeyIdPerFilter");
+  const filter = toRef(props, "filter");
+
+  const isFilterLoading = computed(() => {
+    if (!hasCurrentFilter.value) {
+      return false;
+    }
+    if (typesWithData.value[filter.value.type]) {
+      return isEmpty(dataKeyByKeyIdPerFilter.value[filter.value.modelId || filter.value.id]);
+    }
+    return false;
+  });
+
+  const updateLoadingChildFilters = (newValue, altValue) => {
+    if (newValue !== altValue) {
+      emit("updateLoadingChildFilters", {
+        id: filter.value.modelId || filter.value.id,
+        isLoading: isFilterLoading.value,
+      });
+    }
+  };
+
+  return {
+    isFilterLoading,
+    updateLoadingChildFilters,
+  };
+}

package/src/AFilters/AFilters/compositionAPI/FiltersAPI.js

@@ -1,133 +1,151 @@
-import {
-  computed,
-  ref,
-  toRef,
-} from "vue";
-
-import {
-  typesContainer,
-} from "../../../ui/const/AUiTypes";
-import {
-  isModelForFilterNotEmpty,
-} from "../../../utils/utilsUi";
-import {
-  cloneDeep,
-  forEach,
-} from "lodash-es";
-
-export default function FiltersAPI(props, { emit }) {
-  const filters = toRef(props, "filters");
-  const filterMain = toRef(props, "filterMain");
-  const unappliedModel = toRef(props, "unappliedModel");
-
-  const filtersDataKeyById = ref({});
-  const filtersHorizontalRef = ref(undefined);
-  const filtersVisibleIds = ref([]);
-
-  const hasFilters = computed(() => {
-    return !!(filters.value.length || filterMain.value);
-  });
-
-  const filtersKeyById = computed(() => {
-    const FILTERS = {};
-    forEach(cloneDeep(filters.value), filter => {
-      FILTERS[filter.id] = filter;
-      if (typesContainer.value[filter.type] &&
-        filter.children &&
-        filter.children.length) {
-        forEach(filter.children, filterChild => {
-          FILTERS[filterChild.id] = filterChild;
-        });
-      }
-    });
-    return FILTERS;
-  });
-
-  const filtersGroup = computed(() => {
-    const FILTER_GROUP = {
-      alwaysVisible: [],
-      filters: [],
-    };
-    forEach(cloneDeep(filters.value), filter => {
-      if (filter.alwaysVisible) {
-        FILTER_GROUP.alwaysVisible.push(filter);
-      } else {
-        FILTER_GROUP.filters.push(filter);
-      }
-    });
-
-    return FILTER_GROUP;
-  });
-
-  const filtersVisible = computed(() => {
-    const FILTERS = [];
-    forEach(filtersVisibleIds.value, filterId => {
-      if (filtersKeyById.value[filterId]) {
-        FILTERS.push(filtersKeyById.value[filterId]);
-      }
-    });
-    return FILTERS;
-  });
-
-  const filtersVisibleAll = computed(() => {
-    const FILTERS = [];
-    FILTERS.push(...filters.value);
-    const FILERS_NEW = [];
-    forEach(FILTERS, filter => {
-      FILERS_NEW.push(filter);
-      if (typesContainer.value[filter.type] &&
-        filter.children &&
-        filter.children.length) {
-        forEach(filter.children, filterChild => {
-          FILERS_NEW.push(filterChild);
-        });
-      }
-    });
-    return FILERS_NEW;
-  });
-
-  const setFiltersVisibleIds = () => {
-    const FILTERS_VISIBLE_IDS = [];
-    forEach(filtersGroup.value.filters, filter => {
-      if (isModelForFilterNotEmpty({
-        filter, modelObj: unappliedModel.value,
-      })) {
-        FILTERS_VISIBLE_IDS.push(filter.id);
-      }
-    });
-    filtersVisibleIds.value = FILTERS_VISIBLE_IDS;
-  };
-
-  const onUpdateModelFilters = ({ model, isUpdateFiltersVisible }) => {
-    emit("update:unappliedModel", model);
-
-    if (isUpdateFiltersVisible) {
-      setTimeout(() => {
-        setFiltersVisibleIds();
-      });
-    }
-  };
-
-  const updateAppliedModel = ({ model }) => {
-    emit("update:appliedModel", model);
-  };
-
-  const updateMainModel = ({ model }) => {
-    emit("update:mainModel", model);
-  };
-
-  return {
-    filtersDataKeyById,
-    filtersGroup,
-    filtersHorizontalRef,
-    filtersKeyById,
-    filtersVisible,
-    filtersVisibleAll,
-    filtersVisibleIds,
-    hasFilters,
-    onUpdateModelFilters,
-    setFiltersVisibleIds,
-    updateAppliedModel,
-    updateMainModel,
-  };
-}
+import {
+  computed,
+  ref,
+  toRef,
+} from "vue";
+
+import {
+  typesContainer,
+} from "../../../ui/const/AUiTypes";
+import {
+  isModelForFilterNotEmpty,
+} from "../../../utils/utilsUi";
+import {
+  cloneDeep,
+  forEach,
+} from "lodash-es";
+
+export default function FiltersAPI(props, { emit }) {
+  const filters = toRef(props, "filters");
+  const filterMain = toRef(props, "filterMain");
+  const unappliedModel = toRef(props, "unappliedModel");
+
+  const filtersDataKeyById = ref({});
+  const filtersHorizontalRef = ref(undefined);
+  const filtersVisibleIds = ref([]);
+
+  const hasFilters = computed(() => {
+    return !!(filters.value.length || filterMain.value);
+  });
+
+  const filtersKeyById = computed(() => {
+    const FILTERS = {};
+    forEach(cloneDeep(filters.value), filter => {
+      FILTERS[filter.modelId || filter.id] = {
+        ...filter,
+        id: filter.modelId || filter.id,
+      };
+      if (typesContainer.value[filter.type] &&
+        filter.children &&
+        filter.children.length) {
+        forEach(filter.children, filterChild => {
+          FILTERS[filter.modelId || filterChild.id] = {
+            ...filterChild,
+            id: filterChild.modelId || filterChild.id,
+          };
+        });
+      }
+    });
+    return FILTERS;
+  });
+
+  const filtersGroup = computed(() => {
+    const FILTER_GROUP = {
+      alwaysVisible: [],
+      filters: [],
+    };
+    forEach(cloneDeep(filters.value), filter => {
+      if (filter.alwaysVisible) {
+        FILTER_GROUP.alwaysVisible.push({
+          ...filter,
+          id: filter.modelId || filter.id,
+        });
+      } else {
+        FILTER_GROUP.filters.push({
+          ...filter,
+          id: filter.modelId || filter.id,
+        });
+      }
+    });
+
+    return FILTER_GROUP;
+  });
+
+  const filtersVisible = computed(() => {
+    const FILTERS = [];
+    forEach(filtersVisibleIds.value, filterId => {
+      if (filtersKeyById.value[filterId]) {
+        FILTERS.push(filtersKeyById.value[filterId]);
+      }
+    });
+    return FILTERS;
+  });
+
+  const filtersVisibleAll = computed(() => {
+    const FILTERS = [];
+    FILTERS.push(...filters.value);
+    const FILERS_NEW = [];
+    forEach(FILTERS, filter => {
+      FILERS_NEW.push({
+        ...filter,
+        id: filter.modelId || filter.id,
+      });
+      if (typesContainer.value[filter.type] &&
+        filter.children &&
+        filter.children.length) {
+        forEach(filter.children, filterChild => {
+          FILERS_NEW.push({
+            ...filterChild,
+            id: filterChild.modelId || filterChild.id,
+          });
+        });
+      }
+    });
+    return FILERS_NEW;
+  });
+
+  const setFiltersVisibleIds = () => {
+    const FILTERS_VISIBLE_IDS = [];
+    forEach(filtersGroup.value.filters, filter => {
+      if (isModelForFilterNotEmpty({
+        filter, modelObj: unappliedModel.value,
+      })) {
+        FILTERS_VISIBLE_IDS.push(filter.id);
+      }
+    });
+    filtersVisibleIds.value = FILTERS_VISIBLE_IDS;
+  };
+
+  const onUpdateModelFilters = ({ model, isUpdateFiltersVisible }) => {
+    emit("update:unappliedModel", model);
+
+    if (isUpdateFiltersVisible) {
+      setTimeout(() => {
+        setFiltersVisibleIds();
+      });
+    }
+  };
+
+  const updateAppliedModel = ({ model }) => {
+    emit("update:appliedModel", model);
+  };
+
+  const updateMainModel = ({ model }) => {
+    emit("update:mainModel", model);
+  };
+
+  return {
+    filtersDataKeyById,
+    filtersGroup,
+    filtersHorizontalRef,
+    filtersKeyById,
+    filtersVisible,
+    filtersVisibleAll,
+    filtersVisibleIds,
+    hasFilters,
+    onUpdateModelFilters,
+    setFiltersVisibleIds,
+    updateAppliedModel,
+    updateMainModel,
+  };
+}