refactor(core): markdown fixes and misc cleanup

Author: polonel

src/client/components/EasyMDE/index.jsx

@@ -18,6 +18,9 @@ import PropTypes from 'prop-types'
 import Log from '../../logger'
 
 import $ from 'jquery'
+import ReactMarkdown from 'react-markdown'
+import gfm from 'remark-gfm'
+import rehypeRaw from 'rehype-raw'
 import toMarkdown from 'tomarkdown'
 import Easymde from 'easymde'
 
@@ -109,7 +112,7 @@ class EasyMDE extends React.Component {
   static getDerivedStateFromProps (nextProps, state) {
     if (typeof nextProps.defaultValue !== 'undefined') {
       if (!state.loaded && nextProps.defaultValue !== state.value)
-        return { value: toMarkdown(nextProps.defaultValue), loaded: true }
+        return { value: toMarkdown(nextProps.defaultValue).replace(/\\n/gi, '\n'), loaded: true }
     }
 
     return null

src/client/components/Nav/Sidebar/index.jsx

@@ -20,7 +20,7 @@ import NavSeparator from 'components/Nav/NavSeperator'
 import Submenu from 'components/Nav/Submenu'
 import SubmenuItem from 'components/Nav/SubmenuItem'
 
-import { updateNavChange } from '../../../actions/nav'
+import { updateNavChange } from 'actions/nav'
 
 import Helpers from 'lib/helpers'
 
@@ -30,11 +30,15 @@ class Sidebar extends React.Component {
   }
 
   componentDidMount () {
-    Helpers.UI.getPlugins((err, result) => {
-      if (!err && result.plugins) {
-        this.setState({ plugins: result.plugins })
-      }
-    })
+    // Helpers.UI.getPlugins((err, result) => {
+    //   if (!err && result.plugins) {
+    //     this.setState({ plugins: result.plugins })
+    //   }
+    // })
+    const sidebarRoute = document.getElementById('__sidebar_route').innerText
+    const sidebarSubRoute = document.getElementById('__sidebar_sub_route').innerText
+
+    this.props.updateNavChange({ activeItem: sidebarRoute, activeSubItem: sidebarSubRoute })
   }
 
   componentDidUpdate () {
@@ -77,6 +81,7 @@ class Sidebar extends React.Component {
 
   render () {
     const { activeItem, activeSubItem, sessionUser } = this.props
+
     return (
       <div
         className={'sidebar nopadding'}

src/client/containers/Modals/CreateTicketModal.jsx

@@ -26,7 +26,6 @@ import { fetchAccountsCreateTicket } from 'actions/accounts'
 
 import $ from 'jquery'
 import helpers from 'lib/helpers'
-import socket from 'lib/socket'
 
 import BaseModal from 'containers/Modals/BaseModal'
 import Grid from 'components/Grid'
@@ -105,7 +104,7 @@ class CreateTicketModal extends React.Component {
     e.preventDefault()
     const $form = $(e.target)
 
-    let data = {}
+    const data = {}
     if (this.issueText.length < 1) return
     const allowAgentUserTickets =
       this.props.viewdata.get('ticketSettings').get('allowAgentUserTickets') &&
@@ -140,7 +139,7 @@ class CreateTicketModal extends React.Component {
     data.tags = this.tagSelect.value
     data.priority = this.selectedPriority
     data.issue = this.issueMde.easymde.value()
-    data.socketid = socket.ui.socket.io.engine.id
+    data.socketid = this.props.socket.io.engine.id
 
     this.props.createTicket(data)
   }
@@ -320,6 +319,7 @@ class CreateTicketModal extends React.Component {
 
 CreateTicketModal.propTypes = {
   shared: PropTypes.object.isRequired,
+  socket: PropTypes.object.isRequired,
   viewdata: PropTypes.object.isRequired,
   ticketTypes: PropTypes.object.isRequired,
   priorities: PropTypes.object.isRequired,
@@ -335,6 +335,7 @@ CreateTicketModal.propTypes = {
 
 const mapStateToProps = state => ({
   shared: state.shared,
+  socket: state.shared.socket,
   viewdata: state.common.viewdata,
   ticketTypes: state.ticketsState.types,
   priorities: state.ticketsState.priorities,

src/client/containers/Settings/Legal/index.jsx

@@ -38,6 +38,7 @@ class LegalSettingsContainer extends React.Component {
 
   onSavePrivacyPolicyClicked (e) {
     e.preventDefault()
+    console.log(this.state.privacyPolicy)
     this.props
       .updateSetting({
         stateName: 'privacyPolicy',
@@ -87,7 +88,4 @@ const mapStateToProps = state => ({
   settings: state.settings.settings
 })
 
-export default connect(
-  mapStateToProps,
-  { updateSetting }
-)(LegalSettingsContainer)
+export default connect(mapStateToProps, { updateSetting })(LegalSettingsContainer)

src/client/containers/Tickets/CommentNotePartial.jsx

@@ -17,7 +17,6 @@ import ReactHtmlParser from 'react-html-parser'
 import Avatar from 'components/Avatar/Avatar'
 
 import helpers from 'lib/helpers'
-// import socket from 'lib/socket'
 
 const setupImages = parent => {
   const imagesEl = parent.body.querySelectorAll('img:not(.hasLinked)')

src/client/containers/Tickets/SingleTicketContainer.jsx

@@ -232,8 +232,6 @@ class SingleTicketContainer extends React.Component {
   }
 
   transferToThirdParty (e) {
-    // Update below
-    // socket.ui.sendUpdateTicketStatus(this.ticket._id, 3)
     this.props.transferToThirdParty({ uid: this.ticket.uid })
   }
 
@@ -713,12 +711,21 @@ class SingleTicketContainer extends React.Component {
                                       showSubject: false,
                                       text: comment.comment,
                                       onPrimaryClick: data => {
-                                        socket.ui.setCommentText(this.ticket._id, comment._id, data.text)
+                                        this.props.socket.emit(TICKETS_COMMENT_NOTE_SET, {
+                                          _id: this.ticket._id,
+                                          item: comment._id,
+                                          isNote: comment.isNote,
+                                          value: data.text
+                                        })
                                       }
                                     })
                                   }}
                                   onRemoveClick={() => {
-                                    socket.ui.removeComment(this.ticket._id, comment._id)
+                                    this.props.socket.emit(TICKETS_COMMENT_NOTE_REMOVE, {
+                                      _id: this.ticket._id,
+                                      value: comment._id,
+                                      isNote: comment.isNote
+                                    })
                                   }}
                                 />
                               ))}
@@ -742,12 +749,21 @@ class SingleTicketContainer extends React.Component {
                                       showSubject: false,
                                       text: note.note,
                                       onPrimaryClick: data => {
-                                        socket.ui.setNoteText(this.ticket._id, note._id, data.text)
+                                        this.props.socket.emit(TICKETS_COMMENT_NOTE_SET, {
+                                          _id: this.ticket._id,
+                                          item: note._id,
+                                          isNote: note.isNote,
+                                          value: data.text
+                                        })
                                       }
                                     })
                                   }}
                                   onRemoveClick={() => {
-                                    socket.ui.removeNote(this.ticket._id, note._id)
+                                    this.props.socket.emit(TICKETS_COMMENT_NOTE_REMOVE, {
+                                      _id: this.ticket._id,
+                                      value: note._id,
+                                      isNote: note.isNote
+                                    })
                                   }}
                                 />
                               ))}

src/client/lib/useTrudeskReady.js

@@ -3,7 +3,7 @@ import $ from 'jquery'
 
 export default function useTrudeskReady (callback) {
   useEffect(() => {
-    $(window).on('$trudesk:ready', () => {
+    $(window).on('trudesk:ready', () => {
       if (typeof callback === 'function') return callback()
     })
   }, [])

src/controllers/api/v1/common.js

@@ -12,11 +12,11 @@
  *  Copyright (c) 2014-2019. All rights reserved.
  */
 
-var _ = require('lodash')
-var async = require('async')
-var winston = require('winston')
+const _ = require('lodash')
+const async = require('async')
+const winston = require('../../../logger')
 
-var commonV1 = {}
+const commonV1 = {}
 
 /**
  * Preforms login with username/password and adds
@@ -135,4 +135,16 @@ commonV1.logout = function (req, res) {
   )
 }
 
+commonV1.privacyPolicy = async (req, res) => {
+  const SettingsUtil = require('../../../settings/settingsUtil')
+  try {
+    const results = await SettingsUtil.getSettings()
+
+    return res.json({ success: true, privacyPolicy: results.data.settings.privacyPolicy.value })
+  } catch (err) {
+    winston.warn(err)
+    return res.status(500).json({ success: false, error: err })
+  }
+}
+
 module.exports = commonV1

src/controllers/api/v1/routes.js

@@ -31,6 +31,7 @@ module.exports = function (middleware, router, controllers) {
   router.post('/api/v1/login', apiCtrl.common.login)
   router.get('/api/v1/login', apiv1, apiCtrl.common.getLoggedInUser)
   router.get('/api/v1/logout', apiv1, apiCtrl.common.logout)
+  router.get('/api/v1/privacypolicy', apiCtrl.common.privacyPolicy)
 
   // Roles
   router.get('/api/v1/roles', apiv1, apiCtrl.roles.get)