Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8f3d961
deps: bump to Meteor 3.0 (stable)
jankapunkt Aug 30, 2024
37cdd5c
published 3.0.0-rc.1
jankapunkt Aug 30, 2024
e170c87
await selector function
dokithonon Sep 2, 2024
219a729
await allow, changeSelector and searchCustom
dokithonon Sep 4, 2024
b06983b
Merge pull request #460 from dokithonon/migration/3.0
lynchem Sep 4, 2024
7f8a84e
publish 3.0.0-rc.2
jankapunkt Sep 4, 2024
94848e6
observeChangesAsync
dokithonon Sep 4, 2024
8541797
Merge pull request #462 from dokithonon/migration/3.0
jankapunkt Sep 5, 2024
2cf3f0c
pubklished 3.0.0-rc.3
jankapunkt Sep 5, 2024
4c8f727
feature(client): remove datatables npm version pinning and provide fl…
jankapunkt Oct 14, 2024
15af2c5
docs: update README with 3.0 message
jankapunkt Oct 14, 2024
a43685e
feature(client/server): add isomorphic init function to prevent impor…
jankapunkt Oct 14, 2024
0281be0
fix(deps): resolve dependency pinning
jankapunkt Oct 14, 2024
41542da
publish 3.0.0-rc.4
jankapunkt Oct 14, 2024
2b66bf2
Adding a property extraFieldWithSubDocument
ricaragao Jul 13, 2025
9523aab
dev: add test suite
jankapunkt Jul 18, 2025
febb421
tests: fix imports
jankapunkt Jul 18, 2025
f99afe6
Merge pull request #466 from Meteor-Community-Packages/feature/extra-…
ricaragao Jul 22, 2025
1989fa8
published 3.0.0-rc.5
jankapunkt Aug 12, 2025
82013ef
build: add .meteorignore
jankapunkt Aug 12, 2025
df9c2ee
tests: added test proxy
jankapunkt Aug 12, 2025
d080aad
tests: make testsuite run (failing)
jankapunkt Aug 12, 2025
a794029
ci: add new testuite
jankapunkt Aug 12, 2025
f139782
fix: proper indentation
jankapunkt Aug 12, 2025
0e77b42
fix: ci indenation
jankapunkt Aug 12, 2025
ddb21fd
ci: fix test suite
jankapunkt Aug 12, 2025
146b782
ci: add permissions to testsuite
jankapunkt Aug 12, 2025
8260d5f
Merge branch 'master' into migration/3.0
jankapunkt Aug 12, 2025
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
2 changes: 1 addition & 1 deletion .npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 68 additions & 64 deletions .versions
Original file line number Diff line number Diff line change
@@ -1,65 +1,69 @@
aldeed:tabular@3.0.0-rc.0
allow-deny@1.1.1
aldeed:tabular@3.0.0-rc.1
allow-deny@2.0.0
anti:fake@0.4.1
babel-compiler@7.10.5
babel-runtime@1.5.1
base64@1.0.12
binary-heap@1.0.11
blaze@2.9.0
blaze-tools@1.0.10
boilerplate-generator@1.7.2
caching-compiler@1.2.2
caching-html-compiler@1.0.5
callback-hook@1.5.1
check@1.4.1
ddp@1.4.1
ddp-client@2.6.2
ddp-common@1.4.1
ddp-server@2.7.1
diff-sequence@1.1.2
dynamic-import@0.7.3
ecmascript@0.16.8
ecmascript-runtime@0.8.1
ecmascript-runtime-client@0.12.1
ecmascript-runtime-server@0.11.0
ejson@1.1.3
fetch@0.1.4
geojson-utils@1.0.11
html-tools@1.0.11
htmljs@1.2.1
id-map@1.1.1
inter-process-messaging@0.1.1
local-test:aldeed:tabular@3.0.0-rc.0
logging@1.3.4
meteor@1.11.5
minimongo@1.9.4
modern-browsers@0.1.10
modules@0.20.0
modules-runtime@0.13.1
mongo@1.16.10
mongo-decimal@0.1.3
mongo-dev-server@1.1.0
mongo-id@1.0.8
npm-mongo@4.17.2
observe-sequence@1.0.21
ordered-dict@1.1.0
promise@0.12.2
random@1.2.1
react-fast-refresh@0.2.8
reactive-dict@1.3.1
reactive-var@1.0.12
reload@1.3.1
retry@1.1.0
routepolicy@1.1.1
session@1.2.1
socket-stream-client@0.5.2
spacebars@1.0.10
spacebars-compiler@1.1.0
templating@1.1.8
templating-tools@1.1.1
tinytest@1.2.3
tracker@1.3.3
typescript@4.9.5
underscore@1.6.1
webapp@1.13.8
webapp-hashing@1.1.1
babel-compiler@7.11.0
babel-runtime@1.5.2
base64@1.0.13
binary-heap@1.0.12
blaze@3.0.0
blaze-tools@2.0.0
boilerplate-generator@2.0.0
caching-compiler@2.0.0
caching-html-compiler@2.0.0
callback-hook@1.6.0
check@1.4.2
core-runtime@1.0.0
ddp@1.4.2
ddp-client@3.0.1
ddp-common@1.4.4
ddp-server@3.0.1
diff-sequence@1.1.3
dynamic-import@0.7.4
ecmascript@0.16.9
ecmascript-runtime@0.8.2
ecmascript-runtime-client@0.12.2
ecmascript-runtime-server@0.11.1
ejson@1.1.4
facts-base@1.0.2
fetch@0.1.5
geojson-utils@1.0.12
html-tools@2.0.0
htmljs@2.0.1
id-map@1.2.0
inter-process-messaging@0.1.2
local-test:aldeed:tabular@3.0.0-rc.1
logging@1.3.5
meteor@2.0.1
minimongo@2.0.1
modern-browsers@0.1.11
modules@0.20.1
modules-runtime@0.13.2
mongo@2.0.1
mongo-decimal@0.1.4-beta300.7
mongo-dev-server@1.1.1
mongo-id@1.0.9
npm-mongo@4.17.4
observe-sequence@2.0.0
ordered-dict@1.2.0
promise@1.0.0
random@1.2.2
react-fast-refresh@0.2.9
reactive-dict@1.3.2
reactive-var@1.0.13
reload@1.3.2
retry@1.1.1
routepolicy@1.1.2
session@1.2.2
socket-stream-client@0.5.3
spacebars@2.0.0
spacebars-compiler@2.0.0
templating@1.4.4
templating-compiler@2.0.0
templating-runtime@2.0.0
templating-tools@2.0.0
tinytest@1.3.0
tracker@1.3.4
typescript@5.4.3
underscore@1.6.4
webapp@2.0.1
webapp-hashing@1.1.2
8 changes: 4 additions & 4 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Package.describe({
name: 'aldeed:tabular',
summary: 'Datatables for large or small datasets in Meteor',
version: '3.0.0-rc.0',
version: '3.0.0-rc.1',
git: 'https://github.com/Meteor-Community-Packages/meteor-tabular.git'
});

Expand All @@ -12,13 +12,13 @@ Npm.depends({
});

Package.onUse(function(api) {
api.versionsFrom([ '1.3', '2.8.0', '3.0-rc.4']);
api.versionsFrom([ '1.3', '2.8.0', '3.0']);
api.use([
'check',
'ecmascript',
'underscore',
'mongo',
'blaze@2.9.0 || 3.0.0-rc300.2',
'blaze@2.9.0 || 3.0.0',
'templating',
'reactive-var',
'tracker',
Expand Down Expand Up @@ -48,7 +48,7 @@ Package.onUse(function(api) {
});

Package.onTest(function(api) {
api.versionsFrom([ '1.3', '2.8.0', '3.0-rc.4']);
api.versionsFrom([ '1.3', '2.8.0', '3.0']);
api.use(['aldeed:tabular', 'tinytest']);
api.use([
'anti:fake',
Expand Down
8 changes: 4 additions & 4 deletions server/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Meteor.publish('tabular_getInfo', async function (tableName, selector, sort, ski
// from this function, with sensitive data, there is
// a chance someone could do a query and learn something
// just based on whether a result is found or not.
if (typeof table.allow === 'function' && !table.allow(this.userId)) {
if (typeof table.allow === 'function' && !(await table.allow(this.userId))) {
this.ready();
return;
}
Expand All @@ -81,15 +81,15 @@ Meteor.publish('tabular_getInfo', async function (tableName, selector, sort, ski

// Allow the user to modify the selector before we use it
if (typeof table.changeSelector === 'function') {
newSelector = table.changeSelector(newSelector, this.userId);
newSelector = await table.changeSelector(newSelector, this.userId);
}

// Apply the server side selector specified in the tabular
// table constructor. Both must be met, so we join
// them using $and, allowing both selectors to have
// the same keys.
if (typeof table.selector === 'function') {
const tableSelector = table.selector(this.userId);
const tableSelector = await table.selector(this.userId);
if (_.isEmpty(newSelector)) {
newSelector = tableSelector;
} else {
Expand Down Expand Up @@ -124,7 +124,7 @@ Meteor.publish('tabular_getInfo', async function (tableName, selector, sort, ski
const paths = getSearchPaths(table);
const newSort = transformSortArray(findOptions.sort);

filteredRecordIds = table.searchCustom(
filteredRecordIds = await table.searchCustom(
this.userId,
newSelector,
tokens,
Expand Down