+
(this.modal = i)}
+ data-modal-tag={this.props.modalTag}
+ >
+
{this.props.children}
@@ -70,6 +81,8 @@ BaseModal.propTypes = {
modalTag: PropTypes.string,
hideModal: PropTypes.func.isRequired,
clearModal: PropTypes.func.isRequired,
+ parentExtraClass: PropTypes.string,
+ extraClass: PropTypes.string,
children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired
}
diff --git a/src/client/containers/Modals/EditAccountModal.jsx b/src/client/containers/Modals/EditAccountModal.jsx
new file mode 100644
index 000000000..251f1a498
--- /dev/null
+++ b/src/client/containers/Modals/EditAccountModal.jsx
@@ -0,0 +1,233 @@
+/*
+ * . .o8 oooo
+ * .o8 "888 `888
+ * .o888oo oooo d8b oooo oooo .oooo888 .ooooo. .oooo.o 888 oooo
+ * 888 `888""8P `888 `888 d88' `888 d88' `88b d88( "8 888 .8P'
+ * 888 888 888 888 888 888 888ooo888 `"Y88b. 888888.
+ * 888 . 888 888 888 888 888 888 .o o. )88b 888 `88b.
+ * "888" d888b `V88V"V8P' `Y8bod88P" `Y8bod8P' 8""888P' o888o o888o
+ * ========================================================================
+ * Author: Chris Brame
+ * Updated: 2/23/19 4:03 PM
+ * Copyright (c) 2014-2019. All rights reserved.
+ */
+
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import { observer } from 'mobx-react'
+import { observable } from 'mobx'
+import axios from 'axios'
+import Log from '../../logger'
+
+import { saveEditAccount } from 'actions/accounts'
+
+import Button from 'components/Button'
+import BaseModal from 'containers/Modals/BaseModal'
+import SingleSelect from 'components/SingleSelect'
+import MultiSelect from 'components/MultiSelect'
+
+import helpers from 'lib/helpers'
+
+@observer
+class EditAccountModal extends React.Component {
+ @observable name = ''
+ @observable title = ''
+ @observable password = ''
+ @observable confirmPassword = ''
+ @observable email = ''
+
+ selectedRole = ''
+
+ componentDidMount () {
+ this.name = this.props.user.fullname
+ this.title = this.props.user.title
+ this.email = this.props.user.email
+
+ helpers.UI.inputs()
+ helpers.UI.reRenderInputs()
+ }
+
+ componentDidUpdate () {
+ helpers.UI.reRenderInputs()
+ }
+
+ onFileBtnClick (e) {
+ e.stopPropagation()
+ if (this.uploadImageInput) this.uploadImageInput.click()
+ }
+
+ onImageUploadChanged (e) {
+ const self = e.target
+ const that = this
+ let formData = new FormData()
+ formData.append('username', this.props.user.username)
+ formData.append('_id', this.props.user._id)
+ formData.append('image', self.files[0])
+
+ axios
+ .post('/accounts/uploadImage', formData)
+ .then(res => {
+ const timestamp = new Date().getTime()
+ that.uploadProfileImage.setAttribute('src', `${res.data}?${timestamp}`)
+ })
+ .catch(err => {
+ Log.error(err)
+ })
+ }
+
+ onInputChanged (e, stateName) {
+ this[stateName] = e.target.value
+ }
+
+ onRoleSelectChange (e) {
+ this.selectedRole = e.target.value
+ }
+
+ onSubmitSaveAccount (e) {
+ e.preventDefault()
+ const data = {
+ aUsername: this.props.user.username,
+ aFullname: this.name,
+ aTitle: this.title,
+ aEmail: this.email,
+ aGrps: this.groupSelect.getSelected(),
+ saveGroups: true,
+ aRole: this.selectedRole,
+ aPass: this.password.length > 1 ? this.password : undefined,
+ aPassConfirm: this.confirmPassword.length > 1 ? this.confirmPassword : undefined
+ }
+
+ this.props.saveEditAccount(data)
+ }
+
+ render () {
+ const { user } = this.props
+ const profilePicture = user.image || 'defaultProfile.jpg'
+ const roles = this.props.common.roles.map(role => {
+ return { text: role.name, value: role._id }
+ })
+ const groups = this.props.common.groups.map(group => {
+ return { text: group.name, value: group._id }
+ })
+ return (
+
+
+
+
+
+
+ {user.username}
+ {user.title}
+
+
+
+
+ )
+ }
+}
+
+EditAccountModal.propTypes = {
+ user: PropTypes.object.isRequired,
+ common: PropTypes.object.isRequired,
+ saveEditAccount: PropTypes.func.isRequired
+}
+
+const mapStateToProps = state => ({
+ common: state.common
+})
+
+export default connect(
+ mapStateToProps,
+ { saveEditAccount }
+)(EditAccountModal)
diff --git a/src/client/containers/Modals/index.jsx b/src/client/containers/Modals/index.jsx
index b088601c8..607aa06ed 100644
--- a/src/client/containers/Modals/index.jsx
+++ b/src/client/containers/Modals/index.jsx
@@ -28,6 +28,7 @@ import CreateTicketModal from './CreateTicketModal'
import CreateRoleModal from './CreateRoleModal'
import DeleteRoleModal from './DeleteRoleModal'
import ViewAllNotificationsModal from './ViewAllNotificationsModal'
+import EditAccountModal from './EditAccountModal'
const MODAL_COMPONENTS = {
NOTICE_ALERT: NoticeAlertModal,
@@ -40,7 +41,8 @@ const MODAL_COMPONENTS = {
CREATE_TAG: CreateTagModal,
CREATE_ROLE: CreateRoleModal,
DELETE_ROLE: DeleteRoleModal,
- VIEW_ALL_NOTIFICATIONS: ViewAllNotificationsModal
+ VIEW_ALL_NOTIFICATIONS: ViewAllNotificationsModal,
+ EDIT_ACCOUNT: EditAccountModal
}
const ModalRoot = ({ modalType, modalProps }) => {
diff --git a/src/client/reducers/accountsReducer.js b/src/client/reducers/accountsReducer.js
new file mode 100644
index 000000000..2c7073631
--- /dev/null
+++ b/src/client/reducers/accountsReducer.js
@@ -0,0 +1,58 @@
+/*
+ * . .o8 oooo
+ * .o8 "888 `888
+ * .o888oo oooo d8b oooo oooo .oooo888 .ooooo. .oooo.o 888 oooo
+ * 888 `888""8P `888 `888 d88' `888 d88' `88b d88( "8 888 .8P'
+ * 888 888 888 888 888 888 888ooo888 `"Y88b. 888888.
+ * 888 . 888 888 888 888 888 888 .o o. )88b 888 `88b.
+ * "888" d888b `V88V"V8P' `Y8bod88P" `Y8bod8P' 8""888P' o888o o888o
+ * ========================================================================
+ * Author: Chris Brame
+ * Updated: 2/24/19 7:39 PM
+ * Copyright (c) 2014-2019. All rights reserved.
+ */
+
+import { fromJS, Map, List } from 'immutable'
+import produce from 'immer'
+import { handleActions } from 'redux-actions'
+import { FETCH_ACCOUNTS, SAVE_EDIT_ACCOUNT, UNLOAD_ACCOUNTS } from 'actions/types'
+
+const initialState = {
+ accounts: List([])
+}
+
+const reducer = handleActions(
+ {
+ [FETCH_ACCOUNTS.SUCCESS]: (state, action) => {
+ let arr = state.accounts.toArray()
+ action.payload.response.users.map(i => {
+ arr.push(i)
+ })
+ return {
+ ...state,
+ accounts: fromJS(arr)
+ }
+ },
+
+ [SAVE_EDIT_ACCOUNT.SUCCESS]: (state, action) => {
+ const resUser = action.response.user
+ const accountIndex = state.accounts.findIndex(u => {
+ return u.get('_id') === resUser._id
+ })
+ return {
+ ...state,
+ accounts: state.accounts.set(accountIndex, fromJS(resUser))
+ }
+ },
+
+ [UNLOAD_ACCOUNTS.SUCCESS]: state => {
+ return {
+ ...state,
+ accounts: state.accounts.clear()
+ }
+ }
+ },
+ initialState
+)
+
+export default reducer
diff --git a/src/client/reducers/index.js b/src/client/reducers/index.js
index e1d9efba4..895e2afba 100644
--- a/src/client/reducers/index.js
+++ b/src/client/reducers/index.js
@@ -21,12 +21,14 @@ import modal from './shared/modalReducer'
import sidebar from './sidebarReducer'
import settings from './settings'
import tagsSettings from './tagsReducer'
+import accountsState from './accountsReducer'
const IndexReducer = combineReducers({
shared,
common,
modal,
sidebar,
+ accountsState,
settings,
tagsSettings,
form
diff --git a/src/client/renderer.jsx b/src/client/renderer.jsx
index 1e0e84f74..1776d1016 100644
--- a/src/client/renderer.jsx
+++ b/src/client/renderer.jsx
@@ -16,9 +16,20 @@ import { Provider } from 'react-redux'
import ReactDOM from 'react-dom'
import React from 'react'
-import SettingsContainer from './containers/Settings/SettingsContainer'
+import SettingsContainer from 'containers/Settings/SettingsContainer'
+import AccountsContainer from 'containers/Accounts'
export default function (store) {
+ if (document.getElementById('accounts-container')) {
+ const AccountsContainerWithProvider = (
+
+
+
+ )
+
+ ReactDOM.render(AccountsContainerWithProvider, document.getElementById('accounts-container'))
+ }
+
if (document.getElementById('settings-container')) {
const SettingsContainerWithProvider = (
diff --git a/src/client/sagas/accounts/index.js b/src/client/sagas/accounts/index.js
new file mode 100644
index 000000000..fdf66597d
--- /dev/null
+++ b/src/client/sagas/accounts/index.js
@@ -0,0 +1,63 @@
+/*
+ * . .o8 oooo
+ * .o8 "888 `888
+ * .o888oo oooo d8b oooo oooo .oooo888 .ooooo. .oooo.o 888 oooo
+ * 888 `888""8P `888 `888 d88' `888 d88' `88b d88( "8 888 .8P'
+ * 888 888 888 888 888 888 888ooo888 `"Y88b. 888888.
+ * 888 . 888 888 888 888 888 888 .o o. )88b 888 `88b.
+ * "888" d888b `V88V"V8P' `Y8bod88P" `Y8bod8P' 8""888P' o888o o888o
+ * ========================================================================
+ * Author: Chris Brame
+ * Updated: 2/24/19 2:48 AM
+ * Copyright (c) 2014-2019. All rights reserved.
+ */
+
+import { call, put, takeLatest, takeEvery } from 'redux-saga/effects'
+import { FETCH_ACCOUNTS, HIDE_MODAL, SAVE_EDIT_ACCOUNT, UNLOAD_ACCOUNTS } from 'actions/types'
+
+import Log from '../../logger'
+
+import api from '../../api'
+
+import helpers from 'lib/helpers'
+
+function * fetchAccounts ({ payload, meta }) {
+ try {
+ const response = yield call(api.accounts.getWithPage, payload)
+ yield put({ type: FETCH_ACCOUNTS.SUCCESS, payload: { response, payload }, meta })
+ } catch (error) {
+ let errorText = ''
+ if (error.response) errorText = error.response.data.error
+ helpers.UI.showSnackbar(`Error: ${errorText}`, true)
+ Log.error(errorText, error.response || error)
+ yield put({ type: FETCH_ACCOUNTS.ERROR, error })
+ }
+}
+
+function * saveEditAccount ({ payload }) {
+ try {
+ const response = yield call(api.accounts.updateUser, payload)
+ yield put({ type: SAVE_EDIT_ACCOUNT.SUCCESS, response })
+ yield put({ type: HIDE_MODAL.ACTION })
+ } catch (error) {
+ let errorText = ''
+ if (error.response) errorText = error.response.data.error
+ helpers.UI.showSnackbar(`Error: ${errorText}`, true)
+ Log.error(errorText, error.response || error)
+ yield put({ type: SAVE_EDIT_ACCOUNT.ERROR, error })
+ }
+}
+
+function * unloadThunk ({ payload, meta }) {
+ try {
+ yield put({ type: UNLOAD_ACCOUNTS.SUCCESS, payload, meta })
+ } catch (error) {
+ Log.error(error)
+ }
+}
+
+export default function * watcher () {
+ yield takeLatest(FETCH_ACCOUNTS.ACTION, fetchAccounts)
+ yield takeLatest(SAVE_EDIT_ACCOUNT.ACTION, saveEditAccount)
+ yield takeEvery(UNLOAD_ACCOUNTS.ACTION, unloadThunk)
+}
diff --git a/src/client/sagas/index.js b/src/client/sagas/index.js
index da7e08863..77a7f99f5 100644
--- a/src/client/sagas/index.js
+++ b/src/client/sagas/index.js
@@ -16,7 +16,8 @@ import { all } from 'redux-saga/effects'
import CommonSaga from './common'
import SettingsSaga from './settings'
import TicketSaga from './tickets'
+import AccountSaga from './accounts'
export default function * IndexSagas () {
- yield all([CommonSaga(), TicketSaga(), SettingsSaga()])
+ yield all([CommonSaga(), TicketSaga(), SettingsSaga(), AccountSaga()])
}
diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 1962a3a48..9ae771d86 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -483,6 +483,7 @@ accountsController.uploadImage = function (req, res) {
})
busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
+ console.log(file)
if (mimetype.indexOf('image/') === -1) {
error = {
status: 400,
diff --git a/src/controllers/api/v1/users.js b/src/controllers/api/v1/users.js
index 73937ad61..e9c8d7c2a 100644
--- a/src/controllers/api/v1/users.js
+++ b/src/controllers/api/v1/users.js
@@ -87,7 +87,9 @@ apiUsers.getWithLimit = function (req, res) {
})
})
- user.groups = _.map(groups, 'name')
+ user.groups = _.map(groups, function (group) {
+ return { name: group.name, _id: group._id }
+ })
result.push(stripUserFields(user))
return c()
@@ -334,9 +336,12 @@ apiUsers.createPublicAccount = function (req, res) {
*/
apiUsers.update = function (req, res) {
var username = req.params.username
+ if (_.isNull(username) || _.isUndefined(username))
+ return res.status(400).json({ success: false, error: 'Invalid Post Data' })
+
var data = req.body
// saveGroups - Profile saving where groups are not sent
- var saveGroups = data.saveGroups
+ var saveGroups = data.saveGroups || true
var obj = {
fullname: data.aFullname,
title: data.aTitle,
@@ -358,6 +363,7 @@ apiUsers.update = function (req, res) {
user: function (done) {
UserSchema.getUserByUsername(username, function (err, user) {
if (err) return done(err)
+ if (!user) return done('Invalid User Object')
obj._id = user._id
@@ -380,28 +386,36 @@ apiUsers.update = function (req, res) {
user.save(function (err, nUser) {
if (err) return done(err)
- var resUser = stripUserFields(nUser)
+ nUser.populate('role', function (err, populatedUser) {
+ if (err) return done(err)
+ var resUser = stripUserFields(populatedUser)
- done(null, resUser)
+ return done(null, resUser)
+ })
})
})
},
groups: function (done) {
if (!saveGroups) return done()
+ var userGroups = []
groupSchema.getAllGroups(function (err, groups) {
if (err) return done(err)
async.each(
groups,
function (grp, callback) {
if (_.includes(obj.groups, grp._id.toString())) {
- if (grp.isMember(obj._id)) return callback()
+ if (grp.isMember(obj._id)) {
+ userGroups.push(grp)
+ return callback()
+ }
grp.addMember(obj._id, function (err, result) {
if (err) return callback(err)
if (result) {
grp.save(function (err) {
if (err) return callback(err)
- callback()
+ userGroups.push(grp)
+ return callback()
})
} else {
return callback()
@@ -415,7 +429,7 @@ apiUsers.update = function (req, res) {
grp.save(function (err) {
if (err) return callback(err)
- callback()
+ return callback()
})
} else {
return callback()
@@ -426,7 +440,7 @@ apiUsers.update = function (req, res) {
function (err) {
if (err) return done(err)
- done()
+ return done(null, userGroups)
}
)
})
@@ -438,7 +452,12 @@ apiUsers.update = function (req, res) {
return res.status(400).json({ success: false, error: err })
}
- return res.json({ success: true, user: results.user })
+ var user = results.user.toJSON()
+ user.groups = results.groups.map(function (g) {
+ return { _id: g._id, name: g.name }
+ })
+
+ return res.json({ success: true, user: user })
}
)
}
@@ -1055,7 +1074,6 @@ function stripUserFields (user) {
user.password = undefined
user.accessToken = undefined
user.__v = undefined
- // user.role = undefined;
user.tOTPKey = undefined
user.iOSDeviceTokens = undefined
diff --git a/src/models/ticket.js b/src/models/ticket.js
index cf74f9666..f97fc0fbc 100644
--- a/src/models/ticket.js
+++ b/src/models/ticket.js
@@ -52,7 +52,7 @@ var COLLECTION = 'tickets'
* @property {Boolean} deleted ```Required``` [default: false] If they ticket is flagged as deleted.
* @property {TicketType} type ```Required``` Reference to the TicketType
* @property {Number} status ```Required``` [default: 0] Ticket Status. (See {@link Ticket#setStatus})
- * @property {Number} prioirty ```Required```
+ * @property {Number} priority ```Required```
* @property {Array} tags An array of Tags.
* @property {String} subject ```Required``` The subject of the ticket. (Overview)
* @property {String} issue ```Required``` Detailed information about the ticket problem/task
diff --git a/src/public/js/modules/ajaxify.js b/src/public/js/modules/ajaxify.js
index eca42ab6a..73da10578 100644
--- a/src/public/js/modules/ajaxify.js
+++ b/src/public/js/modules/ajaxify.js
@@ -230,6 +230,9 @@ define('modules/ajaxify', [
// This will be removed once angular and ajaxy are gone (react-router will Replace)
if (document.getElementById('settings-container'))
window.react.dom.unmountComponentAtNode(document.getElementById('settings-container'))
+ if (document.getElementById('accounts-container'))
+ window.react.dom.unmountComponentAtNode(document.getElementById('accounts-container'))
+
// if (document.getElementById('modal-wrapper'))
// window.react.dom.unmountComponentAtNode(document.getElementById('modal-wrapper'))
diff --git a/src/sass/_settings.sass b/src/sass/_settings.sass
index 5202df8a4..c57c7d5af 100644
--- a/src/sass/_settings.sass
+++ b/src/sass/_settings.sass
@@ -41,8 +41,10 @@ $header_primary: #f6f7f8 !default
$accent_success: #29b955 !default
// Highlight color for actions and Errors
$accent_danger: #d32f2f !default
-
+// Highlight color for warnings
$accent_warn: #feca57 !default
+// Highlight color for agents
+$accent_agent: #7d5fff
// ------------------------------------------------------------------------
diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass
index cc04bb77b..042866a5f 100644
--- a/src/sass/partials/common.sass
+++ b/src/sass/partials/common.sass
@@ -97,19 +97,37 @@
margin-top: 10px !important
.mt-20
margin-top: 20px !important
-.mb-10
- margin-bottom: 10px !important
.mb-5
margin-bottom: 5px !important
+.mb-10
+ margin-bottom: 10px !important
+.mb-15
+ margin-bottom: 15px !important
+.mb-25
+ margin-bottom: 25px !important
.mr-10
margin-right: 10px !important
.mr-15
margin-right: 15px !important
+.p-0
+ padding: 0 !important
+.pt-0
+ padding-top: 0 !important
.pr-10
padding-right: 10px !important
+.pr-20
+ padding-right: 20px !important
+.pr-25
+ padding-right: 25px !important
.pl-0
padding-left: 0 !important
+.pl-25
+ padding-left: 25px !important
+.pb-25
+ padding-bottom: 25px !important
+.pb-100
+ padding-bottom: 100px !important
.padding-left-right-15
padding-left: 15px !important
@@ -120,6 +138,9 @@
padding: 10px !important
.padding-15
padding: 15px !important
+.p-25,
+.padding-25
+ padding: 25px !important
.padtop20
padding-top: 20px !important
.padright20
diff --git a/src/sass/partials/trucard.sass b/src/sass/partials/trucard.sass
index 6a6ecf223..156e4c7d9 100644
--- a/src/sass/partials/trucard.sass
+++ b/src/sass/partials/trucard.sass
@@ -26,12 +26,16 @@
position: relative
border-bottom: 1px solid rgba(0,0,0,.12)
&.tru-card-head-admin,
+ &.tru-card-head-agent,
&.tru-card-head-deleted
- background: #3498db
+ background: $accent_blue
+ border-bottom: none
.tru-card-head-text
color: white
.tru-icon
color: white !important
+ &.tru-card-head-agent
+ background: $accent_agent
&.tru-card-head-deleted
background: $accent_danger !important
.tru-card-head-menu
diff --git a/src/views/accounts.hbs b/src/views/accounts.hbs
index 62950da06..65d78a907 100644
--- a/src/views/accounts.hbs
+++ b/src/views/accounts.hbs
@@ -1,164 +1,6 @@
-
-
{{data.page}}
-
-
-
Accounts
-
- {{#canUser data.common.loggedInAccount 'accounts:create'}}
-
- {{/canUser}}
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{#each data.accounts}}
-
-
-
-
-
-
- {{#if image}}
-
- {{else}}
-
- {{/if}}
-
-
-
-
-
- {{fullname}}
- {{firstCap title}}
-
-
-
-
- -
-
- Role
- {{firstCap role.name}}
-
-
- -
-
-
- -
-
- Groups
-
- {{#each groups}}
- {{this}}{{#compare (size ../groups) '>' 1}}, {{/compare}}
- {{/each}}
-
-
-
-
-
-
-
- {{/each}}
-
-
-
-
-
-
-
-
-
- {{> createAccountWindow}}
- {{> editAccountWindow}}
-
+
+