Skip to content

Hotfix/post release 2.4.13.5 #3201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 5 commits into from
Jul 20, 2019
Merged

Hotfix/post release 2.4.13.5 #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4eae41e
Potential fix for empty texts which are causing null pointers for dra…
Jul 19, 2019
8d9ce68
lint fix
Jul 19, 2019
4ea1e0b
Merge pull request #3197 from appirio-tech/hotfix/post-release-2.4.13.4
Jul 19, 2019
647497e
Merge pull request #3198 from appirio-tech/hotfix/post-release-2.4.13.3
Jul 19, 2019
5051a47
Enabling Messages tab again for old projects
Jul 19, 2019
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
3 changes: 2 additions & 1 deletion src/helpers/markdownToState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {convertFromRaw} from 'draft-js'
import _ from 'lodash'
const Remarkable = require('remarkable')

// Block level items, key is Remarkable's key for them, value returned is
Expand Down Expand Up @@ -294,7 +295,7 @@ function markdownToState(markdown, options = {}) {

return convertFromRaw({
entityMap,
blocks
blocks: _.filter(blocks, b => b.text)
})
}

Expand Down
17 changes: 10 additions & 7 deletions src/helpers/projectHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,23 +337,26 @@ export function getNewProjectLink(orgConfigs) {
* @param {string} projectId - The project id
*/
export function getProjectNavLinks(project, projectId) {
let messagesTab = null
// `Discussions` items can be added as soon as project is loaded
// if discussions are not hidden for it
if (project.details && !project.details.hideDiscussions) {
messagesTab = { label: 'Discussions', to: `/projects/${projectId}/discussions`, Icon: InvisibleIcon, iconClassName: 'fill' }
} else {
messagesTab = { label: 'Messages', to: `/projects/${projectId}/messages`, Icon: MessagesIcon, iconClassName: 'stroke', exact: false }
}
// choose set of menu links based on the project version
const navLinks = project.version === 'v3' ? [
{ label: 'Dashboard', to: `/projects/${projectId}`, Icon: DashboardIcon, iconClassName: 'stroke' },
{ label: 'Messages', to: `/projects/${projectId}/messages`, Icon: MessagesIcon, iconClassName: 'stroke', exact: false },
messagesTab,
{ label: 'Scope', to: `/projects/${projectId}/scope`, Icon: ScopeIcon, iconClassName: 'fill' },
// { label: 'Reports', to: '#', Icon: ReportsIcon },
{ label: 'Assets Library', to: `/projects/${projectId}/assets`, Icon: AssetsLibraryIcon, iconClassName: 'stroke' },
] : [
{ label: 'Dashboard', to: `/projects/${projectId}`, Icon: DashboardIcon, iconClassName: 'stroke' },
messagesTab,
{ label: 'Specification', to: `/projects/${projectId}/specification`, Icon: ScopeIcon, iconClassName: 'fill' },
]

// `Discussions` items can be added as soon as project is loaded
// if discussions are not hidden for it
if (project.details && !project.details.hideDiscussions) {
navLinks.push({ label: 'Discussions', to: `/projects/${projectId}/discussions`, Icon: InvisibleIcon, iconClassName: 'fill' })
}

return navLinks
}