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
4 changes: 0 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ apis/client/profile/visibility/lib/bootstrap-switch.js
## We want to lint all those files ##
## Please remove the line on this file if you are changing the file ##
######################################################################
metadata/client/edit/autoform.js
metadata/collection/index.js
metadata/collection/permissions.js
metadata/collection/server/publication.js
monitoring/client/autoform.js
monitoring/client/monitoring.js
monitoring/collection/index.js
Expand Down
2 changes: 1 addition & 1 deletion apis/server/methods/delete.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Mongo } from 'meteor/mongo';

import Apis from '/apis/collection';
import ApiBacklogItems from '/backlog/collection';
import { ApiMetadata } from '/metadata/collection';
import ApiMetadata from '/metadata/collection';
import DocumentationFiles from '/documentation/collection';
import Feedback from '/feedback/collection';
import { MonitoringSettings, MonitoringData } from '/monitoring/collection';
Expand Down
2 changes: 1 addition & 1 deletion metadata/client/edit/edit.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { ApiMetadata } from '../../collection';
import ApiMetadata from '../../collection';

Template.editApiMetadata.helpers({
apiMetadataCollection () {
Expand Down
2 changes: 1 addition & 1 deletion metadata/client/view/metadata.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Template } from 'meteor/templating';

import formatDate from '/core/helper_functions/format_date';
import { ApiMetadata } from '../../collection';
import ApiMetadata from '../../collection';

Template.viewApiMetadata.onCreated(function () {
// Get reference to template instance
Expand Down
6 changes: 4 additions & 2 deletions metadata/collection/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const ApiMetadata = new Mongo.Collection("apiMetadata");
import { Mongo } from 'meteor/mongo';

export { ApiMetadata };
const ApiMetadata = new Mongo.Collection('apiMetadata');

export default ApiMetadata;
12 changes: 6 additions & 6 deletions metadata/collection/permissions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ApiMetadata } from '/metadata/collection';
import ApiMetadata from '/metadata/collection';
import Apis from '/apis/collection';

ApiMetadata.allow({
Expand All @@ -8,17 +8,17 @@ ApiMetadata.allow({
// Make sure there is only one document per API Backend ID
// TODO: refactor ApiMetadata schema to use 'apiId' field
if (ApiMetadata.find({ apiBackendId: apiId }).count() !== 0) {
// eslint-disable-next-line no-console
console.log('no insert allowed');
return false;
} else {
}
// Find related API Backend, select only "managerIds" field
const api = Apis.findOne(apiId, { fields: { managerIds: 1 } });
const api = Apis.findOne(apiId, { fields: { managerIds: 1 } });

// Check if current user can edit API Backend
const userCanEdit = api.currentUserCanEdit();
const userCanEdit = api.currentUserCanEdit();

return userCanEdit;
}
return userCanEdit;
},
update (userId, metadata) {
// Get API Backend ID
Expand Down
2 changes: 1 addition & 1 deletion metadata/collection/schema.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { TAPi18n } from 'meteor/tap:i18n';
import { ApiMetadata } from '/metadata/collection';
import ApiMetadata from '/metadata/collection';

ApiMetadata.schema = new SimpleSchema({
// TODO: migrate to use 'apiId' instead of 'apiBackendId'
Expand Down
10 changes: 8 additions & 2 deletions metadata/collection/server/publication.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { ApiMetadata } from '/metadata/collection/';
import { check } from 'meteor/check';
import { Meteor } from 'meteor/meteor';

import ApiMetadata from '/metadata/collection/';

Meteor.publish('apiMetadata', (apiId) => {
// Make sure apiId is a String
check(apiId, String);

Meteor.publish('apiMetadata', function (apiId) {
// Get metadata document for API Backend
// TODO: migrate ApiMetadata schema to use 'apiId' instead of 'apiBackendId'
const apiMetadata = ApiMetadata.find({ apiBackendId: apiId });
Expand Down