RocketChat#752 Закрытие формы создания рездала и пункта после сохранения

sibdigital · Nov 10, 2020 · 8e792b5 · 8e792b5
1 parent 6977b45
commit 8e792b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/app/models/server/models/Protocols.js b/app/models/server/models/Protocols.js
@@ -65,7 +65,7 @@ class Protocols extends Base {
 		if (data.sections) {
 			data.sections = data.sections.map((section) => {
 				if (section._id === sectionData._id) {
-					return { ...sectionData, items: section.items };
+					return { ...sectionData, inum: section.inum, items: section.items };
 				}
 				return section;
 			});
@@ -137,7 +137,7 @@ class Protocols extends Base {
 				if (section._id === sectionId) {
 					section.items = section.items.map((item) => {
 						if (item._id === itemData._id) {
-							return { ...itemData };
+							return { ...itemData, inum: item.inum };
 						}
 						return item;
 					})

diff --git a/app/protocols/client/views/AddItem.js b/app/protocols/client/views/AddItem.js
@@ -46,12 +46,12 @@ export function AddItem({ goToNew, close, onChange, ...props }) {
 				expireAt
 			);
 			dispatchToastMessage({ type: 'success', message: t('Item_Added_Successfully') });
-			goToNew(sectionId, result)();
+			close();
 			onChange();
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
-	}, [dispatchToastMessage, goToNew, number, name, responsible, expireAt, onChange, saveAction, t]);
+	}, [dispatchToastMessage, close, number, name, responsible, expireAt, onChange, saveAction, t]);
 
 	return <VerticalBar.ScrollableContent {...props}>
 		<Field>

diff --git a/app/protocols/client/views/AddSection.js b/app/protocols/client/views/AddSection.js
@@ -38,12 +38,12 @@ export function AddSection({ goToNew, close, onChange, ...props }) {
 				name
 			);
 			dispatchToastMessage({ type: 'success', message: t('Section_Added_Successfully') });
-			goToNew(result)();
+			close()
 			onChange();
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
-	}, [dispatchToastMessage, goToNew, number, name, onChange, saveAction, t]);
+	}, [dispatchToastMessage, close, number, name, onChange, saveAction, t]);
 
 	return <VerticalBar.ScrollableContent {...props}>
 		<Field>

diff --git a/app/protocols/client/views/EditItem.js b/app/protocols/client/views/EditItem.js
@@ -94,8 +94,9 @@ function EditItemWithData({ close, onChange, protocol, sectionId, itemId, ...pro
 
 	const handleSave = useCallback(async () => {
 		saveAction(number, name, responsible, expireAt);
+		close();
 		onChange();
-	}, [saveAction, onChange]);
+	}, [saveAction, close, onChange]);
 
 	return <VerticalBar.ScrollableContent {...props}>
 		<Field>

diff --git a/app/protocols/client/views/EditSection.js b/app/protocols/client/views/EditSection.js
@@ -81,8 +81,9 @@ function EditSectionWithData({ close, onChange, protocol, sectionId, ...props })
 
 	const handleSave = useCallback(async () => {
 		saveAction(number, name);
+		close();
 		onChange();
-	}, [saveAction, onChange]);
+	}, [saveAction, close, onChange]);
 
 	return <VerticalBar.ScrollableContent {...props}>
 		<Field>