merge

2021-10-01 15:18:37 +01:00 · 2021-10-01 15:18:37 +01:00 · ff34e6fed5
parent 0ea9c2d303 c8260ba4de
commit ff34e6fed5
9 changed files with 70 additions and 42 deletions
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@ -24,9 +24,7 @@ context("Create a Table", () => {
  it("updates a column on the table", () => {
    cy.get(".title").click()
    cy.get(".spectrum-Table-editIcon > use").click()
-    cy.get("input")
-      .eq(1)
-      .type("updated", { force: true })
+    cy.get("input").eq(1).type("updated", { force: true })
    // Unset table display column
    cy.get(".spectrum-Switch-input").eq(1).click()
    cy.contains("Save Column").click()
@ -45,9 +43,7 @@ context("Create a Table", () => {
  it("deletes a row", () => {
    cy.get(".spectrum-Checkbox-input").check({ force: true })
    cy.contains("Delete 1 row(s)").click()
-    cy.get(".spectrum-Modal")
-      .contains("Delete")
-      .click()
+    cy.get(".spectrum-Modal").contains("Delete").click()
    cy.contains("RoverUpdated").should("not.exist")
  })

@ -56,15 +52,18 @@ context("Create a Table", () => {
    cy.get(".spectrum-Table-editIcon > use").click()
    cy.contains("Delete").click()
    cy.wait(50)
-    cy.contains("Delete Column")
-      .click()
+    cy.contains("Delete Column").click()
    cy.contains("nameupdated").should("not.exist")
  })

  it("deletes a table", () => {
-    cy.get(".actions > :nth-child(1) > .icon > .spectrum-Icon > use")
-      .eq(1)
-      .click({ force: true })
+    cy.get(".nav-item")
+      .contains("dog")
+      .parents(".nav-item")
+      .first()
+      .within(() => {
+        cy.get(".actions .spectrum-Icon").click({ force: true })
+      })
    cy.get(".spectrum-Menu > :nth-child(2)").click()
    cy.contains("Delete Table").click()
    cy.contains("dog").should("not.exist")
--- a/packages/builder/cypress/integration/createView.spec.js
+++ b/packages/builder/cypress/integration/createView.spec.js
@ -28,11 +28,7 @@ context("Create a View", () => {
      const headers = Array.from($headers).map(header =>
        header.textContent.trim()
      )
-      expect(removeSpacing(headers)).to.deep.eq([
-        "group",
-        "age",
-        "rating",
-      ])
+      expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
    })
  })

@ -57,11 +53,12 @@ context("Create a View", () => {
  })

  it("creates a stats calculation view based on age", () => {
+    cy.wait(1000)
    cy.contains("Calculate").click()
    cy.get(".modal-inner-wrapper").within(() => {
      cy.get(".spectrum-Picker-label").eq(0).click()
      cy.contains("Statistics").click()
-      
+
      cy.get(".spectrum-Picker-label").eq(1).click()
      cy.contains("age").click({ force: true })

@ -104,20 +101,20 @@ context("Create a View", () => {
    cy.get(".spectrum-Table-cell").then($values => {
      let values = Array.from($values).map(header => header.textContent.trim())
      expect(values).to.deep.eq([
-            "Students",
-            "70",
-            "20",
-            "25",
-            "3",
-            "1650",
-            "23.333333333333332",
-            "Teachers",
-            "85",
-            "36",
-            "49",
-            "2",
-            "3697",
-            "42.5",
+        "Students",
+        "70",
+        "20",
+        "25",
+        "3",
+        "1650",
+        "23.333333333333332",
+        "Teachers",
+        "85",
+        "36",
+        "49",
+        "2",
+        "3697",
+        "42.5",
      ])
    })
  })
--- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
+++ b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
@ -62,7 +62,7 @@
 <Modal bind:this={modal}>
  <ModalContent
    showConfirmButton={false}
-    cancelText="Close"
+    cancelText="View changes"
    showCloseIcon={false}
    title="Theme settings"
  >
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@ -216,6 +216,7 @@
      <div class="filter">
        <div class="select">
          <Select
+            autoWidth
            bind:value={sortBy}
            placeholder={null}
            options={[
@ -224,7 +225,9 @@
              { label: "Sort by status", value: "status" },
            ]}
          />
-          <Search placeholder="Search" bind:value={searchTerm} />
+          <div class="desktop-search">
+            <Search placeholder="Search" bind:value={searchTerm} />
+          </div>
        </div>
        <ActionGroup>
          <ActionButton
@ -241,6 +244,9 @@
          />
        </ActionGroup>
      </div>
+      <div class="mobile-search">
+        <Search placeholder="Search" bind:value={searchTerm} />
+      </div>
      <div
        class:appGrid={layout === "grid"}
        class:appTable={layout === "table"}
@ -318,6 +324,7 @@
    flex-direction: row;
    justify-content: space-between;
    align-items: center;
+    gap: 10px;
  }

  .select {
@ -325,6 +332,12 @@
    grid-template-columns: 1fr 1fr;
    grid-gap: 10px;
  }
+  .filter :global(.spectrum-ActionGroup) {
+    flex-wrap: nowrap;
+  }
+  .mobile-search {
+    display: none;
+  }

  .appGrid {
    display: grid;
@ -364,5 +377,11 @@
    .appTable {
      grid-template-columns: 1fr auto;
    }
+    .desktop-search {
+      display: none;
+    }
+    .mobile-search {
+      display: block;
+    }
  }
 </style>
--- a/packages/server/src/api/controllers/analytics.js
+++ b/packages/server/src/api/controllers/analytics.js
@ -7,14 +7,19 @@ if (env.POSTHOG_TOKEN && env.ENABLE_ANALYTICS && !env.SELF_HOSTED) {
  posthogClient = new PostHog(env.POSTHOG_TOKEN)
 }

-exports.isEnabled = async function (ctx) {
+exports.isEnabled = async ctx => {
  ctx.body = {
    enabled: !env.SELF_HOSTED && env.ENABLE_ANALYTICS === "true",
  }
 }

-exports.endUserPing = async (ctx, next) => {
-  if (!posthogClient) return next()
+exports.endUserPing = async ctx => {
+  if (!posthogClient) {
+    ctx.body = {
+      ping: false,
+    }
+    return
+  }

  posthogClient.capture("budibase:end_user_ping", {
    userId: ctx.user && ctx.user._id,
--- a/packages/server/src/api/routes/analytics.js
+++ b/packages/server/src/api/routes/analytics.js
@ -3,7 +3,8 @@ const controller = require("../controllers/analytics")

 const router = Router()

-router.get("/api/analytics", controller.isEnabled)
-router.post("/api/analytics/ping", controller.endUserPing)
+router
+  .get("/api/analytics", controller.isEnabled)
+  .post("/api/analytics/ping", controller.endUserPing)

 module.exports = router
--- a/packages/server/src/utilities/rowProcessor/index.js
+++ b/packages/server/src/utilities/rowProcessor/index.js
@ -99,6 +99,7 @@ function processAutoColumn(
  row,
  opts = { reprocessing: false, noAutoRelationships: false }
 ) {
+  let noUser = !user || !user.userId
  let now = new Date().toISOString()
  // if a row doesn't have a revision then it doesn't exist yet
  const creating = !row._rev
@ -108,7 +109,12 @@ function processAutoColumn(
    }
    switch (schema.subtype) {
      case AutoFieldSubTypes.CREATED_BY:
-        if (creating && !opts.reprocessing && !opts.noAutoRelationships) {
+        if (
+          creating &&
+          !opts.reprocessing &&
+          !opts.noAutoRelationships &&
+          !noUser
+        ) {
          row[key] = [user.userId]
        }
        break
@ -118,7 +124,7 @@ function processAutoColumn(
        }
        break
      case AutoFieldSubTypes.UPDATED_BY:
-        if (!opts.reprocessing && !opts.noAutoRelationships) {
+        if (!opts.reprocessing && !opts.noAutoRelationships && !noUser) {
          row[key] = [user.userId]
        }
        break
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@ -52,7 +52,8 @@ exports.sendSmtpEmail = async (to, from, subject, contents, automation) => {
  )

  if (response.status !== 200) {
-    throw "Unable to send email."
+    const error = await response.text()
+    throw `Unable to send email - ${error}`
  }
  return response.json()
 }
--- a/packages/worker/src/api/index.js
+++ b/packages/worker/src/api/index.js
@ -87,7 +87,7 @@ router
    if (ctx.publicEndpoint) {
      return next()
    }
-    if (!ctx.isAuthenticated || !ctx.user.budibaseAccess) {
+    if ((!ctx.isAuthenticated || !ctx.user.budibaseAccess) && !ctx.internal) {
      ctx.throw(403, "Unauthorized - no public worker access")
    }
    return next()