Skip to content

fix: remove unsafe any in AddCustomSound and EditSound #38940

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
Agarwalchetan wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: remove unsafe any in AddCustomSound and EditSound #38940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f2ebee
fix: replace any with proper types in AddCustomSound and EditSound
Agarwalchetan Feb 23, 2026
d140540
chore: apply prettier formatting to customSounds files
Agarwalchetan Feb 23, 2026
3a86f23
fix: preserve validation toast when no sound file selected in AddCust…
Agarwalchetan Feb 23, 2026
05d1baf
fix: disable Save button in AddCustomSound when name or sound file is…
Agarwalchetan Feb 23, 2026
1bb2875
fix: add type narrowing guard in handleSave to satisfy TypeScript com…
Agarwalchetan Feb 23, 2026
03277d0
test(gazzodown): mock react-i18next and ui-contexts in Markup.spec to…
Agarwalchetan Feb 23, 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
12 changes: 8 additions & 4 deletions apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
const dispatchToastMessage = useToastMessageDispatch();

const [name, setName] = useState('');
const [sound, setSound] = useState<{ name: string }>();
const [sound, setSound] = useState<File>();

const uploadCustomSound = useMethod('uploadCustomSound');
const insertOrUpdateSound = useMethod('insertOrUpdateSound');
Expand All @@ -31,8 +31,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
const [clickUpload] = useSingleFileInput(handleChangeFile, 'audio/mp3');

const saveAction = useCallback(
// FIXME
async (name: string, soundFile: any) => {
async (name: string, soundFile: File) => {
const soundData = createSoundData(soundFile, name);
const validation = validate(soundData, soundFile) as Array<Parameters<typeof t>[0]>;

Expand Down Expand Up @@ -72,6 +71,11 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
);

const handleSave = useCallback(async () => {
if (!sound) {
// unreachable: Save button is disabled when !sound — guard exists for type narrowing only
return;
}

try {
const result = await saveAction(name, sound);
if (result) {
Expand Down Expand Up @@ -110,7 +114,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
<ContextualbarFooter>
<ButtonGroup stretch>
<Button onClick={close}>{t('Cancel')}</Button>
<Button primary onClick={handleSave}>
<Button primary onClick={handleSave} disabled={!sound || !name}>
{t('Save')}
</Button>
</ButtonGroup>
Expand Down
23 changes: 18 additions & 5 deletions apps/meteor/client/views/admin/customSounds/EditSound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ type EditSoundProps = {
};
};

type ExistingSound = {
_id: string;
name: string;
extension?: string;
};

type SoundFile = File | ExistingSound;

function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactElement {
const { t } = useTranslation();
const dispatchToastMessage = useToastMessageDispatch();
Expand Down Expand Up @@ -52,10 +60,15 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
const hasUnsavedChanges = useMemo(() => previousName !== name || previousSound !== sound, [name, previousName, previousSound, sound]);

const saveAction = useCallback(
// FIXME
async (sound: any) => {
const soundData = createSoundData(sound, name, { previousName, previousSound, _id, extension: sound.extension });
const validation = validate(soundData, sound);
async (sound: SoundFile) => {
const soundData = createSoundData(sound, name, {
previousName,
previousSound,
_id,
extension: sound instanceof File ? '' : (sound.extension ?? ''),
});
const soundFile = sound instanceof File ? sound : undefined;
const validation = validate(soundData, soundFile);
if (validation.length === 0) {
let soundId: string;
try {
Expand All @@ -68,7 +81,7 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
soundData._id = soundId;
soundData.random = Math.round(Math.random() * 1000);

if (sound && sound !== previousSound) {
if (sound instanceof File) {
dispatchToastMessage({ type: 'success', message: t('Uploading_file') });

const reader = new FileReader();
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/customSounds/lib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function validate(soundData: ICustomSoundData, soundFile?: ICustomSoundFi
}

export const createSoundData = (
soundFile: ICustomSoundFile,
soundFile: { name: string },
name: string,
previousData?: {
_id: string;
Expand Down
8 changes: 8 additions & 0 deletions packages/gazzodown/src/Markup.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ jest.mock('highlight.js', () => ({
highlightElement: (): void => undefined,
}));

jest.mock('react-i18next', () => ({
useTranslation: () => ({ t: (key: string) => key }),
}));

jest.mock('@rocket.chat/ui-contexts', () => ({
useToastMessageDispatch: () => (): void => undefined,
}));

it('renders empty', () => {
const { container } = render(<Markup tokens={[]} />);
expect(container).toBeEmptyDOMElement();
Expand Down
Loading