change user_name still used as login and add display_name for dashboard view instead of username on login
This commit is contained in:
1 parent
7a562c18ec
commit
11b0ca26a5
33 files changed
+180
-145
No files matched your search
@@ -26,8 +26,8 @@ const {
|
||||
authState: {
|
||||
user: {
|
||||
id: 5,
|
||||
user_login: 'gm.user',
|
||||
user_name: 'gm.user',
|
||||
display_name: 'gm.user',
|
||||
status: 'gm' as string,
|
||||
managed_by: null as number | null,
|
||||
managed_by_name: null as string | null,
|
||||
@@ -85,8 +85,8 @@ describe('SettingsPage city site registry', () => {
|
||||
refreshUserMock.mockReset();
|
||||
authState.user = {
|
||||
id: 5,
|
||||
user_login: 'gm.user',
|
||||
user_name: 'gm.user',
|
||||
display_name: 'gm.user',
|
||||
status: 'gm',
|
||||
managed_by: null,
|
||||
managed_by_name: null,
|
||||
@@ -129,13 +129,13 @@ describe('SettingsPage city site registry', () => {
|
||||
updated_at: '',
|
||||
});
|
||||
buhsMock.mockResolvedValue([
|
||||
{ id: 2, user_login: 'buh', user_name: 'buh', status: 'buh', created_at: '', updated_at: '' },
|
||||
{ id: 2, user_name: 'buh', display_name: 'buh', status: 'buh', created_at: '', updated_at: '' },
|
||||
]);
|
||||
usersListMock.mockResolvedValue([
|
||||
{
|
||||
id: 5,
|
||||
user_login: 'gm',
|
||||
user_name: 'gm',
|
||||
display_name: 'gm',
|
||||
status: 'gm',
|
||||
managed_by: 2,
|
||||
created_at: '',
|
||||
@@ -191,8 +191,8 @@ describe('SettingsPage city site registry', () => {
|
||||
it('shows pending GM confirmation for BUH', async () => {
|
||||
authState.user = {
|
||||
id: 2,
|
||||
user_login: 'buh',
|
||||
user_name: 'buh',
|
||||
display_name: 'buh',
|
||||
status: 'buh',
|
||||
managed_by: null,
|
||||
managed_by_name: null,
|
||||
@@ -204,8 +204,8 @@ describe('SettingsPage city site registry', () => {
|
||||
pendingMock.mockResolvedValue([
|
||||
{
|
||||
id: 5,
|
||||
user_login: 'gm.user',
|
||||
user_name: 'gm.user',
|
||||
display_name: 'gm.user',
|
||||
status: 'gm',
|
||||
created_at: '',
|
||||
updated_at: '',
|
||||
|
||||
Reference in new issue
Block a user