Skip to content

Commit 3b56110

Browse files
authored
Merge pull request #19038 from aakashgautam-git/fix/18511-calculation-view-screen-usage
fix:display screens button in calculation view
2 parents db179c6 + 77bc00f commit 3b56110

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import type { Screen, ScreenUsage } from "@budibase/types"
77
const dispatch = createEventDispatcher<{ generate: void }>()
88
9+
export let showGenerateAppScreenButton = true
10+
911
const { datasource } = getContext("grid")
1012
1113
let popover: ScreensPopover
@@ -44,8 +46,10 @@
4446
showCount
4547
>
4648
<svelte:fragment slot="footer">
47-
<Button secondary icon="browser" on:click={generateScreen}>
48-
Generate app screen
49-
</Button>
49+
{#if showGenerateAppScreenButton}
50+
<Button secondary icon="browser" on:click={generateScreen}>
51+
Generate app screen
52+
</Button>
53+
{/if}
5054
</svelte:fragment>
5155
</ScreensPopover>

packages/builder/src/pages/builder/workspace/[application]/data/table/[tableId]/[viewId]/index.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,11 @@
150150
{#if !calculation}
151151
<GridColumnsSettingButton />
152152
<GridRowActionsButton />
153-
<GridScreensButton on:generate={() => generateButton?.show()} />
154153
{/if}
154+
<GridScreensButton
155+
showGenerateAppScreenButton={!calculation}
156+
on:generate={() => generateButton?.show()}
157+
/>
155158
<GridGenerateButton bind:this={generateButton} />
156159
{/if}
157160
</svelte:fragment>

0 commit comments

Comments
 (0)