Преглед изворни кода

Merge pull request #18564 from iPagar/empty-names

fix: validate folder and channel names before creation
Tim Baek пре 3 месеци
родитељ
комит
82c45b721e

+ 8 - 1
src/lib/components/layout/Sidebar.svelte

@@ -129,7 +129,8 @@
 	};
 
 	const createFolder = async ({ name, data }) => {
-		if (name === '') {
+		name = name?.trim();
+		if (!name) {
 			toast.error($i18n.t('Folder name cannot be empty.'));
 			return;
 		}
@@ -479,6 +480,12 @@
 <ChannelModal
 	bind:show={showCreateChannel}
 	onSubmit={async ({ name, access_control }) => {
+		name = name?.trim();
+		if (!name) {
+			toast.error($i18n.t('Channel name cannot be empty.'));
+			return;
+		}
+
 		const res = await createNewChannel(localStorage.token, {
 			name: name,
 			access_control: access_control

+ 1 - 0
src/lib/i18n/locales/en-US/translation.json

@@ -221,6 +221,7 @@
 	"Channel": "",
 	"Channel deleted successfully": "",
 	"Channel Name": "",
+	"Channel name cannot be empty.": "",
 	"Channel updated successfully": "",
 	"Channels": "",
 	"Character": "",

+ 1 - 0
src/lib/i18n/locales/ru-RU/translation.json

@@ -221,6 +221,7 @@
 	"Channel": "Канал",
 	"Channel deleted successfully": "Канал успешно удалён",
 	"Channel Name": "Название канала",
+	"Channel name cannot be empty.": "Название канала не может быть пустым.",
 	"Channel updated successfully": "Канал успешно обновлён",
 	"Channels": "Каналы",
 	"Character": "Символ",