From 9e3845cdeb5a0c00ffafa2722e577575e562d294 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 23 Sep 2022 16:10:40 +0100 Subject: [PATCH] Make portal text consistent and hide upgrade prompts when you already have access --- .../builder/portal/manage/groups/index.svelte | 11 ++++++----- .../builder/portal/manage/plugins/index.svelte | 2 +- .../pages/builder/portal/manage/users/index.svelte | 3 +-- .../pages/builder/portal/settings/upgrade.svelte | 14 ++++++-------- .../src/pages/builder/portal/settings/usage.svelte | 8 ++++---- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte index 1eb4f63089..71149f6b76 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/groups/index.svelte @@ -99,10 +99,12 @@ {/if} - Easily assign and manage your users' access with user groups - {#if !$auth.accountPortalAccess} - Contact your account holder to upgrade - {/if} + + Easily assign and manage your users' access with user groups. + {#if !$auth.accountPortalAccess && !$licensing.groupsEnabled} + Contact your account holder to upgrade your plan. + {/if} +
@@ -147,7 +149,6 @@ data={filteredGroups} allowEditColumns={false} allowEditRows={false} - showHeaderBorder={false} {customRenderers} /> diff --git a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte index c03232d091..b1f2480c28 100644 --- a/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/plugins/index.svelte @@ -45,7 +45,7 @@ Plugins - Add your own custom datasources and components + Add your own custom datasources and components. diff --git a/packages/builder/src/pages/builder/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte index 68bd44857c..24954e025a 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte @@ -213,7 +213,7 @@ Users - Add users and control who gets access to your published apps + Add users and control who gets access to your published apps.
@@ -254,7 +254,6 @@ allowEditColumns={false} allowEditRows={false} allowSelectRows={true} - showHeaderBorder={false} {customRenderers} />