Merge pull request '[AURORA-1070] - Ошибка редактирования количества пользователей в Подразделении СПП/РФ' (#35) from AURORA-1070 into test

Reviewed-on: #35

web/src/api/users.js

@@ -7,9 +7,9 @@ export const UsersApi = {
   getById(userId) {
     return api.get(`/users/${userId}`).then((r) => r.data);
   },
-  getAll() {
+  getAll(params = {}) {
     return api
-      .get("/users/", { params: { limit: 1000, skip: 0, load_orgs: true } })
+      .get("/users/", { params: { limit: 1000, skip: 0, ...params } })
       .then((r) => r.data);
   },
   update(idUser, data) {

web/src/pages/AdminPanel/SppsPage/ModalChangeUsersInSsp.jsx

@@ -6,15 +6,20 @@ import { UsersApi } from '../../../api/users';
 import { toast } from 'react-toastify';
 import { AutocompleteForChangeOptions } from '../components/AutocompleteForChangeOptions';
 
-export const ModalChangeUsersInSsp = ({ open, onClose, ssp, onEdit }) => {
+export const ModalChangeUsersInSsp = ({
+  open,
+  onClose,
+  ssp,
+  onUsersCountChange,
+}) => {
   const [users, setUsers] = useState([]);
   const [usersDataForUpdate, setUsersDataForUpdate] = useState({
     update: [],
     delete: [],
   });
-
   const [allUsers, setAllUsers] = useState([]);
   const [loadingUsers, setLoadingUsers] = useState(false);
+
   useEffect(() => {
     UsersApi.getAll()
       .then((data) => {
@@ -58,14 +63,66 @@ export const ModalChangeUsersInSsp = ({ open, onClose, ssp, onEdit }) => {
       });
   }, [open, ssp]);
 
-  const handleClickSave = () => {
-    onEdit?.(ssp, usersDataForUpdate);
+  const deleteUserFromSsp = async (user) => {
+    try {
+      const data = await SspApi.deleteManySsps(user.id, { ssp_ids: [ssp.id] });
+      if (!data.success) {
+        toast.error(data?.message || 'Ошибка удаления пользователя из ССП');
+        return false;
+      }
+      return true;
+    } catch (error) {
+      const msg =
+        error?.response?.data?.message || error?.response?.data?.detail;
+      toast.error(msg || 'Ошибка удаления пользователя из ССП');
+      return false;
+    }
+  };
+
+  const addUserToSsp = async (user) => {
+    try {
+      const data = await SspApi.putManySsps(user.id, { ssp_ids: [ssp.id] });
+      if (!data.success) {
+        toast.error(data?.message || 'Ошибка добавления пользователя');
+        return false;
+      }
+      return true;
+    } catch (error) {
+      const msg =
+        error?.response?.data?.message || error?.response?.data?.detail;
+      toast.error(msg || 'Ошибка добавления пользователя');
+      return false;
+    }
+  };
+
+  const handleClickSave = async () => {
+    let added = 0;
+    let removed = 0;
+
+    for (const user of usersDataForUpdate.update) {
+      if (await addUserToSsp(user)) {
+        added += 1;
+      }
+    }
+
+    for (const user of usersDataForUpdate.delete) {
+      if (await deleteUserFromSsp(user)) {
+        removed += 1;
+      }
+    }
+
+    const delta = added - removed;
+    if (delta !== 0) {
+      onUsersCountChange?.(ssp.id, delta);
+    }
+
     onClose?.();
   };
 
-  const handleChangeUsersList = (dataForUpdate) => {
-    setUsersDataForUpdate(dataForUpdate);
+  const handleChangeUsersList = (updater) => {
+    setUsersDataForUpdate(updater);
   };
+
   if (!ssp) return;
   return (
     <Modal

web/src/pages/AdminPanel/SppsPage/SppsPage.jsx

@@ -376,7 +376,7 @@ const SspsPage = () => {
         open={openModalUsersinSspChange}
         onClose={handleCloseModalUsersInSspChange}
         ssp={sspForChangeUsers}
-        onEdit={handleUpdateUsers}
+        onUsersCountChange={adjustSspUsersCount}
       />
       <ModalEditSsp
         open={openModalEdit}

web/src/pages/AdminPanel/UsersPage/UsersPage.jsx

@@ -34,7 +34,7 @@ const UsersPage = () => {
   const loadUsers = async () => {
     setLoading(true);
     try {
-      const data = await UsersApi.getAll();
+      const data = await UsersApi.getAll({ load_orgs: true });
       if (!data.success) {
         toast.error('Ошибка получения пользователей  ' + data.message);
         return;

web/src/pages/AdminPanel/components/AutocompleteForChangeOptions.jsx

@@ -37,7 +37,7 @@ export const AutocompleteForChangeOptions = ({
     if (value) {
       const newSelected = [...selected, value];
       setSelected(newSelected);
-      onChange?.((prev) => ({ ...prev, update: newSelected }));
+      onChange?.((prev) => ({ ...prev, update: [...prev.update, value] }));
 
       const newAvailable = available.filter((item) => item.id !== value.id);
       setAvailable(newAvailable);
@@ -49,16 +49,23 @@ export const AutocompleteForChangeOptions = ({
 
   const handleRemove = (id) => {
     const itemToRemove = selected.find((s) => s.id === id);
-    if (itemToRemove) {
-      const newSelected = selected.filter((s) => s.id !== id);
-      setSelected(newSelected);
+    if (!itemToRemove) return;
 
-      setAvailable([...available, itemToRemove]);
+    const newSelected = selected.filter((s) => s.id !== id);
+    setSelected(newSelected);
+    setAvailable([...available, itemToRemove]);
 
+    const wasInitial = values.some((v) => v.id === id);
+
+    if (wasInitial) {
       onChange?.((prev) => ({
         ...prev,
         delete: [...prev.delete, itemToRemove],
-        update: [...newSelected],
+      }));
+    } else {
+      onChange?.((prev) => ({
+        ...prev,
+        update: prev.update.filter((u) => u.id !== id),
       }));
     }
   };
@@ -130,7 +137,7 @@ export const AutocompleteForChangeOptions = ({
             />
           )}
           renderOption={(props, option) => (
-            <li {...props} style={{ padding: '4px 12px', minHeight: '36px' }}>
+            <li {...props} style={{ padding: '4px 12px', minHeight: '36px' }} key={option.id}>
               <Box
                 sx={{
                   display: 'flex',