+
-
-
+
+
(this.htmlColor = e.target.value)}
/>
+
+
+ (this.slatimer = e.target.checked)}
+ />
+
+
+ (this.isResolved = e.target.checked)}
+ />
+
+
@@ -98,7 +121,6 @@ class CreateStatusModal extends React.Component {
}
CreateStatusModal.propTypes = {
- onPriorityCreated: PropTypes.func,
createStatus: PropTypes.func.isRequired
}
diff --git a/src/client/containers/Modals/DeleteTicketStatusModal.jsx b/src/client/containers/Modals/DeleteTicketStatusModal.jsx
new file mode 100644
index 000000000..2b65091aa
--- /dev/null
+++ b/src/client/containers/Modals/DeleteTicketStatusModal.jsx
@@ -0,0 +1,114 @@
+/*
+ * . .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: 6/21/23 11:59 AM
+ * Copyright (c) 2014-2023. All rights reserved.
+ */
+
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
+import { fetchTicketStatus, deleteStatus } from 'actions/tickets'
+import BaseModal from './BaseModal'
+import Button from 'components/Button'
+import SingleSelect from 'components/SingleSelect'
+
+import helpers from 'lib/helpers'
+
+class DeleteTicketStatusModal extends React.Component {
+ constructor (props) {
+ super(props)
+ this.state = {
+ selectedStatus: ''
+ }
+ }
+
+ componentDidMount () {}
+
+ getTicketStatuses () {
+ return this.props.settings && this.props.settings.get('status') ? this.props.settings.get('status').toArray() : []
+ }
+
+ onSelectChanged (e) {
+ this.setState({
+ selectedStatus: e.target.value
+ })
+ }
+
+ onFormSubmit (e) {
+ e.preventDefault()
+ if (!this.state.selectedStatus) {
+ helpers.UI.showSnackbar('Unable to get new ticket status. Aborting...', true)
+ return true
+ }
+
+ this.props.deleteStatus({ id: this.props.status.get('_id'), newStatusId: this.state.selectedStatus })
+ }
+
+ render () {
+ const { status } = this.props
+ const mappedStatuses = this.getTicketStatuses()
+ .filter(obj => {
+ return status.get('name') !== obj.get('name')
+ })
+ .map(item => {
+ return { text: item.get('name'), value: item.get('_id') }
+ })
+ return (
+
+
+
+ )
+ }
+}
+
+DeleteTicketStatusModal.propTypes = {
+ status: PropTypes.object.isRequired,
+ settings: PropTypes.object.isRequired,
+ deleteStatus: PropTypes.func.isRequired,
+ fetchTicketStatus: PropTypes.func.isRequired
+}
+
+const mapStateToProps = state => ({
+ settings: state.settings.settings,
+ ticketStatuses: state.ticketsState.ticketStatuses
+})
+
+export default connect(mapStateToProps, { fetchTicketStatus, deleteStatus })(DeleteTicketStatusModal)
diff --git a/src/client/containers/Modals/FilterTicketsModal.jsx b/src/client/containers/Modals/FilterTicketsModal.jsx
index 756e9860b..bed2d9e98 100644
--- a/src/client/containers/Modals/FilterTicketsModal.jsx
+++ b/src/client/containers/Modals/FilterTicketsModal.jsx
@@ -91,8 +91,8 @@ class FilterTicketsModal extends React.Component {
}
render () {
- const statuses = this.props.ticketStatuses.map(s => ({text: s.get('name'), value: s.get('uid')})).toArray()
-
+ const statuses = this.props.ticketStatuses.map(s => ({ text: s.get('name'), value: s.get('_id') })).toArray()
+
const tags = this.props.ticketTags
.map(t => {
return { text: t.get('name'), value: t.get('_id') }
@@ -229,7 +229,7 @@ const mapStateToProps = state => ({
accountsState: state.accountsState,
ticketTags: state.tagsSettings.tags,
ticketTypes: state.ticketsState.types,
- ticketStatuses: state.ticketsState.ticketStatuses,
+ ticketStatuses: state.ticketsState.ticketStatuses
})
export default connect(mapStateToProps, {
diff --git a/src/client/containers/Modals/index.jsx b/src/client/containers/Modals/index.jsx
index 220c0d90c..8852c5cd4 100644
--- a/src/client/containers/Modals/index.jsx
+++ b/src/client/containers/Modals/index.jsx
@@ -23,8 +23,9 @@ import DeleteTicketTypeModal from './DeleteTicketTypeModal'
import FilterTicketModal from './FilterTicketsModal'
import AddPriorityToTypeModal from './AddPriorityToTypeModal'
import CreatePriorityModal from './CreatePriorityModal'
-import CreateStatusModal from './CreateStatusModal'
import DeletePriorityModal from './DeletePriorityModal'
+import CreateStatusModal from './CreateStatusModal'
+import DeleteTicketStatusModal from './DeleteTicketStatusModal'
import CreateTagModal from './CreateTagModal'
import AddTagsModal from './AddTagsModal'
import CreateTicketModal from './CreateTicketModal'
@@ -55,6 +56,7 @@ const MODAL_COMPONENTS = {
CREATE_PRIORITY: CreatePriorityModal,
DELETE_PRIORITY: DeletePriorityModal,
CREATE_STATUS: CreateStatusModal,
+ DELETE_STATUS: DeleteTicketStatusModal,
CREATE_TAG: CreateTagModal,
ADD_TAGS_MODAL: AddTagsModal,
CREATE_ROLE: CreateRoleModal,
diff --git a/src/client/containers/Settings/Tickets/ticketStatusBody.jsx b/src/client/containers/Settings/Tickets/ticketStatusBody.jsx
index d2219bcae..bcfa1d373 100644
--- a/src/client/containers/Settings/Tickets/ticketStatusBody.jsx
+++ b/src/client/containers/Settings/Tickets/ticketStatusBody.jsx
@@ -19,6 +19,7 @@ import { observer } from 'mobx-react'
import Input from 'components/Input'
import { makeObservable, observable } from 'mobx'
import { fetchSettings } from 'actions/settings'
+import { showModal, hideModal } from 'actions/common'
import ColorSelector from 'components/ColorSelector'
import Button from 'components/Button'
import EnableSwitch from 'components/Settings/EnableSwitch'
@@ -70,6 +71,10 @@ class TicketStatusBody extends React.Component {
})
}
+ showDeleteTicketStatusModal (e, status) {
+ this.props.showModal('DELETE_STATUS', { status })
+ }
+
render () {
return (
@@ -135,7 +140,7 @@ class TicketStatusBody extends React.Component {
text={'Delete'}
small={true}
style={'danger'}
- onClick={e => this.showDeleteTicketStatusModal(e, type)}
+ onClick={e => this.showDeleteTicketStatusModal(e, this.props.status)}
/>
@@ -150,7 +155,9 @@ class TicketStatusBody extends React.Component {
TicketStatusBody.propTypes = {
status: PropTypes.object.isRequired,
- fetchSettings: PropTypes.func.isRequired
+ fetchSettings: PropTypes.func.isRequired,
+ showModal: PropTypes.func.isRequired,
+ hideModal: PropTypes.func.isRequired
}
-export default connect(null, { fetchSettings })(TicketStatusBody)
+export default connect(null, { fetchSettings, showModal, hideModal })(TicketStatusBody)
diff --git a/src/client/containers/Settings/Tickets/ticketStatusContainer.jsx b/src/client/containers/Settings/Tickets/ticketStatusContainer.jsx
index c3ca1da80..a3cc41c80 100644
--- a/src/client/containers/Settings/Tickets/ticketStatusContainer.jsx
+++ b/src/client/containers/Settings/Tickets/ticketStatusContainer.jsx
@@ -16,6 +16,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { observer } from 'mobx-react'
+import { showModal, hideModal } from 'actions/common'
import SplitSettingsPanel from 'components/Settings/SplitSettingsPanel'
import Button from 'components/Button'
@@ -27,7 +28,7 @@ import TicketStatusBody from 'containers/Settings/Tickets/ticketStatusBody'
@observer
class TicketStatusContainer extends React.Component {
onCreateStatusClicked (e) {
- console.log(e)
+ this.props.showModal('CREATE_STATUS')
}
onStatusOrderChanged (e) {
@@ -37,9 +38,7 @@ class TicketStatusContainer extends React.Component {
axios
.put('/api/v1/tickets/status/order', { order: arr })
- .then(res => {
- console.log(res)
- })
+ .then(res => {})
.catch(err => {
console.log(err)
helpers.UI.showSnackbar(err.message || err.response?.statusText, true)
@@ -96,9 +95,11 @@ class TicketStatusContainer extends React.Component {
}
TicketStatusContainer.propTypes = {
- statuses: PropTypes.arrayOf(PropTypes.object)
+ statuses: PropTypes.arrayOf(PropTypes.object),
+ showModal: PropTypes.func.isRequired,
+ hideModal: PropTypes.func.isRequired
}
const mapStateToProps = state => ({})
-export default connect(mapStateToProps, {})(TicketStatusContainer)
+export default connect(mapStateToProps, { showModal, hideModal })(TicketStatusContainer)
diff --git a/src/client/containers/Tickets/CommentNotePartial.jsx b/src/client/containers/Tickets/CommentNotePartial.jsx
index d7eed6ee4..47c91336b 100644
--- a/src/client/containers/Tickets/CommentNotePartial.jsx
+++ b/src/client/containers/Tickets/CommentNotePartial.jsx
@@ -65,7 +65,7 @@ class CommentNotePartial extends React.Component {
{!isNote &&
{ReactHtmlParser(comment.comment)}}