Skip to content
Snippets Groups Projects
Commit e0c67fbb authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch '123-view-user-uuid-in-dashboard' into 'main'

Resolve "View user UUID in dashboard"

Closes #123

See merge request !97
parents 841f07d9 7e0d51cf
No related branches found
No related tags found
1 merge request!97Resolve "View user UUID in dashboard"
Pipeline #37861 passed with stages
in 3 minutes and 31 seconds
......@@ -59,6 +59,9 @@ function flow_login() {
var messages_html = render_messages(data);
$('#contentMessages').html(messages_html);
$('#totp_code').focus();
$('#identifier').focus();
},
complete: function (obj) {
// If we get a 410, the flow is expired, need to refresh the flow
......
......@@ -197,6 +197,11 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
</select>
</div>
</div>
{userId && (
<div className="sm:col-span-6">
<Input control={control} name="id" label="UUID" required={false} disabled />
</div>
)}
</>
)}
</div>
......
......@@ -10,7 +10,6 @@ export const getAuthToken = (state: State) => state.auth.token;
export const getCurrentUser = (state: State) => state.auth.userInfo;
export const getIsAdmin = (state: State) => {
window.console.log(state.auth.userInfo);
// check since old users wont have this
if (state.auth.userInfo) {
if (!state.auth.userInfo.app_roles) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment