From d005d885eb28baf5327a0ddce673138c5d2ffbae Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Mon, 21 Oct 2019 03:15:53 -0300 Subject: [PATCH] Apply Fuselage components to GroupPage --- client/components/admin/settings/GroupPage.js | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/client/components/admin/settings/GroupPage.js b/client/components/admin/settings/GroupPage.js index 7868f7f76bc..9541b439eec 100644 --- a/client/components/admin/settings/GroupPage.js +++ b/client/components/admin/settings/GroupPage.js @@ -1,6 +1,6 @@ +import { Button, Paragraph } from '@rocket.chat/fuselage'; import React from 'react'; -import { Button } from '../../basic/Button'; import { Header } from '../../header/Header'; import { useTranslation } from '../../providers/TranslationProvider'; import { useGroup, useBulkActions } from './EditingState'; @@ -17,31 +17,42 @@ export function GroupPage({ children, headerButtons }) { ; } - const handleCancelClick = () => { + const handleSubmit = (event) => { + event.preventDefault(); + save(group); + }; + + const handleCancelClick = (event) => { + event.preventDefault(); cancel(group); }; - const handleSaveClick = () => { + const handleSaveClick = (event) => { + event.preventDefault(); save(group); }; - return
+ return
- {group.changed && } - + {group.changed && } + {headerButtons}
- {t.has(group.i18nDescription) &&
-

{t(group.i18nDescription)}

-
} + {t.has(group.i18nDescription) && {t(group.i18nDescription)}}
{children}
-
; + ; }