diff --git a/.github/workflows/render-preview-deploy.yml b/.github/workflows/render-preview-deploy.yml index 70dd0c02d0..3f1e0ddb4b 100644 --- a/.github/workflows/render-preview-deploy.yml +++ b/.github/workflows/render-preview-deploy.yml @@ -57,6 +57,10 @@ jobs: "key": "PG_DB", "value": "${{ env.PR_NUMBER }}" }, + { + "key": "ENABLE_TOOLJET_DB", + "value": "true" + }, { "key": "TOOLJET_DB", "value": "${{ env.PR_NUMBER }}" diff --git a/.github/workflows/render-suspend-labeler.yml b/.github/workflows/render-suspend-labeler.yml index b60dca1748..7860ae3ade 100644 --- a/.github/workflows/render-suspend-labeler.yml +++ b/.github/workflows/render-suspend-labeler.yml @@ -27,7 +27,7 @@ jobs: env: STALE_NUMBERS: ${{ steps.stale-label.outputs.stale-numbers }} with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.TJ_BOT_PAT }} script: | if (!process.env.STALE_NUMBERS) return diff --git a/docs/docs/contributing-guide/setup/ubuntu.md b/docs/docs/contributing-guide/setup/ubuntu.md index 72dac0405d..17ceea4ee1 100644 --- a/docs/docs/contributing-guide/setup/ubuntu.md +++ b/docs/docs/contributing-guide/setup/ubuntu.md @@ -74,9 +74,10 @@ Follow these steps to setup and run ToolJet on Ubuntu. Open terminal and run the ```bash cd ./frontend && npm start ``` - - + + :::info The client will start running on the port 8082, you can access the client by visiting: [https://localhost:8082](https://localhost:8082) + ::: 9. Create login credentials diff --git a/docs/docs/contributing-guide/tutorials/creating-a-plugin.md b/docs/docs/contributing-guide/tutorials/creating-a-plugin.md index 3192928987..ac8fd54687 100644 --- a/docs/docs/contributing-guide/tutorials/creating-a-plugin.md +++ b/docs/docs/contributing-guide/tutorials/creating-a-plugin.md @@ -75,7 +75,7 @@ All the plugins live under the `/plugins` directory. The structure of a plugin l manifest.json ``` -5. Add data source config paramets to manifest.json +5. Add data source config parameters to manifest.json Our BigQuery plugin needs private key of a GCP service account to connect to BigQuery. Let's add `private_key` as a property for the data source. diff --git a/docs/docs/how-to/bulk-update-multiple-rows-in-table.md b/docs/docs/how-to/bulk-update-multiple-rows-in-table.md index af9ccf6693..437190160c 100644 --- a/docs/docs/how-to/bulk-update-multiple-rows-in-table.md +++ b/docs/docs/how-to/bulk-update-multiple-rows-in-table.md @@ -98,7 +98,7 @@ Let's create a new PostgreSQL query and name it `update`. In **SQL mode**, enter - Click on the handle of the **Table** widget to open its properties - Go to the **Events**, and add a handler -- Select **Bulk Update** in Events, **Run Query** in Actions, and then select the **runjs1** query in Query. Now whenever a user will edit the table and hit the **Save Changes** button runjs1 will run. +- Select **Save Changes** in Events, **Run Query** in Actions, and then select the **runjs1** query in Query. Now whenever a user will edit the table and hit the **Save Changes** button runjs1 will run.
@@ -112,4 +112,4 @@ Let's create a new PostgreSQL query and name it `update`. In **SQL mode**, enter ![ToolJet - How To - Bulk update multiple rows in table](/img/how-to/bulk-update-multiple/success.png) -
\ No newline at end of file + diff --git a/docs/docs/intro.md b/docs/docs/intro.md index a50ff181ae..c9926e0839 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -1,7 +1,7 @@ --- id: introduction title: Introduction -description: ToolJet is an **open-source low-code framework** to build and deploy custom internal tools. ToolJet can connect to your data sources such as databases ( PostgreSQL, MongoDB, MS SQL Server, Snowflake, , BigQuery, etc ), API/GraphQL endpoints, SaaS tools ( Airtable, Stripe, Google Sheets, etc ) and cloud object storage services ( AWS S3, Google Cloud Storage and Minio ). Once the data sources are connected, ToolJet can run queries on these data sources to fetch and update data. The data fetched from data sources can be visualised and modified using the UI widgets such as tables, charts, forms, etc. +description: ToolJet is an **open-source low-code framework** to build and deploy custom internal tools. ToolJet can connect to your data sources such as databases (PostgreSQL, MongoDB, MS SQL Server, Snowflake, , BigQuery, etc), API/GraphQL endpoints, SaaS tools (Airtable, Stripe, Google Sheets, etc) and cloud object storage services (AWS S3, Google Cloud Storage and Minio). Once the data sources are connected, ToolJet can run queries on these data sources to fetch and update data. The data fetched from data sources can be visualised and modified using the UI widgets such as tables, charts, forms, etc. slug: / --- diff --git a/docs/docs/setup/kubernetes-gke.md b/docs/docs/setup/kubernetes-gke.md index c0eff87f83..b8f919b8b9 100644 --- a/docs/docs/setup/kubernetes-gke.md +++ b/docs/docs/setup/kubernetes-gke.md @@ -69,6 +69,6 @@ If you want to seed the database with a sample user, please SSH into a pod and r This seeds the database with a default user with the following credentials: -**emai**: `dev@tooljet.io` +**email**: `dev@tooljet.io` **password**: `password` diff --git a/docs/docs/tracking.md b/docs/docs/tracking.md index 6033e14f19..7ecc966600 100644 --- a/docs/docs/tracking.md +++ b/docs/docs/tracking.md @@ -20,4 +20,4 @@ Self-hosted version of ToolJet pings our server to fetch the latest product upda ToolJet tracks anonymous usage data such as page loads and clicks. ToolJet tracks only the events and doesn't capture data from data sources. -Tracking can be disabled by setting the value environment variable `ENABLE_TRACKING` to `0`. +Tracking can be disabled by setting the value [environment variable](/docs/setup/env-vars/) ENABLE_TRACKING to 0. diff --git a/docs/docs/tutorial/adding-a-datasource.md b/docs/docs/tutorial/adding-a-datasource.md index a8e2d9fb8e..c9b263566b 100644 --- a/docs/docs/tutorial/adding-a-datasource.md +++ b/docs/docs/tutorial/adding-a-datasource.md @@ -26,11 +26,11 @@ You will be prompted to select the data source that you wish to add. Let's selec The name of the data source must be unique (within the app) and can be changed by clicking on the data source name at the top of the prompt. Click on `Test Connection` button to verify the connection, this might take a couple of minutes. Once verified, save the data source. :::tip -If you are using ToolJet cloud and if your data source is not publicly accessible, please white-list our IP address ( shown while creating a new data source ). +If you are using ToolJet cloud (https://app.tooljet.com) and if your data source is not publicly accessible, please white-list our IP address ( shown while creating a new data source ). :::
postgre add datasource -
\ No newline at end of file + diff --git a/docs/docs/tutorial/creating-app.md b/docs/docs/tutorial/creating-app.md index 08d97e2496..24a9c14706 100644 --- a/docs/docs/tutorial/creating-app.md +++ b/docs/docs/tutorial/creating-app.md @@ -26,6 +26,6 @@ You will be redirected to the visual app editor once the app has been created. C The main components of an app: -- **[Widgets](https://docs.tooljet.com/docs/tutorial/adding-widget)** - UI components such as tables, buttons, dropdowns. +- **[Components](https://docs.tooljet.com/docs/tutorial/adding-widget)** - UI components such as tables, buttons, dropdowns. - **[Data sources](https://docs.tooljet.com/docs/tutorial/adding-a-datasource)** - ToolJet can connect to databases, APIs and external services to fetch and modify data. - **[Queries](https://docs.tooljet.com/docs/tutorial/building-queries)** - Queries are used to access the connected data sources. \ No newline at end of file diff --git a/docs/docs/tutorial/multiworkspace.md b/docs/docs/tutorial/multiworkspace.md index 3f1b8c2b48..f13b235f0d 100644 --- a/docs/docs/tutorial/multiworkspace.md +++ b/docs/docs/tutorial/multiworkspace.md @@ -5,42 +5,37 @@ title: Multi-Workspace # Multi-Workspace -User can create their own workspaces, user who created workspace will be having admin privileges for the workspace. - - +Users can create their own workspaces, a user who created workspace will be having **Admin** privileges for the workspace. multi workspace - ## Hierarchy
- - + tooljet workspace -
## Permissions - The administrator can manage [users and groups](/docs/tutorial/manage-users-groups) of each workspace - Applications and settings can not be shared between workspaces -- A user authorised to login to Tooljet will not have access to all workspaces, Usesr should be invited or signed up to a workspace to log-in to it. +- A user authorised to login to ToolJet will not have access to all workspaces, User should be invited or signed up to a workspace to access it. ## Enabling Multi-Workspace -Set environment variable **DISABLE_MULTI_WORKSPACE** value to **false** to enable the feature, and **true** to disable it. +Set environment variable **DISABLE_MULTI_WORKSPACE** value to **false** to enable the feature, and **true** to disable it. ### When enabled -- When Multi-Workspace feature is enabled, user should login with username and password to log in to Tooljet. +- When Multi-Workspace feature is enabled, user should login with username and password to log in to ToolJet. - Administrator can configure authentication methods for their workspaces. - If password login is enabled, switching to the workspace will happen without any other authorization since the user is already authorized with password login. -- User logged in to Toojet and trying to switch to a workspace where SSO is enabled and password login is disabled, will be redirected to workspace login page and enabled SSO options will be shown +- User logged in to TooJet and trying to switch to a workspace where SSO is enabled and password login is disabled, will be redirected to workspace login page and enabled SSO options will be shown - User can directly login to a workspace using workspace login URL, Administrator can view the URL **Manage SSO -> General Settings -> Login URL**. ### When disabled - If Multi-Workspace is disabled, Create workspace feature won’t be available. -- No separate login page for workspace and SSO configured for the workspace will be reflected to the main login page/login. \ No newline at end of file +- No separate login page for workspace and SSO configured for the workspace will be reflected to the main login page/login. diff --git a/docs/docs/tutorial/workspace-environment-variables.md b/docs/docs/tutorial/workspace-environment-variables.md index ab3a6239af..361a37f26d 100644 --- a/docs/docs/tutorial/workspace-environment-variables.md +++ b/docs/docs/tutorial/workspace-environment-variables.md @@ -10,7 +10,7 @@ Workspace Variables are the variables with some value(usually tokens/secret keys Suppose there is an `API key` or a value that you want to use in the queries or widgets in the multiple apps of the same Workspace then the Workspace admin or the user with permissions can add an environment variable. #### Adding the environment variable -- Go to the ToolJet Dashboard, and click on the dropdown on the navigation bar to show `Workspace` options +- Go to the ToolJet's Dashboard, and click on the dropdown on the navigation bar to show `Workspace` options - Select `Manage Environment Variables` - Click on `Add New Variable` button - Give a `Name` to the variable, set the value, choose `Type`, toggle `Encryption`, and click **Add Variable** button @@ -22,12 +22,12 @@ Suppose there is an `API key` or a value that you want to use in the queries or ### Types of variables -- **Client**: The client variable can be used in widgets and queries. +- **Client**: The client variables can be used in widgets and queries. -- **Server**: The server variables can be used with all the queries except the `RunJS`. The reason why we don't allow the server variables to be used with the widgets is that these variables are only resolved during the runtime so they're highly secured. +- **Server**: The server variables can be used with all the queries except the `RunJS` or 'RunPy'. The reason why we don't allow the server variables to be used with the components is that these variables are only resolved during the runtime so they're highly secured. :::info -Variable Type cannot be changed once it has been created. +Variable's Type cannot be changed once it has been created. ::: diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css index a547d5ccc7..10105062c5 100644 --- a/docs/src/css/custom.css +++ b/docs/src/css/custom.css @@ -249,6 +249,10 @@ strong { var(--ifm-color-emphasis-100) 100%); } +.DocSearch-Button{ + border-radius: 5px !important; +} + @media screen and (min-width: 768px) { .DocSearch-Button-Container { min-width: 200px; diff --git a/frontend/assets/images/icons/app-icons/calender.svg b/frontend/assets/images/icons/app-icons/calendar.svg similarity index 100% rename from frontend/assets/images/icons/app-icons/calender.svg rename to frontend/assets/images/icons/app-icons/calendar.svg diff --git a/frontend/src/Editor/Components/Multiselect.jsx b/frontend/src/Editor/Components/Multiselect.jsx index 72bbe2292f..f1ef850772 100644 --- a/frontend/src/Editor/Components/Multiselect.jsx +++ b/frontend/src/Editor/Components/Multiselect.jsx @@ -75,43 +75,53 @@ export const Multiselect = function Multiselect({ registerAction( 'selectOption', async function (value) { - const newSelected = [ - ...selected, - ...selectOptions.filter( - (option) => option.value === value && !selected.map((selectedOption) => selectedOption.value).includes(value) - ), - ]; - setSelected(newSelected); - setExposedVariable( - 'values', - newSelected.map((item) => item.value) - ).then(() => fireEvent('onSelect')); + if ( + selectOptions.some((option) => option.value === value) && + !selected.some((option) => option.value === value) + ) { + const newSelected = [ + ...selected, + ...selectOptions.filter( + (option) => + option.value === value && !selected.map((selectedOption) => selectedOption.value).includes(value) + ), + ]; + setSelected(newSelected); + setExposedVariable( + 'values', + newSelected.map((item) => item.value) + ).then(() => fireEvent('onSelect')); + } }, [selected, setSelected] ); registerAction( 'deselectOption', async function (value) { - const newSelected = [ - ...selected.filter(function (item) { - return item.value !== value; - }), - ]; - setSelected(newSelected); - setExposedVariable( - 'values', - newSelected.map((item) => item.value) - ).then(() => fireEvent('onSelect')); + if (selectOptions.some((option) => option.value === value) && selected.some((option) => option.value === value)) { + const newSelected = [ + ...selected.filter(function (item) { + return item.value !== value; + }), + ]; + setSelected(newSelected); + setExposedVariable( + 'values', + newSelected.map((item) => item.value) + ).then(() => fireEvent('onSelect')); + } }, [selected, setSelected] ); registerAction( 'clearSelections', async function () { - setSelected([]); - setExposedVariable('values', []).then(() => fireEvent('onSelect')); + if (selected.length >= 1) { + setSelected([]); + setExposedVariable('values', []).then(() => fireEvent('onSelect')); + } }, - [setSelected] + [selected, setSelected] ); return ( diff --git a/frontend/src/Editor/Inspector/Inspector.jsx b/frontend/src/Editor/Inspector/Inspector.jsx index 6cc1d0c33f..98e5331459 100644 --- a/frontend/src/Editor/Inspector/Inspector.jsx +++ b/frontend/src/Editor/Inspector/Inspector.jsx @@ -128,6 +128,13 @@ export const Inspector = ({ if (param.type === 'select' && defaultValue) { allParams[defaultValue.paramName]['value'] = defaultValue.value; } + if (param.name === 'secondarySignDisplay') { + if (value === 'negative') { + newDefinition['styles']['secondaryTextColour']['value'] = '#EE2C4D'; + } else if (value === 'positive') { + newDefinition['styles']['secondaryTextColour']['value'] = '#36AF8B'; + } + } } else { allParams[param.name] = value; } diff --git a/frontend/src/_components/Organization.jsx b/frontend/src/_components/Organization.jsx index 4a589f8bdc..22c53df4d8 100644 --- a/frontend/src/_components/Organization.jsx +++ b/frontend/src/_components/Organization.jsx @@ -328,6 +328,7 @@ export const Organization = function Organization({ darkMode }) { href="#" className={`btn ${!isSingleOrganization || admin ? 'dropdown-toggle' : ''} ${darkMode && 'text-muted'}`} onMouseOver={() => setIsListOrganizations(false)} + style={{ height: '38px' }} >
{organization}
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss index 22a2a5f9e6..a51da4a5eb 100644 --- a/frontend/src/_styles/theme.scss +++ b/frontend/src/_styles/theme.scss @@ -4500,7 +4500,7 @@ input[type="text"] { } .modal-main { - padding-bottom: 5rem; + padding-bottom: 1.5rem; } .modal-footer-btn { @@ -5173,7 +5173,7 @@ div#driver-page-overlay { } .organization-list { - margin-top: 5px; + margin-top: 4px; .btn { border: 0px; @@ -6854,4 +6854,4 @@ tbody { } } -} \ No newline at end of file +}