Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

linter corrections

Browse source
This commit is contained in:
Ignatz 2018-05-18 10:24:51 +02:00
parent c1d2e27c09
commit d6cfac0122
7 changed files with 236 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.eslintrc.json
View file

@ -32,7 +32,7 @@
"comma-spacing": 2,
"comma-style": 2,
"eol-last": 2,
"linebreak-style": [2, "unix"],
"linebreak-style": [2, "windows"],
"new-parens": 2,
"no-lonely-if": 2,
"no-multiple-empty-lines": 2,
@ -100,7 +100,9 @@
"Attachments": true,
"Boards": true,
"CardComments": true,
"DatePicker" : true,
"Cards": true,
"CustomFields": true,
"Lists": true,
"UnsavedEditCollection": true,
"Users": true,

12
client/components/cards/cardCustomFields.js
View file

@ -17,14 +17,14 @@ Template.cardCustomFieldsPopup.events({
EscapeActions.executeUpTo('detailsPane');
Sidebar.setView('customFields');
evt.preventDefault();
}
},
});
// cardCustomField
const CardCustomField = BlazeComponent.extendComponent({
getTemplate() {
return 'cardCustomField-' + this.data().definition.type;
return 'cardCustomField-${this.data().definition.type}';
},
onCreated() {
@ -69,7 +69,7 @@ CardCustomField.register('cardCustomField');
return [{
'submit .js-card-customfield-number'(evt) {
evt.preventDefault();
const value = parseInt(this.find('input').value);
const value = parseInt(this.find('input').value, 10);
this.card.setCustomField(this.customFieldId, value);
},
}];
@ -154,14 +154,14 @@ CardCustomField.register('cardCustomField');
this._items = this.data().definition.settings.dropdownItems;
this.items = this._items.slice(0);
this.items.unshift({
_id: "",
name: TAPi18n.__('custom-field-dropdown-none')
_id: '',
name: TAPi18n.__('custom-field-dropdown-none'),
});
}
selectedItem() {
const selected = this._items.find((item) => {
return item._id == this.data().value;
return item._id === this.data().value;
});
return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown');
}

6
client/components/lists/listBody.js
View file

@ -36,9 +36,9 @@ BlazeComponent.extendComponent({
const members = formComponent.members.get();
const labelIds = formComponent.labels.get();
const customFields = formComponent.customFields.get();
console.log("members", members);
console.log("labelIds", labelIds);
console.log("customFields", customFields);
//console.log('members', members);
//console.log('labelIds', labelIds);
//console.log('customFields', customFields);
const boardId = this.data().board()._id;
let swimlaneId = '';

23
client/components/sidebar/sidebarCustomFields.js
View file

@ -27,11 +27,11 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
types() {
const currentType = this.data().type;
return this._types.
map(type => {return {
map((type) => {return {
value: type,
name: TAPi18n.__('custom-field-' + type),
selected: type == currentType,
}});
name: TAPi18n.__('custom-field-${type}'),
selected: type === currentType,
};});
},
isTypeNotSelected(type) {
@ -39,7 +39,7 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
},
getDropdownItems() {
var items = this.dropdownItems.get();
const items = this.dropdownItems.get();
Array.from(this.findAll('.js-field-settings-dropdown input')).forEach((el, index) => {
//console.log('each item!', index, el.value);
if (!items[index]) items[index] = {
@ -51,13 +51,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
},
getSettings() {
let settings = {};
const settings = {};
switch (this.type.get()) {
case 'dropdown':
let dropdownItems = this.getDropdownItems().filter(item => !!item.name.trim());
case 'dropdown': {
const dropdownItems = this.getDropdownItems().filter((item) => !!item.name.trim());
settings.dropdownItems = dropdownItems;
break;
}
}
return settings;
},
@ -69,7 +70,7 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
},
'keydown .js-dropdown-item.last'(evt) {
if (evt.target.value.trim() && evt.keyCode === 13) {
let items = this.getDropdownItems();
const items = this.getDropdownItems();
this.dropdownItems.set(items);
evt.target.value = '';
}
@ -90,8 +91,8 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
name: this.find('.js-field-name').value.trim(),
type: this.type.get(),
settings: this.getSettings(),
showOnCard: this.find('.js-field-show-on-card.is-checked') != null
}
showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
};
// insert or update
if (!this.data()._id) {

17
models/cards.js
View file

@ -51,10 +51,10 @@ Cards.attachSchema(new SimpleSchema({
type: String,
},
value: {
type: Match.OneOf(String,Number,Boolean,Date),
type: Match.OneOf(String, Number, Boolean, Date),
optional: true,
},
})
}),
},
dateLastActivity: {
type: Date,
@ -225,9 +225,9 @@ Cards.helpers({
_id: customField._id,
value: customField.value,
definition: definitions.find((definition) => {
return definition._id == customField._id;
})
}
return definition._id === customField._id;
}),
};
});
},
@ -331,10 +331,13 @@ Cards.mutations({
// todo
const index = this.customFieldIndex(customFieldId);
if (index > -1) {
var update = {$set: {}};
update.$set["customFields." + index + ".value"] = value;
const update = {$set: {}};
update.$set['customFields.${index}.value'] = value;
return update;
}
// TODO
// Ignatz 18.05.2018: Return null to silence ESLint. No Idea if that is correct
return null;
},
setCover(coverId) {

18
models/customFields.js
View file

@ -9,14 +9,14 @@ CustomFields.attachSchema(new SimpleSchema({
},
type: {
type: String,
allowedValues: ['text', 'number', 'date', 'dropdown']
allowedValues: ['text', 'number', 'date', 'dropdown'],
},
settings: {
type: Object,
},
'settings.dropdownItems': {
type: [Object],
optional: true
optional: true,
},
'settings.dropdownItems.$': {
type: new SimpleSchema({
@ -26,11 +26,11 @@ CustomFields.attachSchema(new SimpleSchema({
name: {
type: String,
},
})
}),
},
showOnCard: {
type: Boolean,
}
},
}));
CustomFields.allow({
@ -76,16 +76,16 @@ if (Meteor.isServer) {
//CUSTOM FIELD REST API
if (Meteor.isServer) {
JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields', function (req, res, next) {
JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields', function (req, res) {
Authentication.checkUserId( req.userId);
const paramBoardId = req.params.boardId;
JsonRoutes.sendResult(res, {
code: 200,
data: CustomFields.find({ boardId: paramBoardId })
data: CustomFields.find({ boardId: paramBoardId }),
});
});
JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res, next) {
JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res) {
Authentication.checkUserId( req.userId);
const paramBoardId = req.params.boardId;
const paramCustomFieldId = req.params.customFieldId;
@ -95,7 +95,7 @@ if (Meteor.isServer) {
});
});
JsonRoutes.add('POST', '/api/boards/:boardId/custom-fields', function (req, res, next) {
JsonRoutes.add('POST', '/api/boards/:boardId/custom-fields', function (req, res) {
Authentication.checkUserId( req.userId);
const paramBoardId = req.params.boardId;
const id = CustomFields.direct.insert({
@ -117,7 +117,7 @@ if (Meteor.isServer) {
});
});
JsonRoutes.add('DELETE', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res, next) {
JsonRoutes.add('DELETE', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res) {
Authentication.checkUserId( req.userId);
const paramBoardId = req.params.boardId;
const id = req.params.customFieldId;