Skip to content
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.

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

feat: New users page contextual bar user form #32041

Merged
merged 24 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
020b193
feat: :sparkles: Implement new email field
rique223 Mar 20, 2024
8af72c6
feat: :sparkles: Add password verifier and refactor password field
rique223 Mar 21, 2024
e5fe07a
refactor: :sparkles: Implement hide custom fields button
rique223 Mar 26, 2024
2fab100
feat: :sparkles: Implement "user created" step for new user form
rique223 Apr 4, 2024
04b7d1d
Fix tests
rique223 Apr 8, 2024
a8e664d
feat: :sparkles: Hide join default channels on user editing page
rique223 Jul 30, 2024
f9c4fee
fix: :bug: Fix MultiSelectCustom search bar style
rique223 Jul 31, 2024
431fb68
refactor: :recycle: Refactor UsersTableFilters to remove FilterByText
rique223 Aug 1, 2024
3115dfb
Rollback infoPanelTitle wrong style and unnecessary user creation count
rique223 Aug 2, 2024
70a8b5b
Replace isUserFederated with user.federated
rique223 Aug 5, 2024
a84c866
refactor: :recycle: Add random password, email verification and welco…
rique223 Aug 8, 2024
7f78d21
Merge branch 'develop' into feat/new-user-panel-contextual
rique223 Aug 8, 2024
8107060
test: :white_check_mark: Correct administration.sepc.ts tests to foll…
rique223 Aug 9, 2024
460cd37
refactor: :recycle:
rique223 Aug 12, 2024
8d95dd2
refactor: :speech_balloon: Update copies to better follow figma
rique223 Aug 12, 2024
40ec0aa
fix: :bug: Fix roles filter not scrolling on smaller screens and z-in…
rique223 Aug 13, 2024
aa801fc
refactor: :speech_balloon: Change email required text
rique223 Aug 13, 2024
58437d6
style: :lipstick: Use pixels for CategoryDropDownList borderRadius
rique223 Aug 13, 2024
d6c1624
refactor: :speech_balloon: Change invalid email address text
rique223 Aug 13, 2024
80cdee6
refactor: :recycle: Improve users table GenericNoResults
rique223 Aug 14, 2024
cc73270
Merge branch 'develop' into feat/new-user-panel-contextual
rique223 Aug 15, 2024
906ab41
style: :lipstick: Change width percentage to flexBasis on user create…
rique223 Aug 16, 2024
3c427af
Merge branch 'feat/new-user-panel-contextual' of github.com:RocketCha…
rique223 Aug 16, 2024
2df65e3
Merge branch 'develop' into feat/new-user-panel-contextual
kodiakhq[bot] Aug 22, 2024
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
2 changes: 1 addition & 1 deletion apps/meteor/client/components/UserCard/UserCardInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { ReactElement, ComponentProps } from 'react';
import React from 'react';

const UserCardInfo = (props: ComponentProps<typeof Box>): ReactElement => (
<Box mbe={8} is='span' fontScale='p2' color='hint' withTruncatedText {...props} />
<Box mb={8} is='span' fontScale='p2' color='hint' withTruncatedText {...props} />
);

export default UserCardInfo;
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction
</Box>
<Box minWidth='x224' m='x4'>
<MultiSelectCustom
dropdownOptions={roomTypeFilterStructure as OptionProp[]}
defaultTitle={'All_rooms' as any}
dropdownOptions={roomTypeFilterStructure}
defaultTitle='All_rooms'
selectedOptionsTitle='Rooms'
setSelectedOptions={handleRoomTypeChange}
selectedOptions={roomTypeSelectedOptions}
Expand Down
29 changes: 29 additions & 0 deletions apps/meteor/client/views/admin/users/AdminUserCreated.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { Button, ButtonGroup, ContextualbarFooter } from '@rocket.chat/fuselage';
import { useRouter } from '@rocket.chat/ui-contexts';
import React from 'react';
import { useTranslation } from 'react-i18next';

import { ContextualbarEmptyContent } from '../../../components/Contextualbar';

const AdminUserCreated = ({ uid }: { uid: string }) => {
const { t } = useTranslation();
const router = useRouter();

return (
<>
<ContextualbarEmptyContent icon='user' title={t('You_have_created_user')} />
<ContextualbarFooter>
<ButtonGroup stretch>
<Button type='reset' w='50%' onClick={() => router.navigate(`/admin/users/new`)}>
rique223 marked this conversation as resolved.
Show resolved Hide resolved
{t('Add_more_users')}
</Button>
<Button primary w='50%' onClick={() => router.navigate(`/admin/users/info/${uid}`)}>
rique223 marked this conversation as resolved.
Show resolved Hide resolved
{t('Done')}
</Button>
</ButtonGroup>
</ContextualbarFooter>
</>
);
};

export default AdminUserCreated;
Loading
Loading