Merge branch 'cypress-testing' of https://github.com/Budibase/budibase into cypress-testing

.github/CONTRIBUTING.md

@@ -79,6 +79,8 @@ Component libraries are collections of components as well as the definition of t
 ### Getting Started For Contributors
 #### 1.  Prerequisites
 
+NodeJS Version `14.x.x`
+
 *yarn -* `npm install -g yarn`
 
 *jest* - `npm install -g jest`
@@ -177,36 +179,7 @@ To enable this mode, use:
 yarn mode:account
 ```
 ### CI
-
+ An overview of the CI pipelines can be found [here](./workflows/README.md)
-#### PR Job
-
-After your pr is submitted a github action (can be found at `.github/workflows/budibase_ci.yml`) will run to perform some checks against the changes such as linting, build and test. 
-
-The job will run when changes are pushed to or targetted at `master` and `develop`
-#### Release Develop
-
-To test changes before a release, a prerelease action (can be found at `.github/workflows/release-develop.yml`) will run to build and release develop versions of npm packages and docker images. On each subsequent commit to develop a new alpha version of npm packages will be created and released. 
-
-For example:
-
-- `feature1` -> `develop` = `v0.9.160-alpha.1`
-- `feature2` -> `develop` = `v0.9.160-alpha.0`
-
-The job will run when changes are pushed to `develop`
-#### Release Job
-
-To release changes a release job (can be found at `.github/workflows/release.yml`) will run to create final versions of npm packages and docker images. 
-
-Following the example above:
-
-- `develop` -> `master` = `v0.9.160`
-
-The job will run when changes are pushed to `master`
-
-#### Release Self Host Job
-
-To release the self hosted version of docker images, an additional job (can be found at `.github/workflows/release-selfhost.yml`) must be ran manually. This will releaae docker images to docker hub under the tag `latest` to be picked up by self hosted installations. 
-
 ### Troubleshooting
 
 Sometimes, things go wrong. This can be due to incompatible updates on the budibase platform. To clear down your development environment and start again follow **Step 6. Cleanup**, then proceed from **Step 3. Install and Build** in the setup guide above. You should have a fresh Budibase installation.

.github/stale.yml

@@ -1,7 +1,9 @@
-# Number of days of inactivity before an issue becomes stale
+# Configuration for probot-stale - https://github.com/probot/stale
+# Number of days of inactivity before an Issue or Pull Request becomes stale
 daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-daysUntilClose: 7
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: false
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned

.github/workflows/README.md

@@ -0,0 +1,93 @@
+
+# Budibase CI Pipelines
+
+Welcome to the budibase CI pipelines directory. This document details what each of the CI pipelines are for, and come common combinations.
+
+## All CI Pipelines
+
+### Note
+- When running workflow dispatch jobs, ensure you always run them off the `master` branch. It defaults to `develop`, so double check before running any jobs.
+
+### Standard CI Build Job (budibase_ci.yml)
+Triggers:
+- PR or push to develop
+- PR or push to master
+
+The standard CI Build job is what runs when you raise a PR to develop or master. 
+- Installs all dependencies,
+- builds the project 
+- run the unit tests
+- Generate test coverage metrics with codecov
+- Run the cypress tests
+
+### Release Develop Job (release-develop.yml)
+Triggers:
+- Push to develop
+
+The job responsible for building, tagging and pushing docker images out to the test and staging environments. 
+- Installs all dependencies
+- builds the project 
+- run the unit tests
+- publish the budibase JS packages under a prerelease tag to NPM
+- build, tag and push docker images under the `develop` tag to docker hub
+
+These images will then be pulled by the test and staging environments, updating the latest automatically. Discord notifications are sent to the #infra channel when this occurs.
+
+### Release Job (release.yml)
+Triggers:
+- Push to master
+
+This job is responsible for building and pushing the latest code to NPM and docker hub, so that it can be deployed.
+- Installs all dependencies
+- builds the project 
+- run the unit tests
+- publish the budibase JS packages under a release tag to NPM (always incremented by patch versions)
+- build, tag and push docker images under the `v.x.x.x` (the tag of the NPM release) tag to docker hub
+
+### Release Selfhost Job (release-selfhost.yml)
+Triggers:
+- Manual Workflow Dispatch Trigger
+
+This job is responsible for delivering the latest version of budibase to those that are self-hosting. 
+
+This job relies on the release job to have run first, so the latest image is pushed to dockerhub. This job then will pull the latest version from `lerna.json` and try to find an image in dockerhub corresponding to that version. For example, if the version in `lerna.json` is `1.0.0`:
+- Pull the images for all budibase services tagged `v1.0.0` from dockerhub
+- Tag these images as `latest`
+- Push them back to dockerhub. This now means anyone who pulls `latest` (self hosters using docker-compose) will get the latest version.
+- Build and release the budibase helm chart for kubernetes users
+- Perform a github release with the latest version. You can see previous releases here (https://github.com/Budibase/budibase/releases)
+
+
+### Cloud Deploy (deploy-cloud.yml)
+Triggers:
+- Manual Workflow Dispatch Trigger
+
+This job is responsible for deploying to our production, cloud kubernetes environment. You must run the release job first, to ensure that the latest images have been built and pushed to docker hub. You can also manually enter a version number for this job, so you can perform rollbacks or upgrade to a specific version. After kicking off this job, the following will occur:
+
+- Checks out the master branch 
+- Pulls the latest `values.yaml` from budibase infra, a private repo containing budibases infrastructure configuration
+- Gets the latest budibase version from `lerna.json`, if it hasn't been specified in the workflow when you kicked it off
+- Configures AWS Credentials  
+- Deploys the helm chart in the budibase repo to our production EKS cluster, injecting the `values.yaml` we pulled from budibase-infra
+- Fires off a discord webhook in the #infra channel to show that the deployment completely successfully.
+
+## Common Workflows
+
+### Deploy Changes to Production (Release)
+- Merge `develop` into `master`
+- Wait for budibase CI job and release job to run
+- Run cloud deploy job
+- Run release selfhost job
+
+### Deploy Changes to Production (Hotfix)
+- Branch off `master`
+- Perform your hotfix
+- Merge back into `master`
+- Wait for budibase CI job and release job to run
+- Run cloud deploy job
+- Run release selfhost job
+
+### Rollback A Bad Cloud Deployment
+- Kick off cloud deploy job
+- Ensure you are running off master
+- Enter the version number of the last known good version of budibase. For example `1.0.0`

.github/workflows/budibase_ci.yml

@@ -41,4 +41,6 @@ jobs:
         files: ./packages/server/coverage/clover.xml
         name: codecov-umbrella
         verbose: true 
+
+    # TODO: parallelise this
     - run: yarn test:e2e:ci

.github/workflows/deploy-cloud.yaml

@@ -12,6 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master' 
+        run: | 
+          echo "Ref is not master, you must run this job from master."
+          exit 1
+
       - uses: actions/checkout@v2
 
       - name: Pull values.yaml from budibase-infra

.github/workflows/deploy-preprod.yml

@@ -23,16 +23,19 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-1
 
-      - name: 'Get Previous tag'
+      - name: Get the latest budibase release version
-        id: previoustag
+        id: version
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        run: | 
+          release_version=$(cat lerna.json | jq -r '.version')
+          echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
 
-      # - name: Pull values.yaml from budibase-infra
+      - name: Pull values.yaml from budibase-infra
-      #   run: | 
+        run: | 
-      #     curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \                                                                                [c3a7a9d12]
+          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
-      #     -H 'Accept: application/vnd.github.v3.raw' \
+          -H 'Accept: application/vnd.github.v3.raw' \
-      #     -o values.preprod.yaml \
+          -o values.preprod.yaml \
-      #     -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml
+          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
+          wc -l values.preprod.yaml
 
       - name: Deploy to Preprod Environment
         uses: deliverybot/helm@v1
@@ -41,13 +44,17 @@ jobs:
           namespace: budibase
           chart: charts/budibase
           token: ${{ github.token }}
+          helm: helm3
           values: |
             globals: 
-              appVersion: ${{ steps.previoustag.outputs.tag }}
+              appVersion: v${{ env.RELEASE_VERSION }}
-          # value-files: >-
+            ingress:
-          #   [
+              enabled: true
-          #     "charts/budibase/values.yaml"
+              nginx: true
-          #   ]
+          value-files: >-
+            [
+              "values.preprod.yaml"
+            ]
         env:
           KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
 

.github/workflows/release-develop.yml

@@ -4,6 +4,16 @@ on:
  push:
     branches:
       - develop
+    paths:
+      - '.aws/**'
+      - '.github/**'
+      - 'charts/**'
+      - 'packages/**'
+      - 'scripts/**'
+      - 'package.json'
+      - 'yarn.lock'
+      - 'package.json'
+      - 'yarn.lock'
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}

.github/workflows/release-selfhost.yml

@@ -9,7 +9,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-        with:
+        with: 
+          node-version: 14.x
           fetch_depth: 0
 
       - name: Tag and release Docker images (Self Host)
@@ -37,33 +38,39 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           SELFHOST_TAG: latest
       
+      - name: Build CLI executables
+        run: |
+          pushd packages/cli
+          yarn
+          yarn build
+          popd
+      
       - name: Setup Helm 
         uses: azure/setup-helm@v1
         id: helm-install
 
-      # - name: Build and release helm chart
+      - name: Build and release helm chart
-      #   run: | 
+        run: | 
-      #     git config user.name "Budibase Helm Bot"
+          git config user.name "Budibase Helm Bot"
-      #     git config user.email "<>"
+          git config user.email "<>"
-      #     mv budibase-${{ env.RELEASE_VERSION }}.tgz docs
+          git pull
-      #     helm repo index docs
+          helm package charts/budibase
-      #     git checkout gh-pages
+          git checkout gh-pages
-      #     git add -A
+          mv *.tgz docs
-      #     git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
+          helm repo index docs
-      #     git push
+          git add -A
-      #   env:
+          git commit -m "Helm Release: ${{ env.RELEASE_VERSION }}"
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          git push
-
+        env:
-      # - name: Deploy
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   uses: peaceiris/actions-gh-pages@v3
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     publish_dir: ./public
-      #     full_commit_message: "Helm Release: ${{ env.RELEASE_VERSION }}"
 
       - name: Perform Github Release
         uses: softprops/action-gh-release@v1
         with:
           name: v${{ env.RELEASE_VERSION }}
           tag_name: v${{ env.RELEASE_VERSION }}
-          generate_release_notes: true
+          generate_release_notes: true
+          files: |
+            packages/cli/build/cli-win.exe
+            packages/cli/build/cli-linux
+            packages/cli/build/cli-macos 

.github/workflows/release.yml

@@ -3,7 +3,17 @@ name: Budibase Release
 on:
  push:
     branches:
-      - test
+      - master
+    paths:
+      - '.aws/**'
+      - '.github/**'
+      - 'charts/**'
+      - 'packages/**'
+      - 'scripts/**'
+      - 'package.json'
+      - 'yarn.lock'
+      - 'package.json'
+      - 'yarn.lock'
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -56,34 +66,3 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
-      
-      # - name: Pull values.yaml from budibase-infra
-      #   run: | 
-      #     curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \                                                                                [c3a7a9d12]
-      #     -H 'Accept: application/vnd.github.v3.raw' \
-      #     -o values.preprod.yaml \
-      #     -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.preprod.yaml
-
-      # - name: Deploy to Preprod Environment
-      #   uses: deliverybot/helm@v1
-      #   with:
-      #     release: budibase-preprod
-      #     namespace: budibase
-      #     chart: charts/budibase
-      #     token: ${{ github.token }}
-      #     values: |
-      #       globals: 
-      #         appVersion: ${{ steps.previoustag.outputs.tag }}
-      #     # value-files: >-
-      #     #   [
-      #     #     "charts/budibase/values.yaml"
-      #     #   ]
-      #   env:
-      #     KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
-
-      # - name: Discord Webhook Action
-      #   uses: tsickert/discord-webhook@v4.0.0
-      #   with:
-      #     webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
-      #     content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod."
-      #     embed-title: ${{ env.RELEASE_VERSION }}

.github/workflows/smoke_test.yaml

@@ -0,0 +1,46 @@
+name: Budibase Smoke Test
+
+on:
+ workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn build
+      - name: Pull cypress.env.yaml from budibase-infra
+        run: | 
+          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
+          -H 'Accept: application/vnd.github.v3.raw' \
+          -o packages/builder/cypress.env.json \
+          -L https://api.github.com/repos/budibase/budibase-infra/contents/test/cypress.env.json
+          wc -l packages/builder/cypress.env.json
+      - run: yarn test:e2e:ci
+        env:
+          CI: true
+          name: Budibase CI
+      
+      # TODO: upload recordings to s3
+      # - name: Configure AWS Credentials
+      #   uses: aws-actions/configure-aws-credentials@v1
+      #   with:
+      #     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      #     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      #     aws-region: eu-west-1
+        
+      # TODO look at cypress reporters
+      # - name: Discord Webhook Action
+      #   uses: tsickert/discord-webhook@v4.0.0
+      #   with:
+      #     webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
+      #     content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Cloud."
+      #     embed-title: ${{ env.RELEASE_VERSION }}
+

.gitignore

@@ -93,4 +93,5 @@ hosting/.generated-envoy.dev.yaml
 # Sublime text
 *.sublime-project
 *.sublime-workspace
-packages/builder/cypress.env.json
+packages/builder/cypress.env.json
+bin/

charts/budibase/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: couchdb
+  repository: https://apache.github.io/couchdb-helm
+  version: 3.3.4
+- name: ingress-nginx
+  repository: https://kubernetes.github.io/ingress-nginx
+  version: 4.0.13
+digest: sha256:20892705c2d8e64c98257d181063a514ac55013e2b43399a6e54868a97f97845
+generated: "2021-12-30T18:55:30.878411Z"

charts/budibase/Chart.yaml

@@ -11,14 +11,14 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 1.0.0
+version: 0.2.5
-appVersion: 1.0.20
+appVersion: 1.0.25
 dependencies:
   - name: couchdb
     version: 3.3.4
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled
   - name: ingress-nginx
-    version: 3.35.0
+    version: 4.0.13
-    repository: https://github.com/kubernetes/ingress-nginx
+    repository: https://kubernetes.github.io/ingress-nginx
     condition: ingress.nginx

charts/budibase/templates/proxy-service-service.yaml

@@ -9,12 +9,11 @@ metadata:
     app.kubernetes.io/name: budibase-proxy
   name: proxy-service
 spec:
-  type: NodePort
   ports:
-  - port: {{ .Values.services.proxy.port }}
+  - name: {{ .Values.services.proxy.port | quote }}
+    port: {{ .Values.services.proxy.port }}
     targetPort: {{ .Values.services.proxy.port }}
-    protocol: TCP
   selector:
     app.kubernetes.io/name: budibase-proxy
 status:
-  loadBalancer: {}
+  loadBalancer: {}

charts/budibase/values.yaml

@@ -40,7 +40,7 @@ service:
   port: 10000
 
 ingress:
-  enabled: false
+  enabled: true
   aws: false
   nginx: true
   certificateArn: ""
@@ -302,4 +302,4 @@ couchdb:
     initialDelaySeconds: 0
     periodSeconds: 10
     successThreshold: 1
-    timeoutSeconds: 1
+    timeoutSeconds: 1

i18n/README.fr.md

@@ -0,0 +1,214 @@
+<p align="center">
+  <a href="https://www.budibase.com">
+    <img alt="Budibase" src="https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" width="60" />
+  </a>
+</p>
+<h1 align="center">
+  Budibase
+</h1>
+
+<h3 align="center">
+  La plateform low-code que vous aimerez utiliser
+</h3>
+<p align="center">
+  Budibase est une plateforme low-code open source et c'est la façon la plus facile de créer des outils internes qui améliore la productivité.
+</p>
+
+<h3 align="center">
+ 🤖 🎨 🚀
+</h3>
+<br>
+
+<p align="center">
+  <img alt="Budibase design ui" src="https://res.cloudinary.com/daog6scxm/image/upload/v1633524049/ui/design-ui-wide-mobile_gdaveq.jpg">
+</p>
+
+<p align="center">
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub toutes les releases" src="https://img.shields.io/github/downloads/Budibase/budibase/total">
+  </a>
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub release (par ordre chronologique)" src="https://img.shields.io/github/v/release/Budibase/budibase">
+  </a>
+  <a href="https://twitter.com/intent/follow?screen_name=budibase">
+    <img src="https://img.shields.io/twitter/follow/budibase?style=social" alt="Suivre @budibase" />
+  </a>
+  <img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Code de conduite" />
+  <a href="https://codecov.io/gh/Budibase/budibase">
+    <img src="https://codecov.io/gh/Budibase/budibase/graph/badge.svg?token=E8W2ZFXQOH"/>
+  </a>
+</p>
+
+<h3 align="center">
+  <a href="https://docs.budibase.com/getting-started">Commencer</a>
+  <span> · </span>
+  <a href="https://docs.budibase.com">Documentation</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas">Demandes d'amélioration</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/issues">Signaler un bug</a>
+  <span> · </span>
+  Support: <a href="https://github.com/Budibase/budibase/discussions">Discussions</a>
+</h3>
+
+<br /><br />
+## ✨ Fontionnalités
+
+### Construire et déployer un vrai logiciel 
+Contrairement à d'autres plateformes, avec Budibase vous construisez et déployez des applications one-page. Les applications Budibase sont très perfomantes et peuvent être designées de manière responsive, offrant ainsi à vos utilisateurs une expérience exceptionnelle.
+<br /><br />
+
+### Source libre et extensible
+Budibase est un logiciel libre - sous licence GPL v3. Cela devrait vous rassurer sur le fait que Budibase sera toujours là. Vous pouvez également coder dans Budibase ou le forker et apporter des modifications à votre guise, ce qui en fera une expérience conviviale pour les développeurs.
+<br /><br />
+
+### Importer les données ou partir de zéro
+Budibase peut tirer ses données de plusieurs sources, dont MongoDB, CouchDB, PostgreSQL, MySQL, Airtable, S3, DynamoDB ou une API REST. Et contrairement à d'autres plateformes, avec Budibase, vous pouvez partir de zéro et créer des applications métier sans aucune source de données. [Demander une nouvelle source de données](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+<p align="center">
+  <img alt="Budibase data" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970242/Out%20of%20beta%20launch/data_n1tlhf.png">
+</p>
+<br /><br />
+
+### Concevoir et créer des applications à l'aide de composants prédéfinis.
+
+Budibase est livré avec des composants joliment conçus et puissants que vous pouvez utiliser comme des blocs de construction pour bâtir votre interface utilisateur. Nous exposons également un grand nombre de vos options de style CSS préférées afin que vous puissiez faire preuve d'une créativité accrue. [Demander un nouveau composant](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+<p align="center">
+  <img alt="Budibase design" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970243/Out%20of%20beta%20launch/design-like-a-pro_qhlfeu.gif">
+</p>
+<br /><br />
+
+### Automatiser les processus, intégrer d'autres outils et se connecter à des webhooks
+Gagnez du temps en automatisant les processus manuels et les flux de travail. Qu'il s'agisse de se connecter à des webhooks ou d'automatiser des e-mails, il suffit de dire à Budibase ce qu'il doit faire et de le laisser travailler pour vous. Vous pouvez aisément [créer une nouvelle automatisation pour Budibase ici](https://github.com/Budibase/automations) ou [Demander une nouvelle automatisation](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+<p align="center">
+  <img alt="Budibase automations" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970486/Out%20of%20beta%20launch/automation_riro7u.png">
+</p>
+<br /><br />
+
+### Intégration avec vos outils préférés
+Budibase s'intègre à un certain nombre d'outils populaires, ce qui vous permet de créer des applications qui s'adaptent parfaitement à votre pile technologique.
+
+<p align="center">
+  <img alt="Budibase integrations" src="https://res.cloudinary.com/daog6scxm/image/upload/v1636970242/Out%20of%20beta%20launch/integrations_kc7dqt.png">
+</p>
+<br /><br />
+
+### Paradis des admins
+Budibase est conçu pour évoluer. Avec Budibase, vous pouvez vous auto-héberger sur votre propre infrastructure et gérer globalement les utilisateurs, l'accueil, le SMTP, les applications, les groupes, l'apparence et plus encore. Vous pouvez également fournir aux utilisateurs/groupes un portail d'applications et confier la gestion des utilisateurs au responsable du groupe.
+
+- Regardez la vidéo de promotion: https://youtu.be/xoljVpty_Kw
+
+<br /><br /><br />
+
+## 🏁 Commencer
+
+<img src="https://res.cloudinary.com/daog6scxm/image/upload/v1634808888/logo/deploy_npl9za.png" />
+
+Déployez Budibase en auto-hébergement dans votre infrastructure existante, en utilisant Docker, Kubernetes et Digital Ocean.
+Ou utilisez Budibase Cloud si vous n'avez pas besoin de vous auto-héberger, et que vous souhaitez démarrer rapidement.
+
+### [Commencer avec Budibase](https://budibase.com)
+
+
+<br /><br />
+
+## 🎓 Apprendre Budibase
+
+La documentation Budibase [est ic](https://docs.budibase.com).
+<br />
+
+
+<br /><br />
+
+## 💬 Communauté
+
+Si vous avez une question ou si vous souhaitez discuter avec d'autres utilisateurs de Budibase et rejoindre notre communauté, veuillez vous rendre à l'adresse suivante : [Discussions Github](https://github.com/Budibase/budibase/discussions)
+
+<br /><br /><br />
+
+
+## ❗ Code de conduite
+
+Budibase s'engage à offrir à chacun une expérience accueillante, diversifiée et exempte de harcèlement. Nous attendons de tous les membres de la communauté Budibase qu'ils se conforment aux principes de notre [**Code de conduite**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Merci de le lire.
+<br />
+
+
+<br /><br />
+
+
+## 🙌 Contribuer à Budibase
+
+Qu'il s'agisse d'ouvrir un rapport de bug ou de créer une Pull request, toute contribution est appréciée et bienvenue. Si vous envisagez de mettre en œuvre une nouvelle fonctionnalité ou de modifier l'API, veuillez d'abord créer un Issue. Nous pourrons ainsi nous assurer que votre travail n'est pas vain.
+
+### Vous ne savez pas par où commencer ?
+Un bon endroit pour commencer à contribuer, c'est ici : [Projets en cours](https://github.com/Budibase/budibase/projects/22).
+
+### Comment le repo est-il organisé ?
+Budibase est une monorepo gérée par lerna. Lerna gère la construction et la publication des paquets de Budibase. Voici, à un haut niveau, les paquets qui composent Budibase.
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - contient le code pour l'application svelte côté client du budibase builder.
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - Un module qui s'exécute dans le navigateur et qui est chargé de lire les définitions JSON et de créer des applications web vivantes à partir de celles-ci..
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - Le serveur budibase. Cette application Koa est responsable de servir le JS pour les applications builder et budibase, ainsi que de fournir l'API pour l'interaction avec la base de données et le système de fichiers.
+
+Pour plus d'informations, voir [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+
+<br /><br />
+
+
+## 📝 Licence
+
+Budibase est open source, sous licence de [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html). Les bibliothèques du client et des composants sont sous licence [MPL](https://directory.fsf.org/wiki/License:MPL-2.0) - afin que les applications que vous créez puissent être utilisées sous licence comme vous le souhaitez.
+
+<br /><br />
+
+## ⭐ Stargazers dans le temps
+
+[![Stargazers dans le temps](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
+
+Si vous rencontrez des problèmes entre les mises à jour du builder, veuillez utiliser le guide suivant [ici](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) pour nettoyer votre environnement.
+
+<br /><br />
+
+## Contributeurs ✨
+
+Merci à ces personnes merveilleuses ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://martinmck.com"><img src="https://avatars1.githubusercontent.com/u/11256663?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin McKeaveney</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Tests">⚠️</a> <a href="#infra-shogunpurple" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="http://www.michaeldrury.co.uk/"><img src="https://avatars2.githubusercontent.com/u/4407001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Drury</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Tests">⚠️</a> <a href="#infra-mike12345567" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/aptkingston"><img src="https://avatars3.githubusercontent.com/u/9075550?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Kingston</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Tests">⚠️</a> <a href="#design-aptkingston" title="Design">🎨</a></td>
+    <td align="center"><a href="https://budibase.com/"><img src="https://avatars3.githubusercontent.com/u/3524181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Shanks</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/kevmodrome"><img src="https://avatars3.githubusercontent.com/u/534488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Åberg Kultalahti</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://www.budibase.com/"><img src="https://avatars2.githubusercontent.com/u/49767913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Code">💻</a> <a href="#content-joebudi" title="Content">🖋</a> <a href="#design-joebudi" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Rory-Powell"><img src="https://avatars.githubusercontent.com/u/8755148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rory Powell</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Tests">⚠️</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/PClmnt"><img src="https://avatars.githubusercontent.com/u/5665926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Clement</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Conor-Mack"><img src="https://avatars1.githubusercontent.com/u/36074859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conor_Mack</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/HugoLd"><img src="https://avatars0.githubusercontent.com/u/26521848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HugoLd</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=HugoLd" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/victoriasloan"><img src="https://avatars.githubusercontent.com/u/9913651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>victoriasloan</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=victoriasloan" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yashank09"><img src="https://avatars.githubusercontent.com/u/37672190?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yashank09</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=yashank09" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/SOVLOOKUP"><img src="https://avatars.githubusercontent.com/u/53158137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SOVLOOKUP</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=SOVLOOKUP" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/seoulaja"><img src="https://avatars.githubusercontent.com/u/15101654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seoulaja</b></sub></a><br /><a href="#translation-seoulaja" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/mslourens"><img src="https://avatars.githubusercontent.com/u/1907152?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maurits Lourens</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mslourens" title="Tests">⚠️</a> <a href="https://github.com/Budibase/budibase/commits?author=mslourens" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/Rory-Powell"><img src="https://avatars.githubusercontent.com/u/8755148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rory Powell</b></sub></a><br /><a href="#infra-Rory-Powell" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Tests">⚠️</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+Ce projet suit la spécification [all-contributors](https://allcontributors.org/docs/fr/overview). Les contributions de toute nature sont les bienvenues !

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.27-alpha.0",
+  "version": "1.0.44-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/README.md

@@ -4,7 +4,7 @@ This library contains core functionality, like auth and security features
 which are shared between backend services.
 
 #### Note about top level JS files
-For the purposes of being able to do say `require("@budibase/auth/permissions")` we need to
+For the purposes of being able to do say `require("@budibase/backend-core/permissions")` we need to
 specify the exports at the top-level of the module.
 
 For these files they should be limited to a single `require` of the file that should

packages/backend-core/auth.js

@@ -0,0 +1 @@
+module.exports = require("./src/auth")

packages/backend-core/middleware.js

@@ -0,0 +1 @@
+module.exports = require("./src/middleware")

packages/backend-core/objectStore.js

@@ -0,0 +1,4 @@
+module.exports = {
+  ...require("./src/objectStore"),
+  ...require("./src/objectStore/utils"),
+}

packages/backend-core/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@budibase/auth",
+  "name": "@budibase/backend-core",
-  "version": "1.0.27-alpha.0",
+  "version": "1.0.44-alpha.1",
-  "description": "Authentication middlewares for budibase builder and apps",
+  "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
   "license": "GPL-3.0",

packages/backend-core/src/auth.js

@@ -1,7 +1,6 @@
 const passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
 const JwtStrategy = require("passport-jwt").Strategy
-const { StaticDatabases } = require("./db/utils")
 const { getGlobalDB } = require("./tenancy")
 const {
   jwt,
@@ -14,8 +13,6 @@ const {
   appTenancy,
   authError,
 } = require("./middleware")
-const { setDB } = require("./db")
-const userCache = require("./cache/user")
 
 // Strategies
 passport.use(new LocalStrategy(local.options, local.authenticate))
@@ -36,36 +33,13 @@ passport.deserializeUser(async (user, done) => {
 })
 
 module.exports = {
-  init(pouch) {
+  buildAuthMiddleware: authenticated,
-    setDB(pouch)
+  passport,
-  },
+  google,
-  db: require("./db/utils"),
+  oidc,
-  redis: {
+  jwt: require("jsonwebtoken"),
-    Client: require("./redis"),
+  buildTenancyMiddleware: tenancy,
-    utils: require("./redis/utils"),
+  buildAppTenancyMiddleware: appTenancy,
-  },
+  auditLog,
-  objectStore: {
+  authError,
-    ...require("./objectStore"),
-    ...require("./objectStore/utils"),
-  },
-  utils: {
-    ...require("./utils"),
-    ...require("./hashing"),
-  },
-  auth: {
-    buildAuthMiddleware: authenticated,
-    passport,
-    google,
-    oidc,
-    jwt: require("jsonwebtoken"),
-    buildTenancyMiddleware: tenancy,
-    buildAppTenancyMiddleware: appTenancy,
-    auditLog,
-    authError,
-  },
-  cache: {
-    user: userCache,
-  },
-  StaticDatabases,
-  constants: require("./constants"),
 }

packages/backend-core/src/constants.js

@@ -8,6 +8,7 @@ exports.Cookies = {
   Auth: "budibase:auth",
   Init: "budibase:init",
   OIDC_CONFIG: "budibase:oidc:config",
+  RETURN_URL: "budibase:returnurl",
 }
 
 exports.Headers = {
@@ -16,6 +17,7 @@ exports.Headers = {
   APP_ID: "x-budibase-app-id",
   TYPE: "x-budibase-type",
   TENANT_ID: "x-budibase-tenant-id",
+  TOKEN: "x-budibase-token",
 }
 
 exports.GlobalRoles = {

packages/backend-core/src/db/utils.js

@@ -224,8 +224,15 @@ exports.getAllDbs = async () => {
     }
   }
   let couchUrl = `${exports.getCouchUrl()}/_all_dbs`
-  if (env.MULTI_TENANCY) {
+  let tenantId = getTenantId()
-    let tenantId = getTenantId()
+  if (!env.MULTI_TENANCY || tenantId == DEFAULT_TENANT_ID) {
+    // just get all DBs when:
+    // - single tenancy
+    // - default tenant
+    //    - apps dbs don't contain tenant id
+    //    - non-default tenant dbs are filtered out application side in getAllApps
+    await addDbs(couchUrl)
+  } else {
     // get prod apps
     await addDbs(
       exports.getStartEndKeyURL(couchUrl, DocumentTypes.APP, tenantId)
@@ -236,9 +243,6 @@ exports.getAllDbs = async () => {
     )
     // add global db name
     dbs.push(getGlobalDBName(tenantId))
-  } else {
-    // just get all DBs in self host
-    await addDbs(couchUrl)
   }
   return dbs
 }

packages/backend-core/src/index.js

@@ -0,0 +1,17 @@
+const { setDB } = require("./db")
+
+module.exports = {
+  init(pouch) {
+    setDB(pouch)
+  },
+  // some default exports from the library, however these ideally shouldn't
+  // be used, instead the syntax require("@budibase/backend-core/db") should be used
+  StaticDatabases: require("./db/utils").StaticDatabases,
+  db: require("../db"),
+  redis: require("../redis"),
+  objectStore: require("../objectStore"),
+  utils: require("../utils"),
+  cache: require("../cache"),
+  auth: require("../auth"),
+  constants: require("../constants"),
+}

packages/backend-core/src/middleware/authenticated.js

@@ -1,5 +1,5 @@
 const { Cookies, Headers } = require("../constants")
-const { getCookie, clearCookie } = require("../utils")
+const { getCookie, clearCookie, openJwt } = require("../utils")
 const { getUser } = require("../cache/user")
 const { getSession, updateSessionTTL } = require("../security/sessions")
 const { buildMatcherRegex, matches } = require("./matchers")
@@ -35,8 +35,9 @@ module.exports = (
       publicEndpoint = true
     }
     try {
-      // check the actual user is authenticated first
+      // check the actual user is authenticated first, try header or cookie
-      const authCookie = getCookie(ctx, Cookies.Auth)
+      const headerToken = ctx.request.headers[Headers.TOKEN]
+      const authCookie = getCookie(ctx, Cookies.Auth) || openJwt(headerToken)
       let authenticated = false,
         user = null,
         internal = false

packages/backend-core/src/objectStore/index.js

@@ -206,6 +206,34 @@ exports.retrieveToTmp = async (bucketName, filepath) => {
   return outputPath
 }
 
+/**
+ * Delete a single file.
+ */
+exports.deleteFile = async (bucketName, filepath) => {
+  const objectStore = exports.ObjectStore(bucketName)
+  await exports.makeSureBucketExists(objectStore, bucketName)
+  const params = {
+    Bucket: bucketName,
+    Key: filepath,
+  }
+  return objectStore.deleteObject(params)
+}
+
+exports.deleteFiles = async (bucketName, filepaths) => {
+  const objectStore = exports.ObjectStore(bucketName)
+  await exports.makeSureBucketExists(objectStore, bucketName)
+  const params = {
+    Bucket: bucketName,
+    Delete: {
+      Objects: filepaths.map(path => ({ Key: path })),
+    },
+  }
+  return objectStore.deleteObjects(params).promise()
+}
+
+/**
+ * Delete a path, including everything within.
+ */
 exports.deleteFolder = async (bucketName, folder) => {
   bucketName = sanitizeBucket(bucketName)
   folder = sanitizeKey(folder)

packages/backend-core/src/redis/utils.js

@@ -16,6 +16,7 @@ exports.Databases = {
   USER_CACHE: "users",
   FLAGS: "flags",
   APP_METADATA: "appMetadata",
+  QUERY_VARS: "queryVars",
 }
 
 exports.SEPARATOR = SEPARATOR

packages/backend-core/src/utils.js

@@ -63,6 +63,17 @@ exports.getAppId = ctx => {
   return appId
 }
 
+/**
+ * opens the contents of the specified encrypted JWT.
+ * @return {object} the contents of the token.
+ */
+exports.openJwt = token => {
+  if (!token) {
+    return token
+  }
+  return jwt.verify(token, options.secretOrKey)
+}
+
 /**
  * Get a cookie from context, and decrypt if necessary.
  * @param {object} ctx The request which is to be manipulated.
@@ -75,7 +86,7 @@ exports.getCookie = (ctx, name) => {
     return cookie
   }
 
-  return jwt.verify(cookie, options.secretOrKey)
+  return exports.openJwt(cookie)
 }
 
 /**
@@ -85,7 +96,12 @@ exports.getCookie = (ctx, name) => {
  * @param {string|object} value The value of cookie which will be set.
  * @param {object} opts options like whether to sign.
  */
-exports.setCookie = (ctx, value, name = "builder", opts = { sign: true }) => {
+exports.setCookie = (
+  ctx,
+  value,
+  name = "builder",
+  opts = { sign: true, requestDomain: false }
+) => {
   if (value && opts && opts.sign) {
     value = jwt.sign(value, options.secretOrKey)
   }
@@ -97,7 +113,7 @@ exports.setCookie = (ctx, value, name = "builder", opts = { sign: true }) => {
     overwrite: true,
   }
 
-  if (environment.COOKIE_DOMAIN) {
+  if (environment.COOKIE_DOMAIN && !opts.requestDomain) {
     config.domain = environment.COOKIE_DOMAIN
   }
 

packages/backend-core/utils.js

@@ -0,0 +1,4 @@
+module.exports = {
+  ...require("./src/utils"),
+  ...require("./src/hashing"),
+}

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.27-alpha.0",
+  "version": "1.0.44-alpha.1",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/bbui/src/Drawer/Drawer.svelte

@@ -21,16 +21,8 @@
     }
     visible = false
   }
-
-  function handleKey(e) {
-    if (visible && e.key === "Escape") {
-      hide()
-    }
-  }
 </script>
 
-<svelte:window on:keydown={handleKey} />
-
 {#if visible}
   <Portal>
     <section class:fillWidth class="drawer" transition:slide>

packages/bbui/src/Table/BoldRenderer.svelte

@@ -0,0 +1,11 @@
+<script>
+  export let value
+</script>
+
+<div class="bold">{value}</div>
+
+<style>
+  .bold {
+    font-weight: bold;
+  }
+</style>

packages/bbui/src/Table/CodeRenderer.svelte

@@ -0,0 +1,5 @@
+<script>
+  export let value
+</script>
+
+<code>{value}</code>

packages/bbui/src/Table/Table.svelte

@@ -4,6 +4,7 @@
   import CellRenderer from "./CellRenderer.svelte"
   import SelectEditRenderer from "./SelectEditRenderer.svelte"
   import { cloneDeep } from "lodash"
+  import { deepGet } from "../utils/helpers"
 
   /**
    * The expected schema is our normal couch schemas for our tables.
@@ -318,7 +319,7 @@
                             {customRenderers}
                             {row}
                             schema={schema[field]}
-                            value={row[field]}
+                            value={deepGet(row, field)}
                             on:clickrelationship
                           >
                             <slot />

packages/bbui/src/Tabs/Tabs.svelte

@@ -10,6 +10,8 @@
   export let noHorizPadding = false
   export let quiet = false
   export let emphasized = false
+  // overlay content from the tab bar onto tabs e.g. for a dropdown
+  export let onTop = false
 
   let thisSelected = undefined
 
@@ -78,6 +80,7 @@
     'spectrum-Tabs--quiet'} spectrum-Tabs--{vertical
     ? 'vertical'
     : 'horizontal'}"
+  class:onTop
 >
   <slot />
   {#if $tab.info}
@@ -98,7 +101,9 @@
   .quiet {
     border-bottom: none !important;
   }
-
+  .onTop {
+    z-index: 20;
+  }
   .spectrum-Tabs {
     padding-left: var(--spacing-xl);
     padding-right: var(--spacing-xl);

packages/bbui/src/index.js

@@ -61,6 +61,10 @@ export { default as ColorPicker } from "./ColorPicker/ColorPicker.svelte"
 export { default as InlineAlert } from "./InlineAlert/InlineAlert.svelte"
 export { default as Banner } from "./Banner/Banner.svelte"
 
+// Renderers
+export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"
+export { default as CodeRenderer } from "./Table/CodeRenderer.svelte"
+
 // Typography
 export { default as Body } from "./Typography/Body.svelte"
 export { default as Heading } from "./Typography/Heading.svelte"
@@ -77,3 +81,6 @@ export { default as clickOutside } from "./Actions/click_outside"
 
 // Stores
 export { notifications, createNotificationStore } from "./Stores/notifications"
+
+// Utils
+export * from "./utils/helpers"

packages/bbui/src/utils/helpers.js

@@ -6,3 +6,61 @@ export const generateID = () => {
 }
 
 export const capitalise = s => s.substring(0, 1).toUpperCase() + s.substring(1)
+
+/**
+ * Gets a key within an object. The key supports dot syntax for retrieving deep
+ * fields - e.g. "a.b.c".
+ * Exact matches of keys with dots in them take precedence over nested keys of
+ * the same path - e.g. getting "a.b" from { "a.b": "foo", a: { b: "bar" } }
+ * will return "foo" over "bar".
+ * @param obj the object
+ * @param key the key
+ * @return {*|null} the value or null if a value was not found for this key
+ */
+export const deepGet = (obj, key) => {
+  if (!obj || !key) {
+    return null
+  }
+  if (Object.prototype.hasOwnProperty.call(obj, key)) {
+    return obj[key]
+  }
+  const split = key.split(".")
+  for (let i = 0; i < split.length; i++) {
+    obj = obj?.[split[i]]
+  }
+  return obj
+}
+
+/**
+ * Sets a key within an object. The key supports dot syntax for retrieving deep
+ * fields - e.g. "a.b.c".
+ * Exact matches of keys with dots in them take precedence over nested keys of
+ * the same path - e.g. setting "a.b" of { "a.b": "foo", a: { b: "bar" } }
+ * will override the value "foo" rather than "bar".
+ * If a deep path is specified and the parent keys don't exist then these will
+ * be created.
+ * @param obj the object
+ * @param key the key
+ * @param value the value
+ */
+export const deepSet = (obj, key, value) => {
+  if (!obj || !key) {
+    return
+  }
+  if (Object.prototype.hasOwnProperty.call(obj, key)) {
+    obj[key] = value
+    return
+  }
+  const split = key.split(".")
+  for (let i = 0; i < split.length - 1; i++) {
+    const nextKey = split[i]
+    if (obj && obj[nextKey] == null) {
+      obj[nextKey] = {}
+    }
+    obj = obj?.[nextKey]
+  }
+  if (!obj) {
+    return
+  }
+  obj[split[split.length - 1]] = value
+}

packages/bbui/yarn.lock

@@ -2076,9 +2076,9 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
     supports-color "^6.1.0"
 
 postcss@^8.2.9:
-  version "8.2.10"
+  version "8.2.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
-  integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==
+  integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
   dependencies:
     colorette "^1.2.2"
     nanoid "^3.1.22"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.27-alpha.0",
+  "version": "1.0.44-alpha.1",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.27-alpha.0",
+    "@budibase/bbui": "^1.0.44-alpha.1",
-    "@budibase/client": "^1.0.27-alpha.0",
+    "@budibase/client": "^1.0.44-alpha.1",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.27-alpha.0",
+    "@budibase/string-templates": "^1.0.44-alpha.1",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/builderStore/api.js

@@ -13,6 +13,9 @@ const apiCall =
       headers,
     })
     if (resp.status === 403) {
+      if (url.includes("/api/templates")) {
+        return { json: () => [] }
+      }
       removeCookie(Cookies.Auth)
       // reload after removing cookie, go to login
       if (!url.includes("self") && !url.includes("login")) {