diff --git a/.eslintrc.json b/.eslintrc.json
index d475bba8d1..9dab2f1a88 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -55,7 +55,9 @@
}
],
"no-redeclare": "off",
- "@typescript-eslint/no-redeclare": "error"
+ "@typescript-eslint/no-redeclare": "error",
+ // have to turn this off to allow function overloading in typescript
+ "no-dupe-class-members": "off"
}
},
{
@@ -88,7 +90,9 @@
"jest/expect-expect": "off",
// We do this in some tests where the behaviour of internal tables
// differs to external, but the API is broadly the same
- "jest/no-conditional-expect": "off"
+ "jest/no-conditional-expect": "off",
+ // have to turn this off to allow function overloading in typescript
+ "no-dupe-class-members": "off"
}
},
{
diff --git a/.github/AUTHORS.md b/.github/AUTHORS.md
index df346f3325..d31bb64987 100644
--- a/.github/AUTHORS.md
+++ b/.github/AUTHORS.md
@@ -8,4 +8,5 @@ Contributors
* Andrew Kingston - [@aptkingston](https://github.com/aptkingston)
* Michael Drury - [@mike12345567](https://github.com/mike12345567)
* Peter Clement - [@PClmnt](https://github.com/PClmnt)
-* Rory Powell - [@Rory-Powell](https://github.com/Rory-Powell)
\ No newline at end of file
+* Rory Powell - [@Rory-Powell](https://github.com/Rory-Powell)
+* Michaël St-Georges [@CSLTech](https://github.com/CSLTech)
\ No newline at end of file
diff --git a/i18n/README.it.md b/i18n/README.it.md
new file mode 100644
index 0000000000..8972fcdb18
--- /dev/null
+++ b/i18n/README.it.md
@@ -0,0 +1,213 @@
+
+
+ 
+
+
+
+ Budibase
+
+
+
+ La piattaforma low-code che amerai utilizzare
+
+
+ Budibase è una piattaforma low-code open source ed è il modo più semplice per creare strumenti interni che migliorano la produttività.
+
+
+
+ 🤖 🎨 🚀
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+ 
+
+
+ 
+
+ 
+
+ 
+
+
+
+
+
+
+## ✨ Funzionalità
+
+### Costruisci e distribuisci software reale
+A differenza di altre piattaforme, con Budibase puoi costruire e distribuire applicazioni one-page. Le applicazioni Budibase sono altamente performanti e possono essere progettate in modo responsive, offrendo ai tuoi utenti un'esperienza eccezionale.
+
+
+### Sorgente aperto ed estensibile
+Budibase è software open source - sotto licenza GPL v3. Questo dovrebbe rassicurarti sul fatto che Budibase sarà sempre lì. Puoi anche codificare in Budibase o fare fork e apportare modifiche a tuo piacimento, rendendolo un'esperienza amichevole per gli sviluppatori.
+
+
+### Importa dati o inizia da zero
+Budibase può estrarre i suoi dati da diverse fonti, tra cui MongoDB, CouchDB, PostgreSQL, MySQL, Airtable, S3, DynamoDB o un'API REST. E a differenza di altre piattaforme, con Budibase puoi partire da zero e creare applicazioni aziendali senza alcuna fonte di dati. [Richiedi una nuova fonte di dati](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+ 
+
+
+
+### Progetta e crea applicazioni utilizzando componenti predefiniti.
+
+Budibase è dotato di componenti predefiniti belli e potenti che puoi utilizzare come mattoni per costruire la tua interfaccia utente. Esporremo anche molte delle tue opzioni di stile CSS preferite in modo che tu possa esprimere una creatività maggiore. [Richiedi un nuovo componente](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+ 
+
+
+
+### Automatizza processi, integra altri strumenti e collegati a webhook
+Risparmia tempo automatizzando processi manuali e flussi di lavoro. Che si tratti di connettersi a webhook o automatizzare email, basta dire a Budibase cosa fare e lasciarlo lavorare per te. Puoi facilmente [creare una nuova automazione per Budibase qui](https://github.com/Budibase/automations) o [Richiedere una nuova automazione](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+ 
+
+
+
+### Integrazione con i tuoi strumenti preferiti
+Budibase si integra con vari strumenti popolari, consentendoti di creare applicazioni che si adattano perfettamente alla tua stack tecnologica.
+
+
+ 
+
+
+
+### Paradiso degli amministratori
+Budibase è progettato per crescere. Con Budibase, puoi auto-ospitarti sulla tua infrastruttura e gestire globalmente utenti, home, SMTP, applicazioni, gruppi, aspetto e altro ancora. Puoi anche fornire agli utenti/gruppi un portale delle applicazioni e affidare la gestione degli utenti al responsabile del gruppo.
+
+- Guarda il video promozionale: https://youtu.be/xoljVpty_Kw
+
+
+
+## 🏁 Inizio
+
+
+
+Implementa Budibase self-hosted nella tua infrastruttura esistente, utilizzando Docker, Kubernetes e Digital Ocean.
+Oppure utilizza Budibase Cloud se non hai bisogno di auto-ospitare e desideri iniziare rapidamente.
+
+### [Inizia con Budibase](https://budibase.com)
+
+
+
+
+## 🎓 Imparare Budibase
+
+La documentazione Budibase [è qui](https://docs.budibase.com).
+
+
+
+
+
+## 💬 Comunità
+
+Se hai domande o vuoi discutere con altri utenti di Budibase e unirti alla nostra comunità, vai su: [Discussioni Github](https://github.com/Budibase/budibase/discussions)
+
+
+
+
+## ❗ Codice di condotta
+
+Budibase si impegna a offrire a tutti un'esperienza accogliente, diversificata e priva di molestie. Ci aspettiamo che tutti i membri della comunità Budibase rispettino i principi del nostro [**Codice di condotta**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Grazie per la tua attenzione.
+
+
+
+
+
+
+## 🙌 Contribuire a Budibase
+
+Che tu stia aprendo un rapporto di bug o creando una Pull request, ogni contributo è apprezzato e benvenuto. Se stai pensando di implementare una nuova funzionalità o modificare l'API, crea prima un Issue. In questo modo possiamo assicurarci che il tuo lavoro non sia inutile.
+
+### Non sai da dove cominciare ?
+Un buon punto di partenza per contribuire è qui: [Progetti in corso](https://github.com/Budibase/budibase/projects/22).
+
+### Come è organizzato il repo ?
+Budibase è un monorepo gestito da lerna. Lerna gestisce la costruzione e la pubblicazione dei pacchetti di Budibase. Ecco, a grandi linee, i pacchetti che compongono Budibase.
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - contiene il codice per l'applicazione svelte lato client di budibase builder.
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - Un modulo che viene eseguito nel browser e che è responsabile della lettura delle definizioni JSON e della creazione di applicazioni web viventi da esse.
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - Il server budibase. Questa applicazione Koa è responsabile del servizio del JS per le applicazioni builder e budibase, oltre a fornire l'API per l'interazione con il database e il filesystem.
+
+Per ulteriori informazioni, vedere [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+
+
+
+
+## 📝 Licenza
+
+Budibase è open source, con licenza [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html). Le librerie client e dei componenti sono con licenza [MPL](https://directory.fsf.org/wiki/License:MPL-2.0) - quindi le applicazioni che crei possono essere utilizzate con licenza come desideri.
+
+
+
+## ⭐ Stargazers nel tempo
+
+[](https://starchart.cc/Budibase/budibase)
+
+Se riscontri problemi tra gli aggiornamenti del builder, utilizza la seguente guida [qui](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) per pulire il tuo ambiente.
+
+
+
+## Contributeurs ✨
+
+Grazie a queste meravigliose persone ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+
+
+
+
+
+
+
+
+
+Questo progetto segue il [convenant del contribuente](https://github.com/Budibase/budibase/blob/master/CODE_OF_CONDUCT.md). Ogni contributo è il benvenuto!
+
+
+
+
+
diff --git a/i18n/README.por.md b/i18n/README.por.md
new file mode 100644
index 0000000000..b8954dbe22
--- /dev/null
+++ b/i18n/README.por.md
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+ Budibase
+
+
+
+ A plataforma low-code que você vai adorar usar
+
+
+ Budibase é uma plataforma low-code de código aberto e é a maneira mais fácil de criar ferramentas internas que melhoram a produtividade.
+
+
+
+ 🤖 🎨 🚀
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## ✨ Recursos
+
+### Construa e implante um software real
+Ao contrário de outras plataformas, com o Budibase você constrói e implanta aplicativos de uma página. Os aplicativos Budibase são altamente performáticos e podem ser designados de forma responsiva, proporcionando uma experiência excepcional aos seus usuários.
+
+
+### Código-fonte livre e extensível
+Budibase é software livre - sob a licença GPL v3. Isso deve lhe dar confiança de que o Budibase estará sempre disponível. Você também pode codificar no Budibase ou bifurcá-lo e fazer alterações conforme desejar, tornando-o amigável para desenvolvedores.
+
+
+### Importar dados ou começar do zero
+Budibase pode extrair dados de várias fontes, incluindo MongoDB, CouchDB, PostgreSQL, MySQL, Airtable, S3, DynamoDB ou uma API REST. E ao contrário de outras plataformas, com o Budibase você pode começar do zero e criar aplicativos de negócios sem nenhuma fonte de dados. [Solicitar uma nova fonte de dados](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Projetar e criar aplicativos usando componentes pré-definidos
+O Budibase vem com componentes lindamente projetados e poderosos que você pode usar como blocos de construção para criar sua interface do usuário. Também oferecemos muitas das suas opções de estilo CSS favoritas para que você possa mostrar sua criatividade. [Solicitar um novo componente](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Automatizar processos, integrar outras ferramentas e conectar webhooks
+Economize tempo automatizando processos manuais e fluxos de trabalho. Seja conectando-se a webhooks ou automatizando e-mails, basta dizer ao Budibase o que fazer e deixá-lo trabalhar para você. Você pode facilmente [criar uma nova automação para o Budibase aqui](https://github.com/Budibase/automations) ou [Solicitar uma nova automação](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Integração com suas ferramentas favoritas
+O Budibase se integra a várias ferramentas populares, permitindo que você crie aplicativos que se encaixam perfeitamente em sua pilha tecnológica.
+
+
+
+
+
+
+### Paraíso dos administradores
+O Budibase é projetado para escalar. Com o Budibase, você pode se auto-hospedar em sua própria infraestrutura e gerenciar globalmente usuários, home, SMTP, aplicativos, grupos, aparência e muito mais. Você também pode fornecer aos usuários/grupos um portal de aplicativos e delegar o gerenciamento de usuários ao líder do grupo.
+
+- Assista ao vídeo promocional: https://youtu.be/xoljVpty_Kw
+
+
+
+## 🏁 Começar
+
+
+
+Implante o Budibase em auto-hospedagem em sua infraestrutura existente, usando Docker, Kubernetes e Digital Ocean.
+Ou use o Budibase Cloud se você não precisar se auto-hospedar e quiser começar rapidamente.
+
+### [Começar com o Budibase](https://budibase.com)
+
+
+
+
+## 🎓 Aprenda Budibase
+
+A documentação Budibase [está aqui](https://docs.budibase.com).
+
+
+
+
+
+## 💬 Comunidade
+
+Se você tiver alguma dúvida ou quiser conversar com outros usuários do Budibase e se juntar à nossa comunidade, visite [Discussões do Github](https://github.com/Budibase/budibase/discussions)
+
+
+
+
+## ❗ Código de Conduta
+
+O Budibase está comprometido em oferecer a todos uma experiência acolhedora, diversificada e livre de assédio. Esperamos que todos os membros da comunidade Budibase sigam os princípios do nosso [**Código de Conduta**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Obrigado por ler.
+
+
+
+
+
+
+## 🙌 Contribuindo para o Budibase
+
+Seja abrindo uma issue ou criando um pull request, toda contribuição é apreciada e bem-vinda. Se você está pensando em implementar uma nova funcionalidade ou alterar a API, por favor, crie primeiro uma Issue. Assim, podemos garantir que seu trabalho não seja em vão.
+
+### Não sabe por onde começar?
+Um bom lugar para começar a contribuir é aqui: [Projetos em andamento](https://github.com/Budibase/budibase/projects/22).
+
+### Como o repositório está organizado?
+O Budibase é um monorepo gerenciado pelo lerna. O Lerna cuida da construção e publicação dos pacotes do Budibase. Aqui estão, em alto nível, os pacotes que compõem o Budibase.
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - contém o código para o aplicativo svelte do lado do cliente do budibase builder.
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - Um módulo que roda no navegador e é responsável por ler definições JSON e criar aplicativos web dinâmicos a partir delas.
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - O servidor budibase. Este aplicativo Koa é responsável por servir o JS para os aplicativos builder e budibase, bem como fornecer a API para interagir com o banco de dados e o sistema de arquivos.
+
+Para mais informações, veja [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+
+
+
+
+## 📝 Licença
+
+O Budibase é open source, sob a licença [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html). As bibliotecas do cliente e dos componentes estão licenciadas sob [MPL](https://directory.fsf.org/wiki/License:MPL-2.0) - para que os aplicativos que você cria possam ser usados sob licença como você desejar.
+
+
+
+## ⭐ Stargazers ao longo do tempo
+
+[](https://starchart.cc/Budibase/budibase)
+
+Se você tiver problemas entre as atualizações do builder, por favor, use o guia a seguir [aqui](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) para limpar seu ambiente.
+
+
+
+## Contribuidores ✨
+
+Agradecimentos a estas pessoas maravilhosas ([chave de emoji](https://allcontributors.org/docs/fr/emoji-key)):
+
+
+
+
+
+
+
+
+
+
+## Licença
+
+Distribuído sob a licença GPL v3.0. Veja `LICENSE` para mais informações.
+
+
diff --git a/i18n/README.ru.md b/i18n/README.ru.md
new file mode 100644
index 0000000000..b235828a40
--- /dev/null
+++ b/i18n/README.ru.md
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+ Budibase
+
+
+
+ Низкокодовая платформа, которую вы полюбите использовать
+
+
+ Budibase - это открытая низкокодовая платформа, которая представляет собой самый простой способ создания внутренних инструментов, повышающих производительность.
+
+
+
+ 🤖 🎨 🚀
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## ✨ Функциональные возможности
+
+### Строим и развертываем настоящее программное обеспечение
+В отличие от других платформ, с помощью Budibase вы создаете и развертываете одностраничные приложения. Приложения Budibase имеют высокую производительность и могут быть адаптированы для разных устройств, обеспечивая вашим пользователям удивительный опыт.
+
+
+### Открытый и расширяемый исходный код
+Budibase - это свободное программное обеспечение под лицензией GPL v3. Это должно вас уверить в том, что Budibase всегда будет здесь. Вы также можете писать код в Budibase или форкнуть его и вносить изменения по своему усмотрению, что сделает его дружелюбным для разработчиков.
+
+
+### Импорт данных или начало с нуля
+Budibase может получать данные из различных источников, включая MongoDB, CouchDB, PostgreSQL, MySQL, Airtable, S3, DynamoDB или REST API. И в отличие от других платформ, с помощью Budibase вы можете начать с нуля и создавать бизнес-приложения без каких-либо источников данных. [Запросить новый источник данных](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Проектирование и создание приложений с использованием предварительно определенных компонентов.
+
+Budibase поставляется с красиво оформленными и мощными компонентами, которые вы можете использовать как строительные блоки для создания вашего пользовательского интерфейса. Мы также предоставляем множество ваших любимых опций стилей CSS, чтобы вы могли проявить больше креативности. [Запросить новый компонент](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Автоматизация процессов, интеграция с другими инструментами и подключение к вебхукам
+Экономьте время, автоматизируя ручные процессы и рабочие потоки. Будь то подключение к вебхукам или автоматизация отправки электронных писем, просто скажите Budibase, что он должен делать, и позвольте ему работать за вас. Вы можете легко [создать новую автоматизацию для Budibase здесь](https://github.com/Budibase/automations) или [Запросить новую автоматизацию](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+
+
+
+
+
+### Интеграция с вашими любимыми инструментами
+Budibase интегрируется с рядом популярных инструментов, что позволяет вам создавать приложения, которые идеально вписываются в вашу технологическую стопку.
+
+
+
+
+
+
+### Рай для админов
+Budibase разработан для масштабирования. С Budibase вы можете самостоятельно размещать его на своей собственной инфраструктуре и глобально управлять пользователями, доменами, SMTP, приложениями, группами, внешним видом и многим другим. Вы также можете предоставить пользователям/группам портал приложений и поручить управление пользователями руководителю группы.
+
+- Смотрите промо-видео: https://youtu.be/xoljVpty_Kw
+
+
+
+## 🏁 Начало работы
+
+
+
+Разверните Budibase на своей собственной инфраструктуре с использованием Docker, Kubernetes и Digital Ocean.
+Или используйте Budibase Cloud, если вам не нужно самостоятельно размещаться, и вы хотите быстро начать.
+
+### [Начать работу с Budibase](https://budibase.com)
+
+
+
+
+## 🎓 Изучение Budibase
+
+Документация Budibase [здесь](https://docs.budibase.com).
+
+
+
+
+
+## 💬 Сообщество
+
+Если у вас есть вопросы или вы хотите обсудить что-то с другими пользователями Budibase и присоединиться к нашему сообществу, пожалуйста, перейдите по следующей ссылке: [Обсуждения на GitHub](https://github.com/Budibase/budibase/discussions)
+
+
+
+
+## ❗ Кодекс поведения
+
+Budibase обязуется обеспечить каждому дружелюбный, разнообразный и безопасный опыт. Мы ожидаем, что все члены сообщества Budibase будут следовать принципам нашего [**Кодекса поведения**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Спасибо за внимание.
+
+
+
+
+
+
+## 🙌 Вклад в Budibase
+
+Будь то открытие ошибки или создание запроса на включение изменений, любой вклад приветствуется и приветствуется. Если вы планируете реализовать новую функциональность или изменить API, сначала создайте Issue. Так мы сможем убедиться, что ваша работа не напрасна.
+
+### Не знаете, с чего начать?
+Хорошее место для начала вклада - это здесь: [Текущие проекты](https://github.com/Budibase/budibase/projects/22).
+
+### Как организован репозиторий?
+Budibase - это монорепозиторий, управляемый с помощью lerna. Lerna управляет сборкой и публикацией пакетов Budibase. Вот, в общих чертах, пакеты, из которых состоит Budibase.
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - содержит код клиентского приложения Svelte для Budibase builder.
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - Модуль, который запускается в браузере и отвечает за чтение JSON-определений и создание веб-приложений из них.
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - Сервер Budibase. Это приложение Koa отвечает за предоставление JS для строителей и приложений Budibase, а также предоставляет API для взаимодействия с базой данных и файловой системой.
+
+Для получения дополнительной информации см. [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+
+
+
+
+## 📝 Лицензия
+
+Budibase является проектом с открытым исходным кодом, лицензированным по [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html). Клиентские библиотеки и компоненты лицензируются по [MPL](https://directory.fsf.org/wiki/License:MPL-2.0), так что приложения, которые вы создаете, могут использоваться под любой лицензией, как вам угодно.
+
+
+
+## ⭐ Старгейзеры во времени
+
+[](https://starchart.cc/Budibase/budibase)
+
+Если у вас возникли проблемы между обновлениями билдера, пожалуйста, используйте следующее руководство [здесь](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting), чтобы очистить ваше окружение.
+
+
+
+## Участники ✨
+
+Благодарим этих замечательных людей ([ключи эмодзи](https://allcontributors.org/docs/ru/emoji-key)):
+
+
+
+
+
+
+
+
+
+
diff --git a/lerna.json b/lerna.json
index 16dc73aa30..54b6eb32ff 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
{
- "version": "2.25.0",
+ "version": "2.26.4",
"npmClient": "yarn",
"packages": [
"packages/*",
@@ -22,4 +22,4 @@
"loadEnvFiles": false
}
}
-}
\ No newline at end of file
+}
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 030fec8728..ff35ccee22 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -73,7 +73,6 @@
"chance": "1.1.8",
"ioredis-mock": "8.9.0",
"jest": "29.7.0",
- "jest-environment-node": "29.7.0",
"jest-serial-runner": "1.2.1",
"pino-pretty": "10.0.0",
"pouchdb-adapter-memory": "7.2.2",
diff --git a/packages/backend-core/src/context/types.ts b/packages/backend-core/src/context/types.ts
index f297d3089f..6694320978 100644
--- a/packages/backend-core/src/context/types.ts
+++ b/packages/backend-core/src/context/types.ts
@@ -1,4 +1,6 @@
import { IdentityContext, Snippet, VM } from "@budibase/types"
+import { OAuth2Client } from "google-auth-library"
+import { GoogleSpreadsheet } from "google-spreadsheet"
// keep this out of Budibase types, don't want to expose context info
export type ContextMap = {
@@ -12,4 +14,8 @@ export type ContextMap = {
vm?: VM
cleanup?: (() => void | Promise)[]
snippets?: Snippet[]
+ googleSheets?: {
+ oauthClient: OAuth2Client
+ clients: Record
+ }
}
diff --git a/packages/backend-core/src/db/Replication.ts b/packages/backend-core/src/db/Replication.ts
index 735c2fa86e..617269df10 100644
--- a/packages/backend-core/src/db/Replication.ts
+++ b/packages/backend-core/src/db/Replication.ts
@@ -1,14 +1,31 @@
import PouchDB from "pouchdb"
import { getPouchDB, closePouchDB } from "./couch"
-import { DocumentType } from "../constants"
+import { DocumentType } from "@budibase/types"
+
+enum ReplicationDirection {
+ TO_PRODUCTION = "toProduction",
+ TO_DEV = "toDev",
+}
class Replication {
source: PouchDB.Database
target: PouchDB.Database
+ direction: ReplicationDirection | undefined
constructor({ source, target }: { source: string; target: string }) {
this.source = getPouchDB(source)
this.target = getPouchDB(target)
+ if (
+ source.startsWith(DocumentType.APP_DEV) &&
+ target.startsWith(DocumentType.APP)
+ ) {
+ this.direction = ReplicationDirection.TO_PRODUCTION
+ } else if (
+ source.startsWith(DocumentType.APP) &&
+ target.startsWith(DocumentType.APP_DEV)
+ ) {
+ this.direction = ReplicationDirection.TO_DEV
+ }
}
async close() {
@@ -40,12 +57,18 @@ class Replication {
}
const filter = opts.filter
+ const direction = this.direction
+ const toDev = direction === ReplicationDirection.TO_DEV
delete opts.filter
return {
...opts,
filter: (doc: any, params: any) => {
- if (doc._id && doc._id.startsWith(DocumentType.AUTOMATION_LOG)) {
+ // don't sync design documents
+ if (toDev && doc._id?.startsWith("_design")) {
+ return false
+ }
+ if (doc._id?.startsWith(DocumentType.AUTOMATION_LOG)) {
return false
}
if (doc._id === DocumentType.APP_METADATA) {
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index ef351f7d4d..8194d1aabf 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -12,6 +12,7 @@ import {
isDocument,
RowResponse,
RowValue,
+ SQLiteDefinition,
SqlQueryBinding,
} from "@budibase/types"
import { getCouchInfo } from "./connections"
@@ -21,6 +22,8 @@ import { ReadStream, WriteStream } from "fs"
import { newid } from "../../docIds/newid"
import { SQLITE_DESIGN_DOC_ID } from "../../constants"
import { DDInstrumentedDatabase } from "../instrumentation"
+import { checkSlashesInUrl } from "../../helpers"
+import env from "../../environment"
const DATABASE_NOT_FOUND = "Database does not exist."
@@ -281,25 +284,61 @@ export class DatabaseImpl implements Database {
})
}
+ async _sqlQuery(
+ url: string,
+ method: "POST" | "GET",
+ body?: Record
+ ): Promise {
+ url = checkSlashesInUrl(`${this.couchInfo.sqlUrl}/${url}`)
+ const args: { url: string; method: string; cookie: string; body?: any } = {
+ url,
+ method,
+ cookie: this.couchInfo.cookie,
+ }
+ if (body) {
+ args.body = body
+ }
+ return this.performCall(() => {
+ return async () => {
+ const response = await directCouchUrlCall(args)
+ const json = await response.json()
+ if (response.status > 300) {
+ throw json
+ }
+ return json as T
+ }
+ })
+ }
+
async sql(
sql: string,
parameters?: SqlQueryBinding
): Promise {
const dbName = this.name
const url = `/${dbName}/${SQLITE_DESIGN_DOC_ID}`
- const response = await directCouchUrlCall({
- url: `${this.couchInfo.sqlUrl}/${url}`,
- method: "POST",
- cookie: this.couchInfo.cookie,
- body: {
- query: sql,
- args: parameters,
- },
+ return await this._sqlQuery(url, "POST", {
+ query: sql,
+ args: parameters,
})
- if (response.status > 300) {
- throw new Error(await response.text())
+ }
+
+ // checks design document is accurate (cleans up tables)
+ // this will check the design document and remove anything from
+ // disk which is not supposed to be there
+ async sqlDiskCleanup(): Promise {
+ const dbName = this.name
+ const url = `/${dbName}/_cleanup`
+ return await this._sqlQuery(url, "POST")
+ }
+
+ // removes a document from sqlite
+ async sqlPurgeDocument(docIds: string[] | string): Promise {
+ if (!Array.isArray(docIds)) {
+ docIds = [docIds]
}
- return (await response.json()) as T[]
+ const dbName = this.name
+ const url = `/${dbName}/_purge`
+ return await this._sqlQuery(url, "POST", { docs: docIds })
}
async query(
@@ -314,6 +353,17 @@ export class DatabaseImpl implements Database {
async destroy() {
try {
+ if (env.SQS_SEARCH_ENABLE) {
+ // delete the design document, then run the cleanup operation
+ try {
+ const definition = await this.get(
+ SQLITE_DESIGN_DOC_ID
+ )
+ await this.remove(SQLITE_DESIGN_DOC_ID, definition._rev)
+ } finally {
+ await this.sqlDiskCleanup()
+ }
+ }
return await this.nano().db.destroy(this.name)
} catch (err: any) {
// didn't exist, don't worry
diff --git a/packages/backend-core/src/db/couch/utils.ts b/packages/backend-core/src/db/couch/utils.ts
index 005b02a896..270d953320 100644
--- a/packages/backend-core/src/db/couch/utils.ts
+++ b/packages/backend-core/src/db/couch/utils.ts
@@ -21,7 +21,7 @@ export async function directCouchUrlCall({
url: string
cookie: string
method: string
- body?: any
+ body?: Record
}) {
const params: any = {
method: method,
diff --git a/packages/backend-core/src/db/instrumentation.ts b/packages/backend-core/src/db/instrumentation.ts
index 32ba81ebd8..4e2b147ef3 100644
--- a/packages/backend-core/src/db/instrumentation.ts
+++ b/packages/backend-core/src/db/instrumentation.ts
@@ -56,12 +56,17 @@ export class DDInstrumentedDatabase implements Database {
})
}
+ remove(idOrDoc: Document): Promise
+ remove(idOrDoc: string, rev?: string): Promise
remove(
- id: string | Document,
- rev?: string | undefined
+ idOrDoc: string | Document,
+ rev?: string
): Promise {
return tracer.trace("db.remove", span => {
- span?.addTags({ db_name: this.name, doc_id: id })
+ span?.addTags({ db_name: this.name, doc_id: idOrDoc })
+ const isDocument = typeof idOrDoc === "object"
+ const id = isDocument ? idOrDoc._id! : idOrDoc
+ rev = isDocument ? idOrDoc._rev : rev
return this.db.remove(id, rev)
})
}
@@ -160,4 +165,18 @@ export class DDInstrumentedDatabase implements Database {
return this.db.sql(sql, parameters)
})
}
+
+ sqlPurgeDocument(docIds: string[] | string): Promise {
+ return tracer.trace("db.sqlPurgeDocument", span => {
+ span?.addTags({ db_name: this.name })
+ return this.db.sqlPurgeDocument(docIds)
+ })
+ }
+
+ sqlDiskCleanup(): Promise {
+ return tracer.trace("db.sqlDiskCleanup", span => {
+ span?.addTags({ db_name: this.name })
+ return this.db.sqlDiskCleanup()
+ })
+ }
}
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 9ade81b9d7..20ff16739f 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -109,6 +109,7 @@ const environment = {
API_ENCRYPTION_KEY: getAPIEncryptionKey(),
COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005",
COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL || "http://localhost:4006",
+ SQS_SEARCH_ENABLE: process.env.SQS_SEARCH_ENABLE,
COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
diff --git a/packages/backend-core/src/objectStore/utils.ts b/packages/backend-core/src/objectStore/utils.ts
index 5b9c2e3646..30c2fefbf1 100644
--- a/packages/backend-core/src/objectStore/utils.ts
+++ b/packages/backend-core/src/objectStore/utils.ts
@@ -9,6 +9,9 @@ import {
AutomationAttachmentContent,
BucketedContent,
} from "@budibase/types"
+import stream from "stream"
+import streamWeb from "node:stream/web"
+
/****************************************************
* NOTE: When adding a new bucket - name *
* sure that S3 usages (like budibase-infra) *
@@ -53,12 +56,10 @@ export const bucketTTLConfig = (
Rules: [lifecycleRule],
}
- const params = {
+ return {
Bucket: bucketName,
LifecycleConfiguration: lifecycleConfiguration,
}
-
- return params
}
async function processUrlAttachment(
@@ -69,9 +70,12 @@ async function processUrlAttachment(
throw new Error(`Unexpected response ${response.statusText}`)
}
const fallbackFilename = path.basename(new URL(attachment.url).pathname)
+ if (!response.body) {
+ throw new Error("No response received for attachment")
+ }
return {
filename: attachment.filename || fallbackFilename,
- content: response.body,
+ content: stream.Readable.fromWeb(response.body as streamWeb.ReadableStream),
}
}
diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index f77c6385ba..37547573bd 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -492,7 +492,7 @@ export class UserDB {
await platform.users.removeUser(dbUser)
- await db.remove(userId, dbUser._rev)
+ await db.remove(userId, dbUser._rev!)
const creatorsToDelete = (await isCreator(dbUser)) ? 1 : 0
await UserDB.quotas.removeUsers(1, creatorsToDelete)
diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 6c4fcab757..21635592d2 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -155,6 +155,8 @@ export default function positionDropdown(element, opts) {
applyXStrategy(Strategies.StartToEnd)
} else if (align === "left-outside") {
applyXStrategy(Strategies.EndToStart)
+ } else if (align === "center") {
+ applyXStrategy(Strategies.MidPoint)
} else {
applyXStrategy(Strategies.StartToStart)
}
diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte
index f51ad96e05..627d7e525a 100644
--- a/packages/bbui/src/Tabs/Tab.svelte
+++ b/packages/bbui/src/Tabs/Tab.svelte
@@ -1,40 +1,28 @@
@@ -53,11 +56,12 @@
{#if icon}
@@ -72,7 +76,8 @@
{/if}
{title}
-{#if $selected.title === title}
+
+{#if isSelected}
diff --git a/packages/builder/package.json b/packages/builder/package.json
index f29ae3f7f2..a00936bdca 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -93,7 +93,6 @@
"identity-obj-proxy": "^3.0.0",
"jest": "29.7.0",
"jsdom": "^21.1.1",
- "ncp": "^2.0.0",
"svelte-jester": "^1.3.2",
"vite": "^4.5.0",
"vite-plugin-static-copy": "^0.17.0",
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 85af5bbafd..879927343f 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -374,6 +374,16 @@
return `${value.title || (key === "row" ? "Table" : key)} ${requiredSuffix}`
}
+ function handleAttachmentParams(keyValueObj) {
+ let params = {}
+ if (keyValueObj?.length) {
+ for (let param of keyValueObj) {
+ params[param.url] = param.filename
+ }
+ }
+ return params
+ }
+
onMount(async () => {
try {
await environment.loadVariables()
@@ -381,15 +391,6 @@
console.error(error)
}
})
- const handleAttachmentParams = keyValuObj => {
- let params = {}
- if (keyValuObj?.length) {
- for (let param of keyValuObj) {
- params[param.url] = param.filename
- }
- }
- return params
- }
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 9b4e5e36f6..1b52e35314 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -25,21 +25,21 @@
return !!schema.constraints?.inclusion?.length
}
- const handleAttachmentParams = keyValuObj => {
+ function handleAttachmentParams(keyValueObj) {
let params = {}
if (
schema.type === FieldType.ATTACHMENT_SINGLE &&
- Object.keys(keyValuObj).length === 0
+ Object.keys(keyValueObj).length === 0
) {
return []
}
- if (!Array.isArray(keyValuObj)) {
- keyValuObj = [keyValuObj]
+ if (!Array.isArray(keyValueObj) && keyValueObj) {
+ keyValueObj = [keyValueObj]
}
- if (keyValuObj.length) {
- for (let param of keyValuObj) {
+ if (keyValueObj.length) {
+ for (let param of keyValueObj) {
params[param.url] = param.filename
}
}
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 1ec32cb3fd..4ff8ae994b 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -14,9 +14,8 @@
import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
import Editor from "../../integration/QueryEditor.svelte"
- export let defaultValue
export let meta
- export let value = defaultValue || (meta.type === "boolean" ? false : "")
+ export let value
export let readonly
export let error
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 77229f3a17..26972ede16 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,5 +1,6 @@
@@ -14,12 +15,16 @@
-
-
-
-
+ {#if !disabled}
+
+
+
+
+
+
+ {:else}
-
+ {/if}
+
+
+ Changelog
+
+
+ import { Button, Label, Icon, Input, notifications } from "@budibase/bbui"
+ import { AppStatus } from "constants"
+ import { appStore, initialise } from "stores/builder"
+ import { appsStore } from "stores/portal"
+ import { API } from "api"
+ import { writable } from "svelte/store"
+ import { createValidationStore } from "helpers/validation/yup"
+ import * as appValidation from "helpers/validation/yup/app"
+ import EditableIcon from "components/common/EditableIcon.svelte"
+ import { isEqual } from "lodash"
+ import { createEventDispatcher } from "svelte"
+
+ export let alignActions = "left"
+
+ const values = writable({})
+ const validation = createValidationStore()
+ const dispatch = createEventDispatcher()
+
+ let updating = false
+ let edited = false
+ let initialised = false
+
+ $: filteredApps = $appsStore.apps.filter(app => app.devId == $appStore.appId)
+ $: app = filteredApps.length ? filteredApps[0] : {}
+ $: appDeployed = app?.status === AppStatus.DEPLOYED
+
+ $: appName = $appStore.name
+ $: appURL = $appStore.url
+ $: appIconName = $appStore.icon?.name
+ $: appIconColor = $appStore.icon?.color
+
+ $: appMeta = {
+ name: appName,
+ url: appURL,
+ iconName: appIconName,
+ iconColor: appIconColor,
+ }
+
+ const initForm = appMeta => {
+ edited = false
+ values.set({
+ ...appMeta,
+ })
+
+ if (!initialised) {
+ setupValidation()
+ initialised = true
+ }
+ }
+
+ const validate = (vals, appMeta) => {
+ const { url } = vals || {}
+ validation.check({
+ ...vals,
+ url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+ })
+ edited = !isEqual(vals, appMeta)
+ }
+
+ // On app/apps update, reset the state.
+ $: initForm(appMeta)
+ $: validate($values, appMeta)
+
+ const resolveAppUrl = (template, name) => {
+ let parsedName
+ const resolvedName = resolveAppName(null, name)
+ parsedName = resolvedName ? resolvedName.toLowerCase() : ""
+ const parsedUrl = parsedName ? parsedName.replace(/\s+/g, "-") : ""
+ return encodeURI(parsedUrl)
+ }
+
+ const nameToUrl = appName => {
+ let resolvedUrl = resolveAppUrl(null, appName)
+ tidyUrl(resolvedUrl)
+ }
+
+ const resolveAppName = (template, name) => {
+ if (template && !name) {
+ return template.name
+ }
+ return name ? name.trim() : null
+ }
+
+ const tidyUrl = url => {
+ if (url && !url.startsWith("/")) {
+ url = `/${url}`
+ }
+ $values.url = url === "" ? null : url
+ }
+
+ const updateIcon = e => {
+ const { name, color } = e.detail
+ $values.iconColor = color
+ $values.iconName = name
+ }
+
+ const setupValidation = async () => {
+ appValidation.name(validation, {
+ apps: $appsStore.apps,
+ currentApp: app,
+ })
+ appValidation.url(validation, {
+ apps: $appsStore.apps,
+ currentApp: app,
+ })
+ }
+
+ async function updateApp() {
+ try {
+ await appsStore.save($appStore.appId, {
+ name: $values.name?.trim(),
+ url: $values.url?.trim(),
+ icon: {
+ name: $values.iconName,
+ color: $values.iconColor,
+ },
+ })
+
+ await initialiseApp()
+ notifications.success("App update successful")
+ } catch (error) {
+ console.error(error)
+ notifications.error("Error updating app")
+ }
+ }
+
+ const initialiseApp = async () => {
+ const applicationPkg = await API.fetchAppPackage($appStore.appId)
+ await initialise(applicationPkg)
+ }
+
+
+
+
+
diff --git a/packages/builder/src/components/common/UpdateAppTopNav.svelte b/packages/builder/src/components/common/UpdateAppTopNav.svelte
new file mode 100644
index 0000000000..f4a76c4576
--- /dev/null
+++ b/packages/builder/src/components/common/UpdateAppTopNav.svelte
@@ -0,0 +1,68 @@
+
+
+
+
+
+
{
+ formPopover.show()
+ }}
+ >
+
+
+
+
+
+
+ {
+ formPopover.hide()
+ }}
+ />
+
+
+
+
+
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 105d1ed958..bb950983a6 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -8,13 +8,11 @@
ActionButton,
Icon,
Link,
- Modal,
StatusLight,
AbsTooltip,
} from "@budibase/bbui"
import RevertModal from "components/deploy/RevertModal.svelte"
import VersionModal from "components/deploy/VersionModal.svelte"
- import UpdateAppModal from "components/start/UpdateAppModal.svelte"
import { processStringSync } from "@budibase/string-templates"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import analytics, { Events, EventSource } from "analytics"
@@ -26,7 +24,6 @@
isOnlyUser,
appStore,
deploymentStore,
- initialise,
sortedScreens,
} from "stores/builder"
import TourWrap from "components/portal/onboarding/TourWrap.svelte"
@@ -37,7 +34,6 @@
export let loaded
let unpublishModal
- let updateAppModal
let revertModal
let versionModal
let appActionPopover
@@ -61,11 +57,6 @@
$: canPublish = !publishing && loaded && $sortedScreens.length > 0
$: lastDeployed = getLastDeployedString($deploymentStore, lastOpened)
- const initialiseApp = async () => {
- const applicationPkg = await API.fetchAppPackage($appStore.devId)
- await initialise(applicationPkg)
- }
-
const getLastDeployedString = deployments => {
return deployments?.length
? processStringSync("Published {{ duration time 'millisecond' }} ago", {
@@ -247,16 +238,12 @@
appActionPopover.hide()
if (isPublished) {
viewApp()
- } else {
- updateAppModal.show()
}
}}
>
{$appStore.url}
{#if isPublished}
- {:else}
-
{/if}
@@ -330,20 +317,6 @@
Are you sure you want to unpublish the app 
