diff --git a/frontend/src/TooljetDatabase/Table/styles.scss b/frontend/src/TooljetDatabase/Table/styles.scss
index 0e366a07ab..dd19ec7f4d 100644
--- a/frontend/src/TooljetDatabase/Table/styles.scss
+++ b/frontend/src/TooljetDatabase/Table/styles.scss
@@ -171,15 +171,15 @@
div {
padding-bottom: 0px !important;
- span {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- width: 85%;
+ .cell-menu-text {
+ white-space: nowrap ;
+ overflow: hidden ;
+ text-overflow: ellipsis ;
+ width: 85% ;
color: var(--slate11) !important;
cursor: default;
border-radius: 6px;
- height: 20px;
+ // height: 20px;
font-size: 12px;
}
}
@@ -190,7 +190,7 @@
.tjdb-td-wrapper {
div {
padding-bottom: 0px !important;
- span {
+ .cell-menu-text {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -198,7 +198,7 @@
color: var(--slate11) !important;
cursor: default;
border-radius: 6px;
- height: 20px;
+ // height: 20px;
font-size: 12px;
}
}
diff --git a/frontend/src/_ui/AppButton/AppButton.scss b/frontend/src/_ui/AppButton/AppButton.scss
index c30b7e49b5..2fee7d996e 100644
--- a/frontend/src/_ui/AppButton/AppButton.scss
+++ b/frontend/src/_ui/AppButton/AppButton.scss
@@ -7,7 +7,7 @@
justify-content: center;
align-items: center;
padding: 10px 20px;
- gap: 6px;
+ gap: 8px;
border-radius: 6px;
font-weight: 600;
text-decoration: none;
@@ -51,7 +51,7 @@
.tj-small-btn {
height: 28px;
border-radius: 6px;
- padding: 4px 0px;
+ padding: 4px 16px 4px 16px;
font-size: 12px;
}
@@ -198,7 +198,6 @@
color: var(--indigo9);
border: none;
background: transparent;
- box-shadow: none !important;
&:hover {
color: var(--indigo10);
@@ -214,6 +213,15 @@
background: var(--base);
border: none;
outline: none;
+ box-shadow: 0px 0px 0px 4px var(--indigo6);
+ }
+
+ &:focus {
+ box-shadow: 0px 0px 0px 4px var(--indigo6);
+ }
+
+ &:focus:not(:focus-visible) {
+ box-shadow: none;
}
}
diff --git a/plugins/package-lock.json b/plugins/package-lock.json
index 6119977e79..f0cb5d4650 100644
--- a/plugins/package-lock.json
+++ b/plugins/package-lock.json
@@ -9573,14 +9573,15 @@
"license": "MIT"
},
"node_modules/follow-redirects": {
- "version": "1.15.3",
+ "version": "1.15.6",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+ "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh"
}
],
- "license": "MIT",
"engines": {
"node": ">=4.0"
},
@@ -13874,11 +13875,11 @@
}
},
"node_modules/node-appwrite": {
- "version": "5.1.0",
- "license": "BSD-3-Clause",
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/node-appwrite/-/node-appwrite-13.0.0.tgz",
+ "integrity": "sha512-O1g1RWcRYcvnVvR0Dykjoe/4UcL6ELVvZosb4B8/hhNvleuWfN2fOFxzeCaU8amGW6UtVtZqvNaUT3IF1mPBdA==",
"dependencies": {
- "axios": "^0.26.1",
- "form-data": "^4.0.0"
+ "node-fetch-native-with-agent": "1.7.2"
}
},
"node_modules/node-fetch": {
@@ -13899,6 +13900,11 @@
}
}
},
+ "node_modules/node-fetch-native-with-agent": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/node-fetch-native-with-agent/-/node-fetch-native-with-agent-1.7.2.tgz",
+ "integrity": "sha512-5MaOOCuJEvcckoz7/tjdx1M6OusOY6Xc5f459IaruGStWnKzlI1qpNgaAwmn4LmFYcsSlj+jBMk84wmmRxfk5g=="
+ },
"node_modules/node-fetch-npm": {
"version": "2.0.4",
"license": "MIT",
@@ -19944,7 +19950,7 @@
"version": "1.0.0",
"dependencies": {
"@tooljet-plugins/common": "file:../common",
- "node-appwrite": "^5.1.0",
+ "node-appwrite": "^13.0.0",
"react": "^17.0.2"
}
},
diff --git a/plugins/packages/appwrite/lib/index.ts b/plugins/packages/appwrite/lib/index.ts
index 6a1bad8ced..224ccbaa42 100644
--- a/plugins/packages/appwrite/lib/index.ts
+++ b/plugins/packages/appwrite/lib/index.ts
@@ -1,21 +1,27 @@
import { QueryError, QueryResult, QueryService, ConnectionTestResult } from '@tooljet-plugins/common';
-import { SourceOptions, QueryOptions } from './types';
+import { SourceOptions, QueryOptions, ReturnObject } from './types';
import sdk from 'node-appwrite';
-import { bulkUpdate, createDocument, deleteDocument, getDocument, queryCollection, updateDocument } from './operations';
+import { createDocument, deleteDocument, getDocument, queryCollection, updateDocument } from './operations';
const JSON5 = require('json5');
export default class Appwrite implements QueryService {
async run(sourceOptions: SourceOptions, queryOptions: QueryOptions, dataSourceId: string): Promise
{
const database = await this.getConnection(sourceOptions);
+ const { database_id } = sourceOptions;
const operation = queryOptions.operation;
const body = this.returnObject(queryOptions.body);
+ const isBodyEmpty = !Object.keys(body).length;
let result = {};
try {
+ if (!queryOptions.collectionId) {
+ throw new Error('Collection id is required.');
+ }
switch (operation) {
case 'list_docs':
result = await queryCollection(
database,
+ database_id,
queryOptions.collectionId,
queryOptions.limit,
queryOptions.order_fields,
@@ -26,24 +32,27 @@ export default class Appwrite implements QueryService {
);
break;
case 'get_document':
- result = await getDocument(database, queryOptions.collectionId, queryOptions.documentId);
+ if (!queryOptions.documentId) throw new Error('Document id is required');
+ result = await getDocument(database, database_id, queryOptions.collectionId, queryOptions.documentId);
break;
case 'add_document':
- result = await createDocument(database, queryOptions.collectionId, body);
+ if (isBodyEmpty) throw new Error('Body is required');
+ result = await createDocument(database, database_id, queryOptions.collectionId, body as object);
break;
case 'update_document':
- result = await updateDocument(database, queryOptions.collectionId, queryOptions.documentId, body);
+ if (!queryOptions.documentId) throw new Error('Document id is required');
+ if (isBodyEmpty) throw new Error('Body is required');
+ result = await updateDocument(
+ database,
+ database_id,
+ queryOptions.collectionId,
+ queryOptions.documentId,
+ body as object
+ );
break;
case 'delete_document':
- result = await deleteDocument(database, queryOptions.collectionId, queryOptions.documentId);
- break;
- case 'bulk_update':
- result = await bulkUpdate(
- database,
- queryOptions.collectionId,
- this.returnObject(queryOptions.records),
- queryOptions['document_id_key']
- );
+ if (!queryOptions.documentId) throw new Error('Document id is required');
+ result = await deleteDocument(database, database_id, queryOptions.collectionId, queryOptions.documentId);
break;
}
} catch (error) {
@@ -56,14 +65,14 @@ export default class Appwrite implements QueryService {
};
}
- private returnObject(data: any) {
+ returnObject(data: ReturnObject | string): ReturnObject {
if (!data) {
return {};
}
return typeof data === 'string' ? JSON5.parse(data) : data;
}
- async getConnection(sourceOptions: SourceOptions, _options?: object): Promise {
+ async getConnection(sourceOptions: SourceOptions, _options?: object): Promise {
const { host, secret_key, project_id } = sourceOptions;
const client = new sdk.Client();
@@ -72,20 +81,20 @@ export default class Appwrite implements QueryService {
.setProject(project_id) // Your project ID
.setKey(secret_key); // Your secret API key;
- return new sdk.Database(client);
+ return new sdk.Databases(client);
}
async testConnection(sourceOptions: SourceOptions): Promise {
const databaseClient = await this.getConnection(sourceOptions);
- if (!databaseClient) {
- throw new Error('Invalid credentials');
+ try {
+ await databaseClient.listCollections(sourceOptions.database_id);
+
+ return {
+ status: 'ok',
+ };
+ } catch (err) {
+ throw new Error(`Connection test failed - ${err.message}`);
}
-
- await databaseClient.listCollections();
-
- return {
- status: 'ok',
- };
}
}
diff --git a/plugins/packages/appwrite/lib/manifest.json b/plugins/packages/appwrite/lib/manifest.json
index fb04bd74b4..1f6260be80 100644
--- a/plugins/packages/appwrite/lib/manifest.json
+++ b/plugins/packages/appwrite/lib/manifest.json
@@ -32,6 +32,12 @@
"type": "text",
"description": "Appwrite project id"
},
+ "database_id": {
+ "label": "Database ID",
+ "key": "database_id",
+ "type": "text",
+ "description": "Appwrite Database id"
+ },
"secret_key": {
"label": "Secret Key",
"key": "secret_key",
diff --git a/plugins/packages/appwrite/lib/operations.json b/plugins/packages/appwrite/lib/operations.json
index eb9234f9cd..a906d0fd37 100644
--- a/plugins/packages/appwrite/lib/operations.json
+++ b/plugins/packages/appwrite/lib/operations.json
@@ -27,10 +27,6 @@
"value": "update_document",
"name": "Update Document"
},
- {
- "value": "bulk_update",
- "name": "Bulk update using document id"
- },
{
"value": "delete_document",
"name": "Delete Document"
@@ -121,6 +117,22 @@
"value": ">=",
"name": ">="
},
+ {
+ "value": "is",
+ "name": "Is"
+ },
+ {
+ "value": "startsWith",
+ "name": "Starts With"
+ },
+ {
+ "value": "endsWith",
+ "name": "Ends With"
+ },
+ {
+ "value": "search",
+ "name": "Search"
+ },
{
"value": "",
"name": "None"
@@ -177,7 +189,8 @@
"type": "codehinter",
"description": "Enter document body",
"height": "150px",
- "editorType": "extendedSingleLine"
+ "editorType": "extendedSingleLine",
+ "placeholder": "{'name': 'John', 'age': 30}"
}
},
"update_document": {
@@ -207,7 +220,8 @@
"type": "codehinter",
"description": "Enter document body",
"height": "150px",
- "editorType": "extendedSingleLine"
+ "editorType": "extendedSingleLine",
+ "placeholder": "{'name': 'John', 'age': 30}"
}
},
"delete_document": {
@@ -231,39 +245,6 @@
"className": "codehinter-plugins col-6",
"placeholder": "Enter document id"
}
- },
- "bulk_update": {
- "collectionId": {
- "label": "Collection ID",
- "key": "collectionId",
- "type": "codehinter",
- "lineNumbers": false,
- "description": "Enter collection id",
- "width": "320px",
- "height": "36px",
- "className": "codehinter-plugins",
- "placeholder": "Enter collection id"
- },
- "document_id_key": {
- "label": "Key for document Id",
- "key": "document_id_key",
- "type": "codehinter",
- "lineNumbers": false,
- "description": "Enter key for document Id",
- "width": "320px",
- "height": "36px",
- "className": "codehinter-plugins",
- "placeholder": "Enter key for document Id"
- },
- "records": {
- "label": "Records",
- "key": "records",
- "type": "codehinter",
- "mode": "javascript",
- "description": "Enter records",
- "height": "150px",
- "editorType": "extendedSingleLine"
- }
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/packages/appwrite/lib/operations.ts b/plugins/packages/appwrite/lib/operations.ts
index 53ed36042f..177570a1da 100644
--- a/plugins/packages/appwrite/lib/operations.ts
+++ b/plugins/packages/appwrite/lib/operations.ts
@@ -1,88 +1,150 @@
-import { Database, Query } from 'node-appwrite';
+import { Databases, Query } from 'node-appwrite';
+import { ParsedObject, AwModelDocument, AwModelDocumentList, AwQueryTypes } from './types';
+import { isEmpty } from 'lodash';
-function computeValue(value: string) {
- const numConverted = Number.parseInt(value);
- return isNaN(numConverted) ? value : numConverted;
+function parseValue(value: ParsedObject) {
+ try {
+ return typeof value === 'string' ? JSON.parse(value) : value;
+ } catch (err) {
+ return value;
+ }
+}
+
+function computeValue(value: AwQueryTypes | ParsedObject) {
+ const numConverted = Number.parseInt(value as string);
+ return isNaN(numConverted) ? parseValue(value as ParsedObject) : numConverted;
}
export async function queryCollection(
- db: Database,
+ db: Databases,
+ databaseId: string,
collection: string,
- limit: number,
- order_fields: string[],
- order_types: string[],
+ limit: string,
+ order_fields: string | string[],
+ order_types: string | string[],
where_field: string,
where_operation: string,
- where_value: any
-): Promise