Skip to content

Commit

Permalink
updated listwatch
Browse files Browse the repository at this point in the history
  • Loading branch information
sanoel committed Jun 3, 2024
1 parent a647b01 commit f6466b4
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@qlever-llc/target-helper",
"version": "1.6.4",
"version": "1.6.5",
"description": "A Trellis microservice to fill in around Target integration",
"author": "Andrew Balmos <andrew@qlever.io>",
"license": "Apache-2.0",
Expand Down Expand Up @@ -116,4 +116,4 @@
"volta": {
"node": "20.13.1"
}
}
}
13 changes: 5 additions & 8 deletions src/pdfJob.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import type Jobs from '@oada/types/oada/service/jobs.js';
import type { Link } from '@oada/types/oada/link/v1.js';
import { AssumeState, ChangeType, ListWatch } from '@oada/list-lib';
import { Gauge } from '@oada/lib-prom';
import type { Tree } from '@oada/types/oada/tree/v1.js';
import type Update from '@oada/types/oada/service/job/update.js';
import { assert as assertJob } from '@oada/types/oada/service/job.js';
import { connect } from '@oada/client';
Expand All @@ -46,14 +45,9 @@ import {

import { fromOadaType, matchesAlternateUrlNames } from './conversions.js';
import type { TreeKey } from './tree.js';
import tree from './tree.js';
import { tree, tpTree, documentTypeTree, tpDocsTree, tpDocumentTypeTree } from './tree.js';

const PERSIST_INTERVAL = config.get('oada.listWatch.persistInterval');

const tpDocumentTypeTree: Tree = JSON.parse(JSON.stringify(tree));
delete tpDocumentTypeTree.bookmarks!.trellisfw!['trading-partners']![
'masterid-index'
]!['*']!.shared!.trellisfw!.documents!['*']!['*'];
//const PERSIST_INTERVAL = config.get('oada.listWatch.persistInterval');

const error = debug('target-helper:error');
const info = debug('target-helper:info');
Expand Down Expand Up @@ -980,6 +974,7 @@ export async function startJobCreator({
conn: con,
resume: false,
onNewList: AssumeState.New,
tree: tpTree
});
tpWatch.on(ChangeType.ItemAdded, watchTp);
process.on('beforeExit', async () => tpWatch.stop());
Expand All @@ -1001,6 +996,7 @@ export async function startJobCreator({
conn: con,
resume: false,
onNewList: AssumeState.New,
tree: documentTypeTree
//persistInterval: PERSIST_INTERVAL,
});
selfDocTypesWatch.on(ChangeType.ItemAdded, documentTypeAdded());
Expand Down Expand Up @@ -1061,6 +1057,7 @@ export async function startJobCreator({
onNewList: AssumeState.New,
conn: con,
resume: false,
tree: tpDocsTree,
//persistInterval: PERSIST_INTERVAL,
});
docsWatch.on(ChangeType.ItemAdded, documentTypeAdded(masterId));
Expand Down
29 changes: 29 additions & 0 deletions src/tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,35 @@ const tree: Tree = {
},
},
};
export { tree };

const documentTypeTree: Tree = JSON.parse(JSON.stringify(tree));
delete documentTypeTree.bookmarks!.trellisfw!.documents!['*'];
export { documentTypeTree }

const tpTree: Tree = JSON.parse(JSON.stringify(tree));
delete tpTree.bookmarks?.trellisfw?.['trading-partners']?.['masterid-index']?.[
'*'
]?.shared;
delete tpTree.bookmarks?.trellisfw?.['trading-partners']?.['masterid-index']?.[
'*'
]?.bookmarks;
export { tpTree };

const tpDocsTree: Tree = JSON.parse(JSON.stringify(tree));
delete tpDocsTree.bookmarks!.trellisfw!['trading-partners']![
'masterid-index'
]!['*']!.shared!.trellisfw!.documents!['*']!['*'];
export { tpDocsTree };


const tpDocumentTypeTree: Tree = JSON.parse(JSON.stringify(tree));
delete tpDocumentTypeTree.bookmarks!.trellisfw!['trading-partners']![
'masterid-index'
]!['*']!.shared!.trellisfw!.documents!['*']!['*'];
delete tpDocumentTypeTree.bookmarks!.trellisfw!.documents!['*']!['*'];
export { tpDocumentTypeTree };


export default tree;
export { type TreeKey } from '@oada/types/oada/tree/v1.js';

0 comments on commit f6466b4

Please sign in to comment.