From 03329abfa6b9daafe0947eb47a98b14d81966c94 Mon Sep 17 00:00:00 2001 From: Akshay Sasidharan Date: Mon, 28 Oct 2024 23:26:26 +0530 Subject: [PATCH] sync marketplace and tooljet database changes --- .../TooljetDatabase/AggregateUI/index.jsx | 20 +- .../TooljetDatabase/AggregateUI/style.scss | 5 +- .../TooljetDatabase/CreateRow.jsx | 96 +- .../TooljetDatabase/DeleteRows.jsx | 123 +- .../TooljetDatabase/DropDownSelect.jsx | 122 +- .../QueryEditors/TooljetDatabase/JoinSort.jsx | 28 +- .../TooljetDatabase/JoinTable.jsx | 39 +- .../QueryEditors/TooljetDatabase/ListRows.jsx | 222 +- .../{AggregateUI => }/NoConditionUI.jsx | 4 +- .../TooljetDatabase/RenderColumnUI.jsx | 60 + .../TooljetDatabase/RenderFilterSectionUI.jsx | 114 + .../TooljetDatabase/RenderSortUI.jsx | 69 + .../TooljetDatabase/ToolJetDbOperations.jsx | 218 +- .../TooljetDatabase/UpdateRows.jsx | 210 +- .../QueryEditors/TooljetDatabase/styles.scss | 33 + .../QueryEditors/TooljetDatabase/util.js | 1 - frontend/src/Oauth2/Authorize.jsx | 27 +- .../Drawers/BulkUploadDrawer/FileDropzone.jsx | 12 +- .../Drawers/BulkUploadDrawer/index.jsx | 9 +- .../Drawers/BulkUploadDrawer/styles.scss | 10 +- .../Drawers/CreateTableDrawer/index.jsx | 39 +- .../src/TooljetDatabase/Forms/ColumnForm.jsx | 14 +- .../TooljetDatabase/Forms/EditColumnForm.jsx | 38 +- .../src/TooljetDatabase/Forms/EditRowForm.jsx | 14 +- .../Forms/ForeignKeyRelation.jsx | 2 +- .../src/TooljetDatabase/Forms/RowForm.jsx | 51 +- .../src/TooljetDatabase/Forms/TableSchema.jsx | 18 +- .../src/TooljetDatabase/Sidebar/index.jsx | 11 +- .../UniqueConstraintPopOver.jsx | 21 +- frontend/src/TooljetDatabase/Table/index.jsx | 1 - .../src/TooljetDatabase/Table/styles.scss | 10 + frontend/src/_components/DynamicForm.jsx | 227 +- frontend/src/_components/Sharepoint.jsx | 146 + marketplace/package-lock.json | 12729 ++--- marketplace/package.json | 5 +- marketplace/plugins/jira/.gitignore | 4 + marketplace/plugins/jira/README.md | 4 + marketplace/plugins/jira/__tests__/index.js | 7 + marketplace/plugins/jira/lib/icon.svg | 15 + marketplace/plugins/jira/lib/index.ts | 75 + marketplace/plugins/jira/lib/jira-client.ts | 62 + marketplace/plugins/jira/lib/manifest.json | 67 + marketplace/plugins/jira/lib/operations.json | 669 + .../plugins/jira/lib/query_operations.ts | 376 + marketplace/plugins/jira/lib/types.ts | 37 + marketplace/plugins/jira/package.json | 24 + marketplace/plugins/jira/tsconfig.json | 8 + marketplace/plugins/openai/lib/index.ts | 32 +- .../plugins/openai/lib/operations.json | 381 +- .../plugins/openai/lib/query_operations.ts | 135 +- marketplace/plugins/openai/lib/types.ts | 4 + marketplace/plugins/openai/package.json | 3 +- marketplace/plugins/presto/.gitignore | 5 + marketplace/plugins/presto/README.md | 4 + marketplace/plugins/presto/__tests__/index.js | 7 + marketplace/plugins/presto/lib/icon.svg | 23 + marketplace/plugins/presto/lib/index.ts | 74 + marketplace/plugins/presto/lib/manifest.json | 104 + .../plugins/presto/lib/operations.json | 17 + marketplace/plugins/presto/lib/types.ts | 15 + marketplace/plugins/presto/package.json | 27 + marketplace/plugins/presto/tsconfig.json | 11 + marketplace/plugins/sharepoint/.gitignore | 5 + marketplace/plugins/sharepoint/README.md | 4 + .../plugins/sharepoint/__tests__/index.js | 7 + marketplace/plugins/sharepoint/lib/icon.svg | 23 + marketplace/plugins/sharepoint/lib/index.ts | 353 + .../plugins/sharepoint/lib/manifest.json | 56 + .../plugins/sharepoint/lib/operations.json | 377 + marketplace/plugins/sharepoint/lib/types.ts | 19 + marketplace/plugins/sharepoint/package.json | 26 + marketplace/plugins/sharepoint/tsconfig.json | 11 + plugins/package-lock.json | 40 + plugins/package.json | 1 + plugins/packages/airtable/lib/index.ts | 62 +- plugins/packages/airtable/lib/operations.json | 83 +- plugins/packages/airtable/lib/types.ts | 7 + plugins/packages/clickhouse/package-lock.json | 462 +- plugins/packages/common/lib/index.ts | 8 +- plugins/packages/common/lib/oauth.ts | 104 +- .../packages/common/lib/query_result.type.ts | 9 + plugins/packages/common/lib/utils.helper.ts | 123 +- plugins/packages/elasticsearch/lib/index.ts | 48 +- .../packages/elasticsearch/lib/manifest.json | 8 +- .../elasticsearch/lib/operations.json | 190 +- .../packages/elasticsearch/lib/operations.ts | 68 +- plugins/packages/elasticsearch/lib/types.ts | 11 +- plugins/packages/firestore/package-lock.json | 1 + plugins/packages/googlesheets/lib/index.ts | 11 +- plugins/packages/graphql/lib/index.ts | 21 +- plugins/packages/graphql/lib/manifest.json | 8 +- plugins/packages/graphql/lib/operations.json | 3 +- plugins/packages/grpc/lib/manifest.json | 2 +- plugins/packages/grpc/package-lock.json | 13 +- plugins/packages/mongodb/lib/manifest.json | 2 +- plugins/packages/mssql/lib/index.ts | 70 +- plugins/packages/mssql/lib/operations.json | 17 +- plugins/packages/mssql/lib/types.ts | 4 +- plugins/packages/mssql/package-lock.json | 73 +- plugins/packages/mysql/lib/index.ts | 132 +- plugins/packages/mysql/lib/manifest.json | 163 +- plugins/packages/mysql/lib/operations.json | 17 +- plugins/packages/mysql/lib/types.ts | 10 + plugins/packages/mysql/package-lock.json | 12 +- plugins/packages/n8n/lib/manifest.json | 2 +- plugins/packages/openapi/lib/index.ts | 2 +- plugins/packages/oracledb/lib/index.ts | 6 +- plugins/packages/oracledb/package-lock.json | 256 +- plugins/packages/postgresql/lib/index.ts | 184 +- plugins/packages/postgresql/lib/manifest.json | 197 +- .../packages/postgresql/lib/operations.json | 13 +- plugins/packages/postgresql/lib/types.ts | 6 + plugins/packages/postgresql/package.json | 1 + plugins/packages/restapi/lib/index.ts | 51 +- plugins/packages/restapi/lib/manifest.json | 182 +- plugins/packages/slack/lib/index.ts | 9 +- plugins/packages/snowflake/package-lock.json | 4 +- plugins/packages/twilio/package-lock.json | 6 +- .../packages/woocommerce/package-lock.json | 241 +- plugins/packages/zendesk/lib/index.ts | 39 +- ...tDatabaseTablesFromPublicToTenantSchema.ts | 235 + ...6184-EnableAggregationInTooljetDatabase.ts | 2 +- ...baseTenantPasswordColumnToOrganizations.ts | 62 + server/package-lock.json | 45 + server/package.json | 4 +- server/src/app.module.ts | 11 + server/src/assets/marketplace/plugins.json | 188 +- .../import_export_resources.controller.ts | 34 +- .../src/controllers/tooljet_db.controller.ts | 26 +- server/src/dto/import-resources.dto.ts | 18 +- .../dto/transformers/resource-transformer.ts | 15 + .../dto/transformers/tjdb-dto-transforms.ts | 55 + .../schemas/2.61.3/tooljet_database.json | 106 + .../validators/tooljet-database.validator.ts | 111 + server/src/entities/audit_log.entity.ts | 35 + server/src/entities/organization.entity.ts | 7 + ...organization_tjdb_configurations.entity.ts | 36 + server/src/helpers/migration.helper.ts | 58 + server/src/helpers/tjdb.migration.helper.ts | 15 +- server/src/helpers/tooljet_db.helper.ts | 220 + server/src/helpers/user_lifecycle.ts | 24 +- server/src/helpers/utils.helper.ts | 93 +- .../organizations/organizations.module.ts | 2 +- server/src/modules/seeds/seeds.module.ts | 5 +- .../modules/tooljet_db/tooljet-db.types.ts | 67 + .../modules/tooljet_db/tooljet_db.module.ts | 2 +- server/src/modules/tooljet_db/utils/helper.ts | 6 +- .../src/services/app_import_export.service.ts | 23 +- .../import_export_resources.service.ts | 111 +- .../services/library_app_creation.service.ts | 60 +- server/src/services/organizations.service.ts | 3 + .../src/services/postgrest_proxy.service.ts | 37 +- server/src/services/seeds.service.ts | 16 +- server/src/services/tooljet_db.service.ts | 401 +- .../tooljet_db_bulk_upload.service.ts | 59 +- .../tooljet_db_import_export_service.ts | 40 +- .../services/tooljet_db_operations.service.ts | 281 +- .../data/ats_applicants/data.csv | 21 + .../data/ats_jobs/data.csv | 7 + .../aws-s3-file-explorer/definition.json | 8 +- .../customer-support-admin/definition.json | 16 +- .../customer-ticketing-form/definition.json | 8 +- .../data/employee_directory/data.csv | 21 + .../expense-tracker-admin/definition.json | 16 +- .../expense-tracker-portal/definition.json | 8 +- .../definition.json | 8 +- .../definition.json | 8 +- .../data/inventory_management/data.csv | 21 + .../definition.json | 8 +- .../data/lead_management_system/data.csv | 21 + .../lead-management-system/definition.json | 8 +- .../mortgage-calculator/definition.json | 2 +- server/templates/onboard_sample_app.json | 38208 ++++++++++++++++ .../definition.json | 8 +- .../data/promo_code_management/data.csv | 21 + .../saas-license-management/definition.json | 6 +- .../definition.json | 8 +- .../definition.json | 8 +- server/templates/sample_app_def.json | 734 +- .../supply-chain-management/definition.json | 16 +- 180 files changed, 54689 insertions(+), 7815 deletions(-) rename frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/{AggregateUI => }/NoConditionUI.jsx (80%) create mode 100644 frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/RenderColumnUI.jsx create mode 100644 frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/RenderFilterSectionUI.jsx create mode 100644 frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/RenderSortUI.jsx create mode 100644 frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/styles.scss create mode 100644 frontend/src/_components/Sharepoint.jsx create mode 100644 marketplace/plugins/jira/.gitignore create mode 100644 marketplace/plugins/jira/README.md create mode 100644 marketplace/plugins/jira/__tests__/index.js create mode 100644 marketplace/plugins/jira/lib/icon.svg create mode 100644 marketplace/plugins/jira/lib/index.ts create mode 100644 marketplace/plugins/jira/lib/jira-client.ts create mode 100644 marketplace/plugins/jira/lib/manifest.json create mode 100644 marketplace/plugins/jira/lib/operations.json create mode 100644 marketplace/plugins/jira/lib/query_operations.ts create mode 100644 marketplace/plugins/jira/lib/types.ts create mode 100644 marketplace/plugins/jira/package.json create mode 100644 marketplace/plugins/jira/tsconfig.json create mode 100644 marketplace/plugins/presto/.gitignore create mode 100644 marketplace/plugins/presto/README.md create mode 100644 marketplace/plugins/presto/__tests__/index.js create mode 100644 marketplace/plugins/presto/lib/icon.svg create mode 100644 marketplace/plugins/presto/lib/index.ts create mode 100644 marketplace/plugins/presto/lib/manifest.json create mode 100644 marketplace/plugins/presto/lib/operations.json create mode 100644 marketplace/plugins/presto/lib/types.ts create mode 100644 marketplace/plugins/presto/package.json create mode 100644 marketplace/plugins/presto/tsconfig.json create mode 100644 marketplace/plugins/sharepoint/.gitignore create mode 100644 marketplace/plugins/sharepoint/README.md create mode 100644 marketplace/plugins/sharepoint/__tests__/index.js create mode 100644 marketplace/plugins/sharepoint/lib/icon.svg create mode 100644 marketplace/plugins/sharepoint/lib/index.ts create mode 100644 marketplace/plugins/sharepoint/lib/manifest.json create mode 100644 marketplace/plugins/sharepoint/lib/operations.json create mode 100644 marketplace/plugins/sharepoint/lib/types.ts create mode 100644 marketplace/plugins/sharepoint/package.json create mode 100644 marketplace/plugins/sharepoint/tsconfig.json create mode 100644 server/data-migrations/1721236971725-MoveToolJetDatabaseTablesFromPublicToTenantSchema.ts create mode 100644 server/migrations/1721235304092-AddTooljetDatabaseTenantPasswordColumnToOrganizations.ts create mode 100644 server/src/dto/transformers/resource-transformer.ts create mode 100644 server/src/dto/transformers/tjdb-dto-transforms.ts create mode 100644 server/src/dto/validators/schemas/2.61.3/tooljet_database.json create mode 100644 server/src/dto/validators/tooljet-database.validator.ts create mode 100644 server/src/entities/audit_log.entity.ts create mode 100644 server/src/entities/organization_tjdb_configurations.entity.ts create mode 100644 server/src/helpers/migration.helper.ts create mode 100644 server/src/helpers/tooljet_db.helper.ts create mode 100644 server/templates/applicant-tracking-system/data/ats_applicants/data.csv create mode 100644 server/templates/applicant-tracking-system/data/ats_jobs/data.csv create mode 100644 server/templates/employee-directory/data/employee_directory/data.csv create mode 100644 server/templates/inventory-management-tooljet-db/data/inventory_management/data.csv create mode 100644 server/templates/lead-management-system/data/lead_management_system/data.csv create mode 100644 server/templates/onboard_sample_app.json create mode 100644 server/templates/promo-code-management/data/promo_code_management/data.csv diff --git a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/AggregateUI/index.jsx b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/AggregateUI/index.jsx index 4a489dd8ec..a2cf74da10 100644 --- a/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/AggregateUI/index.jsx +++ b/frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/AggregateUI/index.jsx @@ -1,5 +1,5 @@ import React, { useContext, useMemo, useState } from 'react'; -import { NoCondition } from './NoConditionUI'; +import { NoCondition } from '../NoConditionUI'; import './style.scss'; import { ButtonSolid } from '@/_ui/AppButton/AppButton'; import { isEmpty } from 'lodash'; @@ -352,16 +352,20 @@ export const AggregateFilter = ({ darkMode, operation = '' }) => { return ( <>
-