Skip to content

Commit 74f939a

Browse files
committed
Fix UI
1 parent ff6ae4a commit 74f939a

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

forge/db/views/User.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ module.exports = function (app) {
100100

101101
async function ssoManaged (users, team) {
102102
const list = {}
103-
for (u of users) {
103+
for (const u of users) {
104104
list[u.hashid] = await app.sso.isUserMembershipManaged(u, team)
105105
}
106106
return list

frontend/src/components/blueprints/BlueprintTile.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="ff-blueprint-tile--info">
1818
<label>{{ blueprint.name }}</label>
1919
<p v-if="blueprint.description" :title="blueprint.description">
20-
<ff-markdown-viewer :content="blueprint.description"/>
20+
<ff-markdown-viewer :content="blueprint.description" />
2121
</p>
2222
</div>
2323
<div class="ff-blueprint-tile--actions justify-between">

frontend/src/pages/team/Members/General.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,21 @@
1919
</template>
2020
<template v-if="canEditUser" #context-menu="{row}">
2121
<ff-kebab-item
22-
v-if="(hasPermission('team:user:change-role') && !requiresBilling) || isAdminUser"
22+
v-if="((hasPermission('team:user:change-role') && !requiresBilling) || isAdminUser) && !ssoManaged({row})"
2323
data-action="member-change-role"
2424
label="Change Role" @click="changeRoleDialog(row)"
2525
/>
2626
<ff-kebab-item
27-
v-if="hasPermission('team:user:remove') || isAdminUser"
27+
v-if="(hasPermission('team:user:remove') || isAdminUser) && !ssoManaged({row})"
2828
data-action="member-remove-from-team"
2929
label="Remove From Team"
3030
kind="danger"
3131
@click="removeUserDialog(row)"
3232
/>
33+
<ff-kebab-item
34+
v-if="ssoManaged({row})"
35+
label="User role is SSO Managed"
36+
/>
3337
</template>
3438
</ff-data-table>
3539
</form>
@@ -236,6 +240,9 @@ export default {
236240
},
237241
onApplicationRoleClick ({ application, user }) {
238242
this.$refs.editApplicationPermissionsDialog.show(user, application)
243+
},
244+
ssoManaged (row) {
245+
return row.row.ssoManaged
239246
}
240247
}
241248
}

0 commit comments

Comments
 (0)