diff --git a/.vscode/launch.json b/.vscode/launch.json index b80e833e9b..646aab7971 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -181,7 +181,6 @@ "request": "launch", "args": ["src/__start.ts"], "env": { - "ELASTIC_URL": "http://localhost:9200", "MONGO_URL": "mongodb://localhost:27017", "METRICS_CONSOLE": "false", "STORAGE_CONFIG": "minio|localhost?accessKey=minioadmin&secretKey=minioadmin", @@ -264,8 +263,7 @@ "SERVER_SECRET": "secret", "MONGO_URL": "mongodb://localhost:27017", "ACCOUNTS_URL": "http://localhost:3000", - "TELEGRAM_DATABASE": "telegram-service", - "ELASTIC_URL": "http://localhost:9200" + "TELEGRAM_DATABASE": "telegram-service" }, "runtimeArgs": ["--nolazy", "-r", "ts-node/register"], "sourceMaps": true, @@ -290,7 +288,6 @@ "DB_URL": "mongodb://localhost:27017", "ACCOUNTS_URL": "http://localhost:3000", "TELEGRAM_DATABASE": "telegram-service", - "ELASTIC_URL": "http://localhost:9200", "REKONI_URL": "http://localhost:4004", "MODEL_VERSION": "0.6.287" }, @@ -318,7 +315,6 @@ "DB_URL": "postgresql://root@host.docker.internal:26257/defaultdb?sslmode=disable", "MONGO_URL": "mongodb://localhost:27017", "TELEGRAM_DATABASE": "telegram-service", - "ELASTIC_URL": "http://localhost:9200", "REKONI_URL": "http://localhost:4004", "MODEL_VERSION": "0.6.287" }, @@ -342,7 +338,6 @@ "DB_URL": "postgresql://postgres:example@localhost:5432", "ACCOUNTS_URL": "http://localhost:3000", "TELEGRAM_DATABASE": "telegram-service", - "ELASTIC_URL": "http://localhost:9200", "REKONI_URL": "http://localhost:4004" }, "runtimeVersion": "20", diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index d92ff909c7..01adc293e9 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -232,7 +232,6 @@ services: - ACCOUNTS_URL=http://host.docker.internal:3000 - STATS_URL=http://host.docker.internal:4900 - UPLOAD_URL=/files - - ELASTIC_URL=http://host.docker.internal:9200 - GMAIL_URL=http://host.docker.internal:8088 - CALENDAR_URL=http://host.docker.internal:8095 - TELEGRAM_URL=http://host.docker.internal:8086 diff --git a/dev/import-tool/package.json b/dev/import-tool/package.json index 336f00f6fd..29af15302d 100644 --- a/dev/import-tool/package.json +++ b/dev/import-tool/package.json @@ -19,8 +19,8 @@ "docker:tbuild": "docker build -t hardcoreeng/import-tool . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/import-tool", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/import-tool staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/import-tool", - "run-local": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --max-old-space-size=18000 ./bundle/bundle.js", - "run-local-brk": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", + "run-local": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --max-old-space-size=18000 ./bundle/bundle.js", + "run-local-brk": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost MONGO_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", "run": "rush bundle --to @hcengineering/import-tool >/dev/null && cross-env node --max-old-space-size=8000 ./bundle/bundle.js", "upgrade": "rushx run-local upgrade", "format": "format src", diff --git a/dev/local-mongo/docker-compose.yaml b/dev/local-mongo/docker-compose.yaml index 228b33aec0..234b064008 100644 --- a/dev/local-mongo/docker-compose.yaml +++ b/dev/local-mongo/docker-compose.yaml @@ -87,7 +87,6 @@ services: - 'MONGO_OPTIONS={"appName":"front","maxPoolSize":1}' - ACCOUNTS_URL=http://localhost:3000 - UPLOAD_URL=/files - - ELASTIC_URL=http://elastic:9200 - GMAIL_URL=http://localhost:8088 - CALENDAR_URL=http://localhost:8095 - TELEGRAM_URL=http://localhost:8086 @@ -121,7 +120,6 @@ services: - SERVER_PORT=3333 - SERVER_SECRET=secret - ENABLE_COMPRESSION=true - - ELASTIC_URL=http://elastic:9200 - MONGO_URL=mongodb://host.docker.internal:27017?compressors=snappy - 'MONGO_OPTIONS={"appName": "transactor", "maxPoolSize": 10}' - METRICS_CONSOLE=false diff --git a/dev/tool/package.json b/dev/tool/package.json index 120d8723d6..935c93f993 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -19,10 +19,10 @@ "docker:tbuild": "docker build -t hardcoreeng/tool . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/tool", "docker:staging": "../../common/scripts/docker_tag.sh hardcoreeng/tool staging", "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/tool", - "run-local": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", - "run-local-pg": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=postgresql://postgres:example@localhost:5432 TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", - "run-local-cr": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=postgresql://root@host.docker.internal:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", - "run-local-brk": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service ELASTIC_URL=http://localhost:9200 REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", + "run-local": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", + "run-local-pg": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=postgresql://postgres:example@localhost:5432 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", + "run-local-cr": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3332 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=postgresql://root@host.docker.internal:26257/defaultdb?sslmode=disable TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --expose-gc --max-old-space-size=18000 ./bundle/bundle.js", + "run-local-brk": "rush bundle --to @hcengineering/tool >/dev/null && cross-env SERVER_SECRET=secret ACCOUNTS_URL=http://localhost:3000 TRANSACTOR_URL=ws://localhost:3333 MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost ACCOUNT_DB_URL=mongodb://localhost:27017 DB_URL=mongodb://localhost:27017 TELEGRAM_DATABASE=telegram-service REKONI_URL=http://localhost:4004 MODEL_VERSION=$(node ../../common/scripts/show_version.js) GIT_REVISION=$(git describe --all --long) node --inspect-brk --enable-source-maps --max-old-space-size=18000 ./bundle/bundle.js", "run": "rush bundle --to @hcengineering/tool >/dev/null && cross-env node --max-old-space-size=8000 ./bundle/bundle.js", "upgrade": "rushx run-local upgrade", "format": "format src", diff --git a/dev/tool/src/clean.ts b/dev/tool/src/clean.ts index da7d4f6c4a..6d9d94b5b2 100644 --- a/dev/tool/src/clean.ts +++ b/dev/tool/src/clean.ts @@ -82,7 +82,6 @@ export async function cleanWorkspace ( mongoUrl: string, workspaceId: WorkspaceId, storageAdapter: StorageAdapter, - elasticUrl: string, transactorUrl: string, opt: { recruit: boolean, tracker: boolean, removedTx: boolean } ): Promise { diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts index 882a2a14a2..4d99f62fa7 100644 --- a/dev/tool/src/index.ts +++ b/dev/tool/src/index.ts @@ -167,15 +167,6 @@ export function devTool ( console.error('please provide transactor url.') } - function getElasticUrl (): string { - const elasticUrl = process.env.ELASTIC_URL - if (elasticUrl === undefined) { - console.error('please provide elastic url') - process.exit(1) - } - return elasticUrl - } - const initScriptUrl = process.env.INIT_SCRIPT_URL if (initScriptUrl !== undefined) { setMetadata(toolPlugin.metadata.InitScriptURL, initScriptUrl) @@ -1443,7 +1434,7 @@ export function devTool ( await withDatabase(dbUrl, async (db) => { const wsid = getWorkspaceId(workspace) const endpoint = await getTransactorEndpoint(generateToken(systemAccountEmail, wsid), 'external') - await cleanWorkspace(toolCtx, dbUrl, wsid, adapter, getElasticUrl(), endpoint, cmd) + await cleanWorkspace(toolCtx, dbUrl, wsid, adapter, endpoint, cmd) }) }) }) diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index a8e2857cd4..003de31209 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -435,6 +435,26 @@ export function createModel (builder: Builder): void { }, recruit.viewlet.TableApplicant ) + + const applicationDoneOption: ViewOptionModel = { + key: 'hideDoneState', + type: 'toggle', + defaultValue: true, + actionTarget: 'query', + action: recruit.function.HideDoneState, + label: recruit.string.HideDoneState + } + + // hiding applicants related to archived vacancies from applicants view + const hideApplicantsFromArchivedVacanciesOption: ViewOptionModel = { + key: 'hideArchivedVacancies', + type: 'toggle', + defaultValue: true, + actionTarget: 'query', + action: recruit.function.HideArchivedVacancies, + label: recruit.string.HideApplicantsFromArchivedVacancies + } + builder.createDoc( view.class.Viewlet, core.space.Model, @@ -479,9 +499,10 @@ export function createModel (builder: Builder): void { hiddenKeys: ['name', 'attachedTo'], sortable: true }, - baseQuery: { - isDone: false, - '$lookup.space.archived': false + viewOptions: { + groupBy: [], + orderBy: [], + other: [applicationDoneOption, hideApplicantsFromArchivedVacanciesOption] } }, recruit.viewlet.ApplicantTable @@ -519,25 +540,6 @@ export function createModel (builder: Builder): void { ] } - const applicationDoneOption: ViewOptionModel = { - key: 'hideDoneState', - type: 'toggle', - defaultValue: true, - actionTarget: 'query', - action: recruit.function.HideDoneState, - label: recruit.string.HideDoneState - } - - // hiding applicants related to archived vacancies from applicants view - const hideApplicantsFromArchivedVacanciesOption: ViewOptionModel = { - key: 'hideArchivedVacancies', - type: 'toggle', - defaultValue: true, - actionTarget: 'query', - action: recruit.function.HideArchivedVacancies, - label: recruit.string.HideApplicantsFromArchivedVacancies - } - const applicantViewOptions = (colors: boolean, hides: boolean): ViewOptionsModel => { const model: ViewOptionsModel = { groupBy: ['status', 'assignee', 'space', 'createdBy', 'modifiedBy'], @@ -794,13 +796,8 @@ export function createModel (builder: Builder): void { { attachTo: recruit.class.Applicant, descriptor: task.viewlet.Kanban, - // eslint-disable-next-line @typescript-eslint/consistent-type-assertions - baseQuery: { - isDone: false, - '$lookup.space.archived': false - }, viewOptions: { - ...applicantViewOptions(false, false), + ...applicantViewOptions(false, true), groupDepth: 1 }, options: { diff --git a/packages/core/src/clone.ts b/packages/core/src/clone.ts index baa6437a0e..315b9ca88f 100644 --- a/packages/core/src/clone.ts +++ b/packages/core/src/clone.ts @@ -65,6 +65,10 @@ export function clone (obj: any, as?: (doc: any, m: any) => any, needAs?: (value } } } + if (typeOf === 'Object') { + const m = needAs?.(obj) + return m !== undefined && as !== undefined ? as(result, m) : result + } return result } else { return obj diff --git a/packages/query/src/index.ts b/packages/query/src/index.ts index d24b6ea13c..3e31e09716 100644 --- a/packages/query/src/index.ts +++ b/packages/query/src/index.ts @@ -27,6 +27,7 @@ import core, { IndexingUpdateEvent, Lookup, LookupData, + Mixin, ModelDb, Ref, ReverseLookups, @@ -150,6 +151,13 @@ export class LiveQuery implements WithTx, Client { } private match (q: Query, doc: Doc, skipLookup = false): boolean { + if (this.getHierarchy().isMixin(q._class)) { + if (this.getHierarchy().hasMixin(doc, q._class)) { + doc = this.getHierarchy().as(doc, q._class) + } else { + return false + } + } if (!this.getHierarchy().isDerived(doc._class, q._class)) { // Check if it is not a mixin and not match class const mixinClass = Hierarchy.mixinClass(doc) @@ -518,20 +526,30 @@ export class LiveQuery implements WithTx, Client { return current } + private asMixin (doc: Doc, mixin: Ref>): Doc { + if (this.getHierarchy().isMixin(mixin)) { + return this.getHierarchy().as(doc, mixin) + } + return doc + } + private async getCurrentDoc ( q: Query, _id: Ref, space: Ref, docCache: Map ): Promise { - const current = await this.getDocFromCache(docCache, _id, q._class, space, q) + let current = await this.getDocFromCache(docCache, _id, q._class, space, q) if (q.result instanceof Promise) { q.result = await q.result } const pos = q.result.findDoc(_id) + if (current !== undefined) { + current = this.asMixin(current, q._class) + } if (current !== undefined && this.match(q, current)) { - q.result.updateDoc(current) + q.result.updateDoc(current, false) this.refs.updateDocuments(q, [current]) } else { if (q.options?.limit === q.result.length) { @@ -543,7 +561,6 @@ export class LiveQuery implements WithTx, Client { if (q.options?.total === true) { q.total-- } - return true } } return false @@ -597,7 +614,7 @@ export class LiveQuery implements WithTx, Client { if (q.result instanceof Promise) { q.result = await q.result } - const updatedDoc = q.result.findDoc(tx.objectId) + let updatedDoc = q.result.findDoc(tx.objectId) if (updatedDoc !== undefined) { // If query contains search we must check use fulltext if (q.query.$search != null && q.query.$search.length > 0) { @@ -608,6 +625,7 @@ export class LiveQuery implements WithTx, Client { } else { if (updatedDoc.modifiedOn < tx.modifiedOn) { await this.__updateMixinDoc(q, updatedDoc, tx) + updatedDoc = this.asMixin(updatedDoc, q._class) const updateRefresh = this.checkUpdatedDocMatch(q, q.result, updatedDoc) if (updateRefresh) { continue diff --git a/plugins/task-resources/src/utils.ts b/plugins/task-resources/src/utils.ts index 894d075e88..e1a4cc86c4 100644 --- a/plugins/task-resources/src/utils.ts +++ b/plugins/task-resources/src/utils.ts @@ -17,7 +17,7 @@ import { type ViewQueryOption, type Viewlet } from '@hcengineering/view' -import { getCategories, getCategorySpaces } from '@hcengineering/view-resources' +import { getCategories, getCategorySpaces, concatCategories } from '@hcengineering/view-resources' /** * @public @@ -55,7 +55,7 @@ export async function updateTaskKanbanCategories ( viewlet.descriptor ) if (res !== undefined) { - categories = res + categories = concatCategories(res, categories) break } } @@ -78,7 +78,7 @@ export async function getTaskKanbanResultQuery ( if (viewOption.actionTarget !== 'query') continue const queryOption = viewOption as ViewQueryOption const f = await getResource(queryOption.action) - result = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, query) + result = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result) } return result } diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte index e1a47263fa..10ab2dcee5 100644 --- a/plugins/view-resources/src/components/Table.svelte +++ b/plugins/view-resources/src/components/Table.svelte @@ -24,9 +24,11 @@ Ref, SortingOrder, TxOperations, - getObjectValue + getObjectValue, + mergeQueries } from '@hcengineering/core' import notification from '@hcengineering/notification' + import { getResource } from '@hcengineering/platform' import { createQuery, getClient, reduceCalls, updateAttribute } from '@hcengineering/presentation' import ui, { Button, @@ -39,7 +41,14 @@ mouseAttractor, resizeObserver } from '@hcengineering/ui' - import { AttributeModel, BuildModelKey, BuildModelOptions } from '@hcengineering/view' + import { + AttributeModel, + BuildModelKey, + BuildModelOptions, + ViewOptionModel, + ViewOptions, + ViewQueryOption + } from '@hcengineering/view' import { deepEqual } from 'fast-equals' import { createEventDispatcher } from 'svelte' import { showMenu } from '../actions' @@ -59,6 +68,8 @@ export let tableId: string | undefined = undefined export let readonly = false export let showFooter = false + export let viewOptionsConfig: ViewOptionModel[] | undefined = undefined + export let viewOptions: ViewOptions | undefined = undefined export let totalQuery: DocumentQuery | undefined = undefined @@ -117,6 +128,29 @@ : { ...(options?.sort ?? {}), [sortKey]: sortOrder } } + async function getResultQuery ( + query: DocumentQuery, + viewOptions: ViewOptionModel[] | undefined, + viewOptionsStore: ViewOptions | undefined + ): Promise> { + if (viewOptions === undefined || viewOptionsStore === undefined) { + return query + } + let result: DocumentQuery = hierarchy.clone(query) + for (const viewOption of viewOptions) { + if (viewOption.actionTarget !== 'query') continue + const queryOption = viewOption as ViewQueryOption + const f = await getResource(queryOption.action) + const resultP = f(viewOptionsStore[queryOption.key] ?? queryOption.defaultValue, result) + if (resultP instanceof Promise) { + result = await resultP + } else { + result = resultP + } + } + return result + } + const update = reduceCalls(async function ( _class: Ref>, query: DocumentQuery, @@ -126,9 +160,11 @@ limit: number, options?: FindOptions ) { + const p = await getResultQuery(query, viewOptionsConfig, viewOptions) + const resultQuery = mergeQueries(p, query) loading += q.query( _class, - query, + resultQuery, (result) => { if (sortingFunction !== undefined) { const sf = sortingFunction diff --git a/plugins/view-resources/src/components/TableBrowser.svelte b/plugins/view-resources/src/components/TableBrowser.svelte index a8454a0bcb..f5404485e4 100644 --- a/plugins/view-resources/src/components/TableBrowser.svelte +++ b/plugins/view-resources/src/components/TableBrowser.svelte @@ -16,7 +16,7 @@ import type { Class, Doc, DocumentQuery, FindOptions, Ref } from '@hcengineering/core' import { ActionContext } from '@hcengineering/presentation' import { FadeOptions, Scroller, tableSP } from '@hcengineering/ui' - import { BuildModelKey } from '@hcengineering/view' + import { BuildModelKey, ViewOptions, Viewlet } from '@hcengineering/view' import { onMount } from 'svelte' import { focusStore, ListSelectionProvider, SelectDirection } from '../selection' import { LoadingProps } from '../utils' @@ -34,6 +34,8 @@ export let tableId: string | undefined = undefined export let fade: FadeOptions = tableSP export let prefferedSorting: string = 'modifiedOn' + export let viewOptions: ViewOptions | undefined = undefined + export let viewlet: Viewlet | undefined = undefined // If defined, will show a number of dummy items before real data will appear. export let loadingProps: LoadingProps | undefined = undefined @@ -79,6 +81,8 @@ checked={$selection ?? []} {prefferedSorting} {tableId} + {viewOptions} + viewOptionsConfig={viewlet?.viewOptions?.other} selection={listProvider.current($focusStore)} on:row-focus={(evt) => { listProvider.updateFocus(evt.detail) diff --git a/plugins/view-resources/src/components/ViewletContentView.svelte b/plugins/view-resources/src/components/ViewletContentView.svelte index b04b54c6e4..369e3ab127 100644 --- a/plugins/view-resources/src/components/ViewletContentView.svelte +++ b/plugins/view-resources/src/components/ViewletContentView.svelte @@ -22,12 +22,18 @@ const preferenceQuery = createQuery() const objectConfigurations = createQuery() let preference: ViewletPreference[] = [] - let loading = true + + let configurationsLoading = true + let preferencesLoading = true + $: loading = configurationsLoading || preferencesLoading let configurationRaw: Viewlet[] = [] let configurations: Record>, Viewlet['config']> = {} - $: viewlet && + function fetchConfigurations (viewlet: Viewlet): void { + configurationsLoading = true + configurations = {} + objectConfigurations.query( view.class.Viewlet, { @@ -37,11 +43,13 @@ }, (res) => { configurationRaw = res - loading = false + configurationsLoading = false } ) + } - $: viewlet && + function fetchPreferences (viewlet: Viewlet): void { + preferencesLoading = true preferenceQuery.query( view.class.ViewletPreference, { @@ -50,9 +58,10 @@ }, (res) => { preference = res - loading = false + preferencesLoading = false } ) + } function updateConfiguration (configurationRaw: Viewlet[], preference: ViewletPreference[]): void { const newConfigurations: Record>, Viewlet['config']> = {} @@ -74,6 +83,9 @@ configurations = newConfigurations } + $: fetchConfigurations(viewlet) + $: fetchPreferences(viewlet) + $: updateConfiguration(configurationRaw, preference) $: config = preference.find((it) => it.attachedTo === viewlet._id)?.config ?? viewlet.config diff --git a/pods/front/run.sh b/pods/front/run.sh index 747db11121..063127854b 100755 --- a/pods/front/run.sh +++ b/pods/front/run.sh @@ -2,7 +2,6 @@ export ACCOUNTS_URL=http://localhost:3333 export UPLOAD_URL=http://localhost:3333/files -export ELASTIC_URL=http://elastic:9200 export COLLABORATOR_URL=ws://localhost:3078 export MINIO_ENDPOINT=minio export MINIO_ACCESS_KEY=minioadmin diff --git a/qms-tests/docker-compose.yaml b/qms-tests/docker-compose.yaml index 32314d6f7c..17b784b9ff 100644 --- a/qms-tests/docker-compose.yaml +++ b/qms-tests/docker-compose.yaml @@ -99,7 +99,6 @@ services: - ACCOUNTS_URL=http://host.docker.internal:3003 - MONGO_URL=mongodb://mongodb:27018 - UPLOAD_URL=/files - - ELASTIC_URL=http://elastic:9200 - GMAIL_URL=http://host.docker.internal:8088 - CALENDAR_URL=http://host.docker.internal:8095 - REKONI_URL=http://rekoni:4007 diff --git a/qms-tests/restore-local.sh b/qms-tests/restore-local.sh index 8ca9a3d3f4..6eda942b54 100755 --- a/qms-tests/restore-local.sh +++ b/qms-tests/restore-local.sh @@ -3,7 +3,6 @@ export MINIO_ACCESS_KEY=minioadmin export MINIO_SECRET_KEY=minioadmin export MINIO_ENDPOINT=localhost:9000 export MONGO_URL=mongodb://localhost:27017 -export ELASTIC_URL=http://localhost:9200 export SERVER_SECRET=secret # Restore workspace contents in mongo/elastic diff --git a/qms-tests/tool-local.sh b/qms-tests/tool-local.sh index 0e1e3a919e..6a76ff2081 100755 --- a/qms-tests/tool-local.sh +++ b/qms-tests/tool-local.sh @@ -7,7 +7,6 @@ export DB_URL=mongodb://localhost:27017 export ACCOUNT_DB_URL=mongodb://localhost:27017 export ACCOUNTS_URL=http://localhost:3000 export TRANSACTOR_URL=ws://localhost:3333 -export ELASTIC_URL=http://localhost:9200 export SERVER_SECRET=secret # Restore workspace contents in mongo/elastic diff --git a/qms-tests/tool.sh b/qms-tests/tool.sh index 49c7458199..6b05f411ef 100755 --- a/qms-tests/tool.sh +++ b/qms-tests/tool.sh @@ -8,7 +8,6 @@ export TRANSACTOR_URL=ws://localhost:3334 export MONGO_URL=mongodb://localhost:27018 export ACCOUNT_DB_URL=mongodb://localhost:27018 export DB_URL=mongodb://localhost:27018 -export ELASTIC_URL=http://localhost:9201 export SERVER_SECRET=secret export STORAGE_CONFIG="minio|localhost:9002?accessKey=minioadmin&secretKey=minioadmin" diff --git a/server-plugins/task-resources/src/index.ts b/server-plugins/task-resources/src/index.ts index 2f5943a6db..77dfc862cd 100644 --- a/server-plugins/task-resources/src/index.ts +++ b/server-plugins/task-resources/src/index.ts @@ -50,7 +50,7 @@ export async function OnStateUpdate (txes: TxCUD[], control: TriggerControl } } } - return [] + return result } // eslint-disable-next-line @typescript-eslint/explicit-function-return-type diff --git a/server-plugins/time-resources/src/index.ts b/server-plugins/time-resources/src/index.ts index b502e6d49f..632237b1df 100644 --- a/server-plugins/time-resources/src/index.ts +++ b/server-plugins/time-resources/src/index.ts @@ -405,7 +405,7 @@ export async function OnToDoUpdate (txes: Tx[], control: TriggerControl): Promis ) if (funcs !== undefined) { const func = await getResource(funcs.onDone) - const todoRes = await func(control, resEvents, todo) + const todoRes = await func(control, resEvents, todo, tx.space === core.space.DerivedTx) await control.apply(control.ctx, todoRes) } continue @@ -459,7 +459,12 @@ export async function IssueToDoFactory (actualTx: TxCUD, control: Trigger /** * @public */ -export async function IssueToDoDone (control: TriggerControl, workslots: WorkSlot[], todo: ToDo): Promise { +export async function IssueToDoDone ( + control: TriggerControl, + workslots: WorkSlot[], + todo: ToDo, + isDerived: boolean +): Promise { const res: Tx[] = [] let total = 0 for (const workslot of workslots) { @@ -470,45 +475,47 @@ export async function IssueToDoDone (control: TriggerControl, workslots: WorkSlo await control.findAll(control.ctx, todo.attachedToClass, { _id: todo.attachedTo as Ref }) )[0] if (issue !== undefined) { - const project = (await control.findAll(control.ctx, task.class.Project, { _id: issue.space }))[0] - if (project !== undefined) { - const type = (await control.modelDb.findAll(task.class.ProjectType, { _id: project.type }))[0] - if (type?.classic) { - const taskType = (await control.modelDb.findAll(task.class.TaskType, { _id: issue.kind }))[0] - if (taskType !== undefined) { - const index = taskType.statuses.findIndex((p) => p === issue.status) + if (!isDerived) { + const project = (await control.findAll(control.ctx, task.class.Project, { _id: issue.space }))[0] + if (project !== undefined) { + const type = (await control.modelDb.findAll(task.class.ProjectType, { _id: project.type }))[0] + if (type?.classic) { + const taskType = (await control.modelDb.findAll(task.class.TaskType, { _id: issue.kind }))[0] + if (taskType !== undefined) { + const index = taskType.statuses.findIndex((p) => p === issue.status) - const helpers = await control.modelDb.findAll(time.class.TodoAutomationHelper, {}) - const testers = await Promise.all(helpers.map((it) => getResource(it.onDoneTester))) - let allowed = true - for (const tester of testers) { - if (!(await tester(control, todo))) { - allowed = false - break + const helpers = await control.modelDb.findAll(time.class.TodoAutomationHelper, {}) + const testers = await Promise.all(helpers.map((it) => getResource(it.onDoneTester))) + let allowed = true + for (const tester of testers) { + if (!(await tester(control, todo))) { + allowed = false + break + } } - } - if (index !== -1 && allowed) { - const nextStatus = taskType.statuses[index + 1] - if (nextStatus !== undefined) { - const currentStatus = taskType.statuses[index] - const current = (await control.modelDb.findAll(core.class.Status, { _id: currentStatus }))[0] - const next = (await control.modelDb.findAll(core.class.Status, { _id: nextStatus }))[0] - if ( - current.category !== task.statusCategory.Lost && - next.category !== task.statusCategory.Lost && - current.category !== task.statusCategory.Won - ) { - const innerTx = factory.createTxUpdateDoc(issue._class, issue.space, issue._id, { - status: nextStatus - }) - const outerTx = factory.createTxCollectionCUD( - issue.attachedToClass, - issue.attachedTo, - issue.space, - issue.collection, - innerTx - ) - res.push(outerTx) + if (index !== -1 && allowed) { + const nextStatus = taskType.statuses[index + 1] + if (nextStatus !== undefined) { + const currentStatus = taskType.statuses[index] + const current = (await control.modelDb.findAll(core.class.Status, { _id: currentStatus }))[0] + const next = (await control.modelDb.findAll(core.class.Status, { _id: nextStatus }))[0] + if ( + current.category !== task.statusCategory.Lost && + next.category !== task.statusCategory.Lost && + current.category !== task.statusCategory.Won + ) { + const innerTx = factory.createTxUpdateDoc(issue._class, issue.space, issue._id, { + status: nextStatus + }) + const outerTx = factory.createTxCollectionCUD( + issue.attachedToClass, + issue.attachedTo, + issue.space, + issue.collection, + innerTx + ) + res.push(outerTx) + } } } } diff --git a/server-plugins/time/src/index.ts b/server-plugins/time/src/index.ts index f6a2878bcd..bd90da1424 100644 --- a/server-plugins/time/src/index.ts +++ b/server-plugins/time/src/index.ts @@ -36,7 +36,7 @@ export interface ToDoFactory extends Class { * @public */ export interface OnToDo extends Class { - onDone: Resource<(control: TriggerControl, workslots: WorkSlot[], todo: ToDo) => Promise> + onDone: Resource<(control: TriggerControl, workslots: WorkSlot[], todo: ToDo, isDerived: boolean) => Promise> } /** @@ -49,7 +49,9 @@ export default plugin(serverTimeId, { }, function: { IssueToDoFactory: '' as Resource<(tx: Tx, control: TriggerControl) => Promise>, - IssueToDoDone: '' as Resource<(control: TriggerControl, workslots: WorkSlot[], todo: ToDo) => Promise> + IssueToDoDone: '' as Resource< + (control: TriggerControl, workslots: WorkSlot[], todo: ToDo, isDerived: boolean) => Promise + > }, trigger: { OnTask: '' as Resource, diff --git a/server/front/readme.md b/server/front/readme.md index 0baf88ac2c..304e8d24a1 100644 --- a/server/front/readme.md +++ b/server/front/readme.md @@ -6,7 +6,6 @@ Front service is suited to deliver application bundles and resource assets, it a * SERVER_PORT: Specifies the port number on which the server will listen. * MONGO_URL: Specifies the URL of the MongoDB database. -* ELASTIC_URL: Specifies the URL of the Elasticsearch service. * ACCOUNTS_URL: Specifies the URL of the accounts service. * UPLOAD_URL: Specifies the URL for uploading files. * GMAIL_URL: Specifies the URL of the Gmail service. diff --git a/server/front/run.sh b/server/front/run.sh index 11c733e2ea..c1a2e73f67 100755 --- a/server/front/run.sh +++ b/server/front/run.sh @@ -2,7 +2,6 @@ export ACCOUNTS_URL=http://localhost:3333 export UPLOAD_URL=http://localhost:3333/files -export ELASTIC_URL=http://elastic:9200 export MINIO_ENDPOINT=minio export MINIO_ACCESS_KEY=minioadmin export MINIO_SECRET_KEY=minioadmin diff --git a/server/front/src/index.ts b/server/front/src/index.ts index e77d34000d..63b8297934 100644 --- a/server/front/src/index.ts +++ b/server/front/src/index.ts @@ -243,7 +243,6 @@ async function getFile ( export function start ( ctx: MeasureContext, config: { - elasticUrl: string storageAdapter: StorageAdapter accountsUrl: string uploadUrl: string diff --git a/server/front/src/starter.ts b/server/front/src/starter.ts index 2231b174bf..f643b6cead 100644 --- a/server/front/src/starter.ts +++ b/server/front/src/starter.ts @@ -24,12 +24,6 @@ import { start } from '.' export function startFront (ctx: MeasureContext, extraConfig?: Record): void { const SERVER_PORT = parseInt(process.env.SERVER_PORT ?? '8080') - const elasticUrl = process.env.ELASTIC_URL - if (elasticUrl === undefined) { - console.error('please provide elastic url') - process.exit(1) - } - const storageConfig: StorageConfiguration = storageConfigFromEnv() const storageAdapter = buildStorageFromConfig(storageConfig) @@ -120,7 +114,6 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record> { // Will find a query or add + 1 to callbacks const q = this.findQuery(_class, query, options) ?? this.createQuery(_class, query, options) - if (q.result === undefined) { - q.result = this._findAll(ctx, _class, query, options) - } - if (q.result instanceof Promise) { - q.result = await q.result - } - q.callbacks-- + try { + if (q.result === undefined) { + q.result = this._findAll(ctx, _class, query, options) + } + if (q.result instanceof Promise) { + q.result = await q.result + } - this.removeFromQueue(q) + return q.result as FindResult + } finally { + q.callbacks-- - return q.result as FindResult + this.removeFromQueue(q) + } } private findQuery( diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts index 2b4ecb8272..5ac4aac0d7 100644 --- a/server/postgres/src/storage.ts +++ b/server/postgres/src/storage.ts @@ -576,21 +576,24 @@ abstract class PostgresAdapterBase implements DbAdapter { } sqlChunks.push(`WHERE ${this.buildQuery(_class, domain, query, joins, options)}`) + const totalSqlChunks = [...sqlChunks] + + if (options?.sort !== undefined) { + sqlChunks.push(this.buildOrder(_class, domain, options.sort, joins)) + } + if (options?.limit !== undefined) { + sqlChunks.push(`LIMIT ${options.limit}`) + } + return (await this.mgr.read(ctx.id, async (connection) => { let total = options?.total === true ? 0 : -1 if (options?.total === true) { const totalReq = `SELECT COUNT(${domain}._id) as count FROM ${domain}` - const totalSql = [totalReq, ...sqlChunks].join(' ') + const totalSql = [totalReq, ...totalSqlChunks].join(' ') const totalResult = await connection.unsafe(totalSql) const parsed = Number.parseInt(totalResult[0].count) total = Number.isNaN(parsed) ? 0 : parsed } - if (options?.sort !== undefined) { - sqlChunks.push(this.buildOrder(_class, domain, options.sort, joins)) - } - if (options?.limit !== undefined) { - sqlChunks.push(`LIMIT ${options.limit}`) - } const finalSql: string = [select, ...sqlChunks].join(' ') fquery = finalSql diff --git a/workers/datalake/src/db.ts b/workers/datalake/src/db.ts index 91e9bfe282..624bf6780a 100644 --- a/workers/datalake/src/db.ts +++ b/workers/datalake/src/db.ts @@ -50,7 +50,7 @@ export async function withPostgres ( fn: (db: BlobDB) => Promise ): Promise { const sql = metrics.withSync('db.connect', () => { - return postgres(env.DB_URL, { + return postgres(env.HYPERDRIVE.connectionString, { connection: { application_name: 'datalake' },