Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions models/recruit/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -606,10 +606,9 @@ export function createModel (builder: Builder): void {
}

const applicantViewOptions: ViewOptionsModel = {
groupBy: ['state', 'doneState', 'assignee', 'space'],
groupBy: ['state', 'assignee', 'space'],
orderBy: [
['state', SortingOrder.Ascending],
['doneState', SortingOrder.Ascending],
['modifiedOn', SortingOrder.Descending],
['dueDate', SortingOrder.Descending],
['rank', SortingOrder.Ascending]
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { SortingOrder } from './storage'
import { Tx, TxCreateDoc, TxProcessor, TxUpdateDoc } from './tx'
import { toFindResult } from './utils'

const transactionThreshold = 3000
const transactionThreshold = 500

/**
* @public
Expand Down Expand Up @@ -193,7 +193,7 @@ export async function createClient (
// Find all new transactions and apply
await loadModel(conn, loadedTxIds, allowedPlugins, configs, hierarchy, model)

// We need to look for last 1000 transactions and if it is more since lastTx one we receive, we need to perform full refresh.
// We need to look for last {transactionThreshold} transactions and if it is more since lastTx one we receive, we need to perform full refresh.
const atxes = await conn.findAll(
core.class.Tx,
{ modifiedOn: { $gt: lastTx } },
Expand Down
2 changes: 1 addition & 1 deletion pods/backup/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ WORKDIR /usr/src/app
COPY bundle.js ./

EXPOSE 3000
CMD [ "node", "--enable-source-maps", "bundle.js" ]
CMD [ "node", "bundle.js" ]
2 changes: 1 addition & 1 deletion pods/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ WORKDIR /usr/src/app
COPY bundle.js ./

EXPOSE 8080
CMD [ "node", "--enable-source-maps", "bundle.js" ]
CMD [ "node", "bundle.js" ]
17 changes: 15 additions & 2 deletions server/core/src/fulltext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import core, {
FindOptions,
FindResult,
Hierarchy,
IndexKind,
MeasureContext,
ObjQueryType,
Ref,
Expand Down Expand Up @@ -128,8 +129,19 @@ export class FullTextIndex implements WithFind {
let classes = this.hierarchy.getDescendants(baseClass)

const attrs = this.hierarchy.getAllAttributes(_class)

// We need to filter all non indexed fields from query to make it work properly
const findQuery: DocumentQuery<Doc> = {
$search: query.$search
}
try {
for (const attr of attrs.values()) {
for (const [k, attr] of attrs) {
if (attr.index === IndexKind.FullText) {
const vv = (query as any)[k]
if (vv != null) {
findQuery[k] = vv
}
}
if (attr.type._class === core.class.Collection) {
// we need attached documents to be in clases
const dsc = this.hierarchy.getDescendants(attr.attributeOf)
Expand All @@ -143,7 +155,8 @@ export class FullTextIndex implements WithFind {
classes = classes.filter((it, idx, arr) => arr.indexOf(it) === idx)

const fullTextLimit = options?.limit ?? 200
let { docs, pass } = await this.indexer.search(classes, query, fullTextLimit)

let { docs, pass } = await this.indexer.search(classes, findQuery, fullTextLimit)

if (docs.length === 0 && pass) {
docs = [...docs, ...(await this.adapter.search(classes, query, fullTextLimit))]
Expand Down
2 changes: 1 addition & 1 deletion server/core/src/indexer/field.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export class IndexedFieldStage implements FullTextPipelineStage {
if (pipeline.hierarchy.isMixin(d) && pipeline.hierarchy.hasMixin(doc, d)) {
const mContext = getFullTextContext(pipeline.hierarchy, d)
if (mContext.propogate !== undefined) {
propogate = [...mContext.propogate]
propogate = [...propogate, ...mContext.propogate]
}
}
}
Expand Down