Skip to content

Commit

Permalink
Merge pull request #9491 from ToolJet/release/community
Browse files Browse the repository at this point in the history
Release: Community (v2.37.0)
  • Loading branch information
akshaysasidrn committed Apr 25, 2024
2 parents 960eb57 + 68d0c9c commit 7bec811
Show file tree
Hide file tree
Showing 591 changed files with 16,990 additions and 14,276 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs-pr-app.yml
Expand Up @@ -40,11 +40,11 @@ jobs:
},
{
"key": "NODE_VERSION",
"value": "16.18.1"
"value": "18.18.2"
},
{
"key": "NPM_VERSION",
"value": "8.19.2"
"value": "9.8.1"
},
{
"key": "GTM",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tooljet-release-docker-image-build.yml
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Send Slack Notification
run: |
if [[ "${{ job.status }}" == "success" ]]; then
message="Job '${{ env.JOB_NAME }}' succeeded! tooljet/tooljet-ce:${{ github.event.release.tag_name }}"
message="ToolJet community image published:\n\`tooljet/tooljet-ce:${{ github.event.release.tag_name }}\`"
else
message="Job '${{ env.JOB_NAME }}' failed! tooljet/tooljet-ce:${{ github.event.release.tag_name }}"
fi
Expand Down
2 changes: 1 addition & 1 deletion .version
@@ -1 +1 @@
2.36.1
2.37.0
1 change: 1 addition & 0 deletions docs/.nvmrc
@@ -0,0 +1 @@
v18.18.2
2 changes: 1 addition & 1 deletion docs/docs/actions/unset-variable.md
Expand Up @@ -3,7 +3,7 @@ id: unset-variable
title: Unset variable
---

This action allows you to remove the variable variable that was created using the set variable action.
This action allows you to remove the variable that was created using the set variable action.

## Options

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/app-builder/toolbar.md
Expand Up @@ -75,7 +75,7 @@ Versioning is also helpful when working with **[multiple environments](/docs/rel
### Gitsync
The `Gitsync` icon next to the versions dropdown allows you to sync your application with your GitHub repository.

Read more about Gitsync **[here](/docs/gitsync.md)**.
Read more about Gitsync **[here](/docs/gitsync)**.
### Undo or Redo

You can Undo or Redo any action performed on the canvas using the Undo and Redo buttons.
Expand Down
Expand Up @@ -279,7 +279,7 @@ The **manifest.json** file is utilized by the connection modal component, which
```
The operations.json file specifies the available operations that can be executed on the data source. It provides details about the operation type, required fields to execute the operation, and the data type of each field. The label, key, type, description, and hint properties are used to define the specific fields and their types required to establish a connection with the API or data source.

## Step 4: Add the npm package of Gitub to the plugin dependencies
## Step 4: Add the npm package of GitHub to the plugin dependencies

- Change directory to the plugin directory where the npm package needs to be installed and then install the package
```bash
Expand Down
30 changes: 15 additions & 15 deletions docs/docs/contributing-guide/setup/docker.md
Expand Up @@ -15,7 +15,7 @@ If you rather want to try out ToolJet locally with docker, you can follow the st

## Prerequisites

Make sure you have the latest version of `docker` and `docker-compose` installed.
Make sure you have the latest version of `docker` and `docker compose` installed.

[Official docker installation guide](https://docs.docker.com/desktop/)

Expand All @@ -27,8 +27,8 @@ We recommend:
docker --version
Docker version 19.03.12, build 48a66213fe

docker-compose --version
docker-compose version 1.26.2, build eefe0d31
docker compose --version
docker compose version 1.26.2, build eefe0d31
```

## Setting up
Expand Down Expand Up @@ -94,20 +94,20 @@ Please find more information [here](https://docs.docker.com/desktop/windows/wsl/
4. Build docker images

```bash
docker-compose build
docker-compose run --rm plugins npm run build:plugins
docker compose build
docker compose run --rm plugins npm run build:plugins
```

5. Run ToolJet

```bash
docker-compose up
docker compose up
```
ToolJet should now be served locally at `http://localhost:8082`.

8. To shut down the containers,
```bash
docker-compose stop
docker compose stop
```

## Making changes to the codebase
Expand All @@ -116,9 +116,9 @@ If you make any changes to the codebase/pull the latest changes from upstream, t

Caveat:

1. If the changes include database migrations or new npm package additions in the package.json, you would need to restart the ToolJet server container by running `docker-compose restart server`.
1. If the changes include database migrations or new npm package additions in the package.json, you would need to restart the ToolJet server container by running `docker compose restart server`.

2. If you need to add a new binary or system library to the container itself, you would need to add those dependencies in `docker/server.Dockerfile.dev` and then rebuild the ToolJet server image. You can do that by running `docker-compose build server`. Once that completes you can start everything normally with `docker-compose up`.
2. If you need to add a new binary or system library to the container itself, you would need to add those dependencies in `docker/server.Dockerfile.dev` and then rebuild the ToolJet server image. You can do that by running `docker compose build server`. Once that completes you can start everything normally with `docker compose up`.

Example:
Let's say you need to install the `imagemagick` binary in your ToolJet server's container. You'd then need to make sure that `apt` installs `imagemagick` while building the image. The Dockerfile at `docker/server.Dockerfile.dev` for the server would then look something like this:
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN ["chmod", "755", "entrypoint.sh"]
```

Once you've updated the Dockerfile, rebuild the image by running `docker-compose build server`. After building the new image, start the services by running `docker-compose up`.
Once you've updated the Dockerfile, rebuild the image by running `docker compose build server`. After building the new image, start the services by running `docker compose up`.

## Running tests

Expand All @@ -159,24 +159,24 @@ Test config picks up config from `.env.test` file at the root of the project.
Run the following command to create and migrate data for test db

```bash
docker-compose run --rm -e NODE_ENV=test server npm run db:create
docker-compose run --rm -e NODE_ENV=test server npm run db:migrate
docker compose run --rm -e NODE_ENV=test server npm run db:create
docker compose run --rm -e NODE_ENV=test server npm run db:migrate
```

To run the unit tests
```bash
docker-compose run --rm server npm run --prefix server test
docker compose run --rm server npm run --prefix server test
```

To run e2e tests
```bash
docker-compose run --rm server npm run --prefix server test:e2e
docker compose run --rm server npm run --prefix server test:e2e
```

To run a specific unit test

```bash
docker-compose run --rm server npm --prefix server run test <path-to-file>
docker compose run --rm server npm --prefix server run test <path-to-file>
```

## Troubleshooting
Expand Down
3 changes: 2 additions & 1 deletion docs/docs/contributing-guide/setup/macos.md
Expand Up @@ -14,7 +14,8 @@ Follow these steps to setup and run ToolJet on macOS for development purposes. O
1. Set up the environment

1.1 Install Homebrew
```/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
```bash
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
```

1.2 Install Node.js ( version: v18.18.2 ) and npm (version: v9.8.1)
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/contributing-guide/troubleshooting/eslint.md
Expand Up @@ -42,5 +42,5 @@ For VSCode users, you can set the formatter to `ESLint` in the [**settings.json*
2. **npm version 9.8.1**

:::tip
It is recommended to check the VSCode **Setting.json**(Press `ctrl/cmnd + P` and search `>Settings (JSON)`) file to ensure there are no overrides to the eslint config rules. Comment the following rules for eslint: **eslint.options: {...}**.
It is recommended to check the VSCode **Setting.json**(Press `ctrl/cmnd + P` and search `>Settings (JSON)`) file to ensure there are no overrides to the eslint config rules. Comment the following rules for eslint: **eslint.options: `{...}`**.
:::
2 changes: 1 addition & 1 deletion docs/docs/data-sources/custom-js.md
Expand Up @@ -48,7 +48,7 @@ When the query is triggered the alert will show the parameters value.

Let's demonstrate how to utilize parameters in RunJS queries and call one query from another by providing custom parameter values:

1. Begin by creating a new RunJS query named `multiply`. In this query, add the following parameters: **num1** with a default value of `10` and **num2** with a default value of `2`. To display the result, place a text component on the canvas and set its text to **{{queries.multiply.data}}**. Save and Run the query.
1. Begin by creating a new RunJS query named `multiply`. In this query, add the following parameters: **num1** with a default value of `10` and **num2** with a default value of `2`. To display the result, place a text component on the canvas and set its text to `{{queries.multiply.data}}`. Save and Run the query.
<div style={{textAlign: 'center'}}>

<img className="screenshot-full" src="/img/datasource-reference/custom-javascript/multiply.png" alt="Run JavaScript code" />
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/data-sources/mongodb.md
Expand Up @@ -145,7 +145,7 @@ Delete many records based on the filter. [Reference](https://docs.mongodb.com/dr

Perform bulk operations. [Reference](https://docs.mongodb.com/drivers/node/v4.0/usage-examples/bulkWrite/)

### Dynamic Quries
### Dynamic Queries

```javascript
{ amount: { $lt: '{{ components.textinput1.value }}' }}
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/data-sources/notion.md
Expand Up @@ -57,7 +57,7 @@ This operations retrieves a Database object using the ID specified.

- **Database ID**: You'll find the Database ID in the url. Suppose this is the example url: `https://www.notion.so/workspace/XXX?v=YYY&p=ZZZ` then `XXX` is the database ID, `YYY` is the view ID and `ZZZ` is the page ID.

<img className="screenshot-full" src="/img/datasource-reference/notion/db_retrieve.png" alt="notion db retreieve" />
<img className="screenshot-full" src="/img/datasource-reference/notion/db_retrieve.png" alt="notion db retrieve" />

#### 2. Query a database

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/data-sources/overview.md
Expand Up @@ -91,7 +91,7 @@ To configure these permissions, navigate to **Workspace Settings** -> **Groups S
| **Just Create** | Add new data sources and modify existing ones. Delete button will not be visible on hovering over the connected data source. |
| **Just Delete** | Remove connected data sources from the workspace. Delete button will show up on hovering over the connected data source. |
| **Both Create and Delete** | Add new data sources and remove connected data sources from the workspace. |
| **Niether Create nor Delete** | No access to the Data Sources page from the Dashboard. Error toast will popup on trying to access the Data Sources page using URL. |
| **Neither Create nor Delete** | No access to the Data Sources page from the Dashboard. Error toast will popup on trying to access the Data Sources page using URL. |

<div style={{textAlign: 'center'}}>

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/data-sources/restapi.md
Expand Up @@ -188,7 +188,7 @@ Google Cloud Platform provides access to more than 350 APIs and Services that ca
2. Navigate to the **APIs and Services**, and then open the **OAuth consent screen** section from the left sidebar.
3. Enter the Application details and select the appropriate scopes for your application. We will select the profile and the email scopes.
4. Once you have created the OAuth consent screen, Create new credentials for the **OAuth client ID** from the **Credentials** section in the left sidebar.
5. Select the application type, enter the application name, and then add the following URIs under Authorised Redirect URIs:
5. Select the application type, enter the application name, and then add the following URIs under Authorized Redirect URIs:
1. `https://app.tooljet.com/oauth2/authorize` (if you鈥檙e using ToolJet cloud)
2. `http://localhost:8082/oauth2/authorize` (if you鈥檙e using ToolJet locally)
6. Now save and then you鈥檒l get the **Client ID and Client secret** for your application.
Expand Down

0 comments on commit 7bec811

Please sign in to comment.