Skip to content

fix: Prevent whitespace-only names in Create Discussion #38435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dnyanesh-29 wants to merge 5 commits into
base: develop
Choose a base branch
from
+19 −11
Open

fix: Prevent whitespace-only names in Create Discussion #38435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44ea40d
fix: vertically align app icons in GenericMenu
Dnyanesh-29 Jan 27, 2026
9a05b1f
fix: update avatar URL placeholder to example format
Dnyanesh-29 Jan 28, 2026
17939ca
fix: prevent creating discussions with whitespace-only names
Dnyanesh-29 Jan 30, 2026
386295a
Merge branch 'develop' into fix/discussion-whitespace-validation
Dnyanesh-29 Jan 30, 2026
ec53e8b
Refactor validation rules for discussion name field
Dnyanesh-29 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ const CreateDiscussion = ({
<Controller
name='name'
control={control}
rules={{ required: t('Required_field', { field: t('Name') }) }}
rules={{
required: t('Required_field', { field: t('Name') }),
validate: (value) => value.trim().length > 0 || t('Required_field', { field: t('Name') })
}}
render={({ field }) => (
<TextInput
id={discussionNameId}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function UserAvatarEditor({ currentUsername, username, setAvatarObj, name, disab
<TextInput
id={imageUrlField}
flexGrow={0}
placeholder={t('Use_url_for_avatar')}
placeholder="https://example.com/avatar.png"
value={avatarFromUrl}
mis={4}
onChange={handleAvatarFromUrlChange}
Expand Down
23 changes: 14 additions & 9 deletions packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage';
import { Box, MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage'; // 1. Added Box import
import type { ComponentProps, MouseEvent, ReactNode } from 'react';

export type GenericMenuItemProps = {
Expand All @@ -17,13 +17,18 @@ export type GenericMenuItemProps = {
};

const GenericMenuItem = ({ icon, iconColor, content, addon, status, gap, tooltip }: GenericMenuItemProps) => (
<>
{gap && <MenuItemColumn />}
{icon && <MenuItemIcon name={icon} color={iconColor} />}
{status && <MenuItemColumn>{status}</MenuItemColumn>}
{content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
{addon && <MenuItemInput>{addon}</MenuItemInput>}
</>
<>
{gap && <MenuItemColumn />}
{/* 2. Wrap the icon in a flexbox container */}
{icon && (
<Box display='flex' alignItems='center' justifyContent='center' width='x20'>
<MenuItemIcon name={icon} color={iconColor} />
</Box>
)}
{status && <MenuItemColumn>{status}</MenuItemColumn>}
{content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
{addon && <MenuItemInput>{addon}</MenuItemInput>}
</>
);

export default GenericMenuItem;
export default GenericMenuItem;