Merge branch 'develop' of github.com:Budibase/budibase into fix/export-no-auto-logs

2023-04-27 16:44:26 +01:00 · 2023-04-27 16:44:26 +01:00 · 71f2287474
parent 5363693ac3 bea67941fe
commit 71f2287474
23 changed files with 94 additions and 82 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "npmClient": "yarn",
  "useWorkspaces": true,
  "packages": ["packages/*"],
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/backend-core",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase backend core libraries used in server and worker",
  "main": "dist/src/index.js",
  "types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
  "dependencies": {
    "@budibase/nano": "10.1.2",
    "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.5.6-alpha.36",
+    "@budibase/types": "2.5.6-alpha.38",
    "@shopify/jest-koa-mocks": "5.0.1",
    "@techpass/passport-openidconnect": "0.3.2",
    "aws-cloudfront-sign": "2.2.0",
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
  ],
  "dependencies": {
    "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
+    "@budibase/shared-core": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
    "@spectrum-css/accordion": "3.0.24",
    "@spectrum-css/actionbutton": "1.0.1",
    "@spectrum-css/actiongroup": "1.0.1",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -58,10 +58,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "2.5.6-alpha.36",
-    "@budibase/frontend-core": "2.5.6-alpha.36",
-    "@budibase/shared-core": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
+    "@budibase/bbui": "2.5.6-alpha.38",
+    "@budibase/frontend-core": "2.5.6-alpha.38",
+    "@budibase/shared-core": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
    "@fortawesome/fontawesome-svg-core": "^6.2.1",
    "@fortawesome/free-brands-svg-icons": "^6.2.1",
    "@fortawesome/free-solid-svg-icons": "^6.2.1",
--- a/packages/builder/src/pages/builder/portal/account/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/account/usage.svelte
@ -43,12 +43,18 @@
  }

  $: quotaUsage = $licensing.quotaUsage
+
  $: license = $auth.user?.license
+  $: plan = license?.plan
+  $: usesInvoicing = plan?.usesInvoicing
+
  $: accountPortalAccess = $auth?.user?.accountPortalAccess
  $: quotaReset = quotaUsage?.quotaReset
  $: canManagePlan =
    ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin)

+  $: showButton = !usesInvoicing && accountPortalAccess
+
  const setMonthlyUsage = () => {
    monthlyUsage = []
    if (quotaUsage.monthly) {
@ -121,7 +127,7 @@
  const setTextRows = () => {
    textRows = []

-    if (cancelAt) {
+    if (cancelAt && !usesInvoicing) {
      textRows.push({ message: "Subscription has been cancelled" })
      textRows.push({
        message: `${getDaysRemaining(cancelAt)} days remaining`,
@ -213,7 +219,7 @@
      description="YOUR CURRENT PLAN"
      title={planTitle()}
      {primaryActionText}
-      primaryAction={accountPortalAccess ? goToAccountPortal : undefined}
+      primaryAction={showButton ? goToAccountPortal : undefined}
      {textRows}
    >
      <div class="content">
@ -224,33 +230,23 @@
                <Usage {usage} warnWhenFull={WARN_USAGE.includes(usage.name)} />
              </div>
            {/each}
+            <Layout gap="XS" noPadding>
+              <Heading size="S">Monthly limits</Heading>
+              <div class="detail">
+                <TooltipWrapper tooltip={new Date(quotaReset)}>
+                  <Detail size="M">
+                    Resets in {daysRemainingInMonth} days
+                  </Detail>
+                </TooltipWrapper>
+              </div>
+            </Layout>
+            <Layout noPadding gap="M">
+              {#each monthlyUsage as usage}
+                <Usage {usage} warnWhenFull={WARN_USAGE.includes(usage.name)} />
+              {/each}
+            </Layout>
          </Layout>
        </div>
-
-        {#if monthlyUsage.length}
-          <div class="column">
-            <Layout noPadding gap="M">
-              <Layout gap="XS" noPadding>
-                <Heading size="S">Monthly limits</Heading>
-                <div class="detail">
-                  <TooltipWrapper tooltip={new Date(quotaReset)}>
-                    <Detail size="M">
-                      Resets in {daysRemainingInMonth} days
-                    </Detail>
-                  </TooltipWrapper>
-                </div>
-              </Layout>
-              <Layout noPadding gap="M">
-                {#each monthlyUsage as usage}
-                  <Usage
-                    {usage}
-                    warnWhenFull={WARN_USAGE.includes(usage.name)}
-                  />
-                {/each}
-              </Layout>
-            </Layout>
-          </div>
-        {/if}
      </div>
    </DashCard>
  </Layout>
--- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte
@ -176,7 +176,7 @@
      <Heading>Backups</Heading>
      {#if !$licensing.backupsEnabled}
        <Tags>
-          <Tag icon="LockClosed">Pro plan</Tag>
+          <Tag icon="LockClosed">Premium</Tag>
        </Tags>
      {/if}
    </div>
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@ -378,7 +378,7 @@
        </div>
        {#if !$licensing.enforceableSSO}
          <Tags>
-            <Tag icon="LockClosed">Enterprise plan</Tag>
+            <Tag icon="LockClosed">Enterprise</Tag>
          </Tags>
        {/if}
      </div>
--- a/packages/builder/src/pages/builder/portal/settings/branding.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte
@ -213,7 +213,7 @@
        {/if}
        {#if isCloud && !brandingEnabled}
          <Tags>
-            <Tag icon="LockClosed">Pro</Tag>
+            <Tag icon="LockClosed">Premium</Tag>
          </Tags>
        {/if}
      </div>
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@ -94,7 +94,7 @@
      <Heading size="M">Groups</Heading>
      {#if !$licensing.groupsEnabled}
        <Tags>
-          <Tag icon="LockClosed">Pro plan</Tag>
+          <Tag icon="LockClosed">Business</Tag>
        </Tags>
      {/if}
    </div>
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "dist/index.js",
  "bin": {
@ -29,9 +29,9 @@
    "outputPath": "build"
  },
  "dependencies": {
-    "@budibase/backend-core": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
-    "@budibase/types": "2.5.6-alpha.36",
+    "@budibase/backend-core": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
+    "@budibase/types": "2.5.6-alpha.38",
    "axios": "0.21.2",
    "chalk": "4.1.0",
    "cli-progress": "3.11.2",
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,11 +19,11 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "2.5.6-alpha.36",
-    "@budibase/frontend-core": "2.5.6-alpha.36",
-    "@budibase/shared-core": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
-    "@budibase/types": "2.5.6-alpha.36",
+    "@budibase/bbui": "2.5.6-alpha.38",
+    "@budibase/frontend-core": "2.5.6-alpha.38",
+    "@budibase/shared-core": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
+    "@budibase/types": "2.5.6-alpha.38",
    "@spectrum-css/button": "^3.0.3",
    "@spectrum-css/card": "^3.0.3",
    "@spectrum-css/divider": "^1.0.3",
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@ -1,13 +1,13 @@
 {
  "name": "@budibase/frontend-core",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase frontend core libraries used in builder and client",
  "author": "Budibase",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "dependencies": {
-    "@budibase/bbui": "2.5.6-alpha.36",
-    "@budibase/shared-core": "2.5.6-alpha.36",
+    "@budibase/bbui": "2.5.6-alpha.38",
+    "@budibase/shared-core": "2.5.6-alpha.38",
    "dayjs": "^1.11.7",
    "lodash": "^4.17.21",
    "socket.io-client": "^4.6.1",
--- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte
@ -1,5 +1,6 @@
 <script>
  import { onMount, tick } from "svelte"
+  import { clickOutside } from "@budibase/bbui"

  export let value
  export let focused = false
@ -60,6 +61,7 @@
    on:change={handleChange}
    on:wheel|stopPropagation
    spellcheck="false"
+    use:clickOutside={close}
  />
 {:else}
  <div class="long-form-cell" on:click={editable ? open : null} class:editable>
--- a/packages/frontend-core/src/components/grid/cells/NumberCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/NumberCell.svelte
@ -2,6 +2,13 @@
  import TextCell from "./TextCell.svelte"

  export let api
+  export let onChange
+
+  const numberOnChange = value => {
+    const float = parseFloat(value)
+    const newValue = isNaN(float) ? null : float
+    onChange(newValue)
+  }
 </script>

-<TextCell {...$$props} bind:api type="number" />
+<TextCell {...$$props} onChange={numberOnChange} bind:api type="number" />
--- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte
@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "@budibase/bbui"
+  import { Icon, clickOutside } from "@budibase/bbui"
  import { getColor } from "../lib/utils"
  import { onMount } from "svelte"

@ -118,6 +118,7 @@
      class:invertX
      class:invertY
      on:wheel={e => e.stopPropagation()}
+      use:clickOutside={close}
    >
      {#each options as option, idx}
        {@const color = getOptionColor(option)}
--- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
@ -18,7 +18,7 @@
 <script>
  import { getColor } from "../lib/utils"
  import { onMount, getContext } from "svelte"
-  import { Icon, Input, ProgressCircle } from "@budibase/bbui"
+  import { Icon, Input, ProgressCircle, clickOutside } from "@budibase/bbui"
  import { debounce } from "../../../utils/utils"

  export let value
@ -284,7 +284,13 @@
  </div>

  {#if isOpen}
-    <div class="dropdown" class:invertX class:invertY on:wheel|stopPropagation>
+    <div
+      class="dropdown"
+      class:invertX
+      class:invertY
+      on:wheel|stopPropagation
+      use:clickOutside={close}
+    >
      <div class="search">
        <Input
          autofocus
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/sdk",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase Public API SDK",
  "author": "Budibase",
  "license": "MPL-2.0",
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase Web Server",
  "main": "src/index.ts",
  "repository": {
@ -45,12 +45,12 @@
  "license": "GPL-3.0",
  "dependencies": {
    "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.6-alpha.36",
-    "@budibase/client": "2.5.6-alpha.36",
-    "@budibase/pro": "2.5.6-alpha.36",
-    "@budibase/shared-core": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
-    "@budibase/types": "2.5.6-alpha.36",
+    "@budibase/backend-core": "2.5.6-alpha.38",
+    "@budibase/client": "2.5.6-alpha.38",
+    "@budibase/pro": "2.5.6-alpha.38",
+    "@budibase/shared-core": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
+    "@budibase/types": "2.5.6-alpha.38",
    "@bull-board/api": "3.7.0",
    "@bull-board/koa": "3.9.4",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/shared-core",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Shared data utils",
  "main": "dist/cjs/src/index.js",
  "types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
    "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
  },
  "dependencies": {
-    "@budibase/types": "2.5.6-alpha.36"
+    "@budibase/types": "2.5.6-alpha.38"
  },
  "devDependencies": {
    "concurrently": "^7.6.0",
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/types/package.json
+++ b/packages/types/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/types",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase types",
  "main": "dist/cjs/index.js",
  "types": "dist/mjs/index.d.ts",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.36",
+  "version": "2.5.6-alpha.38",
  "description": "Budibase background service",
  "main": "src/index.ts",
  "repository": {
@ -37,10 +37,10 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/backend-core": "2.5.6-alpha.36",
-    "@budibase/pro": "2.5.6-alpha.36",
-    "@budibase/string-templates": "2.5.6-alpha.36",
-    "@budibase/types": "2.5.6-alpha.36",
+    "@budibase/backend-core": "2.5.6-alpha.38",
+    "@budibase/pro": "2.5.6-alpha.38",
+    "@budibase/string-templates": "2.5.6-alpha.38",
+    "@budibase/types": "2.5.6-alpha.38",
    "@koa/router": "8.0.8",
    "@sentry/node": "6.17.7",
    "@techpass/passport-openidconnect": "0.3.2",
--- a/yarn.lock
+++ b/yarn.lock
@ -1486,15 +1486,15 @@
    pouchdb-promise "^6.0.4"
    through2 "^2.0.0"

-"@budibase/pro@2.5.6-alpha.36":
-  version "2.5.6-alpha.36"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6"
-  integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ==
+"@budibase/pro@2.5.6-alpha.38":
+  version "2.5.6-alpha.38"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.38.tgz#09e8dfbb6cefe856b5c01845a5a5c02a406faedf"
+  integrity sha512-CBZv6V+163USHPN0SuEIrXeGA+9gB1QNmHrMEPSmwlOCZbNW2dhniz00EVSuVh3ypHSjDECgozasDJTNRhiufQ==
  dependencies:
-    "@budibase/backend-core" "2.5.6-alpha.36"
+    "@budibase/backend-core" "2.5.6-alpha.38"
    "@budibase/shared-core" "2.4.44-alpha.1"
    "@budibase/string-templates" "2.4.44-alpha.1"
-    "@budibase/types" "2.5.6-alpha.36"
+    "@budibase/types" "2.5.6-alpha.38"
    "@koa/router" "8.0.8"
    bull "4.10.1"
    joi "17.6.0"