dcowan/vscode-appwrite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

start multiple database support

Browse source 
plus more package updates
This commit is contained in:
Dovi Cowan 2022-10-07 17:12:41 +01:00
parent f65f64d1a0
commit ebfd4b9362
No known key found for this signature in database
GPG key ID: CC028FE44C985E37
12 changed files with 107 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
package.json
View file

@ -28,7 +28,7 @@
"onCommand:vscode-appwrite.Connect",
"onView:Appwrite",
"onView:Users",
"onView:Database",
"onView:Databases",
"onView:Health",
"onView:Functions",
"onCommand:vscode-appwrite.AddProject",
@ -348,8 +348,8 @@
"name": "Users"
},
{
"id": "Database",
"name": "Database"
"id": "Databases",
"name": "Databases"
},
{
"id": "Storage",
@ -388,7 +388,7 @@
},
{
"command": "vscode-appwrite.OpenDatabaseDocumentation",
"when": "view == Database",
"when": "view == Databases",
"group": "navigation"
},
{
@ -403,12 +403,12 @@
},
{
"command": "vscode-appwrite.refreshCollectionsList",
"when": "view == Database",
"when": "view == Databases",
"group": "navigation"
},
{
"command": "vscode-appwrite.createCollection",
"when": "view == Database",
"when": "view == Databases",
"group": "navigation"
},
{
@ -738,19 +738,21 @@
"scripts": {
"vscode:prepublish": "npm run package",
"compile": "webpack",
"watch": "webpack --watch",
"watch": "webpack --mode development --watch",
"package": "webpack --mode production --devtool hidden-source-map",
"test-compile": "tsc -p ./",
"test-watch": "tsc -watch -p ./",
"pretest": "npm run test-compile && npm run lint",
"lint": "eslint src --ext ts",
"test": "node ./out/test/runTest.js"
"test": "node ./out/test/runTest.js",
"webpack": "webpack --mode development",
"webpack-dev": "webpack --mode development --watch"
},
"devDependencies": {
"@types/fs-extra": "^9.0.11",
"@types/glob": "^7.1.3",
"@types/mocha": "^8.0.4",
"@types/node": "^12.11.7",
"@types/node": "^12.20.55",
"@types/tar": "^4.0.4",
"@types/vscode": "^1.55.0",
"@typescript-eslint/eslint-plugin": "^4.14.1",
@ -758,19 +760,20 @@
"eslint": "^7.19.0",
"glob": "^7.1.6",
"mocha": "^8.2.1",
"ts-loader": "^8.0.14",
"ts-loader": "^8.4.0",
"typescript": "^4.1.3",
"vsce": "^1.88.0",
"vscode-test": "^1.5.0",
"webpack": "^5.19.0",
"webpack-cli": "^4.4.0"
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0"
},
"dependencies": {
"cron-validate": "^1.4.3",
"cronstrue": "^1.113.0",
"dayjs": "^1.10.4",
"fs-extra": "^9.1.0",
"node-appwrite": "^2.2.3",
"node-appwrite": "^8.1.0",
"node-polyfill-webpack-plugin": "^2.0.1",
"tar": "^6.1.0"
}
}

20
src/appwrite.d.ts vendored
View file

@ -260,8 +260,13 @@ export type File = {
sizeOriginal: number;
};
export type Database = {
$id: string;
}
export type Collection = {
$id: string;
$database: string;
$permissions: Permissions;
name: string;
dateCreated: number;
@ -312,12 +317,13 @@ export type UsersClient = {
};
export type DatabaseClient = {
listCollections: () => Promise<any>;
listDocuments: (collectionId: string) => Promise<any>;
updateCollection: (collectionId: string, name: string, read: string[], write: string[], rules?: (Rule | CreatedRule)[]) => Promise<any>;
deleteCollection: (collectionId: string) => Promise<any>;
getCollection: (collectionId: string) => Promise<any>;
deleteDocument: (collectionId: string, documentId: string) => Promise<any>;
list: () => Promise<any>;
listCollections: (collectionDatabase: string) => Promise<any>;
listDocuments: (collectionDatabase: string, collectionId: string) => Promise<any>;
updateCollection: (collectionDatabase: string, collectionId: string, name: string, read: string[], write: string[], rules?: (Rule | CreatedRule)[]) => Promise<any>;
deleteCollection: (collectionDatabase: string, collectionId: string) => Promise<any>;
getCollection: (collectionDatabase: string, collectionId: string) => Promise<any>;
deleteDocument: (collectionDatabase: string, collectionId: string, documentId: string) => Promise<any>;
createCollection: (name: string, read: string[], write: string[], rules: Rule[]) => Promise<any>;
};
@ -448,7 +454,7 @@ export type SDK = {
Users: new (client: Client) => UsersClient;
Health: new (client: Client) => HealthClient;
Database: new (client: Client) => DatabaseClient;
Databases: new (client: Client) => DatabaseClient;
Storage: new (client: Client) => StorageClient;
Functions: new (client: Client) => FunctionsClient;
};

23
src/appwrite/Database.ts
View file

@ -6,19 +6,23 @@ export class Database {
private readonly database: DatabaseClient;
constructor(client: Client) {
this.database = new AppwriteSDK.Database(client);
this.database = new AppwriteSDK.Databases(client);
}
public async getCollection(collectionId: string): Promise<Collection | undefined> {
return await AppwriteCall<Collection>(this.database.getCollection(collectionId));
public async list(): Promise<any> {
return await AppwriteCall<any>(this.database.list());
}
public async deleteDocument(collectionId: string, documentId: string): Promise<void> {
await AppwriteCall(this.database.deleteDocument(collectionId, documentId));
public async getCollection(collectionDB: string, collectionId: string): Promise<Collection | undefined> {
return await AppwriteCall<Collection>(this.database.getCollection(collectionDB, collectionId));
}
public async deleteCollection(collectionId: string): Promise<void> {
await AppwriteCall(this.database.deleteCollection(collectionId));
public async deleteDocument(collectionDB:string, collectionId: string, documentId: string): Promise<void> {
await AppwriteCall(this.database.deleteDocument(collectionDB, collectionId, documentId));
}
public async deleteCollection(collectionDB:string, collectionId: string): Promise<void> {
await AppwriteCall(this.database.deleteCollection(collectionDB, collectionId));
}
public async createCollection(collection: CreatedCollection): Promise<void> {
@ -33,12 +37,12 @@ export class Database {
}
public async updatePermissions(collection: Collection, read: string[], write: string[]): Promise<void> {
await AppwriteCall(this.database.updateCollection(collection.$id, collection.name, read, write, collection.rules));
await AppwriteCall(this.database.updateCollection(collection.$database, collection.$id, collection.name, read, write, collection.rules));
}
public async createRule(collection: Collection, newRule: CreatedRule): Promise<void> {
await AppwriteCall(
this.database.updateCollection(collection.$id, collection.name, collection.$permissions.read, collection.$permissions.write, [
this.database.updateCollection(collection.$database, collection.$id, collection.name, collection.$permissions.read, collection.$permissions.write, [
...collection.rules,
newRule,
])
@ -50,6 +54,7 @@ export class Database {
await AppwriteCall(
this.database.updateCollection(
collection.$database,
collection.$id,
collection.name,
collection.$permissions.read,

4
src/commands/database/deleteCollection.ts
View file

@ -11,10 +11,10 @@ export async function deleteCollection(collectionTreeItem: CollectionTreeItem):
try {
const shouldDelete = await confirmDialog(`Delete collection "${collection.name}"?`);
if (shouldDelete) {
await databaseClient.deleteCollection(collection.$id);
await databaseClient.deleteCollection(collection.$database, collection.$id);
window.showInformationMessage(`Deleted collection "${collection.name}".`);
}
} catch (e) {
} catch (e: any) {
window.showErrorMessage(e);
}
}

4
src/commands/database/deleteDocument.ts
View file

@ -12,10 +12,10 @@ export async function deleteDocument(documentTreeItem: DocumentTreeItem): Promis
try {
const shouldDelete = await confirmDialog(`Delete document "${document["$id"]}" from ${collection.name}?`);
if (shouldDelete) {
await databaseClient.deleteDocument(collection.$id, document["$id"]);
await databaseClient.deleteDocument(collection.$database, collection.$id, document["$id"]);
window.showInformationMessage(`Deleted document "${document["$id"]}" from ${collection.name}.`);
}
} catch (e) {
} catch (e: any) {
window.showErrorMessage(e);
}
}

1
src/extension.ts
View file

@ -1,5 +1,6 @@
import * as vscode from "vscode";
import { createAppwriteClient } from "./client";
import { activateTag } from "./commands/functions/activateTag";
import { registerCommands } from "./commands/registerCommands";
import { ext } from "./extensionVariables";
import { getActiveProjectConfiguration } from "./settings";

2
src/tree/database/CollectionTreeItem.ts
View file

@ -20,7 +20,7 @@ export class CollectionTreeItem extends AppwriteTreeItemBase {
if (!databaseClient) {
return;
}
this.collection = (await databaseClient.getCollection(this.collection.$id)) ?? this.collection;
this.collection = (await databaseClient.getCollection(this.collection.$database, this.collection.$id)) ?? this.collection;
this.provider.refreshChild(this);
}

36
src/tree/database/DatabaseTreeItem.ts Normal file
View file

@ -0,0 +1,36 @@
import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
import { Database } from "../../appwrite";
import { databaseClient } from "../../client";
import { AppwriteTreeItemBase } from "../../ui/AppwriteTreeItemBase";
import { CollectionTreeItem } from "./CollectionTreeItem";
import { DatabaseTreeItemProvider } from "./DatabaseTreeItemProvider";
import { DocumentsTreeItem } from "./DocumentsTreeItem";
import { PermissionsTreeItem } from "./settings/PermissionsTreeItem";
import { RulesTreeItem } from "./settings/RulesTreeItem";
export class DatabaseTreeItem extends AppwriteTreeItemBase {
constructor(public database: any, public readonly provider: DatabaseTreeItemProvider) {
super(undefined, database.name);
}
public async getChildren(): Promise<TreeItem[]> {
// return [new RulesTreeItem(this), new PermissionsTreeItem(this), new DocumentsTreeItem(this)];
// return [new CollectionTreeItem(this)];
console.warn(this);
return [];
}
public async refresh(): Promise<void> {
if (!databaseClient) {
return;
}
this.database = (await databaseClient.list()) ?? this.database;
this.provider.refreshChild(this);
}
collapsibleState = TreeItemCollapsibleState.Collapsed;
contextValue = "database";
iconPath = new ThemeIcon("folder");
}

25
src/tree/database/DatabaseTreeItemProvider.ts
View file

@ -3,6 +3,7 @@ import { client } from "../../client";
import AppwriteCall from "../../utils/AppwriteCall";
import { Collection, CollectionsList } from "../../appwrite";
import { CollectionTreeItem } from "./CollectionTreeItem";
import { DatabaseTreeItem } from "./DatabaseTreeItem";
import { AppwriteSDK } from "../../constants";
import { ext } from '../../extensionVariables';
import { AppwriteTreeItemBase } from '../../ui/AppwriteTreeItemBase';
@ -37,17 +38,27 @@ export class DatabaseTreeItemProvider implements vscode.TreeDataProvider<vscode.
return await parent.getChildren?.() ?? [];
}
const databaseSdk = new AppwriteSDK.Database(client);
const databaseSdk = new AppwriteSDK.Databases(client);
const collectionsList = await AppwriteCall<CollectionsList, CollectionsList>(databaseSdk.listCollections());
if (collectionsList) {
const collectionTreeItems = collectionsList.collections.map((collection: Collection) => new CollectionTreeItem(collection, this)) ?? [];
const databaseList = await AppwriteCall<any>(databaseSdk.list());
if(databaseList) {
const databaseTreeItems = databaseList.databases.map((database: any) => new DatabaseTreeItem(database, this)) ?? [];
const headerItem: vscode.TreeItem = {
label: `Total collections: ${collectionsList.sum}`,
label: `Total databases: ${databaseList.sum}`,
};
return [headerItem, ...collectionTreeItems];
return [headerItem, ...databaseTreeItems];
}
return [{ label: "No collections found" }];
// const collectionsList = await AppwriteCall<CollectionsList, CollectionsList>(databaseSdk.listCollections());
// if (collectionsList) {
// const collectionTreeItems = collectionsList.collections.map((collection: Collection) => new CollectionTreeItem(collection, this)) ?? [];
// const headerItem: vscode.TreeItem = {
// label: `Total collections: ${collectionsList.sum}`,
// };
// return [headerItem, ...collectionTreeItems];
// }
return [{ label: "No databases found" }];
}
}

4
src/tree/database/DocumentsTreeItem.ts
View file

@ -14,8 +14,8 @@ export class DocumentsTreeItem extends AppwriteTreeItemBase<CollectionTreeItem>
}
public async getChildren(): Promise<TreeItem[]> {
const databaseSdk = new AppwriteSDK.Database(client);
const documentList = await AppwriteCall<DocumentsList>(databaseSdk.listDocuments(this.parent.collection.$id));
const databaseSdk = new AppwriteSDK.Databases(client);
const documentList = await AppwriteCall<DocumentsList>(databaseSdk.listDocuments(this.parent.collection.$database, this.parent.collection.$id));
if (documentList === undefined) {
return [];
}

2
src/tree/health/HealthTreeItemProvider.ts
View file

@ -40,7 +40,7 @@ export class HealthTreeItemProvider implements vscode.TreeDataProvider<vscode.Tr
async () => {
try {
return await healthClient?.checkup();
} catch (e) {
} catch (e: any) {
ext.outputChannel?.append('Error: ' + e.message);
vscode.window.showErrorMessage('Could not connect to Appwrite project');
}

2
src/ui/createRuleWizard.ts
View file

@ -68,7 +68,7 @@ export async function createRuleWizard(collection: Collection): Promise<CreateRu
let list: string[] | undefined = undefined;
if (type === "document") {
const databaseSdk = new AppwriteSDK.Database(client);
const databaseSdk = new AppwriteSDK.Databases(client);
const collectionsList = await AppwriteCall<CollectionsList, CollectionsList>(databaseSdk.listCollections());
if (collectionsList === undefined) {