Merge branch 'develop' of github.com:Budibase/budibase into develop

2022-12-02 10:21:00 +00:00 · 2022-12-02 10:21:00 +00:00 · 07377ba54e
parent 05526a86cf a159f52012
commit 07377ba54e
14 changed files with 353 additions and 303 deletions
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@ -158,6 +158,10 @@ spec:
        {{ end }}
        - name: CDN_URL
          value: {{ .Values.globals.cdnUrl }}
+        {{ if .Values.services.tlsRejectUnauthorized }}
+        - name: NODE_TLS_REJECT_UNAUTHORIZED
+          value: {{ .Values.services.tlsRejectUnauthorized }}
+        {{ end }}

        image: budibase/apps:{{ .Values.globals.appVersion }}
        imagePullPolicy: Always
--- a/charts/budibase/templates/minio-service-deployment.yaml
+++ b/charts/budibase/templates/minio-service-deployment.yaml
@ -42,6 +42,7 @@ spec:
            secretKeyRef:
              name: {{ template "budibase.fullname" . }}
              key: objectStoreSecret
+
        image: minio/minio
        imagePullPolicy: ""
        livenessProbe:
--- a/charts/budibase/templates/redis-service-deployment.yaml
+++ b/charts/budibase/templates/redis-service-deployment.yaml
@ -60,5 +60,6 @@ spec:
      - name: redis-data
        persistentVolumeClaim:
          claimName: redis-data
+
 status: {}
 {{- end }}
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@ -149,6 +149,10 @@ spec:
        {{ end }}
        - name: CDN_URL
          value: {{ .Values.globals.cdnUrl }}
+        {{ if .Values.services.tlsRejectUnauthorized }}
+        - name: NODE_TLS_REJECT_UNAUTHORIZED
+          value: {{ .Values.services.tlsRejectUnauthorized }}
+        {{ end }}

        image: budibase/worker:{{ .Values.globals.appVersion }}
        imagePullPolicy: Always
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@ -110,6 +110,7 @@ globals:
 services:
  budibaseVersion: latest
  dns: cluster.local
+  # tlsRejectUnauthorized: 0

  proxy:
    port: 10000
--- a/packages/bbui/src/Modal/ModalContent.svelte
+++ b/packages/bbui/src/Modal/ModalContent.svelte
@ -28,9 +28,9 @@
  let loading = false
  $: confirmDisabled = disabled || loading

-  async function secondary() {
+  async function secondary(e) {
    loading = true
-    if (!secondaryAction || (await secondaryAction()) !== false) {
+    if (!secondaryAction || (await secondaryAction(e)) !== false) {
      hide()
    }
    loading = false
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@ -4,6 +4,7 @@
  import { Table, Modal, Heading, notifications, Layout } from "@budibase/bbui"
  import { API } from "api"
  import Spinner from "components/common/Spinner.svelte"
+  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import DeleteRowsButton from "./buttons/DeleteRowsButton.svelte"
  import CreateEditRow from "./modals/CreateEditRow.svelte"
  import CreateEditUser from "./modals/CreateEditUser.svelte"
@ -34,8 +35,8 @@
  let editRowModal
  let editColumnModal
  let customRenderers = []
+  let confirmDelete

-  $: isInternal = type !== "external"
  $: isUsersTable = tableId === TableNames.USERS
  $: data && resetSelectedRows()
  $: editRowComponent = isUsersTable ? CreateEditUser : CreateEditRow
@ -89,15 +90,17 @@
    )
  }

-  const deleteRows = async () => {
+  const deleteRows = async targetRows => {
    try {
      await API.deleteRows({
        tableId,
-        rows: selectedRows,
+        rows: targetRows,
      })
-      data = data.filter(row => !selectedRows.includes(row))
-      notifications.success(`Successfully deleted ${selectedRows.length} rows`)
-      selectedRows = []
+
+      const deletedRowIds = targetRows.map(row => row._id)
+      data = data.filter(row => deletedRowIds.indexOf(row._id))
+
+      notifications.success(`Successfully deleted ${targetRows.length} rows`)
    } catch (error) {
      notifications.error("Error deleting rows")
    }
@ -133,7 +136,14 @@
    <div class="popovers">
      <slot />
      {#if !isUsersTable && selectedRows.length > 0}
-        <DeleteRowsButton on:updaterows {selectedRows} {deleteRows} />
+        <DeleteRowsButton
+          on:updaterows
+          {selectedRows}
+          deleteRows={async rows => {
+            await deleteRows(rows)
+            resetSelectedRows()
+          }}
+        />
      {/if}
    </div>
  </Layout>
@ -164,8 +174,33 @@
 </Layout>

 <Modal bind:this={editRowModal}>
-  <svelte:component this={editRowComponent} on:updaterows row={editableRow} />
+  <svelte:component
+    this={editRowComponent}
+    on:updaterows
+    on:deleteRows={() => {
+      confirmDelete.show()
+    }}
+    row={editableRow}
+  />
 </Modal>
+
+<ConfirmDialog
+  bind:this={confirmDelete}
+  okText="Delete"
+  onOk={async () => {
+    if (editableRow) {
+      await deleteRows([editableRow])
+    }
+    editableRow = undefined
+  }}
+  onCancel={async () => {
+    editRow(editableRow)
+  }}
+  title="Confirm Deletion"
+>
+  Are you sure you want to delete this row?
+</ConfirmDialog>
+
 <Modal bind:this={editColumnModal}>
  <CreateEditColumn
    field={editableColumn}
--- a/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
@ -11,7 +11,7 @@
  let modal

  async function confirmDeletion() {
-    await deleteRows()
+    await deleteRows(selectedRows)
    modal?.hide()
    dispatch("updaterows")
  }
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@ -50,22 +50,34 @@
  }
 </script>

-<ModalContent
-  title={creating ? "Create Row" : "Edit Row"}
-  confirmText={creating ? "Create Row" : "Save Row"}
-  onConfirm={saveRow}
->
-  {#each tableSchema as [key, meta]}
-    {#if !meta.autocolumn && meta.type !== FORMULA_TYPE}
-      <div>
-        <RowFieldControl error={errors[key]} {meta} bind:value={row[key]} />
-      </div>
-    {/if}
-  {/each}
-</ModalContent>
+<span class="modal-wrap">
+  <ModalContent
+    title={creating ? "Create Row" : "Edit Row"}
+    confirmText={creating ? "Create Row" : "Save Row"}
+    onConfirm={saveRow}
+    showCancelButton={creating}
+    showSecondaryButton={!creating}
+    secondaryButtonWarning={!creating}
+    secondaryButtonText="Delete"
+    secondaryAction={() => {
+      dispatch("deleteRows", row)
+    }}
+  >
+    {#each tableSchema as [key, meta]}
+      {#if !meta.autocolumn && meta.type !== FORMULA_TYPE}
+        <div>
+          <RowFieldControl error={errors[key]} {meta} bind:value={row[key]} />
+        </div>
+      {/if}
+    {/each}
+  </ModalContent>
+</span>

 <style>
  div {
    min-width: 0;
  }
+  .modal-wrap :global(.secondary-action) {
+    margin-right: unset;
+  }
 </style>
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@ -479,6 +479,7 @@
    definition.name !== "Screenslot" &&
    children.length === 0 &&
    !instance._blockElementHasChildren &&
+    !definition.block &&
    definition.skeleton !== false
 </script>

--- a/packages/client/src/components/app/blocks/CardsBlock.svelte
+++ b/packages/client/src/components/app/blocks/CardsBlock.svelte
@ -36,7 +36,6 @@
  let dataProviderId
  let repeaterId
  let schema
-  let schemaLoaded = false

  $: fetchSchema(dataSource)
  $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema)
@ -75,138 +74,135 @@
        enrichRelationships: true,
      })
    }
-    schemaLoaded = true
  }
 </script>

-{#if schemaLoaded}
-  <Block>
-    <BlockComponent
-      type="form"
-      bind:id={formId}
-      props={{ dataSource, disableValidation: true }}
-    >
-      {#if title || enrichedSearchColumns?.length || showTitleButton}
+<Block>
+  <BlockComponent
+    type="form"
+    bind:id={formId}
+    props={{ dataSource, disableValidation: true }}
+  >
+    {#if title || enrichedSearchColumns?.length || showTitleButton}
+      <BlockComponent
+        type="container"
+        props={{
+          direction: "row",
+          hAlign: "stretch",
+          vAlign: "middle",
+          gap: "M",
+          wrap: true,
+        }}
+        styles={{
+          normal: {
+            "margin-bottom": "20px",
+          },
+        }}
+        order={0}
+      >
+        <BlockComponent
+          type="heading"
+          props={{
+            text: title,
+          }}
+          order={0}
+        />
        <BlockComponent
          type="container"
          props={{
            direction: "row",
-            hAlign: "stretch",
+            hAlign: "left",
            vAlign: "middle",
            gap: "M",
            wrap: true,
          }}
+          order={1}
+        >
+          {#if enrichedSearchColumns?.length}
+            {#each enrichedSearchColumns as column, idx}
+              <BlockComponent
+                type={column.componentType}
+                props={{
+                  field: column.name,
+                  placeholder: column.name,
+                  text: column.name,
+                  autoWidth: true,
+                }}
+                order={idx}
+                styles={{
+                  normal: {
+                    width: "192px",
+                  },
+                }}
+              />
+            {/each}
+          {/if}
+          {#if showTitleButton}
+            <BlockComponent
+              type="button"
+              props={{
+                onClick: titleButtonAction,
+                text: titleButtonText,
+                type: "cta",
+              }}
+              order={enrichedSearchColumns?.length ?? 0}
+            />
+          {/if}
+        </BlockComponent>
+      </BlockComponent>
+    {/if}
+    <BlockComponent
+      type="dataprovider"
+      bind:id={dataProviderId}
+      props={{
+        dataSource,
+        filter: enrichedFilter,
+        sortColumn,
+        sortOrder,
+        paginate,
+        limit,
+      }}
+      order={1}
+    >
+      <BlockComponent
+        type="repeater"
+        bind:id={repeaterId}
+        context="repeater"
+        props={{
+          dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
+          direction: "row",
+          hAlign: "stretch",
+          vAlign: "top",
+          gap: "M",
+          noRowsMessage: "No rows found",
+        }}
+        styles={{
+          custom: `display: grid;\ngrid-template-columns: repeat(auto-fill, minmax(min(${cardWidth}px, 100%), 1fr));`,
+        }}
+        order={0}
+      >
+        <BlockComponent
+          type="spectrumcard"
+          props={{
+            title: cardTitle,
+            subtitle: cardSubtitle,
+            description: cardDescription,
+            imageURL: cardImageURL,
+            horizontal: cardHorizontal,
+            showButton: showCardButton,
+            buttonText: cardButtonText,
+            buttonOnClick: cardButtonOnClick,
+            linkURL: fullCardURL,
+            linkPeek: cardPeek,
+          }}
          styles={{
            normal: {
-              "margin-bottom": "20px",
+              width: "auto",
            },
          }}
          order={0}
-        >
-          <BlockComponent
-            type="heading"
-            props={{
-              text: title,
-            }}
-            order={0}
-          />
-          <BlockComponent
-            type="container"
-            props={{
-              direction: "row",
-              hAlign: "left",
-              vAlign: "middle",
-              gap: "M",
-              wrap: true,
-            }}
-            order={1}
-          >
-            {#if enrichedSearchColumns?.length}
-              {#each enrichedSearchColumns as column, idx}
-                <BlockComponent
-                  type={column.componentType}
-                  props={{
-                    field: column.name,
-                    placeholder: column.name,
-                    text: column.name,
-                    autoWidth: true,
-                  }}
-                  order={idx}
-                  styles={{
-                    normal: {
-                      width: "192px",
-                    },
-                  }}
-                />
-              {/each}
-            {/if}
-            {#if showTitleButton}
-              <BlockComponent
-                type="button"
-                props={{
-                  onClick: titleButtonAction,
-                  text: titleButtonText,
-                  type: "cta",
-                }}
-                order={enrichedSearchColumns?.length ?? 0}
-              />
-            {/if}
-          </BlockComponent>
-        </BlockComponent>
-      {/if}
-      <BlockComponent
-        type="dataprovider"
-        bind:id={dataProviderId}
-        props={{
-          dataSource,
-          filter: enrichedFilter,
-          sortColumn,
-          sortOrder,
-          paginate,
-          limit,
-        }}
-        order={1}
-      >
-        <BlockComponent
-          type="repeater"
-          bind:id={repeaterId}
-          context="repeater"
-          props={{
-            dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
-            direction: "row",
-            hAlign: "stretch",
-            vAlign: "top",
-            gap: "M",
-            noRowsMessage: "No rows found",
-          }}
-          styles={{
-            custom: `display: grid;\ngrid-template-columns: repeat(auto-fill, minmax(min(${cardWidth}px, 100%), 1fr));`,
-          }}
-          order={0}
-        >
-          <BlockComponent
-            type="spectrumcard"
-            props={{
-              title: cardTitle,
-              subtitle: cardSubtitle,
-              description: cardDescription,
-              imageURL: cardImageURL,
-              horizontal: cardHorizontal,
-              showButton: showCardButton,
-              buttonText: cardButtonText,
-              buttonOnClick: cardButtonOnClick,
-              linkURL: fullCardURL,
-              linkPeek: cardPeek,
-            }}
-            styles={{
-              normal: {
-                width: "auto",
-              },
-            }}
-            order={0}
-          />
-        </BlockComponent>
+        />
      </BlockComponent>
    </BlockComponent>
-  </Block>
-{/if}
+  </BlockComponent>
+</Block>
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@ -36,7 +36,6 @@
  let newRowSidePanelId
  let schema
  let primaryDisplay
-  let schemaLoaded = false

  $: fetchSchema(dataSource)
  $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema)
@ -89,7 +88,6 @@
        enrichRelationships: true,
      })
    }
-    schemaLoaded = true
  }

  const getNormalFields = schema => {
@ -113,162 +111,160 @@
  }
 </script>

-{#if schemaLoaded}
-  <Block>
-    <BlockComponent
-      type="form"
-      bind:id={formId}
-      props={{
-        dataSource,
-        disableValidation: true,
-        editAutoColumns: true,
-        size,
-      }}
-    >
-      {#if title || enrichedSearchColumns?.length || showTitleButton}
+<Block>
+  <BlockComponent
+    type="form"
+    bind:id={formId}
+    props={{
+      dataSource,
+      disableValidation: true,
+      editAutoColumns: true,
+      size,
+    }}
+  >
+    {#if title || enrichedSearchColumns?.length || showTitleButton}
+      <BlockComponent
+        type="container"
+        props={{
+          direction: "row",
+          hAlign: "stretch",
+          vAlign: "middle",
+          gap: "M",
+          wrap: true,
+        }}
+        styles={{
+          normal: {
+            "margin-bottom": "20px",
+          },
+        }}
+        order={0}
+      >
+        <BlockComponent
+          type="heading"
+          props={{
+            text: title,
+          }}
+          order={0}
+        />
        <BlockComponent
          type="container"
          props={{
            direction: "row",
-            hAlign: "stretch",
-            vAlign: "middle",
+            hAlign: "left",
+            vAlign: "center",
            gap: "M",
            wrap: true,
          }}
-          styles={{
-            normal: {
-              "margin-bottom": "20px",
-            },
-          }}
-          order={0}
+          order={1}
        >
-          <BlockComponent
-            type="heading"
-            props={{
-              text: title,
-            }}
-            order={0}
-          />
-          <BlockComponent
-            type="container"
-            props={{
-              direction: "row",
-              hAlign: "left",
-              vAlign: "center",
-              gap: "M",
-              wrap: true,
-            }}
-            order={1}
-          >
-            {#if enrichedSearchColumns?.length}
-              {#each enrichedSearchColumns as column, idx}
-                <BlockComponent
-                  type={column.componentType}
-                  props={{
-                    field: column.name,
-                    placeholder: column.name,
-                    text: column.name,
-                    autoWidth: true,
-                  }}
-                  styles={{
-                    normal: {
-                      width: "192px",
-                    },
-                  }}
-                  order={idx}
-                />
-              {/each}
-            {/if}
-            {#if showTitleButton}
+          {#if enrichedSearchColumns?.length}
+            {#each enrichedSearchColumns as column, idx}
              <BlockComponent
-                type="button"
+                type={column.componentType}
                props={{
-                  onClick: buttonClickActions,
-                  text: titleButtonText,
-                  type: "cta",
+                  field: column.name,
+                  placeholder: column.name,
+                  text: column.name,
+                  autoWidth: true,
                }}
-                order={enrichedSearchColumns?.length ?? 0}
+                styles={{
+                  normal: {
+                    width: "192px",
+                  },
+                }}
+                order={idx}
              />
-            {/if}
-          </BlockComponent>
+            {/each}
+          {/if}
+          {#if showTitleButton}
+            <BlockComponent
+              type="button"
+              props={{
+                onClick: buttonClickActions,
+                text: titleButtonText,
+                type: "cta",
+              }}
+              order={enrichedSearchColumns?.length ?? 0}
+            />
+          {/if}
        </BlockComponent>
-      {/if}
+      </BlockComponent>
+    {/if}
+    <BlockComponent
+      type="dataprovider"
+      bind:id={dataProviderId}
+      props={{
+        dataSource,
+        filter: enrichedFilter,
+        sortColumn: sortColumn || primaryDisplay,
+        sortOrder,
+        paginate,
+        limit: rowCount,
+      }}
+      order={1}
+    >
      <BlockComponent
-        type="dataprovider"
-        bind:id={dataProviderId}
+        type="table"
+        context="table"
        props={{
-          dataSource,
-          filter: enrichedFilter,
-          sortColumn: sortColumn || primaryDisplay,
-          sortOrder,
-          paginate,
-          limit: rowCount,
+          dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
+          columns: tableColumns,
+          rowCount,
+          quiet,
+          compact,
+          allowSelectRows,
+          size,
+          onClick: rowClickActions,
        }}
-        order={1}
+      />
+    </BlockComponent>
+    {#if clickBehaviour === "details"}
+      <BlockComponent
+        name="Details side panel"
+        type="sidepanel"
+        bind:id={detailsSidePanelId}
+        context="details-side-panel"
+        order={2}
      >
        <BlockComponent
-          type="table"
-          context="table"
+          name="Details form block"
+          type="formblock"
+          bind:id={detailsFormBlockId}
          props={{
-            dataProvider: `{{ literal ${safe(dataProviderId)} }}`,
-            columns: tableColumns,
-            rowCount,
-            quiet,
-            compact,
-            allowSelectRows,
-            size,
-            onClick: rowClickActions,
+            dataSource,
+            showSaveButton: true,
+            showDeleteButton: true,
+            actionType: "Update",
+            rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
+            fields: normalFields,
+            title: editTitle,
+            labelPosition: "left",
          }}
        />
      </BlockComponent>
-      {#if clickBehaviour === "details"}
+    {/if}
+    {#if showTitleButton && titleButtonClickBehaviour === "new"}
+      <BlockComponent
+        name="New row side panel"
+        type="sidepanel"
+        bind:id={newRowSidePanelId}
+        context="new-side-panel"
+        order={3}
+      >
        <BlockComponent
-          name="Details side panel"
-          type="sidepanel"
-          bind:id={detailsSidePanelId}
-          context="details-side-panel"
-          order={2}
-        >
-          <BlockComponent
-            name="Details form block"
-            type="formblock"
-            bind:id={detailsFormBlockId}
-            props={{
-              dataSource,
-              showSaveButton: true,
-              showDeleteButton: true,
-              actionType: "Update",
-              rowId: `{{ ${safe("state")}.${safe(stateKey)} }}`,
-              fields: normalFields,
-              title: editTitle,
-              labelPosition: "left",
-            }}
-          />
-        </BlockComponent>
-      {/if}
-      {#if showTitleButton && titleButtonClickBehaviour === "new"}
-        <BlockComponent
-          name="New row side panel"
-          type="sidepanel"
-          bind:id={newRowSidePanelId}
-          context="new-side-panel"
-          order={3}
-        >
-          <BlockComponent
-            name="New row form block"
-            type="formblock"
-            props={{
-              dataSource,
-              showSaveButton: true,
-              showDeleteButton: false,
-              actionType: "Create",
-              fields: normalFields,
-              title: "Create Row",
-              labelPosition: "left",
-            }}
-          />
-        </BlockComponent>
-      {/if}
-    </BlockComponent>
-  </Block>
-{/if}
+          name="New row form block"
+          type="formblock"
+          props={{
+            dataSource,
+            showSaveButton: true,
+            showDeleteButton: false,
+            actionType: "Create",
+            fields: normalFields,
+            title: "Create Row",
+            labelPosition: "left",
+          }}
+        />
+      </BlockComponent>
+    {/if}
+  </BlockComponent>
+</Block>
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@ -20,7 +20,6 @@
  const context = getContext("context")
  const { API, fetchDatasourceSchema } = getContext("sdk")

-  let loaded = false
  let schema
  let table

@ -49,9 +48,6 @@
  // Fetches the form schema from this form's dataSource
  const fetchSchema = async dataSource => {
    schema = (await fetchDatasourceSchema(dataSource)) || {}
-    if (!loaded) {
-      loaded = true
-    }
  }

  const fetchTable = async dataSource => {
@ -70,21 +66,19 @@
  )
 </script>

-{#if loaded}
-  {#key resetKey}
-    <InnerForm
-      {dataSource}
-      {theme}
-      {size}
-      {disabled}
-      {actionType}
-      {schema}
-      {table}
-      {initialValues}
-      {disableValidation}
-      {editAutoColumns}
-    >
-      <slot />
-    </InnerForm>
-  {/key}
-{/if}
+{#key resetKey}
+  <InnerForm
+    {dataSource}
+    {theme}
+    {size}
+    {disabled}
+    {actionType}
+    {schema}
+    {table}
+    {initialValues}
+    {disableValidation}
+    {editAutoColumns}
+  >
+    <slot />
+  </InnerForm>
+{/key}
--- a/packages/client/src/stores/derived/currentRole.js
+++ b/packages/client/src/stores/derived/currentRole.js
@ -1,4 +1,5 @@
 import { derived } from "svelte/store"
+import { Constants } from "@budibase/frontend-core"
 import { devToolsStore } from "../devTools.js"
 import { authStore } from "../auth.js"

@ -6,6 +7,10 @@ import { authStore } from "../auth.js"
 export const currentRole = derived(
  [devToolsStore, authStore],
  ([$devToolsStore, $authStore]) => {
-    return ($devToolsStore.enabled && $devToolsStore.role) || $authStore?.roleId
+    return (
+      ($devToolsStore.enabled && $devToolsStore.role) ||
+      $authStore?.roleId ||
+      Constants.Roles.PUBLIC
+    )
  }
 )