From 17bf73706a862a9aea1468533f2f6cd1cbcd50d0 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 26 Apr 2021 16:14:16 +0100
Subject: [PATCH] Update filter popover to modal

---
 packages/bbui/src/Styleguide/Label.svelte     |  2 +-
 .../DataTable/buttons/FilterButton.svelte     | 27 ++++++++-------
 .../CalculateModal.svelte}                    | 34 ++++---------------
 3 files changed, 22 insertions(+), 41 deletions(-)
 rename packages/builder/src/components/backend/DataTable/{popovers/CalculatePopover.svelte => modals/CalculateModal.svelte} (71%)

diff --git a/packages/bbui/src/Styleguide/Label.svelte b/packages/bbui/src/Styleguide/Label.svelte
index 4fe9458a35..5ca8b52672 100644
--- a/packages/bbui/src/Styleguide/Label.svelte
+++ b/packages/bbui/src/Styleguide/Label.svelte
@@ -3,7 +3,7 @@
 </script>
 
 <label
-  class={`spectrum-FieldLabel spectrum-FieldLabel--sizeM spectrum-Form-itemLabel`}>
+  class={`spectrum-FieldLabel spectrum-FieldLabel--sizeL spectrum-Form-itemLabel`}>
   <slot />
 </label>
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte
index 889b9bdcf7..50730abcda 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte
@@ -1,20 +1,21 @@
 <script>
-  import { Popover, Button, Icon } from "@budibase/bbui"
+  import { Button, Modal } from "@budibase/bbui"
   import FilterPopover from "../popovers/FilterPopover.svelte"
 
   export let view = {}
 
-  let anchor
-  let dropdown
+  let modal
 </script>
 
-<div bind:this={anchor}>
-  <Button icon="Filter" primary size="S" quiet
-    on:click={dropdown.show}
-    active={view.filters && view.filters.length}>
-    Filter
-  </Button>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <FilterPopover {view} onClosed={dropdown.hide} />
-</Popover>
+<Button
+  icon="Filter"
+  primary
+  size="S"
+  quiet
+  on:click={modal.show}
+  active={view.filters?.length}>
+  Filter
+</Button>
+<Modal bind:this={modal}>
+  <FilterPopover {view} />
+</Modal>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
similarity index 71%
rename from packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
rename to packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
index fb882a5dc0..3eec950edb 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Button, Select, Label, notifications } from "@budibase/bbui"
+  import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
   import { tables, views } from "stores/backend"
   import analytics from "analytics"
 
@@ -35,13 +35,15 @@
   function saveView() {
     views.save(view)
     notifications.success(`View ${view.name} saved.`)
-    onClosed()
     analytics.captureEvent("Added View Calculate", { field: view.field })
   }
 </script>
 
-<div class="actions">
-  <h5>Calculate</h5>
+<ModalContent
+  title="Calculate"
+  confirmText="Save"
+  onConfirm={saveView}
+  disabled={!view.field}>
   <div class="input-group-row">
     <Label>The</Label>
     <Select
@@ -54,31 +56,9 @@
       <Select bind:value={view.field} options={fields} />
     {/if}
   </div>
-  <div class="footer">
-    <Button secondary on:click={onClosed}>Cancel</Button>
-    <Button cta on:click={saveView} disabled={!view.field}>Save</Button>
-  </div>
-</div>
+</ModalContent>
 
 <style>
-  .actions {
-    width: 200px;
-    display: grid;
-    grid-gap: var(--spacing-xl);
-    padding: var(--spacing-xl);
-  }
-
-  h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  .footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
-
   .input-group-row {
     display: grid;
     grid-template-columns: auto 1fr;