@banch0u/core-project-test-repository 1.9.9 → 1.9.11

package/dist/layout/Sidebar/index.js

@@ -116,7 +116,7 @@ var Sidebar = function Sidebar(_ref) {
     return location.pathname.includes(item.key);
   })) === null || _items$flatMap$find === void 0 ? void 0 : _items$flatMap$find.key;
   return /*#__PURE__*/React.createElement(Sider, {
-    width: 270,
+    width: 287,
     collapsible: true,
     collapsed: collapsed,
     collapsedWidth: 64,
@@ -132,7 +132,9 @@ var Sidebar = function Sidebar(_ref) {
   })), /*#__PURE__*/React.createElement(Link, {
     to: PLATFORM_PATH,
     className: style.buttons
-  }, collapsed ? /*#__PURE__*/React.createElement(DsgLogoEmblem, null) : imageSrc ? /*#__PURE__*/React.createElement("img", {
+  }, collapsed ? /*#__PURE__*/React.createElement("div", {
+    className: style.emblem
+  }, /*#__PURE__*/React.createElement(DsgLogoEmblem, null)) : imageSrc ? /*#__PURE__*/React.createElement("img", {
     src: imageSrc,
     alt: "Company Logo"
   }) : isDark ? /*#__PURE__*/React.createElement(DsgLogo, {

package/dist/layout/Sidebar/index.module.scss

@@ -25,15 +25,20 @@
     position: absolute;
     left: 15px;
     bottom: 16px;
-    svg {
-      width: 100%;
-      height: auto;
-      padding-right: 15px;
-    }
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
     img {
-      width: 100%;
-      height: auto;
-      padding-right: 15px;
+      height: 100px;
+      width: auto;
+    }
+    .emblem {
+      svg {
+        height: auto;
+        width: 100%;
+        padding-right: 15px;
+      }
     }
   }
   .collapseButton {

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

@@ -3,7 +3,7 @@ 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, drivingcategoriesAll, dispatch, innerW) {
   return [{
     title: "№",
     dataIndex: "num",
@@ -16,6 +16,15 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     width: innerW,
     disabled: true,
     ellipsis: true
+  }, {
+    title: "Kateqoriya",
+    dataIndex: "category",
+    width: innerW,
+    disabled: false,
+    ellipsis: true,
+    type: "select",
+    selectData: drivingcategoriesAll,
+    queryName: "categoryIds"
   }, {
     title: "Status",
     key: "status",

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

@@ -26,7 +26,7 @@ import Button from "../../../components/Button";
 import Loading from "../../../components/Loading";
 import Table from "../../../components/Table";
 import Filter from "../../../components/Filter";
-import { addModel, deleteModel, editModel, getBrandsAll, getModel, modelsVisibility } from "../../../store/slices/questionnaire";
+import { addModel, deleteModel, editModel, getBrandsAll, getDrivingcategoriesAll, getModel, modelsVisibility } from "../../../store/slices/questionnaire";
 import Select from "../../../components/Select";
 var Content = Layout.Content;
 var Item = Form.Item;
@@ -71,16 +71,26 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
   var brandsAll = useSelector(function (state) {
     return state.questionnaire.brandsAll;
   });
+  var drivingcategoriesAll = useSelector(function (state) {
+    return state.questionnaire.drivingcategoriesAll;
+  });
+  console.log(drivingcategoriesAll);
   var paginationLength = setPaginationLength(model === null || model === void 0 ? void 0 : model.count, model === null || model === void 0 ? void 0 : model.size);
   var onSubmit = useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
+      var category, categoryName;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            category = drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.find(function (item) {
+              return item.id === data.categoryId;
+            });
+            categoryName = (category === null || category === void 0 ? void 0 : category.name) || "";
             dispatch(addModel(_objectSpread(_objectSpread({}, data), {}, {
-              brandId: brandSelect
+              brandId: brandSelect,
+              categoryName: categoryName
             })));
-          case 1:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -89,14 +99,21 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [dispatch, brandSelect]);
+  }(), [dispatch, brandSelect, drivingcategoriesAll]);
   var onEdit = useCallback(function (id, record) {
     var data = {
       id: id,
       name: record === null || record === void 0 ? void 0 : record.name,
-      brandId: brandSelect
+      brandId: brandSelect,
+      categoryId: record === null || record === void 0 ? void 0 : record.categoryId
     };
-    dispatch(editModel(data));
+    var category = drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.find(function (item) {
+      return item.id === data.categoryId;
+    });
+    var categoryName = (category === null || category === void 0 ? void 0 : category.name) || "";
+    dispatch(editModel(_objectSpread(_objectSpread({}, data), {}, {
+      categoryName: categoryName
+    })));
   }, [dispatch, brandSelect]);
   var onStatusChange = useCallback(function (data, checked) {
     var data_ = {
@@ -134,18 +151,21 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
   if (model !== null && model !== void 0 && model.items) {
     var _model$items;
     data = model === null || model === void 0 || (_model$items = model.items) === null || _model$items === void 0 ? void 0 : _model$items.map(function (dataObj, i) {
+      var _dataObj$category, _dataObj$category2;
       return {
         num: (model === null || model === void 0 ? void 0 : model.size) * (model === null || model === void 0 ? void 0 : model.page) + i + 1 - (model === null || model === void 0 ? void 0 : model.size),
         id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
         name: dataObj === null || dataObj === void 0 ? void 0 : dataObj.name,
+        category: dataObj === null || dataObj === void 0 || (_dataObj$category = dataObj.category) === null || _dataObj$category === void 0 ? void 0 : _dataObj$category.text,
+        categoryId: dataObj === null || dataObj === void 0 || (_dataObj$category2 = dataObj.category) === null || _dataObj$category2 === void 0 ? void 0 : _dataObj$category2.id,
         isActive: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isActive,
         className: "rowClassName1"
       };
     });
   }
   var columns = useMemo(function () {
-    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch);
-  }, [onEditClick, onDelete, onStatusChange, dispatch]);
+    return getStreetColumns(onEditClick, onDelete, onStatusChange, drivingcategoriesAll, dispatch);
+  }, [onEditClick, onDelete, onStatusChange, drivingcategoriesAll, dispatch]);
   var _useState13 = useState(columns.map(function (col) {
       return col.dataIndex;
     })),
@@ -162,6 +182,7 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     dispatch(getBrandsAll({
       visibility: "nondeleted"
     }));
+    dispatch(getDrivingcategoriesAll("nondeleted"));
   }, [dispatch]);
   useEffect(function () {
     if (window.innerWidth >= 1900) {
@@ -266,7 +287,19 @@ var QuestionnairesModelsContent = function QuestionnairesModelsContent() {
     label: "Ad"
   }, /*#__PURE__*/React.createElement(Input, {
     className: style.modal_input
-  }))), /*#__PURE__*/React.createElement(DeleteModal, {
+  })), /*#__PURE__*/React.createElement(Item, {
+    rules: [{
+      required: true,
+      message: ""
+    }],
+    name: "categoryId",
+    label: "Kateqoriya"
+  }, /*#__PURE__*/React.createElement(Select, null, drivingcategoriesAll === null || drivingcategoriesAll === void 0 ? void 0 : drivingcategoriesAll.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      key: item.id,
+      value: item.id
+    }, item.name);
+  })))), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
     },

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

@@ -11051,6 +11051,10 @@ export var questionnaire = createSlice({
       var payload = _ref754.payload;
       state.ordersAll = payload;
     });
+    builder.addCase(getDrivingcategoriesAll.fulfilled, function (state, _ref755) {
+      var payload = _ref755.payload;
+      state.drivingcategoriesAll = payload;
+    });
   }
 });
 var setPage = questionnaire.actions.setPage;

package/package.json

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