MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace license with feature

This commit is contained in:
adrinr 2023-03-28 11:11:16 +01:00
parent b50e4df28c
commit 14347096e4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/pages/builder/portal/users/groups/index.svelte
View File

@ -13,7 +13,7 @@
Search, Search,
notifications, notifications,
} from "@budibase/bbui" } from "@budibase/bbui"
import { groups, auth, licensing, admin } from "stores/portal" import { groups, auth, licensing, admin, features } from "stores/portal"
import { onMount } from "svelte" import { onMount } from "svelte"
import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte" import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
import { cloneDeep } from "lodash/fp" import { cloneDeep } from "lodash/fp"
@ -107,7 +107,7 @@
<div class="controls"> <div class="controls">
<ButtonGroup> <ButtonGroup>
{#if $licensing.groupsEnabled} {#if $licensing.groupsEnabled}
{#if !$licensing.scimEnabled} {#if !$features.isScimEnabled}
<!--Show the group create button--> <!--Show the group create button-->
<Button disabled={readonly} cta on:click={showCreateGroupModal}> <Button disabled={readonly} cta on:click={showCreateGroupModal}>
Add group Add group

4
packages/builder/src/pages/builder/portal/users/users/[userId].svelte
View File

@ -19,7 +19,7 @@
Table, Table,
} from "@budibase/bbui" } from "@budibase/bbui"
import { onMount, setContext } from "svelte" import { onMount, setContext } from "svelte"
import { users, auth, groups, apps, licensing } from "stores/portal" import { users, auth, groups, apps, licensing, features } from "stores/portal"
import { roles } from "stores/backend" import { roles } from "stores/backend"
import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"
import UserGroupPicker from "components/settings/UserGroupPicker.svelte" import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
@ -86,7 +86,7 @@
let user let user
let loaded = false let loaded = false
const scimEnabled = $licensing.scimEnabled const scimEnabled = $features.isScimEnabled
$: isSSO = !!user?.provider $: isSSO = !!user?.provider
$: readonly = !$auth.isAdmin || scimEnabled $: readonly = !$auth.isAdmin || scimEnabled

2
packages/builder/src/pages/builder/portal/users/users/index.svelte
View File

@ -238,7 +238,7 @@
</Layout> </Layout>
<Divider /> <Divider />
<div class="controls"> <div class="controls">
{#if !$features.isScimEnabled} {#if !readonly}
<ButtonGroup> <ButtonGroup>
<Button disabled={readonly} on:click={createUserModal.show} cta> <Button disabled={readonly} on:click={createUserModal.show} cta>
Add users Add users