From daf314b0378efac13b5c58adf32ce7348ea29193 Mon Sep 17 00:00:00 2001 From: Justin Reynolds Date: Wed, 8 May 2019 16:51:27 -0500 Subject: Fix missing profile checks --- client/components/boards/boardBody.jade | 2 ++ client/components/boards/boardBody.js | 8 ++++---- client/components/boards/boardHeader.jade | 2 +- client/components/boards/boardHeader.js | 8 +++++--- client/components/lists/list.js | 4 ++-- client/components/lists/listBody.js | 18 +++++++++--------- client/components/lists/listHeader.js | 2 +- client/components/swimlanes/swimlanes.js | 2 +- models/export.js | 2 +- models/swimlanes.js | 6 +++--- models/users.js | 18 +++++++++--------- server/publications/boards.js | 2 +- 12 files changed, 39 insertions(+), 35 deletions(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 32f8629f..017d0b0a 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -30,6 +30,8 @@ template(name="boardBody") +listsGroup(currentBoard) else if isViewCalendar +calendarView + else + +listsGroup(currentBoard) template(name="calendarView") if isViewCalendar diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 9105e624..301c0742 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -191,19 +191,19 @@ BlazeComponent.extendComponent({ isViewSwimlanes() { const currentUser = Meteor.user(); if (!currentUser) return false; - return (currentUser.profile.boardView === 'board-view-swimlanes'); + return ((currentUser.profile || {}).boardView === 'board-view-swimlanes'); }, isViewLists() { const currentUser = Meteor.user(); if (!currentUser) return true; - return (currentUser.profile.boardView === 'board-view-lists'); + return ((currentUser.profile || {}).boardView === 'board-view-lists'); }, isViewCalendar() { const currentUser = Meteor.user(); if (!currentUser) return false; - return (currentUser.profile.boardView === 'board-view-cal'); + return ((currentUser.profile || {}).boardView === 'board-view-cal'); }, openNewListForm() { @@ -335,6 +335,6 @@ BlazeComponent.extendComponent({ isViewCalendar() { const currentUser = Meteor.user(); if (!currentUser) return false; - return (currentUser.profile.boardView === 'board-view-cal'); + return ((currentUser.profile || {}).boardView === 'board-view-cal'); }, }).register('calendarView'); diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 823bd806..ad11c528 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -98,7 +98,7 @@ template(name="boardHeaderBar") a.board-header-btn.js-toggle-board-view( title="{{_ 'board-view'}}") i.fa.fa-th-large - span {{_ currentUser.profile.boardView}} + span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}} if canModifyBoard a.board-header-btn.js-multiselection-activate( diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 86fbebb3..f2b5c4f5 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -89,12 +89,14 @@ BlazeComponent.extendComponent({ }, 'click .js-toggle-board-view'() { const currentUser = Meteor.user(); - if (currentUser.profile.boardView === 'board-view-swimlanes') { + if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') { currentUser.setBoardView('board-view-cal'); - } else if (currentUser.profile.boardView === 'board-view-lists') { + } else if ((currentUser.profile || {}).boardView === 'board-view-lists') { currentUser.setBoardView('board-view-swimlanes'); - } else if (currentUser.profile.boardView === 'board-view-cal') { + } else if ((currentUser.profile || {}).boardView === 'board-view-cal') { currentUser.setBoardView('board-view-lists'); + } else { + currentUser.setBoardView('board-view-swimlanes'); } }, 'click .js-toggle-sidebar'() { diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 12932a82..ea0068eb 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -69,10 +69,10 @@ BlazeComponent.extendComponent({ const listId = Blaze.getData(ui.item.parents('.list').get(0))._id; const currentBoard = Boards.findOne(Session.get('currentBoard')); let swimlaneId = ''; - const boardView = Meteor.user().profile.boardView; + const boardView = (Meteor.user().profile || {}).boardView; if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard()) swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id; - else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal')) + else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView) swimlaneId = currentBoard.getDefaultSwimline()._id; // Normally the jquery-ui sortable library moves the dragged DOM element diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 43619890..a5ccba3f 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -48,7 +48,7 @@ BlazeComponent.extendComponent({ const board = this.data().board(); let linkedId = ''; let swimlaneId = ''; - const boardView = Meteor.user().profile.boardView; + const boardView = (Meteor.user().profile || {}).boardView; let cardType = 'cardType-card'; if (title) { if (board.isTemplatesBoard()) { @@ -72,7 +72,7 @@ BlazeComponent.extendComponent({ } } else if (boardView === 'board-view-swimlanes') swimlaneId = this.parentComponent().parentComponent().data()._id; - else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal')) + else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView) swimlaneId = board.getDefaultSwimline()._id; const _id = Cards.insert({ @@ -149,7 +149,7 @@ BlazeComponent.extendComponent({ idOrNull(swimlaneId) { const currentUser = Meteor.user(); - if (currentUser.profile.boardView === 'board-view-swimlanes' || + if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' || this.data().board().isTemplatesBoard()) return swimlaneId; return undefined; @@ -356,10 +356,10 @@ BlazeComponent.extendComponent({ // Swimlane where to insert card const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane'); this.swimlaneId = ''; - const boardView = Meteor.user().profile.boardView; + const boardView = (Meteor.user().profile || {}).boardView; if (boardView === 'board-view-swimlanes') this.swimlaneId = Blaze.getData(swimlane[0])._id; - else if (boardView === 'board-view-lists') + else if (boardView === 'board-view-lists' || !boardView) this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id; }, @@ -485,13 +485,13 @@ BlazeComponent.extendComponent({ this.isBoardTemplateSearch; let board = {}; if (this.isTemplateSearch) { - board = Boards.findOne(Meteor.user().profile.templatesBoardId); + board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId); } else { // Prefetch first non-current board id board = Boards.findOne({ archived: false, 'members.userId': Meteor.userId(), - _id: {$nin: [Session.get('currentBoard'), Meteor.user().profile.templatesBoardId]}, + _id: {$nin: [Session.get('currentBoard'), (Meteor.user().profile || {}).templatesBoardId]}, }); } if (!board) { @@ -510,7 +510,7 @@ BlazeComponent.extendComponent({ this.swimlaneId = ''; // Swimlane where to insert card const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane'); - if (Meteor.user().profile.boardView === 'board-view-swimlanes') + if ((Meteor.user().profile || {}).boardView === 'board-view-swimlanes') this.swimlaneId = Blaze.getData(swimlane[0])._id; else this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id; @@ -620,7 +620,7 @@ BlazeComponent.extendComponent({ this.listId = this.parentComponent().data()._id; this.swimlaneId = ''; - const boardView = Meteor.user().profile.boardView; + const boardView = (Meteor.user().profile || {}).boardView; if (boardView === 'board-view-swimlanes') this.swimlaneId = this.parentComponent().parentComponent().parentComponent().data()._id; }, diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 25e6cb69..923d6063 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -30,7 +30,7 @@ BlazeComponent.extendComponent({ cardsCount() { const list = Template.currentData(); let swimlaneId = ''; - const boardView = Meteor.user().profile.boardView; + const boardView = (Meteor.user().profile || {}).boardView; if (boardView === 'board-view-swimlanes') swimlaneId = this.parentComponent().parentComponent().data()._id; diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 519b00d2..d0ec3f4a 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -8,7 +8,7 @@ function currentListIsInThisSwimlane(swimlaneId) { function currentCardIsInThisList(listId, swimlaneId) { const currentCard = Cards.findOne(Session.get('currentCard')); const currentUser = Meteor.user(); - if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes') + if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes') return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId; else // Default view: board-view-lists return currentCard && currentCard.listId === listId; diff --git a/models/export.js b/models/export.js index 49aac828..4f17d727 100644 --- a/models/export.js +++ b/models/export.js @@ -172,7 +172,7 @@ export class Exporter { }; result.users = Users.find(byUserIds, userFields).fetch().map((user) => { // user avatar is stored as a relative url, we export absolute - if (user.profile.avatarUrl) { + if ((user.profile || {}).avatarUrl) { user.profile.avatarUrl = FlowRouter.url(user.profile.avatarUrl); } return user; diff --git a/models/swimlanes.js b/models/swimlanes.js index bd2565af..9a53d116 100644 --- a/models/swimlanes.js +++ b/models/swimlanes.js @@ -168,17 +168,17 @@ Swimlanes.helpers({ isListTemplatesSwimlane() { const user = Users.findOne(Meteor.userId()); - return user.profile.listTemplatesSwimlaneId === this._id; + return (user.profile || {}).listTemplatesSwimlaneId === this._id; }, isCardTemplatesSwimlane() { const user = Users.findOne(Meteor.userId()); - return user.profile.cardTemplatesSwimlaneId === this._id; + return (user.profile || {}).cardTemplatesSwimlaneId === this._id; }, isBoardTemplatesSwimlane() { const user = Users.findOne(Meteor.userId()); - return user.profile.boardTemplatesSwimlaneId === this._id; + return (user.profile || {}).boardTemplatesSwimlaneId === this._id; }, remove() { diff --git a/models/users.js b/models/users.js index 0dd9c1d6..3240f8de 100644 --- a/models/users.js +++ b/models/users.js @@ -288,32 +288,32 @@ Users.helpers({ }, starredBoards() { - const {starredBoards = []} = this.profile; + const {starredBoards = []} = this.profile || {}; return Boards.find({archived: false, _id: {$in: starredBoards}}); }, hasStarred(boardId) { - const {starredBoards = []} = this.profile; + const {starredBoards = []} = this.profile || {}; return _.contains(starredBoards, boardId); }, invitedBoards() { - const {invitedBoards = []} = this.profile; + const {invitedBoards = []} = this.profile || {}; return Boards.find({archived: false, _id: {$in: invitedBoards}}); }, isInvitedTo(boardId) { - const {invitedBoards = []} = this.profile; + const {invitedBoards = []} = this.profile || {}; return _.contains(invitedBoards, boardId); }, hasTag(tag) { - const {tags = []} = this.profile; + const {tags = []} = this.profile || {}; return _.contains(tags, tag); }, hasNotification(activityId) { - const {notifications = []} = this.profile; + const {notifications = []} = this.profile || {}; return _.contains(notifications, activityId); }, @@ -323,7 +323,7 @@ Users.helpers({ }, getEmailBuffer() { - const {emailBuffer = []} = this.profile; + const {emailBuffer = []} = this.profile || {}; return emailBuffer; }, @@ -358,11 +358,11 @@ Users.helpers({ }, getTemplatesBoardId() { - return this.profile.templatesBoardId; + return (this.profile || {}).templatesBoardId; }, getTemplatesBoardSlug() { - return Boards.findOne(this.profile.templatesBoardId).slug; + return (Boards.findOne((this.profile || {}).templatesBoardId) || {}).slug; }, }); diff --git a/server/publications/boards.js b/server/publications/boards.js index 144eabb8..52940739 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -10,7 +10,7 @@ Meteor.publish('boards', function() { // Defensive programming to verify that starredBoards has the expected // format -- since the field is in the `profile` a user can modify it. - const {starredBoards = []} = Users.findOne(this.userId).profile; + const {starredBoards = []} = Users.findOne(this.userId).profile || {}; check(starredBoards, [String]); return Boards.find({ -- cgit v1.2.3-1-g7c22