From 00f694f906c42f5cfea96a2f096dc9b3705a9c66 Mon Sep 17 00:00:00 2001 From: Andrey Platov Date: Thu, 19 Aug 2021 18:36:31 +0200 Subject: [PATCH] checkpoint Signed-off-by: Andrey Platov --- common/config/rush/pnpm-lock.yaml | 5 ++++- dev/prod/.env | 2 -- packages/ui/src/components/internal/Status.svelte | 4 ++-- server/mongo/src/storage.ts | 1 + server/server/package.json | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index cd82baa477..6fe5ed57c6 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -9513,7 +9513,7 @@ packages: dev: false file:projects/server.tgz_6c259fadfeb3a4b20890aefe87070b8b: - resolution: {integrity: sha512-FGh0R+fgnIuNcoSfPKeIXVZuNrlspS3l7hwwb/pJbyHQ/ao/mETg/xyDtFO53czcAIPCYt43i/de/OOGF0j3Lw==, tarball: file:projects/server.tgz} + resolution: {integrity: sha512-Bpc8oo27XWe+uKFoDgS9nnkZF4A9rzcNq/IB1M6u0V4HUOfA/HW8XrdJ3Y2heEWev4B9CGuJ0j6QWq6Usm8lHg==, tarball: file:projects/server.tgz} id: file:projects/server.tgz name: '@rush-temp/server' version: 0.0.0 @@ -9526,7 +9526,10 @@ packages: eslint-plugin-import: 2.23.4_eslint@7.32.0 eslint-plugin-node: 11.1.0_eslint@7.32.0 eslint-plugin-promise: 4.3.1 + ts-node: 10.2.1_c780171742f6906a053a603dfa210a4e transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' - '@typescript-eslint/parser' - supports-color - typescript diff --git a/dev/prod/.env b/dev/prod/.env index b43dca119b..5a5fa69641 100644 --- a/dev/prod/.env +++ b/dev/prod/.env @@ -4,5 +4,3 @@ ACCOUNTS_URL=/account UPLOAD_URL=/upload LOGIN_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJlbWFpbCI6InJvc2FtdW5kQGhjLmVuZ2luZWVyaW5nIiwid29ya3NwYWNlIjoid3MxIn0.crxqT7QUkpZiTmmxouB40LpMwK2CfTf76XqPFWIMyic LOGIN_ENDPOINT=ws://localhost:3333 - -X=ZfVAdSSnw9myvd70 diff --git a/packages/ui/src/components/internal/Status.svelte b/packages/ui/src/components/internal/Status.svelte index f4b7e2244c..e519d46c8f 100644 --- a/packages/ui/src/components/internal/Status.svelte +++ b/packages/ui/src/components/internal/Status.svelte @@ -19,8 +19,8 @@ .container { user-select: none; span { - margin-left: .75rem; - font-size: .75rem; + margin-left: .75em; + font-size: .75em; color: var(--theme-content-accent-color); } } diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts index ebc7b1dcee..be5e383737 100644 --- a/server/mongo/src/storage.ts +++ b/server/mongo/src/storage.ts @@ -67,6 +67,7 @@ class MongoStorage implements ServerStorage { options?: FindOptions ): Promise> { const domain = this.hierarchy.getDomain(_class) + console.log('findAll', _class, domain, query) if (domain === DOMAIN_MODEL) return await this.modeldb.findAll(_class, query, options) return await this.db.collection(domain).find(translateQuery(query)).toArray() } diff --git a/server/server/package.json b/server/server/package.json index 0eb0cdcfe2..cd4c0f48d2 100644 --- a/server/server/package.json +++ b/server/server/package.json @@ -5,6 +5,7 @@ "author": "Anticrm Platform Contributors", "license": "EPL-2.0", "scripts": { + "start": "ts-node src/__start.ts", "build": "heft build", "lint:fix": "eslint --fix src" }, @@ -17,7 +18,8 @@ "eslint-plugin-promise":"4", "eslint-plugin-node":"11", "eslint":"^7.32.0", - "@types/ws":"^7.4.7" + "@types/ws":"^7.4.7", + "ts-node":"^10.2.1" }, "dependencies": { "@anticrm/core": "~0.6.10",