@banch0u/core-project-test-repository 2.2.2 → 2.2.3

package/dist/layout/QuestionnairesSidebar/index.js

@@ -290,7 +290,7 @@ var QuestionnairesSidebar = function QuestionnairesSidebar(_ref) {
   {
     key: "subtypes",
     //delete the "/" at the start of string
-    label: "Müqavilə alt növü",
+    label: "Müqavilənin predmeti",
     link: QUESTIONNAIRES_CONTRACTTYPESSUBTYPES
   },
   // ---- generated sidebar item by questionnaireGenerator: ContractTypesSubtypes ----
@@ -305,7 +305,7 @@ var QuestionnairesSidebar = function QuestionnairesSidebar(_ref) {
 
   {
     key: "routelocations",
-    //delete the "/" at the start of string 
+    //delete the "/" at the start of string
     label: "Göndərilən yerlər",
     link: QUESTIONNAIRES_ROUTELOCATIONS
   },
@@ -313,8 +313,8 @@ var QuestionnairesSidebar = function QuestionnairesSidebar(_ref) {
 
   {
     key: "internalstructures",
-    //delete the "/" at the start of string 
-    label: "Daxili Strukturlar",
+    //delete the "/" at the start of string
+    label: "Şablon strukturlar",
     link: QUESTIONNAIRES_INTERNALSTRUCTURE
   }
   // ---- generated sidebar item by questionnaireGenerator: InternalStructure ----

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

@@ -11,7 +11,7 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     ellipsis: true,
     width: 35
   }, {
-    title: "Müqavilə alt növü",
+    title: "Müqavilənin predmeti",
     dataIndex: "name",
     width: innerW,
     disabled: true,

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

@@ -205,7 +205,7 @@ var QuestionnairesContractTypesSubtypesContent = function QuestionnairesContract
     className: style.content
   }, /*#__PURE__*/React.createElement("div", {
     className: style.table_header
-  }, /*#__PURE__*/React.createElement("h2", null, "M\xFCqavil\u0259 alt n\xF6v\xFC"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("h2", null, "M\xFCqavil\u0259nin predmeti"), /*#__PURE__*/React.createElement("div", {
     className: style.buttons
   }, /*#__PURE__*/React.createElement(Select, {
     size: "sm",

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

@@ -21,12 +21,6 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, d
     width: innerW,
     disabled: false,
     ellipsis: true
-  }, {
-    title: "Daxili Struktur",
-    dataIndex: "internalStructure",
-    width: innerW,
-    disabled: false,
-    ellipsis: true
   }, {
     title: "",
     key: "actions",

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

@@ -1,7 +1,10 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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";
@@ -30,12 +33,111 @@ import Input from "../../../components/Input";
 var Content = Layout.Content;
 var Item = Form.Item;
 var Option = AntdSelect.Option;
+
+/**
+ * Helpers
+ */
+var toNumSafe = function toNumSafe(v) {
+  return v === null || v === undefined || v === "" ? NaN : Number(v);
+};
+var deriveFlowPriorityFromRank = function deriveFlowPriorityFromRank(rank) {
+  var r = toNumSafe(rank);
+  if (Number.isNaN(r)) return undefined;
+  if (r === -1 || r === 0 || r === 1 || r === 2) return r;
+  if (r >= 3) return 3;
+  return undefined;
+};
+
+/**
+ * ✅ EDIT NORMALIZATION (flowPriority-first)
+ */
+var normalizeForEdit = function normalizeForEdit(row) {
+  var fpNum = toNumSafe(row === null || row === void 0 ? void 0 : row.flowPriority);
+  if (!Number.isNaN(fpNum) && [-1, 0, 1, 2, 3].includes(fpNum)) {
+    if (fpNum === 3) {
+      var _rankNum = toNumSafe(row === null || row === void 0 ? void 0 : row.rank);
+      return _objectSpread(_objectSpread({}, row), {}, {
+        flowPriority: 3,
+        rank: Number.isNaN(_rankNum) ? undefined : _rankNum
+      });
+    }
+    return _objectSpread(_objectSpread({}, row), {}, {
+      flowPriority: fpNum,
+      rank: undefined
+    });
+  }
+  var rankNum = toNumSafe(row === null || row === void 0 ? void 0 : row.rank);
+  if (Number.isNaN(rankNum)) {
+    var fp = row === null || row === void 0 ? void 0 : row.flowPriority;
+    return _objectSpread(_objectSpread({}, row), {}, {
+      flowPriority: fp === -1 || fp === 0 || fp === 1 || fp === 2 || fp === 3 ? fp : undefined,
+      rank: undefined
+    });
+  }
+  if (rankNum === -1) return _objectSpread(_objectSpread({}, row), {}, {
+    flowPriority: -1,
+    rank: undefined
+  });
+  if (rankNum === 0 || rankNum === 1 || rankNum === 2) return _objectSpread(_objectSpread({}, row), {}, {
+    flowPriority: rankNum,
+    rank: undefined
+  });
+  return _objectSpread(_objectSpread({}, row), {}, {
+    flowPriority: 3,
+    rank: rankNum
+  });
+};
+
+/**
+ * ✅ PAYLOAD BUILD (SEND BOTH rank + flowPriority)
+ */
+var buildPayloadFromForm = function buildPayloadFromForm(id, values) {
+  var flowPriority = Number(values === null || values === void 0 ? void 0 : values.flowPriority);
+  var base = _objectSpread(_objectSpread({}, id ? {
+    id: id
+  } : {}), {}, {
+    responsiblePersonId: values === null || values === void 0 ? void 0 : values.responsiblePersonId,
+    internalStructureId: values === null || values === void 0 ? void 0 : values.internalStructureId,
+    // ✅ will come from top select
+    flowPriority: flowPriority
+  });
+  if (flowPriority === -1) return _objectSpread(_objectSpread({}, base), {}, {
+    rank: -1
+  });
+  if (flowPriority === 0 || flowPriority === 1 || flowPriority === 2) return _objectSpread(_objectSpread({}, base), {}, {
+    rank: flowPriority
+  });
+  return _objectSpread(_objectSpread({}, base), {}, {
+    rank: Number(values === null || values === void 0 ? void 0 : values.rank)
+  });
+};
+var resolveRankFromValues = function resolveRankFromValues(values) {
+  var fp = Number(values === null || values === void 0 ? void 0 : values.flowPriority);
+  if (fp === -1) return -1;
+  if (fp === 0 || fp === 1 || fp === 2) return fp;
+  return Number(values === null || values === void 0 ? void 0 : values.rank);
+};
+
+// ✅ for priority labels (only 0/1 unique now; 2 can be multiple)
+var PRIORITY_LABEL = {
+  0: "Sənəd yaradan",
+  1: "Birinci baxan"
+};
 var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultAgreementPlansContent() {
+  var _query$internalStruct;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     innerW = _useState2[0],
     setInnerW = _useState2[1];
-  var ref = useRef();
+
+  // ✅ modal ref
+  var modalRef = useRef();
+
+  // ✅ capture FormModal's internal antd form so we can set field errors on submit
+  var modalFormRef = useRef(null);
+
+  // ✅ default internalStructure init only once
+  var didInitInternalStructure = useRef(false);
   var dispatch = useDispatch();
   var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -49,6 +151,8 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     _useState8 = _slicedToArray(_useState7, 2),
     size = _useState8[0],
     setSize = _useState8[1];
+
+  // ✅ query will get internalStructureId default after internalStructureAll loads
   var _useState9 = useState({
       name: ""
     }),
@@ -69,7 +173,6 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
   var internalStructureAll = useSelector(function (state) {
     return state.questionnaire.internalStructureAll;
   });
-  console.log(internalStructureAll);
   var contractUsersAll = useSelector(function (state) {
     return state.employees.contractUsersAll;
   });
@@ -78,81 +181,262 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     editingRecord = _useState12[0],
     setEditingRecord = _useState12[1];
   var paginationLength = setPaginationLength(DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.count, DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.size);
+
+  // ✅ build table data (current page)
+  var data = useMemo(function () {
+    if (!(DefaultAgreementPlans !== null && DefaultAgreementPlans !== void 0 && DefaultAgreementPlans.items)) return [];
+    return DefaultAgreementPlans.items.map(function (dataObj, i) {
+      var _dataObj$responsibleP, _dataObj$responsibleP2, _dataObj$internalStru, _dataObj$internalStru2;
+      return {
+        num: (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.size) * (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.page) + i + 1 - (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.size),
+        id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
+        responsiblePerson: dataObj === null || dataObj === void 0 || (_dataObj$responsibleP = dataObj.responsiblePerson) === null || _dataObj$responsibleP === void 0 ? void 0 : _dataObj$responsibleP.fullName,
+        responsiblePersonId: dataObj === null || dataObj === void 0 || (_dataObj$responsibleP2 = dataObj.responsiblePerson) === null || _dataObj$responsibleP2 === void 0 ? void 0 : _dataObj$responsibleP2.id,
+        flowPriority: dataObj === null || dataObj === void 0 ? void 0 : dataObj.flowPriority,
+        rank: dataObj === null || dataObj === void 0 ? void 0 : dataObj.rank,
+        internalStructure: dataObj === null || dataObj === void 0 || (_dataObj$internalStru = dataObj.internalStructure) === null || _dataObj$internalStru === void 0 ? void 0 : _dataObj$internalStru.text,
+        internalStructureId: dataObj === null || dataObj === void 0 || (_dataObj$internalStru2 = dataObj.internalStructure) === null || _dataObj$internalStru2 === void 0 ? void 0 : _dataObj$internalStru2.id,
+        className: "rowClassName1"
+      };
+    });
+  }, [DefaultAgreementPlans]);
+
+  /**
+   * ✅ rows used for validation:
+   * - prefer DefaultAgreementPlansAll if exists (covers all pages)
+   * - fallback to current page `data`
+   */
+  var rowsForValidation = useMemo(function () {
+    var list = Array.isArray(DefaultAgreementPlansAll) && DefaultAgreementPlansAll.length ? DefaultAgreementPlansAll : data;
+    if (list === data) return data;
+    return list.map(function (item) {
+      var _ref, _item$flowPriority, _item$responsiblePers, _item$responsiblePers2, _item$internalStructu, _item$internalStructu2;
+      var rank = item === null || item === void 0 ? void 0 : item.rank;
+      var fp = (_ref = (_item$flowPriority = item === null || item === void 0 ? void 0 : item.flowPriority) !== null && _item$flowPriority !== void 0 ? _item$flowPriority : item === null || item === void 0 ? void 0 : item.flowpriority) !== null && _ref !== void 0 ? _ref : deriveFlowPriorityFromRank(rank);
+      return {
+        id: item === null || item === void 0 ? void 0 : item.id,
+        responsiblePersonId: (_item$responsiblePers = item === null || item === void 0 ? void 0 : item.responsiblePersonId) !== null && _item$responsiblePers !== void 0 ? _item$responsiblePers : item === null || item === void 0 || (_item$responsiblePers2 = item.responsiblePerson) === null || _item$responsiblePers2 === void 0 ? void 0 : _item$responsiblePers2.id,
+        internalStructureId: (_item$internalStructu = item === null || item === void 0 ? void 0 : item.internalStructureId) !== null && _item$internalStructu !== void 0 ? _item$internalStructu : item === null || item === void 0 || (_item$internalStructu2 = item.internalStructure) === null || _item$internalStructu2 === void 0 ? void 0 : _item$internalStructu2.id,
+        rank: rank,
+        flowPriority: fp
+      };
+    });
+  }, [DefaultAgreementPlansAll, data]);
+
+  // ✅ IMPORTANT: Filter should not wipe internalStructureId; merge patches into query
+  var setQueryMerge = useCallback(function (patchOrUpdater) {
+    setQuery(function (prev) {
+      var patch = typeof patchOrUpdater === "function" ? patchOrUpdater(prev) : patchOrUpdater;
+      return _objectSpread(_objectSpread({}, prev), patch || {});
+    });
+  }, []);
+
+  // ✅ top select change => set query.internalStructureId
+  var handleInternalStructureChange = useCallback(function (value) {
+    setPage(1);
+    setQuery(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        internalStructureId: value
+      });
+    });
+  }, []);
+
+  // ✅ set default internalStructureId = internalStructureAll[0].id (ONLY ONCE)
+  useEffect(function () {
+    var _internalStructureAll;
+    if (didInitInternalStructure.current) return;
+    var firstId = internalStructureAll === null || internalStructureAll === void 0 || (_internalStructureAll = internalStructureAll[0]) === null || _internalStructureAll === void 0 ? void 0 : _internalStructureAll.id;
+    if (firstId !== undefined && firstId !== null) {
+      didInitInternalStructure.current = true;
+      setPage(1);
+      setQuery(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          internalStructureId: firstId
+        });
+      });
+    }
+  }, [internalStructureAll]);
+
+  // ✅ window width once
+  useEffect(function () {
+    if (window.innerWidth >= 1900) setInnerW(210);else setInnerW(155);
+  }, []);
+
+  // ✅ fetch lists separately
+  useEffect(function () {
+    dispatch(getDefaultAgreementPlansAll("onlyactive"));
+    dispatch(getInternalStructureAll("onlyactive"));
+  }, [dispatch, DefaultAgreementPlansRender]);
+
+  // ✅ NOW fetch paged data ONLY when internalStructureId exists
+  useEffect(function () {
+    if ((query === null || query === void 0 ? void 0 : query.internalStructureId) === undefined || (query === null || query === void 0 ? void 0 : query.internalStructureId) === null) return;
+    var req = {
+      page: page,
+      size: size,
+      query: query,
+      visibility: "nondeleted"
+    };
+    dispatch(getDefaultAgreementPlans(req));
+  }, [dispatch, page, size, query, DefaultAgreementPlansRender]);
+  useEffect(function () {
+    dispatch(getContractUsersAll());
+  }, [dispatch]);
+
+  // ✅ throw helper: duplicate same person in same structure
+  var throwDuplicateError = useCallback(function () {
+    var errMsg = "Bu məsul şəxs bu struktur üçün artıq təyin olunub!";
+    if (modalFormRef.current) {
+      modalFormRef.current.setFields([{
+        name: "responsiblePersonId",
+        errors: [errMsg]
+      }]);
+    }
+    throw new Error(errMsg);
+  }, []);
+
+  // ✅ throw helper: priority already taken in this internalStructure (ONLY for 0/1 now)
+  var throwPriorityTakenError = useCallback(function (priority01) {
+    var label = (PRIORITY_LABEL === null || PRIORITY_LABEL === void 0 ? void 0 : PRIORITY_LABEL[priority01]) || "Prioritet ".concat(priority01);
+    var errMsg = "Bu strukturda art\u0131q \"".concat(label, "\" prioriteti t\u0259yin olunub!");
+    if (modalFormRef.current) {
+      modalFormRef.current.setFields([{
+        name: "flowPriority",
+        errors: [errMsg]
+      }]);
+    }
+    throw new Error(errMsg);
+  }, []);
+
+  // ✅ validation 1: same person cannot be in same structure twice
+  var hasDuplicatePersonInStructure = useCallback(function (personId, structureId, ignoreId) {
+    if (!personId || !structureId) return false;
+    var p = Number(personId);
+    var s = Number(structureId);
+    return rowsForValidation.some(function (row) {
+      if (ignoreId && Number(row === null || row === void 0 ? void 0 : row.id) === Number(ignoreId)) return false;
+      return Number(row === null || row === void 0 ? void 0 : row.responsiblePersonId) === p && Number(row === null || row === void 0 ? void 0 : row.internalStructureId) === s;
+    });
+  }, [rowsForValidation]);
+
+  /**
+   * ✅ validation 2 (UPDATED):
+   * each internalStructure can have ONLY ONE flowPriority 0/1
+   * ✅ flowPriority (or rank) = 2 can be MULTIPLE
+   * flowPriority 3 can be multiple
+   */
+  var hasPriority01TakenInStructure = useCallback(function (structureId, priority01, ignoreId) {
+    if (!structureId && structureId !== 0) return false;
+    var s = Number(structureId);
+    var p = Number(priority01);
+    if (!(p === 0 || p === 1)) return false;
+    return rowsForValidation.some(function (row) {
+      var _row$flowPriority;
+      if (ignoreId && Number(row === null || row === void 0 ? void 0 : row.id) === Number(ignoreId)) return false;
+      var rowFp = toNumSafe((_row$flowPriority = row === null || row === void 0 ? void 0 : row.flowPriority) !== null && _row$flowPriority !== void 0 ? _row$flowPriority : deriveFlowPriorityFromRank(row === null || row === void 0 ? void 0 : row.rank));
+      return Number(row === null || row === void 0 ? void 0 : row.internalStructureId) === s && rowFp === p;
+    });
+  }, [rowsForValidation]);
   var onSubmit = useCallback(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(values) {
+      var fpCandidate, internalStructureId, payload;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            dispatch(addDefaultAgreementPlans(data));
+            fpCandidate = Number(values === null || values === void 0 ? void 0 : values.flowPriority);
+            resolveRankFromValues(values);
+            internalStructureId = query === null || query === void 0 ? void 0 : query.internalStructureId; // ✅ 1) block duplicate person+structure (structure comes from top select)
+            if (hasDuplicatePersonInStructure(values === null || values === void 0 ? void 0 : values.responsiblePersonId, internalStructureId, null)) {
+              throwDuplicateError();
+            }
+
+            // ✅ 2) block if flowPriority 0/1 already exists in this structure
+            if (fpCandidate === 0 || fpCandidate === 1) {
+              if (hasPriority01TakenInStructure(internalStructureId, fpCandidate, null)) {
+                throwPriorityTakenError(fpCandidate);
+              }
+            }
+
+            // ✅ inject internalStructureId from top select into payload
+            payload = buildPayloadFromForm(null, _objectSpread(_objectSpread({}, values), {}, {
+              internalStructureId: internalStructureId
+            }));
+            dispatch(addDefaultAgreementPlans(payload));
             setEditingRecord(null);
-          case 2:
+          case 8:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function (_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
-  }(), [dispatch]);
-  var onEdit = useCallback(function (id, record) {
-    var data = {
-      id: id,
-      responsiblePersonId: record === null || record === void 0 ? void 0 : record.responsiblePersonId,
-      flowPriority: record === null || record === void 0 ? void 0 : record.flowPriority,
-      // ✅ include it for edit
-      rank: record === null || record === void 0 ? void 0 : record.rank,
-      internalStructureId: record === null || record === void 0 ? void 0 : record.internalStructureId
+  }(), [dispatch, query === null || query === void 0 ? void 0 : query.internalStructureId, hasDuplicatePersonInStructure, hasPriority01TakenInStructure, throwDuplicateError, throwPriorityTakenError]);
+  var onEdit = useCallback(/*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(editId, values) {
+      var fpCandidate, internalStructureId, payload;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            fpCandidate = Number(values === null || values === void 0 ? void 0 : values.flowPriority);
+            resolveRankFromValues(values);
+            internalStructureId = query === null || query === void 0 ? void 0 : query.internalStructureId; // ✅ 1) block duplicate person+structure (ignore self)
+            if (hasDuplicatePersonInStructure(values === null || values === void 0 ? void 0 : values.responsiblePersonId, internalStructureId, editId)) {
+              throwDuplicateError();
+            }
+
+            // ✅ 2) block if flowPriority 0/1 already exists in this structure (ignore self)
+            if (fpCandidate === 0 || fpCandidate === 1) {
+              if (hasPriority01TakenInStructure(internalStructureId, fpCandidate, editId)) {
+                throwPriorityTakenError(fpCandidate);
+              }
+            }
+
+            // ✅ inject internalStructureId from top select into payload
+            payload = buildPayloadFromForm(editId, _objectSpread(_objectSpread({}, values), {}, {
+              internalStructureId: internalStructureId
+            }));
+            dispatch(editDefaultAgreementPlans(payload));
+            setEditingRecord(null);
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x2, _x3) {
+      return _ref3.apply(this, arguments);
     };
-    dispatch(editDefaultAgreementPlans(data));
-    setEditingRecord(null);
-  }, [dispatch]);
+  }(), [dispatch, query === null || query === void 0 ? void 0 : query.internalStructureId, hasDuplicatePersonInStructure, hasPriority01TakenInStructure, throwDuplicateError, throwPriorityTakenError]);
   var closeOnViewModal = useCallback(function () {
     dispatch(setViewModalVisible(false));
   }, [dispatch]);
   var onClickModal = function onClickModal() {
-    var _ref$current;
-    setEditingRecord(null); // RESET
-    ref === null || ref === void 0 || (_ref$current = ref.current) === null || _ref$current === void 0 || _ref$current.open();
+    var _modalRef$current;
+    setEditingRecord(null);
+    modalRef === null || modalRef === void 0 || (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 || _modalRef$current.open();
   };
-  var onEditClick = useCallback(function (data) {
-    var _ref$current2;
-    setEditingRecord(data); // ⭐ store editing record
-    ref === null || ref === void 0 || (_ref$current2 = ref.current) === null || _ref$current2 === void 0 || _ref$current2.setEdit(data); // keep existing modal functionality
-  }, []);
-  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;
+
+  // ✅ when clicking edit, also sync top select to that row's structure
+  var onEditClick = useCallback(function (row) {
+    var _modalRef$current2;
+    var normalized = normalizeForEdit(row);
+    var rowStructureId = normalized === null || normalized === void 0 ? void 0 : normalized.internalStructureId;
+    if (rowStructureId !== undefined && rowStructureId !== null && rowStructureId !== (query === null || query === void 0 ? void 0 : query.internalStructureId)) {
+      setPage(1);
+      setQuery(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          internalStructureId: rowStructureId
         });
-      }
-    });
-  };
-  var data = [];
-  if (DefaultAgreementPlans !== null && DefaultAgreementPlans !== void 0 && DefaultAgreementPlans.items) {
-    var _DefaultAgreementPlan;
-    data = DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 || (_DefaultAgreementPlan = DefaultAgreementPlans.items) === null || _DefaultAgreementPlan === void 0 ? void 0 : _DefaultAgreementPlan.map(function (dataObj, i) {
-      var _dataObj$responsibleP, _dataObj$internalStru, _dataObj$internalStru2;
-      return {
-        num: (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.size) * (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.page) + i + 1 - (DefaultAgreementPlans === null || DefaultAgreementPlans === void 0 ? void 0 : DefaultAgreementPlans.size),
-        id: dataObj === null || dataObj === void 0 ? void 0 : dataObj.id,
-        responsiblePerson: dataObj === null || dataObj === void 0 ? void 0 : dataObj.responsiblePerson.fullName,
-        responsiblePersonId: dataObj === null || dataObj === void 0 || (_dataObj$responsibleP = dataObj.responsiblePerson) === null || _dataObj$responsibleP === void 0 ? void 0 : _dataObj$responsibleP.id,
-        flowPriority: dataObj === null || dataObj === void 0 ? void 0 : dataObj.flowPriority,
-        // ✅ so edit modal knows what to show
-        rank: dataObj === null || dataObj === void 0 ? void 0 : dataObj.rank,
-        internalStructure: dataObj === null || dataObj === void 0 || (_dataObj$internalStru = dataObj.internalStructure) === null || _dataObj$internalStru === void 0 ? void 0 : _dataObj$internalStru.text,
-        internalStructureId: dataObj === null || dataObj === void 0 || (_dataObj$internalStru2 = dataObj.internalStructure) === null || _dataObj$internalStru2 === void 0 ? void 0 : _dataObj$internalStru2.id,
-        className: "rowClassName1"
-      };
-    });
-  }
+      });
+    }
+    setEditingRecord(normalized);
+    modalRef === null || modalRef === void 0 || (_modalRef$current2 = modalRef.current) === null || _modalRef$current2 === void 0 || _modalRef$current2.setEdit(normalized);
+  }, [query === null || query === void 0 ? void 0 : query.internalStructureId]);
+  var onDelete = useCallback(function (deleteId) {
+    setId(deleteId);
+  }, []);
   var columns = useMemo(function () {
     return getStreetColumns(onEditClick, onDelete, dispatch);
   }, [onEditClick, onDelete, dispatch]);
@@ -162,37 +446,20 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     _useState14 = _slicedToArray(_useState13, 2),
     selectedColumns = _useState14[0],
     setSelectedColumns = _useState14[1];
-  useEffect(function () {
-    if (window.innerWidth >= 1900) {
-      setInnerW(210);
-    } else {
-      setInnerW(155);
-    }
-    var data = {
-      page: page,
-      size: size,
-      query: query,
-      visibility: "nondeleted"
-    };
-    dispatch(getDefaultAgreementPlans(data));
-    dispatch(getDefaultAgreementPlansAll("onlyactive"));
-    dispatch(getInternalStructureAll("onlyactive"));
-  }, [dispatch, page, DefaultAgreementPlansRender, query, size]);
-  useEffect(function () {
-    dispatch(getContractUsersAll());
-  }, [dispatch]);
+  var handleColumnToggle = function handleColumnToggle(checked, dataIndex) {
+    setSelectedColumns(function (prevSelected) {
+      if (checked) return [].concat(_toConsumableArray(prevSelected), [dataIndex]);
+      return prevSelected.filter(function (col) {
+        return col !== dataIndex;
+      });
+    });
+  };
   var updateSize = function updateSize(newSize) {
     setSize(newSize);
     Cookies.set("pagination-size-questionnaire-defaultagreementplans", JSON.stringify(newSize), {
       expires: 7
     });
   };
-  var assignedIds = useMemo(function () {
-    return DefaultAgreementPlansAll === null || DefaultAgreementPlansAll === void 0 ? void 0 : DefaultAgreementPlansAll.map(function (item) {
-      var _item$responsiblePers;
-      return (_item$responsiblePers = item.responsiblePerson) === null || _item$responsiblePers === void 0 ? void 0 : _item$responsiblePers.id;
-    });
-  }, [DefaultAgreementPlansAll]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, loading ? /*#__PURE__*/React.createElement(Loading, null) : null, /*#__PURE__*/React.createElement(Layout, {
     className: style.layout
   }, /*#__PURE__*/React.createElement(Content, {
@@ -205,7 +472,8 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
   }, /*#__PURE__*/React.createElement(PlusIcon, null), " Soraq\xE7a \u0259lav\u0259 et"), /*#__PURE__*/React.createElement(Filter, {
     columns: columns,
     selectedColumns: selectedColumns,
-    setQuery: setQuery,
+    setQuery: setQueryMerge // ✅ merge (doesn't remove internalStructureId)
+    ,
     disabledElementCount: 3,
     setPage: setPage
   }))), /*#__PURE__*/React.createElement(Layout, {
@@ -216,7 +484,17 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     className: style.table_header
   }, /*#__PURE__*/React.createElement("h2", null, "\u015Eablon raz\u0131la\u015Fma sxemi"), /*#__PURE__*/React.createElement("div", {
     className: style.buttons
-  }, /*#__PURE__*/React.createElement(ColSort, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    width: 250,
+    size: "sm",
+    value: (_query$internalStruct = query === null || query === void 0 ? void 0 : query.internalStructureId) !== null && _query$internalStruct !== void 0 ? _query$internalStruct : undefined,
+    onChange: handleInternalStructureChange
+  }, internalStructureAll === null || internalStructureAll === void 0 ? void 0 : internalStructureAll.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
@@ -237,7 +515,10 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     page: page,
     onChange: setPage
   })), /*#__PURE__*/React.createElement(FormModal, {
-    ref: ref,
+    ref: modalRef,
+    customForm: function customForm(f) {
+      modalFormRef.current = f;
+    },
     width: 454,
     title: "Yeni soraqça yaratma",
     titleEdit: "Soraqça redaktə etmə",
@@ -248,13 +529,15 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     className: "absolute",
     centered: false
   }, /*#__PURE__*/React.createElement(Item, {
+    name: "responsiblePersonId",
+    label: "Məsul şəxs",
     rules: [{
       required: true,
       message: ""
-    }],
-    name: "responsiblePersonId",
-    label: "Məsul şəxs"
-  }, /*#__PURE__*/React.createElement(Select, null, contractUsersAll === null || contractUsersAll === void 0 ? void 0 : contractUsersAll.map(function (item) {
+    }]
+  }, /*#__PURE__*/React.createElement(Select, {
+    size: "md"
+  }, contractUsersAll === null || contractUsersAll === void 0 ? void 0 : contractUsersAll.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       key: item.id,
       value: item.id
@@ -281,8 +564,8 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
     shouldUpdate: function shouldUpdate(prev, cur) {
       return prev.flowPriority !== cur.flowPriority;
     }
-  }, function (_ref2) {
-    var getFieldValue = _ref2.getFieldValue;
+  }, function (_ref4) {
+    var getFieldValue = _ref4.getFieldValue;
     var flowPriority = getFieldValue("flowPriority");
     if (flowPriority !== 3) return null;
     return /*#__PURE__*/React.createElement(Item, {
@@ -290,38 +573,52 @@ var QuestionnairesDefaultAgreementPlansContent = function QuestionnairesDefaultA
       name: "rank",
       label: "Qrup \u2116",
       rules: [{
-        required: false,
+        required: true,
         message: ""
       }, {
-        validator: function validator(_, value) {
-          if (!value) return Promise.resolve();
-          var numericValue = Number(value);
-          if (numericValue !== 1) return Promise.resolve();
-          var existsRank1 = DefaultAgreementPlansAll === null || DefaultAgreementPlansAll === void 0 ? void 0 : DefaultAgreementPlansAll.some(function (item) {
-            return item.rank === 1 && (!editingRecord || item.id !== editingRecord.id);
-          });
-          return existsRank1 ? Promise.reject("Yalnız bir qrup 1 ola bilər!") : Promise.resolve();
-        }
+        validator: function () {
+          var _validator = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_, value) {
+            var numericValue;
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  if (!(value === undefined || value === null || value === "")) {
+                    _context3.next = 2;
+                    break;
+                  }
+                  throw new Error("");
+                case 2:
+                  numericValue = Number(value);
+                  if (!Number.isNaN(numericValue)) {
+                    _context3.next = 5;
+                    break;
+                  }
+                  throw new Error("");
+                case 5:
+                  if (!(numericValue < 3)) {
+                    _context3.next = 7;
+                    break;
+                  }
+                  throw new Error("Qrup № 3-dən kiçik ola bilməz!");
+                case 7:
+                  return _context3.abrupt("return", true);
+                case 8:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _callee3);
+          }));
+          function validator(_x4, _x5) {
+            return _validator.apply(this, arguments);
+          }
+          return validator;
+        }()
       }]
     }, /*#__PURE__*/React.createElement(Input, {
       type: "number",
       size: "md"
     }));
-  }), /*#__PURE__*/React.createElement(Item, {
-    rules: [{
-      required: true,
-      message: ""
-    }],
-    name: "internalStructureId",
-    label: "Daxili Struktur"
-  }, /*#__PURE__*/React.createElement(Select, {
-    size: "md"
-  }, internalStructureAll === null || internalStructureAll === void 0 ? void 0 : internalStructureAll.map(function (item) {
-    return /*#__PURE__*/React.createElement(Option, {
-      key: item.id,
-      value: item.id
-    }, item.name);
-  })))), /*#__PURE__*/React.createElement(DeleteModal, {
+  })), /*#__PURE__*/React.createElement(DeleteModal, {
     onCancel: function onCancel() {
       return dispatch(setDeleteModalVisible(false));
     },

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

@@ -11,7 +11,7 @@ export var getStreetColumns = function getStreetColumns(onEditClick, onDelete, o
     ellipsis: true,
     width: 35
   }, {
-    title: "Daxili Strukturlar",
+    title: "Şablon strukturlar",
     dataIndex: "name",
     width: innerW,
     disabled: true,

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

@@ -178,7 +178,7 @@ var QuestionnairesInternalStructureContent = function QuestionnairesInternalStru
     className: style.content
   }, /*#__PURE__*/React.createElement("div", {
     className: style.table_header
-  }, /*#__PURE__*/React.createElement("h2", null, "Daxili Strukturlar"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("h2", null, "\u015Eablon strukturlar"), /*#__PURE__*/React.createElement("div", {
     className: style.buttons
   }, /*#__PURE__*/React.createElement(ColSort, {
     columns: columns,

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

@@ -8141,7 +8141,7 @@ _defineProperty(Services, "getDefaultAgreementPlans", /*#__PURE__*/function () {
       while (1) switch (_context429.prev = _context429.next) {
         case 0:
           _context429.next = 2;
-          return api.get("/defaultagreementplans/".concat(size, "/page/").concat(page, "?visibility=").concat(visibility, "&name=").concat(query === null || query === void 0 ? void 0 : query.name));
+          return api.get("/defaultagreementplans/".concat(size, "/page/").concat(page, "?visibility=").concat(visibility, "&name=").concat(query === null || query === void 0 ? void 0 : query.name, "&internalStructureId=").concat(query === null || query === void 0 ? void 0 : query.internalStructureId));
         case 2:
           response = _context429.sent;
           return _context429.abrupt("return", response === null || response === void 0 ? void 0 : response.data);

package/package.json

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