@banch0u/core-project-test-repository 2.1.10 → 2.1.12

package/dist/components/Filter/index.js

@@ -4,10 +4,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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, { useState } from "react";
-import { Dropdown, Menu, Form, Input, Select as AntdSelect, DatePicker, TreeSelect } from "antd";
+import { Dropdown, Menu, Form, Select as AntdSelect, DatePicker, TreeSelect } from "antd";
 import style from "./index.module.scss";
 import { FilterIcon } from "../../assets/icons";
 import Select from "../Select";
+import Input from "../Input";
 import Button from "../Button";
 var Option = AntdSelect.Option;
 var RangePicker = DatePicker.RangePicker;
@@ -33,18 +34,34 @@ var Filter = function Filter(_ref) {
     var formattedMonth = String(month).padStart(2, "0");
     return "".concat(formattedDay, ".").concat(formattedMonth, ".").concat(year);
   };
+
+  // ✅ detect dayjs/moment-like objects
+  var isDateLike = function isDateLike(v) {
+    if (!v) return false;
+    if (typeof (v === null || v === void 0 ? void 0 : v.isValid) === "function" && v.isValid()) return true; // dayjs/moment
+    if (typeof (v === null || v === void 0 ? void 0 : v.date) === "function" && typeof (v === null || v === void 0 ? void 0 : v.month) === "function" && typeof (v === null || v === void 0 ? void 0 : v.year) === "function") return true; // fallback
+    return false;
+  };
+
+  // ✅ only treat [start,end] as date range if both are date-like
+  var isDateRange = function isDateRange(v) {
+    return Array.isArray(v) && v.length === 2 && isDateLike(v[0]) && isDateLike(v[1]);
+  };
   var handleFinish = function handleFinish(values) {
     var formattedValues = _objectSpread({}, values);
     Object.keys(values).forEach(function (key) {
-      if (Array.isArray(values[key]) && values[key].length === 2) {
-        var _values$key = _slicedToArray(values[key], 2),
-          start = _values$key[0],
-          end = _values$key[1];
-        if (start && end) {
-          var formattedStart = formatDate(start.date(), start.month() + 1, start.year());
-          var formattedEnd = formatDate(end.date(), end.month() + 1, end.year());
-          formattedValues[key] = "".concat(formattedStart, " - ").concat(formattedEnd);
-        }
+      var val = values[key];
+
+      // ✅ only format RangePicker values, ignore multi-select arrays
+      if (isDateRange(val)) {
+        var _val = _slicedToArray(val, 2),
+          start = _val[0],
+          end = _val[1];
+
+        // Prefer .format if available (dayjs/moment), else manual
+        var formattedStart = typeof (start === null || start === void 0 ? void 0 : start.format) === "function" ? start.format("DD.MM.YYYY") : formatDate(start.date(), start.month() + 1, start.year());
+        var formattedEnd = typeof (end === null || end === void 0 ? void 0 : end.format) === "function" ? end.format("DD.MM.YYYY") : formatDate(end.date(), end.month() + 1, end.year());
+        formattedValues[key] = "".concat(formattedStart, " - ").concat(formattedEnd);
       }
     });
     setQuery(formattedValues);
@@ -54,8 +71,7 @@ var Filter = function Filter(_ref) {
   // Filter the columns based on selectedColumns, filterDisable, and filter status
   var filteredColumns = columns.filter(function (col) {
     return selectedColumns.includes(col.dataIndex) && col.filter !== false && col.filterDisable !== true || col.dataIndex === "filterOnly";
-  } // Always include "filterOnly" columns in the filter
-  );
+  });
   var getGrid = function getGrid() {
     var elementCount = selectedColumns.length - disabledElementCount;
     if (elementCount >= 5) return style.grid5;
@@ -78,25 +94,26 @@ var Filter = function Filter(_ref) {
   })), _toConsumableArray(filteredColumns.filter(function (col) {
     return col.isDouble;
   }))).map(function (col) {
-    if (col.showCheckbox === false) {
-      return null;
-    }
+    if (col.showCheckbox === false) return null;
     var gridSpanClass = col.isDouble ? style.doubleGrid : style.singleGrid;
     if (col.type === "select") {
       return /*#__PURE__*/React.createElement(Form.Item, {
         key: col.dataIndex,
         label: col.title,
         name: col.queryName ? col.queryName : col.dataIndex,
-        className: gridSpanClass // Dynamically apply grid class
-      }, /*#__PURE__*/React.createElement(Select
-      // showSearch={col.isDouble}
-      , {
+        className: gridSpanClass
+      }, /*#__PURE__*/React.createElement(Select, {
         size: "sm",
+        style: {
+          height: "32px"
+        },
         onChange: function onChange(value) {
           if (col.dataIndex === "topic" || col.dataIndex === "contractTypeId" || col.dataIndex === "contractType") {
             setSelectedTopic(value);
           }
-        }
+        },
+        mode: col.selectType === "multiple" ? "multiple" : "single",
+        optionFilterProp: "label"
       }, /*#__PURE__*/React.createElement(Option, {
         value: ""
       }), ((col === null || col === void 0 ? void 0 : col.selectData) || []).map(function (option, i) {
@@ -104,8 +121,8 @@ var Filter = function Filter(_ref) {
         var isIdArray = Array.isArray(option.id);
         return /*#__PURE__*/React.createElement(Option, {
           key: i,
-          value: isIdArray ? JSON.stringify(option.id) // Convert array to string
-          : option.id // Use ID directly
+          value: isIdArray ? JSON.stringify(option.id) : option.id,
+          label: option.name
         }, option.name, " ", option.surname, " ", option.text, (option === null || option === void 0 ? void 0 : option.registrationNumber) && (option === null || option === void 0 || (_option$brandId = option.brandId) === null || _option$brandId === void 0 ? void 0 : _option$brandId.text) && (option === null || option === void 0 || (_option$modelId = option.modelId) === null || _option$modelId === void 0 ? void 0 : _option$modelId.text) && " [".concat(option.registrationNumber, "] ").concat((_option$brandId2 = option.brandId) === null || _option$brandId2 === void 0 ? void 0 : _option$brandId2.text, " ").concat((_option$modelId2 = option.modelId) === null || _option$modelId2 === void 0 ? void 0 : _option$modelId2.text));
       })));
     }
@@ -114,7 +131,7 @@ var Filter = function Filter(_ref) {
         key: col.dataIndex,
         label: col.title,
         name: col.queryName ? col.queryName : col.dataIndex,
-        className: gridSpanClass // Dynamically apply grid class
+        className: gridSpanClass
       }, /*#__PURE__*/React.createElement(RangePicker, {
         format: "DD.MM.YYYY",
         placeholder: ""
@@ -125,7 +142,7 @@ var Filter = function Filter(_ref) {
         key: col.dataIndex,
         label: col.title,
         name: col.queryName ? col.queryName : col.dataIndex,
-        className: gridSpanClass // Dynamically apply grid class
+        className: gridSpanClass
       }, /*#__PURE__*/React.createElement(TreeSelect, {
         showSearch: true,
         popupMatchSelectWidth: false,
@@ -138,8 +155,10 @@ var Filter = function Filter(_ref) {
       key: col.dataIndex,
       label: col.title,
       name: col.queryName ? col.queryName : col.dataIndex,
-      className: gridSpanClass // Dynamically apply grid class
-    }, /*#__PURE__*/React.createElement(Input, null));
+      className: gridSpanClass
+    }, /*#__PURE__*/React.createElement(Input, {
+      size: "sm"
+    }));
   })), /*#__PURE__*/React.createElement("div", {
     className: style.buttons
   }, /*#__PURE__*/React.createElement(Button, {
@@ -157,9 +176,8 @@ var Filter = function Filter(_ref) {
   return /*#__PURE__*/React.createElement(Dropdown, {
     overlay: menu,
     trigger: ["click"],
-    open: visible // Updated to use open
-    ,
-    onOpenChange: handleOpenChange // Updated to use onOpenChange
+    open: visible,
+    onOpenChange: handleOpenChange
   }, /*#__PURE__*/React.createElement(Button, {
     color: "white"
   }, /*#__PURE__*/React.createElement(FilterIcon, null)));

package/dist/pages/Login/index.js

@@ -4,14 +4,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useCallback, useState } from "react";
 import style from "./index.module.scss";
 import { Form, Input } from "antd";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { DsgLogo } from "../../assets/icons";
 import Loading from "../../components/Loading";
 import { login } from "../../store/slices/auth";
 import { useDispatch, useSelector } from "react-redux";
-import AsanImza from "../../assets/icons/AsanImza.png";
-import Sima from "../../assets/icons/Sima.png";
-import Ldap from "../../assets/icons/Ldap.png";
+// import AsanImza from "../../assets/icons/AsanImza.png";
+// import Sima from "../../assets/icons/Sima.png";
+// import Ldap from "../../assets/icons/Ldap.png";
 import { getCompanyInfo } from "../../store/slices/companyInfo";
 import api from "../../utils/axios"; // 💡 Make sure this points to your axios instance
 
@@ -150,32 +150,13 @@ var Login = function Login() {
     },
     placeholder: "\u015Eifr\u0259",
     className: style.control_input
-  }))), /*#__PURE__*/React.createElement(Link, {
-    to: ""
-  }, "\u015Eifr\u0259ni unuttdun?"), /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     className: style.button
   }, /*#__PURE__*/React.createElement("div", {
     className: style.border,
     "data-no-invert": true
   }, /*#__PURE__*/React.createElement("button", {
     type: "submit"
-  }, "Daxil Ol"))), /*#__PURE__*/React.createElement("div", {
-    className: style.alternative_login
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    className: style.background
-  }, /*#__PURE__*/React.createElement("img", {
-    src: AsanImza,
-    alt: "asan_imza"
-  })), /*#__PURE__*/React.createElement("h3", null, "Asan imza")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    className: style.background
-  }, /*#__PURE__*/React.createElement("img", {
-    src: Sima,
-    alt: "sima"
-  })), /*#__PURE__*/React.createElement("h3", null, "E-\u0130mza")), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    className: style.background
-  }, /*#__PURE__*/React.createElement("img", {
-    src: Ldap,
-    alt: "ldap"
-  })), /*#__PURE__*/React.createElement("h3", null, "Ldap")))));
+  }, "Daxil Ol")))));
 };
 export default Login;

package/dist/pages/Login/index.module.scss

@@ -72,6 +72,8 @@
       display: flex;
       justify-content: center;
       margin-bottom: 42px;
+      margin-top: 45px;
+
       .border {
         width: 228px;
         padding: 2px;

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

@@ -96,7 +96,8 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
   var onEdit = useCallback(function (id, record) {
     var data = {
       id: id,
-      name: record === null || record === void 0 ? void 0 : record.name
+      responsiblePersonId: record === null || record === void 0 ? void 0 : record.responsiblePersonId,
+      rank: record === null || record === void 0 ? void 0 : record.rank
     };
     dispatch(editDefaultAgreementPlans(data));
     setEditingRecord(null);

package/dist/pages/Questionnnaires/QuestionnairesVehicleTypesContent/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, dispatch, onTrailerChange) {
   return [{
     title: "№",
     dataIndex: "num",
@@ -13,9 +13,25 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
   }, {
     title: "Növ",
     dataIndex: "name",
-    width: innerW,
     disabled: true,
     ellipsis: true
+  }, {
+    title: "Qoşqu",
+    key: "Qoşqu",
+    disabled: false,
+    filter: true,
+    render: function render(data) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "top",
+        title: "Qo\u015Fqu"
+      }, /*#__PURE__*/React.createElement(Switch, {
+        size: "medium",
+        checked: data === null || data === void 0 ? void 0 : data.isTrailer,
+        onChange: function onChange(checked) {
+          return onTrailerChange(data, checked, dispatch);
+        }
+      }));
+    }
   }, {
     title: "Status",
     key: "status",

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

@@ -90,6 +90,14 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
     };
     dispatch(vehicletypesVisibility(data_));
   }, [dispatch]);
+  var onTrailerChange = useCallback(function (data, checked) {
+    var data_ = {
+      id: data === null || data === void 0 ? void 0 : data.id,
+      name: data === null || data === void 0 ? void 0 : data.name,
+      isTrailer: checked
+    };
+    dispatch(editVehicletype(data_));
+  }, [dispatch]);
   var closeOnViewModal = useCallback(function () {
     dispatch(setViewModalVisible(false));
   }, [dispatch]);
@@ -124,13 +132,14 @@ var QuestionnairesVehicleTypesContent = function QuestionnairesVehicleTypesConte
         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,
+        isTrailer: dataObj === null || dataObj === void 0 ? void 0 : dataObj.isTrailer,
         className: "rowClassName1"
       };
     });
   }
   var columns = useMemo(function () {
-    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch);
-  }, [onEditClick, onDelete, onStatusChange, dispatch]);
+    return getStreetColumns(onEditClick, onDelete, onStatusChange, dispatch, onTrailerChange);
+  }, [onEditClick, onDelete, onStatusChange, dispatch, onTrailerChange]);
   var _useState11 = useState(columns.map(function (col) {
       return col.dataIndex;
     })),

package/package.json

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