Skip to content

[FIX] UI is not rendering when trying to edit an user #17972

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

Merged
ggazzo merged 2 commits into from
Jun 20, 2020
Merged

[FIX] UI is not rendering when trying to edit an user #17972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2fd2f
[FIX] UI is crashing when trying to edit an user
pierre-lehnen-rc Jun 19, 2020
108a0a7
Fix review
ggazzo Jun 20, 2020
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
18 changes: 14 additions & 4 deletions client/admin/users/CustomFieldsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useMemo, useEffect } from 'react';
import React, { useMemo, useEffect, useState } from 'react';
import { TextInput, Select, Field, Divider, Box } from '@rocket.chat/fuselage';

import { useSetting } from '../../contexts/SettingsContext';
Expand Down Expand Up @@ -59,17 +59,27 @@ export default function CustomFieldsForm({ customFieldsData, setCustomFieldsData
const customFieldsJson = useSetting('Accounts_CustomFields');

// TODO: add deps. Left this way so that a possible change in the setting can't crash the page (useForm generates states automatically)
const customFields = useMemo(() => JSON.parse(customFieldsJson || '{}'), []);
const [customFields] = useState(() => {
try {
JSON.parse(customFieldsJson || '{}');
} catch {
return {};
}
});

const hasCustomFields = Boolean(Object.values(customFields).length);
const defaultFields = useMemo(() => Object.entries(customFields).reduce((data, [key, value]) => { data[key] = value.defaultValue ?? ''; return data; }, {}), []);

const { values, handlers } = useForm({ ...defaultFields, ...customFieldsData });

useEffect(() => {
setCustomFieldsData(values);
if (hasCustomFields) {
setCustomFieldsData(values);
}
// TODO: remove stringify. Is needed to avoid infinite rendering
}, [JSON.stringify(values)]);

if (!Object.values(customFields).length) {
if (!hasCustomFields) {
return null;
}

Expand Down