forked from apache/superset
-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: login button does not render (apache#19685)
* fix: login button does not render * add type guard (cherry picked from commit 2ba484f)
- Loading branch information
1 parent
59dda1f
commit 2cf0a32
Showing
3 changed files
with
90 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,10 +16,54 @@ | |
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes'; | ||
import { | ||
UndefinedUser, | ||
UserWithPermissionsAndRoles, | ||
} from 'src/types/bootstrapTypes'; | ||
import Dashboard from 'src/types/Dashboard'; | ||
import Owner from 'src/types/Owner'; | ||
import findPermission, { canUserEditDashboard } from './findPermission'; | ||
import findPermission, { | ||
canUserEditDashboard, | ||
isUserAdmin, | ||
} from './findPermission'; | ||
|
||
const ownerUser: UserWithPermissionsAndRoles = { | ||
createdOn: '2021-05-12T16:56:22.116839', | ||
email: '[email protected]', | ||
firstName: 'Test', | ||
isActive: true, | ||
isAnonymous: false, | ||
lastName: 'User', | ||
userId: 1, | ||
username: 'owner', | ||
permissions: {}, | ||
roles: { Alpha: [['can_write', 'Dashboard']] }, | ||
}; | ||
|
||
const adminUser: UserWithPermissionsAndRoles = { | ||
...ownerUser, | ||
roles: { | ||
...(ownerUser?.roles || {}), | ||
Admin: [['can_write', 'Dashboard']], | ||
}, | ||
userId: 2, | ||
username: 'admin', | ||
}; | ||
|
||
const outsiderUser: UserWithPermissionsAndRoles = { | ||
...ownerUser, | ||
userId: 3, | ||
username: 'outsider', | ||
}; | ||
|
||
const owner: Owner = { | ||
first_name: 'Test', | ||
id: ownerUser.userId, | ||
last_name: 'User', | ||
username: ownerUser.username, | ||
}; | ||
|
||
const undefinedUser: UndefinedUser = {}; | ||
|
||
describe('findPermission', () => { | ||
it('findPermission for single role', () => { | ||
|
@@ -70,42 +114,6 @@ describe('findPermission', () => { | |
}); | ||
|
||
describe('canUserEditDashboard', () => { | ||
const ownerUser: UserWithPermissionsAndRoles = { | ||
createdOn: '2021-05-12T16:56:22.116839', | ||
email: '[email protected]', | ||
firstName: 'Test', | ||
isActive: true, | ||
isAnonymous: false, | ||
lastName: 'User', | ||
userId: 1, | ||
username: 'owner', | ||
permissions: {}, | ||
roles: { Alpha: [['can_write', 'Dashboard']] }, | ||
}; | ||
|
||
const adminUser: UserWithPermissionsAndRoles = { | ||
...ownerUser, | ||
roles: { | ||
...ownerUser.roles, | ||
Admin: [['can_write', 'Dashboard']], | ||
}, | ||
userId: 2, | ||
username: 'admin', | ||
}; | ||
|
||
const outsiderUser: UserWithPermissionsAndRoles = { | ||
...ownerUser, | ||
userId: 3, | ||
username: 'outsider', | ||
}; | ||
|
||
const owner: Owner = { | ||
first_name: 'Test', | ||
id: ownerUser.userId, | ||
last_name: 'User', | ||
username: ownerUser.username, | ||
}; | ||
|
||
const dashboard: Dashboard = { | ||
id: 1, | ||
dashboard_title: 'Test Dash', | ||
|
@@ -136,9 +144,7 @@ describe('canUserEditDashboard', () => { | |
it('rejects missing roles', () => { | ||
// in redux, when there is no user, the user is actually set to an empty object, | ||
// so we need to handle missing roles as well as a missing user.s | ||
expect( | ||
canUserEditDashboard(dashboard, {} as UserWithPermissionsAndRoles), | ||
).toEqual(false); | ||
expect(canUserEditDashboard(dashboard, {})).toEqual(false); | ||
}); | ||
it('rejects "admins" if the admin role does not have edit rights for some reason', () => { | ||
expect( | ||
|
@@ -149,3 +155,15 @@ describe('canUserEditDashboard', () => { | |
).toEqual(false); | ||
}); | ||
}); | ||
|
||
test('isUserAdmin returns true for admin user', () => { | ||
expect(isUserAdmin(adminUser)).toEqual(true); | ||
}); | ||
|
||
test('isUserAdmin returns false for undefined user', () => { | ||
expect(isUserAdmin(undefinedUser)).toEqual(false); | ||
}); | ||
|
||
test('isUserAdmin returns false for non-admin user', () => { | ||
expect(isUserAdmin(ownerUser)).toEqual(false); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters