@banch0u/core-project-test-repository 2.3.3 → 2.3.5

package/dist/pages/Questionnnaires/QuestionnairesInventoryCategoriesContent/constant.js

@@ -3,23 +3,37 @@ import { Switch, Tooltip } from "antd";
 import style from "../Questionnaires.module.scss";
 import { setDeleteModalVisible } from "../../../store/slices/global";
 import { DeleteIconQ, EditIcon } from "../../../assets/icons";
-export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch, innerW) {
+export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch, innerW, dynamicNumWidth) {
   return [{
-    title: "№",
+    title: "",
     dataIndex: "num",
     showCheckbox: false,
     ellipsis: true,
-    width: 35
+    width: Math.max(dynamicNumWidth || 120, 100) // ✅ dynamic
   }, {
-    title: "Kateqoriyalar (Mal-meteriallar)",
+    title: "Kateqoriyalar (Kod)",
     dataIndex: "name",
-    width: innerW,
     disabled: true,
-    ellipsis: true
+    ellipsis: true,
+    render: function render(text, record) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          paddingLeft: "".concat(record.level * 20, "px"),
+          display: "flex",
+          alignItems: "center",
+          gap: 6
+        }
+      }, /*#__PURE__*/React.createElement("span", null, text), record.code && /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: "#888"
+        }
+      }, "(", record.code, ")"));
+    }
   }, {
     title: "Status",
     key: "status",
     disabled: true,
+    width: 100,
     filter: false,
     render: function render(data) {
       return /*#__PURE__*/React.createElement(Tooltip, {
@@ -29,7 +43,7 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
         size: "medium",
         checked: data === null || data === void 0 ? void 0 : data.isActive,
         onChange: function onChange(checked) {
-          return onStatusChange(data, checked, dispatch);
+          return onStatusChange(data, checked);
         }
       }));
     }
@@ -39,7 +53,7 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     showCheckbox: false,
     width: 80,
     render: function render(data) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement("div", {
         className: style.number
       }, /*#__PURE__*/React.createElement("div", {
         className: style.actions
@@ -52,7 +66,7 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
           onDelete(data === null || data === void 0 ? void 0 : data.id);
           dispatch(setDeleteModalVisible(true));
         }
-      }, /*#__PURE__*/React.createElement(DeleteIconQ, null)))));
+      }, /*#__PURE__*/React.createElement(DeleteIconQ, null))));
     }
   }];
 };

package/dist/pages/Questionnnaires/QuestionnairesInventoryCategoriesContent/index.js

@@ -1,12 +1,7 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React from "react";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import Cookies from "js-cookie";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import style from "../Questionnaires.module.scss";
-import { Form, Input, Layout } from "antd";
+import { Form, Input, Layout, TreeSelect } from "antd";
 import { PlusIcon } from "../../../assets/icons";
 import FormModal from "../../../components/FormModal";
 import { useDispatch, useSelector } from "react-redux";
@@ -15,42 +10,24 @@ import DeleteModal from "../../../components/DeleteModal/DeleteModal";
 import Success from "../../../components/Success/Success";
 import { setDeleteModalVisible, setViewModalVisible } from "../../../store/slices/global";
 import ViewModal from "../../../components/ViewModal";
-import { getStreetColumns } from "./constant";
-import Pagination from "../../../components/Pagination";
-import ColSort from "../../../components/ColSort";
-import { setPaginationLength } from "../../../helpers/paginationLength";
 import Button from "../../../components/Button";
 import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
-import Filter from "../../../components/Filter";
 import { addInventoryCategories, deleteInventoryCategories, editInventoryCategories, getInventoryCategories, inventoryCategoriesVisibility } from "../../../store/slices/questionnaire";
+import { getStreetColumns } from "./constant";
 var Content = Layout.Content;
 var Item = Form.Item;
 var QuestionnairesInventoryCategoriesContent = function QuestionnairesInventoryCategoriesContent() {
+  var dispatch = useDispatch();
+  var ref = useRef();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
-    innerW = _useState2[0],
-    setInnerW = _useState2[1];
-  var ref = useRef();
-  var dispatch = useDispatch();
-  var _useState3 = useState(0),
+    id = _useState2[0],
+    setId = _useState2[1];
+  var _useState3 = useState(160),
     _useState4 = _slicedToArray(_useState3, 2),
-    id = _useState4[0],
-    setId = _useState4[1];
-  var _useState5 = useState(1),
-    _useState6 = _slicedToArray(_useState5, 2),
-    page = _useState6[0],
-    setPage = _useState6[1];
-  var _useState7 = useState(Cookies.get("pagination-size-questionnaire-inventorycategories") ? JSON.parse(Cookies.get("pagination-size-questionnaire-inventorycategories")) : 20),
-    _useState8 = _slicedToArray(_useState7, 2),
-    size = _useState8[0],
-    setSize = _useState8[1];
-  var _useState9 = useState({
-      name: ""
-    }),
-    _useState0 = _slicedToArray(_useState9, 2),
-    query = _useState0[0],
-    setQuery = _useState0[1];
+    innerW = _useState4[0],
+    setInnerW = _useState4[1];
   var _useSelector = useSelector(function (state) {
       return state.global;
     }),
@@ -59,147 +36,143 @@ var QuestionnairesInventoryCategoriesContent = function QuestionnairesInventoryC
   var InventoryCategories = useSelector(function (state) {
     return state.questionnaire.inventoryCategories;
   });
-  var paginationLength = setPaginationLength(InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.count, InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.size);
-  var onSubmit = useCallback(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            dispatch(addInventoryCategories(data));
-          case 1:
-          case "end":
-            return _context.stop();
+
+  // ✅ BUILD TREE WITH LEVEL
+  var buildTree = function buildTree(list) {
+    var map = {};
+    var roots = [];
+    list.forEach(function (item, index) {
+      map[item.id] = {
+        key: item.id,
+        id: item.id,
+        name: item.name,
+        code: item.code,
+        parentId: item.parentId,
+        isActive: item.isActive,
+        // num: index + 1,
+        children: [],
+        level: 0,
+        className: "rowClassName1"
+      };
+    });
+    list.forEach(function (item) {
+      if (item.parentId) {
+        var parent = map[item.parentId];
+        if (parent) {
+          map[item.id].level = parent.level + 1;
+          parent.children.push(map[item.id]);
         }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [dispatch]);
-  var onEdit = useCallback(function (id, record) {
-    var data = {
-      id: id,
-      name: record === null || record === void 0 ? void 0 : record.name
+      } else {
+        roots.push(map[item.id]);
+      }
+    });
+    return roots;
+  };
+  var treeData = useMemo(function () {
+    return buildTree((InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.items) || []);
+  }, [InventoryCategories]);
+
+  // ✅ MAX DEPTH
+  var getMaxDepth = function getMaxDepth(nodes) {
+    var max = 0;
+    var _traverse = function traverse(arr) {
+      var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+      arr.forEach(function (node) {
+        var _node$children;
+        if (level > max) max = level;
+        if ((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length) {
+          _traverse(node.children, level + 1);
+        }
+      });
     };
-    dispatch(editInventoryCategories(data));
-  }, [dispatch]);
-  var onStatusChange = useCallback(function (data, checked) {
-    var data_ = {
-      id: data === null || data === void 0 ? void 0 : data.id,
-      checked: checked
+    _traverse(nodes);
+    return max;
+  };
+  var maxDepth = useMemo(function () {
+    return getMaxDepth(treeData);
+  }, [treeData]);
+  var dynamicNumWidth = useMemo(function () {
+    var base = 40;
+    var perLevel = 20;
+    return base + maxDepth * perLevel;
+  }, [maxDepth]);
+
+  // ✅ TreeSelect
+  var treeSelectData = useMemo(function () {
+    var _convert = function convert(nodes) {
+      return nodes.map(function (node) {
+        return {
+          title: node.name,
+          value: node.id,
+          children: _convert(node.children || [])
+        };
+      });
     };
-    dispatch(inventoryCategoriesVisibility(data_));
+    return _convert(treeData);
+  }, [treeData]);
+
+  // ✅ ACTIONS
+  var onSubmit = useCallback(function (data) {
+    return dispatch(addInventoryCategories(data));
   }, [dispatch]);
-  var closeOnViewModal = useCallback(function () {
-    dispatch(setViewModalVisible(false));
+  var onEdit = useCallback(function (id, record) {
+    return dispatch(editInventoryCategories({
+      id: id,
+      name: record.name,
+      code: record.code,
+      parentId: record.parentId
+    }));
   }, [dispatch]);
-  var onClickModal = function onClickModal() {
-    var _ref$current;
-    ref === null || ref === void 0 || (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.open();
-  };
   var onEditClick = useCallback(function (data) {
-    var _ref$current2;
-    ref === null || ref === void 0 || (_ref$current2 = ref.current) === null || _ref$current2 === void 0 || _ref$current2.setEdit(data);
+    ref.current.setEdit(data);
   }, []);
   var onDelete = useCallback(function (id) {
     setId(id);
   }, []);
-  var handleColumnToggle = function handleColumnToggle(checked, dataIndex) {
-    setSelectedColumns(function (prevSelected) {
-      if (checked) {
-        return [].concat(_toConsumableArray(prevSelected), [dataIndex]);
-      } else {
-        return prevSelected.filter(function (col) {
-          return col !== dataIndex;
-        });
-      }
-    });
-  };
-  var data = [];
-  if (InventoryCategories !== null && InventoryCategories !== void 0 && InventoryCategories.items) {
-    var _InventoryCategories$;
-    data = InventoryCategories === null || InventoryCategories === void 0 || (_InventoryCategories$ = InventoryCategories.items) === null || _InventoryCategories$ === void 0 ? void 0 : _InventoryCategories$.map(function (dataObj, i) {
-      return {
-        num: (InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.size) * (InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.page) + i + 1 - (InventoryCategories === null || InventoryCategories === void 0 ? void 0 : InventoryCategories.size),
-        id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
-        name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
-        isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
-        className: "rowClassName1"
-      };
-    });
-  }
+  var onStatusChange = useCallback(function (data, checked) {
+    return dispatch(inventoryCategoriesVisibility({
+      id: data === null || data === void 0 ? void 0 : data.id,
+      checked: checked
+    }));
+  }, [dispatch]);
+
+  // ✅ COLUMNS
   var columns = useMemo(function () {
-    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch);
-  }, [onEditClick, onDelete, onStatusChange, dispatch]);
-  var _useState1 = useState(columns.map(function (col) {
-      return col.dataIndex;
-    })),
-    _useState10 = _slicedToArray(_useState1, 2),
-    selectedColumns = _useState10[0],
-    setSelectedColumns = _useState10[1];
+    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch, innerW, dynamicNumWidth);
+  }, [onEditClick, onDelete, onStatusChange, dispatch, innerW, dynamicNumWidth]);
+
+  // ✅ FETCH
   useEffect(function () {
-    if (window.innerWidth >= 1900) {
-      setInnerW(210);
-    } else {
-      setInnerW(155);
-    }
-    var data = {
-      page: page,
-      size: size,
-      query: query,
+    setInnerW(window.innerWidth >= 1900 ? 210 : 155);
+    dispatch(getInventoryCategories({
+      page: 1,
+      size: 99999,
       visibility: "nondeleted"
-    };
-    dispatch(getInventoryCategories(data));
-  }, [dispatch, page, InventoryCategoriesRender, query, size]);
-  var updateSize = function updateSize(newSize) {
-    setSize(newSize);
-    Cookies.set("pagination-size-questionnaire-inventorycategories", JSON.stringify(newSize), {
-      expires: 7
-    });
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, loading ? /*#__PURE__*/React.createElement(Loading, null) : null, /*#__PURE__*/React.createElement(Layout, {
+    }));
+  }, [dispatch, InventoryCategoriesRender]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement(Loading, null), /*#__PURE__*/React.createElement(Layout, {
     className: style.layout
   }, /*#__PURE__*/React.createElement(Content, {
     className: style.content
   }, /*#__PURE__*/React.createElement("header", {
     className: style.header
   }, /*#__PURE__*/React.createElement(Button, {
-    onClick: onClickModal,
+    onClick: function onClick() {
+      return ref.current.open();
+    },
     color: "green"
-  }, /*#__PURE__*/React.createElement(PlusIcon, null), " Soraq\xE7a \u0259lav\u0259 et"), /*#__PURE__*/React.createElement(Filter, {
-    columns: columns,
-    selectedColumns: selectedColumns,
-    setQuery: setQuery,
-    disabledElementCount: 3,
-    setPage: setPage
-  }))), /*#__PURE__*/React.createElement(Layout, {
+  }, /*#__PURE__*/React.createElement(PlusIcon, null), " Kateqoriya \u0259lav\u0259 et"))), /*#__PURE__*/React.createElement(Layout, {
     className: style.layout1
   }, /*#__PURE__*/React.createElement(Content, {
     className: style.content
   }, /*#__PURE__*/React.createElement("div", {
     className: style.table_header
-  }, /*#__PURE__*/React.createElement("h2", null, "Kateqoriyalar (Mal-meteriallar)"), /*#__PURE__*/React.createElement("div", {
-    className: style.buttons
-  }, /*#__PURE__*/React.createElement(ColSort, {
-    columns: columns,
-    selectedColumns: selectedColumns,
-    handleColumnToggle: handleColumnToggle
-  }))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("h2", null, "Kateqoriyalar (Mal-materiallar)")), /*#__PURE__*/React.createElement("div", {
     className: "bigTable"
   }, /*#__PURE__*/React.createElement(Table, {
-    selectedColumns: selectedColumns,
-    innerW: innerW,
-    dataSource: data,
+    dataSource: treeData,
     columns: columns,
     disableDrag: true
-  })), /*#__PURE__*/React.createElement("div", {
-    className: style.pagination
-  }, /*#__PURE__*/React.createElement(Pagination, {
-    size: size,
-    setSize: updateSize,
-    total: paginationLength,
-    page: page,
-    onChange: setPage
   })), /*#__PURE__*/React.createElement(FormModal, {
     ref: ref,
     width: 454,
@@ -212,17 +185,30 @@ var QuestionnairesInventoryCategoriesContent = function QuestionnairesInventoryC
     className: "absolute",
     centered: false
   }, /*#__PURE__*/React.createElement(Item, {
+    name: "name",
+    label: "Ad",
     rules: [{
       required: true,
       message: ""
     }, {
       min: 3,
-      message: "Ən azından 3 simvol olmalıdır"
-    }],
-    name: "name",
-    label: "Ad"
+      message: "Ən az 3 simvol"
+    }]
   }, /*#__PURE__*/React.createElement(Input, {
     className: style.modal_input
+  })), /*#__PURE__*/React.createElement(Item, {
+    name: "code",
+    label: "Kod"
+  }, /*#__PURE__*/React.createElement(Input, {
+    className: style.modal_input
+  })), /*#__PURE__*/React.createElement(Item, {
+    name: "parentId",
+    label: "\xDCst kateqoriya"
+  }, /*#__PURE__*/React.createElement(TreeSelect, {
+    allowClear: true,
+    treeData: treeSelectData,
+    placeholder: "",
+    className: style.modal_input
   }))), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
@@ -235,13 +221,17 @@ var QuestionnairesInventoryCategoriesContent = function QuestionnairesInventoryC
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
     },
-    value: "Soraqçanı"
+    value: "Kateqoriyanı"
   })), /*#__PURE__*/React.createElement(ViewModal, {
-    onCancel: closeOnViewModal,
+    onCancel: function onCancel() {
+      return dispatch(setViewModalVisible(false));
+    },
     width: 695
   }, /*#__PURE__*/React.createElement(Success, {
-    onClick: closeOnViewModal,
-    value: "Soraqça"
+    onClick: function onClick() {
+      return dispatch(setViewModalVisible(false));
+    },
+    value: "Kateqoriya"
   }))))));
 };
 export default QuestionnairesInventoryCategoriesContent;

package/dist/pages/Questionnnaires/QuestionnairesInventoryModelsContent/index.js

@@ -1,12 +1,15 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import Cookies from "js-cookie";
 import style from "../Questionnaires.module.scss";
-import { Form, Input, Layout } from "antd";
+import { Form, Input, Layout, Select as AntdSelect } from "antd";
 import { PlusIcon } from "../../../assets/icons";
 import FormModal from "../../../components/FormModal";
 import { useDispatch, useSelector } from "react-redux";
@@ -23,9 +26,11 @@ import Button from "../../../components/Button";
 import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
-import { addInventoryModels, deleteInventoryModels, editInventoryModels, getInventoryModels, inventoryModelsVisibility } from "../../../store/slices/questionnaire";
+import { addInventoryModels, deleteInventoryModels, editInventoryModels, getInventoryBrandsAll, getInventoryModels, inventoryModelsVisibility } from "../../../store/slices/questionnaire";
+import Select from "../../../components/Select";
 var Content = Layout.Content;
 var Item = Form.Item;
+var Option = AntdSelect.Option;
 var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModelsContent() {
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -41,31 +46,40 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
     _useState6 = _slicedToArray(_useState5, 2),
     page = _useState6[0],
     setPage = _useState6[1];
-  var _useState7 = useState(Cookies.get("pagination-size-questionnaire-inventorymodels") ? JSON.parse(Cookies.get("pagination-size-questionnaire-inventorymodels")) : 20),
+  var _useState7 = useState(Cookies.get("pagination-size-questionnaire-models") ? JSON.parse(Cookies.get("pagination-size-questionnaire-models")) : 20),
     _useState8 = _slicedToArray(_useState7, 2),
     size = _useState8[0],
     setSize = _useState8[1];
-  var _useState9 = useState({
+  var _useState9 = useState(null),
+    _useState0 = _slicedToArray(_useState9, 2),
+    inventoryBrandSelect = _useState0[0],
+    setBrandSelect = _useState0[1];
+  var _useState1 = useState({
       name: ""
     }),
-    _useState0 = _slicedToArray(_useState9, 2),
-    query = _useState0[0],
-    setQuery = _useState0[1];
+    _useState10 = _slicedToArray(_useState1, 2),
+    query = _useState10[0],
+    setQuery = _useState10[1];
   var _useSelector = useSelector(function (state) {
       return state.global;
     }),
     loading = _useSelector.loading,
     InventoryModelsRender = _useSelector.InventoryModelsRender;
-  var InventoryModels = useSelector(function (state) {
+  var inventoryModels = useSelector(function (state) {
     return state.questionnaire.inventoryModels;
   });
-  var paginationLength = setPaginationLength(InventoryModels === null || InventoryModels === void 0 ? void 0 : InventoryModels.count, InventoryModels === null || InventoryModels === void 0 ? void 0 : InventoryModels.size);
+  var inventoryBrandsAll = useSelector(function (state) {
+    return state.questionnaire.inventoryBrandsAll;
+  });
+  var paginationLength = setPaginationLength(inventoryModels === null || inventoryModels === void 0 ? void 0 : inventoryModels.count, inventoryModels === null || inventoryModels === void 0 ? void 0 : inventoryModels.size);
   var onSubmit = useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            dispatch(addInventoryModels(data));
+            dispatch(addInventoryModels(_objectSpread(_objectSpread({}, data), {}, {
+              inventoryBrandId: inventoryBrandSelect
+            })));
           case 1:
           case "end":
             return _context.stop();
@@ -75,14 +89,15 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [dispatch]);
+  }(), [dispatch, inventoryBrandSelect]);
   var onEdit = useCallback(function (id, record) {
     var data = {
       id: id,
-      name: record === null || record === void 0 ? void 0 : record.name
+      name: record === null || record === void 0 ? void 0 : record.name,
+      inventoryBrandId: inventoryBrandSelect
     };
     dispatch(editInventoryModels(data));
-  }, [dispatch]);
+  }, [dispatch, inventoryBrandSelect]);
   var onStatusChange = useCallback(function (data, checked) {
     var data_ = {
       id: data === null || data === void 0 ? void 0 : data.id,
@@ -116,11 +131,11 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
     });
   };
   var data = [];
-  if (InventoryModels !== null && InventoryModels !== void 0 && InventoryModels.items) {
-    var _InventoryModels$item;
-    data = InventoryModels === null || InventoryModels === void 0 || (_InventoryModels$item = InventoryModels.items) === null || _InventoryModels$item === void 0 ? void 0 : _InventoryModels$item.map(function (dataObj, i) {
+  if (inventoryModels !== null && inventoryModels !== void 0 && inventoryModels.items) {
+    var _inventoryModels$item;
+    data = inventoryModels === null || inventoryModels === void 0 || (_inventoryModels$item = inventoryModels.items) === null || _inventoryModels$item === void 0 ? void 0 : _inventoryModels$item.map(function (dataObj, i) {
       return {
-        num: (InventoryModels === null || InventoryModels === void 0 ? void 0 : InventoryModels.size) * (InventoryModels === null || InventoryModels === void 0 ? void 0 : InventoryModels.page) + i + 1 - (InventoryModels === null || InventoryModels === void 0 ? void 0 : InventoryModels.size),
+        num: (inventoryModels === null || inventoryModels === void 0 ? void 0 : inventoryModels.size) * (inventoryModels === null || inventoryModels === void 0 ? void 0 : inventoryModels.page) + i + 1 - (inventoryModels === null || inventoryModels === void 0 ? void 0 : inventoryModels.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
@@ -131,12 +146,21 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
   var columns = useMemo(function () {
     return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch);
   }, [onEditClick, onDelete, onStatusChange, dispatch]);
-  var _useState1 = useState(columns.map(function (col) {
+  var _useState11 = useState(columns.map(function (col) {
       return col.dataIndex;
     })),
-    _useState10 = _slicedToArray(_useState1, 2),
-    selectedColumns = _useState10[0],
-    setSelectedColumns = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    selectedColumns = _useState12[0],
+    setSelectedColumns = _useState12[1];
+  useEffect(function () {
+    if (inventoryBrandsAll) {
+      var _inventoryBrandsAll$;
+      setBrandSelect(inventoryBrandsAll === null || inventoryBrandsAll === void 0 || (_inventoryBrandsAll$ = inventoryBrandsAll[0]) === null || _inventoryBrandsAll$ === void 0 ? void 0 : _inventoryBrandsAll$.id);
+    }
+  }, [inventoryBrandsAll]);
+  useEffect(function () {
+    dispatch(getInventoryBrandsAll("nondeleted"));
+  }, [dispatch]);
   useEffect(function () {
     if (window.innerWidth >= 1900) {
       setInnerW(210);
@@ -146,16 +170,19 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
     var data = {
       page: page,
       size: size,
+      inventoryBrands: inventoryBrandSelect,
       query: query,
       visibility: "nondeleted"
     };
-    dispatch(getInventoryModels(data));
-  }, [dispatch, page, InventoryModelsRender, query, size]);
+    if (inventoryBrandSelect !== null) {
+      dispatch(getInventoryModels(data));
+    }
+  }, [dispatch, page, InventoryModelsRender, inventoryBrandSelect, query, size]);
   var updateSize = function updateSize(newSize) {
-    setSize(newSize);
-    Cookies.set("pagination-size-questionnaire-inventorymodels", JSON.stringify(newSize), {
+    setSize(newSize); // Update state
+    Cookies.set("pagination-size-questionnaire-models", JSON.stringify(newSize), {
       expires: 7
-    });
+    }); // Save to cookies
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, loading ? /*#__PURE__*/React.createElement(Loading, null) : null, /*#__PURE__*/React.createElement(Layout, {
     className: style.layout
@@ -178,9 +205,23 @@ var QuestionnairesInventoryModelsContent = function QuestionnairesInventoryModel
     className: style.content
   }, /*#__PURE__*/React.createElement("div", {
     className: style.table_header
-  }, /*#__PURE__*/React.createElement("h2", null, "Modell\u0259r (Mal-meteriallar)"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("h2", null, "Modell\u0259r (Mal-materiallar)"), /*#__PURE__*/React.createElement("div", {
     className: style.buttons
-  }, /*#__PURE__*/React.createElement(ColSort, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    size: "sm",
+    width: 200,
+    allowClear: false,
+    value: inventoryBrandSelect,
+    defaultValue: "",
+    onChange: function onChange(value) {
+      setBrandSelect(value);
+    }
+  }, inventoryBrandsAll === null || inventoryBrandsAll === void 0 ? void 0 : inventoryBrandsAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: item.id,
+      value: item.id
+    }, item.name);
+  })), /*#__PURE__*/React.createElement(ColSort, {
     columns: columns,
     selectedColumns: selectedColumns,
     handleColumnToggle: handleColumnToggle

package/dist/store/slices/questionnaire/index.js

@@ -1030,7 +1030,7 @@ export var getCountries = createAsyncThunk("/getCountries", /*#__PURE__*/functio
         case 3:
           _context30.prev = 3;
           _t30 = _context30["catch"](1);
-          errorMessage();
+          errorMessage(_t30.response.data.message);
           dispatch(setLoading(false));
         case 4:
         case "end":
@@ -1060,7 +1060,7 @@ export var getCountriesAll = createAsyncThunk("/getCountriesAll", /*#__PURE__*/f
         case 3:
           _context31.prev = 3;
           _t31 = _context31["catch"](1);
-          errorMessage();
+          errorMessage(_t31.response.data.message);
           dispatch(setLoading(false));
         case 4:
         case "end":
@@ -1094,7 +1094,7 @@ export var addCountry = createAsyncThunk("/addCountry", /*#__PURE__*/function ()
           _context32.prev = 3;
           _t32 = _context32["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t32.response.data.message);
         case 4:
         case "end":
           return _context32.stop();
@@ -1127,7 +1127,7 @@ export var editCountry = createAsyncThunk("/editCountry", /*#__PURE__*/function
           _context33.prev = 3;
           _t33 = _context33["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t33.response.data.message);
         case 4:
         case "end":
           return _context33.stop();
@@ -1160,7 +1160,7 @@ export var countryVisibility = createAsyncThunk("/countryVisibility", /*#__PURE_
           _context34.prev = 3;
           _t34 = _context34["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t34.response.data.message);
         case 4:
         case "end":
           return _context34.stop();
@@ -1194,7 +1194,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
           _context35.prev = 3;
           _t35 = _context35["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t35.response.data.message);
           dispatch(setDeleteModalVisible(false));
         case 4:
         case "end":
@@ -1221,7 +1221,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
 //       dispatch(setLoading(false));
 //       return response?.data;
 //     } catch (error) {
-//       errorMessage();
+//        errorMessage(error.response.data.message);
 //       dispatch(setLoading(false));
 //     }
 //   }
@@ -1238,7 +1238,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
 //       dispatch(setStreetRender((prev) => !prev));
 //     } catch (error) {
 //       dispatch(setLoading(false));
-//       errorMessage();
+//        errorMessage(error.response.data.message);
 //     }
 //   }
 // );
@@ -1253,7 +1253,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
 //       dispatch(setStreetRender((prev) => !prev));
 //     } catch (error) {
 //       dispatch(setLoading(false));
-//       errorMessage();
+//        errorMessage(error.response.data.message);
 //     }
 //   }
 // );
@@ -1268,7 +1268,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
 //       dispatch(setStreetRender((prev) => !prev));
 //     } catch (error) {
 //       dispatch(setLoading(false));
-//       errorMessage();
+//        errorMessage(error.response.data.message);
 //     }
 //   }
 // );
@@ -1285,7 +1285,7 @@ export var deleteCountry = createAsyncThunk("/deleteCountry", /*#__PURE__*/funct
 //     } catch (error) {
 //       dispatch(setLoading(false));
 //       dispatch(setDeleteModalVisible(false));
-//       errorMessage();
+//        errorMessage(error.response.data.message);
 //     }
 //   }
 // );
@@ -1308,7 +1308,7 @@ export var getOrganizations = createAsyncThunk("/getOrganizations", /*#__PURE__*
         case 3:
           _context36.prev = 3;
           _t36 = _context36["catch"](1);
-          errorMessage();
+          errorMessage(_t36.response.data.message);
           dispatch(setLoading(false));
         case 4:
         case "end":
@@ -1342,7 +1342,8 @@ export var organizationVisibility = createAsyncThunk("/organizationVisibility",
           _context37.prev = 3;
           _t37 = _context37["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          console.log(_t37.response.data);
+          errorMessage(_t37.response.data.message);
         case 4:
         case "end":
           return _context37.stop();
@@ -1376,7 +1377,7 @@ export var addOrganization = createAsyncThunk("/addOrganization", /*#__PURE__*/f
           _context38.prev = 3;
           _t38 = _context38["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t38.response.data.message);
         case 4:
         case "end":
           return _context38.stop();
@@ -1409,7 +1410,7 @@ export var editOrganization = createAsyncThunk("/editOrganization", /*#__PURE__*
           _context39.prev = 3;
           _t39 = _context39["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t39.response.data.message);
         case 4:
         case "end":
           return _context39.stop();
@@ -1442,7 +1443,7 @@ export var deleteOrganization = createAsyncThunk("/deleteOrganization", /*#__PUR
           _context40.prev = 3;
           _t40 = _context40["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t40.response.data.message);
         case 4:
         case "end":
           return _context40.stop();
@@ -1471,7 +1472,7 @@ export var getStructures = createAsyncThunk("/getStructures", /*#__PURE__*/funct
         case 3:
           _context41.prev = 3;
           _t41 = _context41["catch"](1);
-          errorMessage();
+          errorMessage(_t41.response.data.message);
         case 4:
         case "end":
           return _context41.stop();
@@ -1504,7 +1505,7 @@ export var addStructure = createAsyncThunk("/addStructure", /*#__PURE__*/functio
           _context42.prev = 3;
           _t42 = _context42["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t42.response.data.message);
         case 4:
         case "end":
           return _context42.stop();
@@ -1537,7 +1538,7 @@ export var editStructure = createAsyncThunk("/editStructure", /*#__PURE__*/funct
           _context43.prev = 3;
           _t43 = _context43["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t43.response.data.message);
         case 4:
         case "end":
           return _context43.stop();
@@ -1570,7 +1571,7 @@ export var deleteStructure = createAsyncThunk("/deleteStructure", /*#__PURE__*/f
           _context44.prev = 3;
           _t44 = _context44["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t44.response.data.message);
         case 4:
         case "end":
           return _context44.stop();
@@ -1603,7 +1604,7 @@ export var structureVisibility = createAsyncThunk("/structureVisibility", /*#__P
           _context45.prev = 3;
           _t45 = _context45["catch"](1);
           dispatch(setLoading(false));
-          errorMessage();
+          errorMessage(_t45.response.data.message);
         case 4:
         case "end":
           return _context45.stop();
@@ -8550,7 +8551,7 @@ export var getRegionsChildren = createAsyncThunk("/getRegionsChildren", /*#__PUR
         case 3:
           _context259.prev = 3;
           _t259 = _context259["catch"](1);
-          errorMessage();
+          errorMessage(_t259.response.data.message);
           dispatch(setLoading(false));
         case 4:
         case "end":
@@ -16368,7 +16369,7 @@ export var getInventoryCategories = createAsyncThunk("/getInventoryCategories",
           _context498.prev = 1;
           dispatch(setLoading(true));
           _context498.next = 2;
-          return Services.getInventoryCategories(data.size, data.page, data.query, data.visibility);
+          return Services.getInventoryCategories(data.size, data.page, data.visibility);
         case 2:
           response = _context498.sent;
           dispatch(setLoading(false));
@@ -16566,7 +16567,7 @@ export var getInventoryModels = createAsyncThunk("/getInventoryModels", /*#__PUR
           _context504.prev = 1;
           dispatch(setLoading(true));
           _context504.next = 2;
-          return Services.getInventoryModels(data.size, data.page, data.query, data.visibility);
+          return Services.getInventoryModels(data.size, data.page, data.query, data.visibility, data === null || data === void 0 ? void 0 : data.inventoryBrands);
         case 2:
           response = _context504.sent;
           dispatch(setLoading(false));

package/dist/store/slices/questionnaire/service.js

@@ -9671,13 +9671,13 @@ _defineProperty(Services, "inventoryBrandsVisibility", /*#__PURE__*/function ()
 // ---- end generated ----
 // ---- generated by questionnaireGenerator: InventoryCategories ----
 _defineProperty(Services, "getInventoryCategories", /*#__PURE__*/function () {
-  var _ref499 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee499(size, page, query, visibility) {
+  var _ref499 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee499(size, page, visibility) {
     var response;
     return _regeneratorRuntime.wrap(function (_context499) {
       while (1) switch (_context499.prev = _context499.next) {
         case 0:
           _context499.next = 1;
-          return api.get("/inventoryCategories/".concat(size, "/page/").concat(page, "?visibility=").concat(visibility, "&name=").concat(query === null || query === void 0 ? void 0 : query.name));
+          return api.get("/inventoryCategories/".concat(size, "/page/").concat(page, "?visibility=").concat(visibility));
         case 1:
           response = _context499.sent;
           return _context499.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
@@ -9687,7 +9687,7 @@ _defineProperty(Services, "getInventoryCategories", /*#__PURE__*/function () {
       }
     }, _callee499);
   }));
-  return function (_x762, _x763, _x764, _x765) {
+  return function (_x762, _x763, _x764) {
     return _ref499.apply(this, arguments);
   };
 }());
@@ -9708,7 +9708,7 @@ _defineProperty(Services, "getInventoryCategoriesAll", /*#__PURE__*/function ()
       }
     }, _callee500);
   }));
-  return function (_x766) {
+  return function (_x765) {
     return _ref500.apply(this, arguments);
   };
 }());
@@ -9729,7 +9729,7 @@ _defineProperty(Services, "addInventoryCategories", /*#__PURE__*/function () {
       }
     }, _callee501);
   }));
-  return function (_x767) {
+  return function (_x766) {
     return _ref501.apply(this, arguments);
   };
 }());
@@ -9750,7 +9750,7 @@ _defineProperty(Services, "editInventoryCategories", /*#__PURE__*/function () {
       }
     }, _callee502);
   }));
-  return function (_x768) {
+  return function (_x767) {
     return _ref502.apply(this, arguments);
   };
 }());
@@ -9771,7 +9771,7 @@ _defineProperty(Services, "deleteInventoryCategories", /*#__PURE__*/function ()
       }
     }, _callee503);
   }));
-  return function (_x769) {
+  return function (_x768) {
     return _ref503.apply(this, arguments);
   };
 }());
@@ -9792,20 +9792,20 @@ _defineProperty(Services, "inventoryCategoriesVisibility", /*#__PURE__*/function
       }
     }, _callee504);
   }));
-  return function (_x770) {
+  return function (_x769) {
     return _ref504.apply(this, arguments);
   };
 }());
 // ---- end generated ----
 // ---- generated by questionnaireGenerator: InventoryModels ----
 _defineProperty(Services, "getInventoryModels", /*#__PURE__*/function () {
-  var _ref505 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee505(size, page, query, visibility) {
+  var _ref505 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee505(size, page, query, visibility, inventoryBrands) {
     var response;
     return _regeneratorRuntime.wrap(function (_context505) {
       while (1) switch (_context505.prev = _context505.next) {
         case 0:
           _context505.next = 1;
-          return api.get("/inventoryModels/".concat(size, "/page/").concat(page, "?visibility=").concat(visibility, "&name=").concat(query === null || query === void 0 ? void 0 : query.name));
+          return api.get("/inventoryModels/".concat(size, "/page/").concat(page, "?inventoryBrandIds=").concat(inventoryBrands, "&visibility=").concat(visibility, "&name=").concat(query === null || query === void 0 ? void 0 : query.name));
         case 1:
           response = _context505.sent;
           return _context505.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
@@ -9815,7 +9815,7 @@ _defineProperty(Services, "getInventoryModels", /*#__PURE__*/function () {
       }
     }, _callee505);
   }));
-  return function (_x771, _x772, _x773, _x774) {
+  return function (_x770, _x771, _x772, _x773, _x774) {
     return _ref505.apply(this, arguments);
   };
 }());

package/dist/utils/axios.js

@@ -4,7 +4,7 @@ import axios from "axios";
 export var ACCESS_TOKEN_KEY = "token";
 export var REFRESH_TOKEN_KEY = "refreshToken";
 var baseUrl;
-if (window.location.hostname === "localhost") {
+if (window.location.hostname === "localhost" || window.location.hostname.startsWith("192.168.11.")) {
   baseUrl = process.env.REACT_APP_BASE_URL;
 } else {
   baseUrl = window.location.origin + "/api";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banch0u/core-project-test-repository",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "description": "Shared core features for all projects",
   "main": "dist/index.js",
   "files": [