Commit graph

549 commits

Author SHA1 Message Date
Akshay
ad4d81c5f4
Merge branch 'main' into release/templates-1.0 2024-01-05 19:19:01 +05:30
Abhinaba Adhikari
491908ebb6
Add new templates and remove old templates (#8490)
* bugfix: airtable plugin support for personal access token (#8295)

* fix: airtable plugin support for personal access token

* fix: review comments fixed

* Add new templates and remove old templates

* Change onboarding page templates and fix CSS

* Change Job application tracker template images

* Implement dark mode for onbarding page templates

* Fix templates with query issues

* fix template creation

* Remove redundant datasource options from templates

---------

Co-authored-by: Ganesh Kumar <40178541+ganesh8056@users.noreply.github.com>
Co-authored-by: Akshay <akshaysasidharan93@gmail.com>
2024-01-05 17:46:52 +05:30
Arpit
b91029a008
[hotfix] CE fixes (#8395)
* events should be synced for multi-edit

* remove console

* removes db constrainsts for layouts and handles corrupeted apps created from prev migrations

* Revert "removes db constrainsts for layouts and handles corrupeted apps created from prev migrations"

This reverts commit 10a307118b.

* removing constrainsts fro CE

* bumped the patched version ~ 2.26.3

* fixes: import/export general styles for components

* fixes: viewer crash on adding plugin as gds due to accessing camalised data

* fixes: plugin queries gds

* preserve duplicate search params on restapi

* preserve duplicate params in query manager params fields

* fixes: edge cases where undo of some components crashes thew widget

---------

Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
2023-12-28 15:16:50 +05:30
Midhun G S
49d11d7cd6
Added test user on seeding (#8393)
* Added test user on seeding

* fix

* fix

* fix
2023-12-22 17:51:06 +05:30
Muhsin Shah C P
53d119680f
[chore] Node-module vulnerabilities (#8226)
* started working on node upgrade to 18.18.2

* testing ci

* updated ci node version

* updated action code

* deleted all package-lock.json files

* deleted and ovverrided some packages

* deleted and fixed server & frontend vulnerabilities

* updated firestore version

* fix: ws type issue

* fix: upgraded lerna version

* regenerated package-lock.json files again

* regenerated marketplace lock file

* updated node version in other ci and docker files

* update: lock file plugin side

* updated the npm version in docker & ci files

* removed unused imports from events file

* removed dependency-review action

* updated some packages

* tried to go with current node-module of jest. had to upgrade

* fix: deprecated function usage - ts-jest

* fix: server directory lint issues

* fixed login page issue after router-dom upgrade

* updated import/no-unresolved rule to ignore import errors of  react-loading-skeleton, react-spring packages

* fix: cypress node version & package-lock issue

* regenerated cli package-lock.json

* fix: new webpack version might cause runtime issues (had issues with enterprise). lets use old version only

* fix: form-data docker issue

* removed comment
2023-12-21 11:55:35 +05:30
Anantshree Chandola
b556c06d21
Fix for handling 'go to app' event for previously added unreleased apps and new apps (#8169)
* fix go to app event for unreleased apps

* updates
2023-12-19 20:06:23 +05:30
vjaris42
ab3c03847e
fix: constants resolution on saved datasources (#8223) 2023-12-19 10:35:56 +05:30
Arpit
911d152176
[Hotfix] Table component column generations issues (#8309)
* fixes: on column deletion, the array is replaced with prev data instead of latest update from client

* fixes: table crash on viewer editor as there are duplicte columns while create component definition
2023-12-14 15:50:07 +05:30
Arpit
f2de0f2374
fixes:only gds queries caanot be versioned on creating a new versions (#8292) 2023-12-12 17:47:17 +05:30
Kavin Venkatachalam
6cc57e704b Merge branch 'main' of https://github.com/ToolJet/ToolJet into appbuilder-1.4 2023-12-11 15:54:08 +05:30
Nakul Nagargade
63c0682a55
Allow esm.sh as a allowed source for importing ES6 modules from a URL in script-src (#7499) 2023-12-11 15:18:33 +05:30
Akshay Sasidharan
52162f75a4 Merge branch 'develop' into release/marketplace-1.5 2023-12-07 19:42:23 +05:30
Sherfin Shamsudeen
83b53c949b
[hotfix ]fix: event mapping query race condition (#8258) (#8261)
* [hotfix ]fix: event mapping query race condition (#8258)

* fix: event mapping query race condition

* fixes: duplication dq from lds and gds

* Bump version (#8262)

---------

Co-authored-by: Arpit <arpitnath42@gmail.com>
2023-12-07 19:17:03 +05:30
Akshay Sasidharan
ffffc7f2f4 Merge branch 'develop' into release/marketplace-1.5 2023-11-29 17:36:50 +05:30
Akshay Sasidharan
80dc61e92c make join errors user friendly 2023-11-17 16:06:09 +05:30
Arpit
84026a25ec
Hotfix : Import/export apps with tabs (#8162)
* fixes: tab children should be correctly mapped on imprted app from older versions

* fixes: event mapping for import/export

* fixes: run queries on page load is not available untill manually run once

* Sort event getting fired only when sorting is applied in the table (#8165)

* bug fixed : sort event getting fired on each render

* removed then

* bumping version to v2.24.2

---------

Co-authored-by: Manish Kushare <37823141+manishkushare@users.noreply.github.com>
2023-11-17 15:53:56 +05:30
Akshay
2f48cde337
Add query validation for TJDB join (#7854)
* Updated cypess mysql spec (#7717)

* add join table dto

* update dto

* add join query validation setup

* inprogress: join raw query as parameterized query

* fix: only limit and offset values are parameterized still filter values are pending to be parameterized

* make use of querybuilder with parameterized query

* add tjdb orm logging

* fix function name

* remove unused argument

* revise imports

* update error message

---------

Co-authored-by: Mekhla Asopa <59684099+Mekhla-Asopa@users.noreply.github.com>
Co-authored-by: Ganesh Kumar <ganesh8056234@gmail.com>
2023-11-17 12:18:41 +05:30
Ganesh Kumar
a13ad5a6a9
Slack plugin oauth flow not working (#7702)
* fix: slack oauth access token undefined error fixed - but query returns un-authorized

* fix: slack oauth issue fixed

* fix: removed the commented code
2023-11-16 12:18:03 +05:30
Ganesh Kumar
a03b73d4a8
Bugfix/App export should also export tables in join query - Design Review Changes (#7806)
* basic and static join query executed

* tooljetDB Join operation flow - work inprogress

* complete flow for tooljetdb join pending testing and minor changes

* updated constructHavingStatement method logic to support aggregation function and added comments

* worki in progress tooljetDB Join

* feat: added basic layout for tjdb join fields

* feat: dropdown support for icons

* feat: working on where condition ui in join

* feat: added base layout for filter and sort in tooljetdb join

* feat: added multi select support and minor style changes

* feat: support default value for selectbox

* feat: dd select styling added

* style: override vanilla  dd select styles with tj styles

* fix: fixed minor UI issues in select box

* feat: added select section layout

* feat: added hooks state for join options

* feat: load all added tables columns

* feat: working on where section logic

* feat: join constraints UI

* feat: filter condition dropdowns added

* feat: join widget for join query op in tjdb

* feat: sort section base UI

* feat: select widget for join query in tjdb

* feat: filter section add option and delete option done

* feat: update filter condition logic added

* feat: added onchange event for operator and rhs values update

* feat: added sort dropdown for tjdb join

* feat: base logic for Filters in join query

* fix: removed comments and added validation for fetching table details

* feat: add limit option logic

* feat: backend api has been integrated for tooljetdb joins

* added icons to solid icons

* fix: jsconfig auto save lint fix

* fix: update from table when selected table changes

* feat: added from to join table options in tjdb dq

* fix: added fetching tables list for JSON in backend

* fix: fixed json data for join query

* fix: temp fix for fields with empty object

* feat: added icon support for dd select

* fix: added default state to avoid error in conditionlist

* fix: limit tables selection to already joined tables in tjdb join

* fix: empty values to orderBy, filters and limit will remove the option from json

* fix: in json first level empty value scenario has been handled

* fix: select in tooljetdb join query can have multiple columns with same name handled by adding prefix tablename_ to the column name

* fix: restrict selectable tables in join contraints

* feat: reset join constraints when invlaid joins added

* fix: empty values will not be allowed UI validation

* fix: codehinter border has been removed

* fix: recalculate join data when join tables change

* fix: corrected options length calc for showing search box

* fix: filter table dropdown must contain only selected tables from join section

* fix: empty values validation has been removed

* fix: add from attribute to join options

* fix: alias is added to all the table column

* feat: selected option in Select section will be at the top

* fix: reset joins when selected table changed

* fix: drop down focus ui

* feat: autoselect all columns by defualt for join select

* feat: restrict column selection to same datatype

* fix: removed blank table names from select

* feat: added tooltip for info

* fix: removed duplicate tooltip

* fix: add button in table dropdown

* fix: added from table object back

* feat: tjdb join select dropdown select all cols by default

* fix: add new table button name corrected

* feat: no table selected error message

* feat: add select style for select dropdown

* style: updated dropdown select style to match new theme

* feat: added alert modal for deleting joins

* feat: hardcode operator since once one option available at the moment

* style: fix icon styles for dropdown

* feat: created reusable confirm dialogue

* fix: fixed bug for nested dropdowns

* fix; cache select components to prevent unnecessory rerenders

* feat: reused the common popup on updating the tables

* fix: info popup will trigger only if table is already exists

* fix: fixed bug that caused edit to break for tjdb join

* style: fixed spacing for tjdb join components

* fix: select section all options cant be deselected issue fixed

* fix: add info icon for empty filter and sort component

* feat: offset fature for joins has been added

* fix: layout fixed to incorporate filter dropdown with text

* fix: basic validation in UI for mandatory and non-mandatory fields

* feat: more options added for filter in joins

* fix: added filter option for regular expression

* fix: fixed wrong autoupdate of join fields

* style: updated badge color w.r.t theme

* fix: removed the commented code

* style fixes

* refactor: changed tooljetdb join logic based on tableId instead of name

* fix: joins table value is not been shown after save

* fix: CSS design fix and removed not required commented codes

* feat: tableid to table name mapping in error

* fix: errors will be shown in the debugger for tooljetdb join

* stylefix: container for join sort and select made full width

* stylefix: changed CTA test in popup spacing issue adjusted

* fix: few PR review comments to refactor has been done

* fix:random id generator has been removed and uuid has been used

* feat: Select all functionality in Select Drop down has been added

* fix: first time AND operator has been removed

* fix:Sort Section - Removed table were listed in the drop down

* fix: add more in join section deleting newly created joins

* fix: select section total selected count was wrong

* stylefix: dropdown menu height has been reduced

* fix: sort section on join query will have prefix table name along with column name

* feat: changed the select drop down with add new table option

* fix: center align text only for join operator drop down

* fix join icons to be centred

* reduce chevron icon size

* fix:error handling by status code

* feat: added placeholder for empty select box

* fix: fixed the PR comments

* stylefix:multi select with checkbox will not have tick and bgcolor

* stylefix: codehinter doesnt expand entire row content

* stylefix: codehinter placeholder is center aligned scroll has been removed and overflow content has been handled

* stylefix: codehinter font size made to 12

* feat: offset option for list rows in tjdb query

* inprogress: tjdb joins tables must be exported

* Updated cypess mysql spec (#7717)

* fix: import app missed the tjdb tables in join query

---------

Co-authored-by: Johnson Cherian <johnsonc.dev@gmail.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
Co-authored-by: Mekhla Asopa <59684099+Mekhla-Asopa@users.noreply.github.com>
2023-11-16 12:12:57 +05:30
Akshay Sasidharan
d773777686 Merge branch 'develop' into release/marketplace-1.5 2023-11-16 12:08:00 +05:30
Arpit
3f737b0b1d
[hotfix] fixes: should have the new color value with fx option (#8131)
* fixes: should have the new color value with fx option

* fixes: default value for fx

* fixes: component meta data mutates on drop

* version bumped to v2.24.1
2023-11-10 16:55:43 +05:30
Arpit
f0a403e619
Release : Appbuilder - appdefinition architecture revamp (#7448)
* importing service: updated

* import service, categorize and update events with associations

* fix: deleting events associated with pages on page delete

* handle app version: creation, updates, switching versions from app builder

* on version switch: no updates should be triggeted to server

* versioning for query events

* fixes: new components db transaction fails for newly created pages

* fixes: query chaining with events

* map older query ids to new for event action: run query

* fixes: multi-editor support

* fixes/multi-editor: users should be able to edit different version of the app at real time without sync

* minor fixes

* fixes: undo/redo savings with latest app def updates

* fixes: execution of page switch action

* fixes: csa events

* fixes: csa selection dropdown

* fixes: on csa action changed, the action params should also be updated correctly

* fixes: event rendering actions

* fixes: table event - row hovered

* fixes: table event - on search

* fixes: table event - onNewRowsAdded

* fixes: table event - onBulkUpdate

* fixes: table column updates

* fixes: table column updates to component definition

* re-order events

* handle adding widgets to sub containers

* fixes: csa for modals

* fixes: deletes children components on deleting parent

* fixes: components with default children

* fixed events for imported app

* gs- crash fix

* fixes: global settings UI

* fixes: header and user

* fixes: page switch event

* fixes: adapts to new event manager ui

* import app

* add event index for creating app versions

* fixes: table rendering on viewer

* fixes: event execution for viewer

* fixes: loading app with slug

* fixes: Page side bar is not rendered in viewer

* fixes: version manager ui for released versions

* fixes: tabs default children saving

* fixes: app resource mapping for parent-child components

* fixes: duplicate pages

* fixes: page load events for viewer

* fixes: enable and disable pages

* fixes: hide and show pages

* fixes: on maintaince toggle button

* fixes: new version child components are not tied to its parent

* fixes: redo breaks- on deleting a component and undo then redo (editor)

* new export schema and handling apps impport with new and older schemas

* table events: column and actions events

* fixes: query confirmations popup

* fixes: copy/paste

* fixes: cut/paste

* fixes: event mapping for newer versions for new components, pages and queries id

* fixes: app resource mapping for imported apps

* fixes: cascade events for table actions and colulmns

* Migrates the existing JSON-based app definition schema to a structured table-based architecture. This enhancement introduces component and page-specific permissions, improves data organization, and enables fine-grained access control. Additionally, it adds the 'globalSettings' column to the 'appVersion' table.

* cleanup

* fixes: enable and disable pages

* fixes: hide/show page and set saving state for cloning pages

* cleanup

* fixes: page disable menu

* fixes: migrations for data query events

* fixes: switching app version from version creation modal results in editor loading state

* fixes: setting up the page title

* fixes: Page duplication has same page handler name.

* fixes: updating general styles of a component

* fixes: delete component should trigger confirmations box for one widget and for multiple should process deletion

* fixes: CSA for button(component) does not work for page event handler.

* fixes: component name update [calendar]

* fixes: Duplicating pages do not create child components

* improves copy-paste mechanism of widgets

* fix: calendar subcontainer components comes out of the parent container on copy/paste

* fix:Form properties, no option for selecting submit button.

* fixes: Dark mode issue with event handler.

* fixes: display preferences for components

* fixes:have to select the selected version again to create a new

* fixes: Pages menu is not getting disabled when enabled and vice-versa

* fixes: correct naming of duplicating pages

* fixes: 2 action button even with no event attached to one, it gets attached to both.

* fixes: event deletion for action btn removal

* fixes: Keyboard action to move component is not saving

* reduce outbound calls when widget re-positioned with keyboard

* fixes: Not able to delete component from Inspector

* fixes: cloning of widgets

* fixes: Request confirmation before query run toggle is not visible on viewer mode. (can't run query if confirmation toggle is on)

* fixes: event sorting

* fixes: events mapping for versioning: queries and components

* fixes: importing app bug - query running issue when importing apps

* [appdef-2.0] fixes: event action linking for imported apps (#7627)

* fixes: event action linking for imported apps

* cleanup

* fixes: Toggling display preferences is not saving for components. (#7629)

* fixes: dnd issue for mobile view (#7632)

* default page menu settings should be true

* [appdef-2] event manager selector bug (#7631)

* fixes: on selecting query - 3 outbound calls are done to the server, and event manager re-renders 3times resulting in flikering ui

* reduces outbound calls for updating csa actions to 1

* [appdef] - copy associated events for cloned components (#7634)

* fixes: Copying  component is not coping the events associated with the component.

* cleanup

* [appdef-2] : Fixes frontend issues (#7636)

* Fix UI issues

* Fix Scrollbar is not available after we pin the inspector.

* Fix button  jumping places if switched from extended monitor to laptop.

* Fix white background around canvas

* fixes: Component inspector go blank after switching to different pages after dropping components (#7637)

* fixes: general properties of widgets are not getting saved (#7638)

* fixes: selecting the components via selecto (#7653)

* fixes: multiple undo-redo simlut. (#7656)

* fixes: copy associated events for cloned queries (#7657)

* Fixes not able toggle of Listview pagination toggle (#7701)

* Fix UI issues

* Fix Scrollbar is not available after we pin the inspector.

* Fix button  jumping places if switched from extended monitor to laptop.

* fix enable pagination not getting toggled in listview

* Fix form children not being displayed

* fixes: dnd fix for widgets dropped inside subcontainer (#7691)

* [Appdef-2] copy-paste, cut and  clone fix for widgets (#7687)

* fixes: copy/cut/paste and cloning of widgets

* cleanup

* can copy/paste-clone in listview

* fixes: on mulit-widget selected via mouse area selection: widget manager should be rendered (#7688)

* fixes: on deleting tabs widgets should delete its children (#7692)

* fixes: column data generated from restapi does not render correct columns in viewer (#7695)

* [appdef-2] fixes: multiple query confirmations trigger (#7704)

* fixes: multiple query confirmations trigger

* fixes: multiple outbound calls in the inital load, run queries on app load with confirmations:editor&viewer

* fixes: correct confirmations list to the stote

* [appdef-2] fixes:Event handler are running twice for page load (#7705)

* fixes:Event handler are running twice for page load(eg- add 2 show alert and change the page).

* fixes: for viewer page events

* fixes: container widget is not getting saved on drop (#7718)

* fixes: Create app version from is empty if we delete another version. (#7720)

* [appdef-2] fixes: on versioned app (switching or creating) version, the componet layout is wrongly updated to the container dnd (#7721)

* fixes: on versioned app (switching or creating) version, the component layout is wrongly updated to the container dnd

* fixes: container widget is not saving

* fixes: triggering confirmation box for every query with on load trigger (#7728)

* Fixes canvas background and go to app crashing (#7725)

* Fix UI issues

* Fix Scrollbar is not available after we pin the inspector.

* Fix button  jumping places if switched from extended monitor to laptop.

* fix enable pagination not getting toggled in listview

* Fix form children not being displayed

* Fix Go to app is crashing the application.

* Fix fx for canvas background color is not working.

* fixes: cloned/copied table with actions (#7758)

* fixes: calendar and form widgets (#7735)

* fixes: rendering of components in viewer for mobile (#7759)

* fixes: toggling, resizing, dropping widgets in both display preferences (#7760)

* fixes: page switch action via runjs actions (#7762)

* fixes: component validations do not get saved (#7766)

* [appdef-2] subcontainer dnd height outbound fix (#7767)

* fixes: listview children can be dragged outside its outbound limit

* cleanup

* fixes: widget inspector going to empty component (#7768)

* fixes: goToApp not running from runjs in viewer mode (#7770)

* fixes: multi-components cloning or copy/paste have same name (#7761)

* Fix disabled page is being displayed on switch page event dropdown (#7769)

* Fix kanban rendering leading to infinite look

* Fix disabled page is being displayed on switch page event dropdown

* Fix Kanban widget getting into infinite loop (#7808)

* Fix kanban rendering leading to infinite look

* Fix disabled page is being displayed on switch page event dropdown

* Fix kanban getting into infinite loop

* adds support of constants to current state of the ediotr (#7821)

* removes loader added for testing (#7822)

* [appdef] fixes - dnd container cloning edge cases (#7820)

* fixes: copy/pasting components updating wrong display preferences

* fixes: copy/pasting tabs and cloning components inside tabs

* fixes: duplication of calendar component bug

* if components in subcontainer(children) are selected via selecto along with its parent, children should not be going through duplication

* if components in subcontainer(children) are selected via selecto along with its parent, children should not be going through duplication

* fixes: Resolving App Version and Timestamp Update Challenges (#7863)

* Fixes query confirmation issue on viewer (#7862)

* [appdef ]fixes: components copied from template app to a new page or app do not render in canvas (#7867)

* fixes: components copied from template app to a new page or app does not render in canvas

* fixes: table crash on coping from other pages with columns

* adds the column exists check

* fixes: tables crash for imported apps with auto generated cols

* appdefinition refactor/cleanup (#7872)

* cleanup controllers and request calls from frontend

* removing unwanted console logs and unused variables

* revering v1 apis og

* adding length validation for page dto

* adding dtos for components

* updated dtos for components and pages

* added dto for event handlers

* fixes event handler dto

* fixes: page dto

* adds/fixes event handlers creating dtp

* fixes: event handler service and dtos

* [appdef] fixes: Creating page not changing the slug (#7873)

* fixes: Creating page not changing the slug

* removes extra whitespace

* [appdef] fixes: on importing a exported app child components are not present in the parent component (#7864)

* fixes: on importing a exported app child components are not present in the parent component

* handles parent component mapping for tabs and calendar component

* handles parent component mapping for tabs and calendar component for new versions

* [appdef] api endpoint fixes (#7888)

* fixes: moved fetching app version to v2 api

* fixes: app slug api

* Fixes CurrentUser & Mode not present in globals in inspector (#7812)

* Fix current user not being present in inspector

* Add Mode in globas in inspector

* Fix creating page not changing the slug.

* Revert "Fix creating page not changing the slug."

This reverts commit 0ff9c18ab8.

* Fixes  on adding query params in event handler, breaking the app (#7889)

* Fix on version change if left sidebar is open canvas not scrolling right

* Fix on adding query params in event handler, breaking the app

* Fix

* Fix on version change if left sidebar is open canvas not scrolling right (#7884)

* fixes: fixes on on app load switch page action via run queires (#7858)

* fixes: fixes on on app load switch page action via run queires

* Fix

* refactor

* Fix on load event not appearing on viewer

---------

Co-authored-by: Nakul Nagargade <nakul@tooljet.com>

* [appdef] fixes: event actions mapping for import-export (#7895)

* fixes: event actions mapping for import-export

* fixes: updates organisation id

* fixes: templates event mapping

* do not app again for not normalized apps

* [appdef]migrations fix (#7910)

* fixes: page attributes

* fixes: table action and column events for imported apps (prev) and app migrations

* adds processDataInBatches

* fixes: app data migrations

* create a new queryBuilder instance for each batch to ensure that there's no interference between batches

* fix: app migration

* cleanup

* cleanup

* fixes: table column data not updated on boxes changes in container (#7919)

* fixes: creating all pages from all versions (#7905)

* Fix state not changing in chart (#7900)

* Fix in chart, toggles are not working

* Update Chart.jsx

---------

Co-authored-by: Arpit <arpitnath42@gmail.com>

* fix event param not updating (#7902)

* [appdef] Pages attributes are missing on versioning or imported app (#7904)

* fixes: on creating new version pages attributes are not copied

* fixes: on importing apps with  pages attributes are not copied

* fixes: component double duplication issues

* fixes: deleting children components via selecto (#7915)

* fixes: component deletion fixes

* fixes: cloning components to a new version should also create associated events

* fixes: creating components on cloning with general styles or properties

* fixes: creatinng general properties on version

* fixes: imported app

* fixes added to app migrations

* fixes: mobile view

* fixes: Created a new version with multiple pages from second page, the new version shows the homepage with second page URL

* fixes: table crash due to columnDeletionHistory saved as an object instead of an array

* fixes: on creating new version, data_queries should be created (#7975)

* [appdef] fixes: migrations  (#7951)

* refactor migrations with batching

* event actions: switch page should be mapped to correct new page id

* fixes: importing json-schema app with multiple version: same components do not get render in the canvas

* fixes: import/export of legecy apps

* event actions mapping to correct page ids: migrations

* fixes: migrations  children not rendered in subcontainer components

* adapts to main/viewer changes

* fixes: viewer with #6698

* fixes: viewer route

* fixes: page switch via validateRoutes

* fixes: on delete version fetchApp fails

* handle error on saving changes

* skip name opts

* typo fix

* Instead of relying on the schema, we choose to use the Tooljet version as the determining factor for decoupling import flows

* fixes: slug updates from global settings

* fixes: slug app link (#8008)

* fixes: on version changed the preview link should also update (#8009)

* fixes: on cut and paste events should not cascade (#8010)

* fixes: query options to new mapped ids

* [appdef] fixes: cloning apps (#8012)

* fixes: cloning apps

* fixes: slug status from share modal

* fixes: query confirmations list on viewer (#8017)

* undo-fix

* fixes: updates current state with page data on creating new page

* Fix failing specs (#8031)

* [appdef] fixes : ghost child components are being created on imported/cloned apps and while migrating (#8026)

* fixes: ignore ghost components while importing

* added the fix in migrations

* fixes: adding other components

* fixes: table column resizes

* updates layout dto

* update component dto

* fixes: tabs children are not rendered as the are not in their repsective parent container (#8036)

* moving editorFunc to Editor.jsx

* cleanup

* fixes: e2e test for clone

* cleanup

* fixes: toggle maintaince

* bumping version

* multi-edit: ymap-fix-1

* Revert "multi-edit: ymap-fix-1"

This reverts commit 8b799c3c51.

* [appdef] fixes: viewer route: keeps on reloading for private apps (#8051)

* fixes: viewer route: keeps on reloading for pribate apps

* should return the response

* test: ymap updates-1

* fixes: v1 apps with dq queries resuts in app crash

* Updated import spec

* Revert "Updated import spec"

This reverts commit 802136cdc3.

* Fixed failed platform test cases for app desinition re-design (#8053)

* Fix failed platform test cases

* Modify user permission test cases

* fixes: trial-5: fixing vanishing of components

* Revert "fixes: trial-5: fixing vanishing of components"

This reverts commit a22aec12c7.

* fixes: trail-6: fix

* fixes: trail-7: fix

* Revert "fixes: trail-7: fix"

This reverts commit 08f373c415.

* Revert "fixes: trail-6: fix"

This reverts commit c4e19b5d05.

* multi-edit: ymap-fix

* Revert "multi-edit: ymap-fix"

This reverts commit 92f49c0cde.

* fixes: multi-user updates: adding or removing

* event handlers sycned for multi-user

* should take slug instead of appid if slug is present

* updating adding ymap logic

* versioning with multi-user

* fixes: saving issue

* dont skip ymap

* adds delay to ymap

* ymap-update-order-fixed

* ymap-update-order-fixed-1.1

* ymap-update-order-fixed-1.2

* test=fix

* Updated import spec (#8061)

* cleanup

* lint fixed

* fixes: cloning apps with tabs

* veiwer on event should return

* fixes: event should map with show/hide modal component id

* Fix failing appbuilder specs (#8117)

* cherrypicked ee/00195c064

* bumping version to v2.24.0

* fixed modal actionid typo

* fixes: slugs issues for released an public apps (#8119)

* Fix failed test cases (#8121)

* reverting global slug input

* fixes: versioning with cloned page and ghost components (#8122)

---------

Co-authored-by: Nakul Nagargade <133095394+nakulnagargade@users.noreply.github.com>
Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
Co-authored-by: Nakul Nagargade <nakul@tooljet.com>
Co-authored-by: Midhun Kumar E <midhun752@gmail.com>
Co-authored-by: nandinisaha13 <nandinisaha13@gmail.com>
Co-authored-by: Mekhla Asopa <dadhichmekhla@gmail.com>
Co-authored-by: Ajith KV <ajith.jaban@gmail.com>
Co-authored-by: Mekhla Asopa <59684099+Mekhla-Asopa@users.noreply.github.com>
2023-11-08 11:09:47 +05:30
Muhsin Shah C P
bbee870346
fix: backward compatibility for old preview url. redirect back to new URL (#8047) 2023-11-03 15:00:19 +05:30
Akshay
ea1b54a6cd
Merge pull request #7954 from ToolJet/fix/postgres-proxy-init
chore: remove unused postgrest proxy provider in import export module
2023-11-03 11:34:41 +05:30
Muhsin Shah C P
cc0735fe3d
[improvement] From now on, users will not be able to make the app public or access the shareable URL if the app has not been released (#8007)
* started working on restricting users from accessing the app urls

* worked on design changes

* replaced the modal with error page

* added: the tooltip

* fix: design

* refactoring: removed unwanted controller and service code

* changed div title logic

* updated: tooltip msg
2023-11-02 11:42:56 +05:30
Anantshree Chandola
06cc13c865
fixes (#7953) 2023-10-18 16:33:56 +05:30
Muhsin Shah
9e5d01798c fix: app name empty msg 2023-10-18 16:07:27 +05:30
Akshay Sasidharan
1bf1e561c5 remove unused postgrest proxy provider in import export module 2023-10-18 15:10:24 +05:30
Muhsin Shah C P
3ea8d6e3ca
[feature] Make workspace urls more readable (#6698)
* working on replacing workspace id with workspace name

* experimenting with zustand

* added slug column to workspace table

* working on workspace url

* working on backward compatibility

* fixing bugs

* added not found error

* fixed workspace switching issue

* fix: switching b/w workspaces

* fix: workspace login

* changed workspace login url link

* resolved conflicts

* added create organization design

* added backend validation

* fixed constraint errors issue

* fixed: creating new workspace

* fixed: update workspace

* fixed: update workspace bugs

* fixed: auto created slug bugs

* fixed: login slug

* design changes

* added folder slug

* fixed: lint error

* fixed: invite and first user issues

* fixed: login page redirection

* fixed: redirect path

* added reserved word check

* fix: edit workspace design

* fix: folder query issue

* fix: create and edit workspace modal validation issues

* fixing failed test cases

* fixing failed test cases - app.e2e

* fixed organizations specs

* fixed public app issue

* working on app slug

* Added app slug design to the general settings

* Working on appId -> slug changes
- Handling appId cases
- Fixing issues

* Worked on share modal design change
- replaced slug functionality
- Fixed backend slug issues
- Fixed page handle issues

* changed switch label

* replace version param with query param

* fix: possible uuid bug

* fix: login app slug redirection issue

* Worked on unique app slug

* moved all apps related api calls to apps.service.js file

* refactoring the code and fixing minor issues

* Refactored and fixed some bugs

* Fixed bugs: redirect cookie issue

* Fixed dark-mode issues

* removed duplicate code

* Worked on develop branch conflicts

* Moved handle app access check to private route

* Added fix for navigate

* Refactored the code. Added slug to failed sso login redirection path

* again some redirect url fixes

* onbaord navbar tj-icon onclick

* Fix: viewer version id undefined issue

* fix: multi-pages, invalid workspace slug

* fix: removing the version search param while switching the pages

* fix-sso: redirecting to prev tab's login organization slug

* fix-sso: google signup

* fix: preivew permission issue

* Fixing merge issues

* Fixed tjdb issues

* dark mode fix of manage users button

* fix: extra slash in url, tj-logo on click wrong org id

* subpath workspace login url

* resolved lint issue

* fix: cannot clone apps

* fixed switch workspace issue

* fix: login page flashing issue

* fix: back button issue

* fix: private endless redirection

* Update the modal with new UX

* fixed all ui issues

* fixed placeholder translation issues

* fix: sso multi-request issues

* fix: multi-pages crash while promoting a version

* fix: error text msg delay

* added default slug to the first workspace in the instance

* subpath-fix: slug preview url

* fix: same value check

* fixed switch page query params issue

* fix: folder query

* fix: manage app users ui responsive issue

* Backend PR changes

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-10-18 13:00:17 +05:30
Anantshree Chandola
94707a2bf8
Revamps related to app import and app clone resources (#7939)
* revamps

* remove console log

* open cloned app

* remove extra cloneApp func call

* cleanup

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
2023-10-18 10:24:18 +05:30
Anantshree Chandola
03e3fd950b
New Improved App creation flow (#7209)
* App creation flow

* Add separate footer and divider

* added create app dto, updated tests

* update test

* Update server/src/dto/app-create.dto.ts

Co-authored-by: Midhun G S <gsmithun4@gmail.com>

* Update server/src/dto/app-create.dto.ts

Co-authored-by: Midhun G S <gsmithun4@gmail.com>

* updates

* Removed comments

* small updates

* rename app flow

* Import App, Create App From Template, Clone App (BE+FE)

* Edit app updates

* remove comments

* updates

* updates

* styling updates

* handle spaces in app name

* update

* styling updates

* Update permissions

* updates

* don't show toast failure message

* Update frontend/src/Editor/Header/EditAppName.jsx

Co-authored-by: Muhsin Shah C P  <muhsinshah21@gmail.com>

* styling updates

* Update server/src/controllers/app_import_export.controller.ts

Co-authored-by: Muhsin Shah C P  <muhsinshah21@gmail.com>

* remove comments

* remove comments and small corrections

* removed logs and deleted unwanted files

* correct lint error

* resolve failing tests + handled trimmed app names

* resolve failing tests + handle trimmed app names

* updates

* duplicate imports removed

* updates

* Rebase corrections and updates

* update

* resolve failing e2e test

* fix error

* fix

* length fix

* fix

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>
Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
2023-10-17 13:18:18 +05:30
Akshay
f86c6f53d0
Release v2.20.0: New Templates (#7805)
* [docs] SAML (#7577)

* added saml doc

* added saml in 2.19

* minor changes

* minor updates

* update new quickstart guide link on canvas (#7733)

* Template: Supply chain management (#7453)

* add setup to create template from new exports

Co-authored-by: abhinabaadhikari <abhinabaadhikari2014@gmail.com>

* Add new templates and update an existing template (#7765)

* Add new templates and update an existing template

* Add two more templates

* fix lead management system template definition

* fix lead management system template definition - handle null values

* Template: Supply chain management (#7453)

* add setup to create template from new exports

Co-authored-by: abhinabaadhikari <abhinabaadhikari2014@gmail.com>

* Add new templates and update an existing template (#7765)

* Add new templates and update an existing template

* Add two more templates

* fix lead management system template definition

* fix lead management system template definition - handle null values

* bump to v2.20.0

* fix e2e test

* fix app name

* handle template import based on the tooljet version

---------

Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com>
Co-authored-by: Shubhendra Singh Chauhan <withshubh@gmail.com>
Co-authored-by: Karan Rathod <karan.altcampus@gmail.com>
Co-authored-by: abhinabaadhikari <abhinabaadhikari2014@gmail.com>
Co-authored-by: Abhinaba Adhikari <79746925+abhinabaadhikari@users.noreply.github.com>
2023-10-12 11:56:29 +05:30
Akshay Sasidharan
db9e70984f add default host for tjdb proxy 2023-10-03 12:22:12 +05:30
Akshay
3c4954ae4d
Feature: Bulk csv upload for TJDB (#7421)
* add wip ui components for csv upload

* add backend support for csv bulk upload

* add missing type information

* add wip ui setup for bulk upload

* update bulk upload drawer to handle errors

* update error message

* move export table from navbar to popover

* revise navbar buttons

* remove unrelated changes

* Fixed UI issues

* remove redundant counter increment

* remove console.log

* explicitly add express import

* fix undefined toast error

* Fixed button UI issues

* rename button

* remove unused solid icon

* fix row count check

* handle null values

* add max row count at lib options

* check NaN for parsed numbers

* skip columns for null values to insert default

* reuse declared set

* only validate datatype conversion but pass original string

* fix content type on requests

* remove filter/sort applied by text

* reset query and sort filters after upload

* add padding for filter/sort buttons

* make error on max rows explicit

* handle stream errors through events

* fix bulk upload to be disabled after drawer close

* fix lint

* update bulk upload success toast

* scroll lock bulk upload drawer

* update icon for export

* order default by id desc

* Fixed hover state issue for download button in bulk upload section

* added focusTrapoption's initial focus as false in FocusTrap

* Updated data-cy for export option (#7545)

* Updated export data-cy

* Updated cypess database spec (#7547)

---------

Co-authored-by: Abd-Rahman-1999 <s.rahmanabd1999@gmail.com>
Co-authored-by: Mekhla Asopa <59684099+Mekhla-Asopa@users.noreply.github.com>
2023-09-28 21:42:00 +05:30
Ganesh Kumar
72147a0fda
Feature: Tooljetdb join operations (#7263)
* basic and static join query executed

* tooljetDB Join operation flow - work inprogress

* complete flow for tooljetdb join pending testing and minor changes

* updated constructHavingStatement method logic to support aggregation function and added comments

* worki in progress tooljetDB Join

* feat: added basic layout for tjdb join fields

* feat: dropdown support for icons

* feat: working on where condition ui in join

* feat: added base layout for filter and sort in tooljetdb join

* feat: added multi select support and minor style changes

* feat: support default value for selectbox

* feat: dd select styling added

* style: override vanilla  dd select styles with tj styles

* fix: fixed minor UI issues in select box

* feat: added select section layout

* feat: added hooks state for join options

* feat: load all added tables columns

* feat: working on where section logic

* feat: join constraints UI

* feat: filter condition dropdowns added

* feat: join widget for join query op in tjdb

* feat: sort section base UI

* feat: select widget for join query in tjdb

* feat: filter section add option and delete option done

* feat: update filter condition logic added

* feat: added onchange event for operator and rhs values update

* feat: added sort dropdown for tjdb join

* feat: base logic for Filters in join query

* fix: removed comments and added validation for fetching table details

* feat: add limit option logic

* feat: backend api has been integrated for tooljetdb joins

* added icons to solid icons

* fix: jsconfig auto save lint fix

* fix: update from table when selected table changes

* feat: added from to join table options in tjdb dq

* fix: added fetching tables list for JSON in backend

* fix: fixed json data for join query

* fix: temp fix for fields with empty object

* feat: added icon support for dd select

* fix: added default state to avoid error in conditionlist

* fix: limit tables selection to already joined tables in tjdb join

* fix: empty values to orderBy, filters and limit will remove the option from json

* fix: in json first level empty value scenario has been handled

* fix: select in tooljetdb join query can have multiple columns with same name handled by adding prefix tablename_ to the column name

* fix: restrict selectable tables in join contraints

* feat: reset join constraints when invlaid joins added

* fix: empty values will not be allowed UI validation

* fix: codehinter border has been removed

* fix: recalculate join data when join tables change

* fix: corrected options length calc for showing search box

* fix: filter table dropdown must contain only selected tables from join section

* fix: empty values validation has been removed

* fix: add from attribute to join options

* fix: alias is added to all the table column

* feat: selected option in Select section will be at the top

* fix: reset joins when selected table changed

* fix: drop down focus ui

* feat: autoselect all columns by defualt for join select

* feat: restrict column selection to same datatype

* fix: removed blank table names from select

* feat: added tooltip for info

* fix: removed duplicate tooltip

* fix: add button in table dropdown

* fix: added from table object back

* feat: tjdb join select dropdown select all cols by default

* fix: add new table button name corrected

* feat: no table selected error message

* feat: add select style for select dropdown

* style: updated dropdown select style to match new theme

* feat: added alert modal for deleting joins

* feat: hardcode operator since once one option available at the moment

* style: fix icon styles for dropdown

* feat: created reusable confirm dialogue

* fix: fixed bug for nested dropdowns

* fix; cache select components to prevent unnecessory rerenders

* feat: reused the common popup on updating the tables

* fix: info popup will trigger only if table is already exists

* fix: fixed bug that caused edit to break for tjdb join

* style: fixed spacing for tjdb join components

* fix: select section all options cant be deselected issue fixed

* fix: add info icon for empty filter and sort component

* feat: offset fature for joins has been added

* fix: layout fixed to incorporate filter dropdown with text

* fix: basic validation in UI for mandatory and non-mandatory fields

* feat: more options added for filter in joins

* fix: added filter option for regular expression

* fix: fixed wrong autoupdate of join fields

* style: updated badge color w.r.t theme

* fix: removed the commented code

* style fixes

* refactor: changed tooljetdb join logic based on tableId instead of name

* fix: joins table value is not been shown after save

* fix: CSS design fix and removed not required commented codes

* feat: tableid to table name mapping in error

* fix: errors will be shown in the debugger for tooljetdb join

* stylefix: container for join sort and select made full width

* stylefix: changed CTA test in popup spacing issue adjusted

* fix: few PR review comments to refactor has been done

* fix:random id generator has been removed and uuid has been used

* feat: Select all functionality in Select Drop down has been added

* fix: first time AND operator has been removed

* fix:Sort Section - Removed table were listed in the drop down

* fix: add more in join section deleting newly created joins

* fix: select section total selected count was wrong

* stylefix: dropdown menu height has been reduced

* fix: sort section on join query will have prefix table name along with column name

* feat: changed the select drop down with add new table option

* fix: center align text only for join operator drop down

* fix join icons to be centred

* reduce chevron icon size

* fix:error handling by status code

* feat: added placeholder for empty select box

* fix: fixed the PR comments

---------

Co-authored-by: Johnson Cherian <johnsonc.dev@gmail.com>
Co-authored-by: Akshay Sasidharan <akshaysasidharan93@gmail.com>
2023-09-28 19:58:47 +05:30
Akshay Sasidharan
f8fdcde86a Merge branch 'main' into release/marketplace_1.4 2023-09-28 15:25:48 +05:30
gsmithun4
6f9b050101 rebase 2023-09-26 21:36:08 +05:30
Akshay Sasidharan
7b83878464 Merge branch 'develop' into release/marketplace_1.4 2023-09-26 20:59:10 +05:30
Midhun G S
50b5129058
Added unique key constrain to organization users table (#7207)
* added unique key constrain to organization users

* fix

* fix

* added logs and comments

* test case fixes

* resolve fail test

* resolve tests google auth

* comment out organization id checks

* remove all e2e tests changes

* comment tests

* test case fixes

* resolve fail test

* resolve tests google auth

* revert all changes

* fix for test cases

* test case fixes

* revert all test case changes

* refractor

---------

Co-authored-by: Anantshree Chandola <anantshreechandola23@gmail.com>
2023-09-26 11:28:59 +05:30
Akshay
b5d08402ec
Add support for bigint (#7458) 2023-09-21 11:54:03 +05:30
Akshay
3ef7c5db68
Merge pull request #7420 from ValkonX33/updatedPlugin
Fix #7417 Updated plugin descriptions on the Marketplace page
2023-09-14 15:09:18 +05:30
Sumukh
bd05709742 Fix #7417Updated the Titles 2023-09-13 16:47:55 +05:30
Sumukh
e26449d79a Fix #7417 Updated plugin descriptions on the Marketplace page 2023-09-12 22:15:32 +05:30
Kavin Venkatachalam
9f22399029 Merged with main 2023-09-08 16:50:22 +05:30
Akshay
71a5c122e9
Hotfix: marketplace fixes (#7397)
* add default manifest attributes for snowflake

* fix imports and clones with default datasource

* bumpt to v2.16.1
2023-09-08 14:19:52 +05:30
Akshay Sasidharan
be1de4b378 fix events not being linked on import 2023-09-05 16:06:14 +05:30
Kavin Venkatachalam
fe00df1b32 Resolved merge conflicts and version bump 2023-09-05 13:26:51 +05:30
Nakul Nagargade
c609fe2a78
Setup sentry logging as per version and upload its source map (#7143)
* Added a fix for snake case properties

* Setup sentry logging as per version and upload its source map

* Remove version

* Fix process not being defined

* Add version to sentry release

* Add release version in config api

* Changes in docker file

* Create a version file in frontend

* Remove docker changes

* fix

* Add a script to bump .version files

---------

Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>
2023-09-04 10:00:14 +05:30
Akshay Sasidharan
080eb5c0a1 fix default ds options recreate on import 2023-08-30 20:52:41 +05:30
Akshay
c6fe0aa45e
Feature: Import export tjdb schema (#5752)
* add ability to import export app and tjdb schema

* init

* feat ::global settings popover new ui

* feat :: ui for version export modal

* fix :: import export modal

* cleanup

* ui updates

* header footer style fixes

* closing settings modal while showing export modal

* style fix header

* feat :: added button to download table schema

* fix :: styling for fx

* add ability to import and export apps with tjdb schema

* handle duplicate table in workspace

* fix table rename

* fix selected table on edit and delete

* fix invalid toast on table delete

* fix column default value

* handle exports to strip '::' and quotes

* make import/export backward compatible

* handle page redirects based on resource import

* handle import without tjdb schema

* fix column delete and addition

* make data migrations to be run per organizations

* wip

* update migration

* fix credentials to be included

* fix specific version export

* make use of apps ability for import export resource

* fix import navigation

* fix lint

* fix failing tests

* fix lint

* enable tjdb for public apps

* update export error message on tjdb table blank

* fix table not selected after creation

* fix :: styling for imp exp modal , and functionality bug fixes after dev merge

* fixes blank slate and columns selection

* fix table delete

* fix invalid toast on table edit

* fix column information missing tjdb query manager

* make ds imports to either reuse global or create

* export only unique table ids

* create default datasources if not present in export data

* reuse existing table on imports

* add timestamp to table name if name already exists

* add ability to clone with tjdb

* make imports work with marketplace plugin

* skip dataqueries for which plugins are not installed

* fix filter input width

* fix failing spec

* fix marketplace plugin installation in diff workspaces

* fix check for plugin installed in workspace

* fix export when table name is empty

---------

Co-authored-by: stepinfwd <stepinfwd@gmail.com>
2023-08-28 21:23:15 +05:30