diff --git a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue
index d51764ef5..c7453219f 100644
--- a/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue
+++ b/app/javascript/dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue
@@ -1,207 +1,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index f12b0c9c1..f50485723 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -10,7 +10,7 @@ import InboxName from '../InboxName.vue';
import ConversationContextMenu from './contextMenu/Index.vue';
import TimeAgo from 'dashboard/components/ui/TimeAgo.vue';
import CardLabels from './conversationCardComponents/CardLabels.vue';
-import PriorityMark from './PriorityMark.vue';
+import CardPriorityIcon from 'dashboard/components-next/Conversation/ConversationCard/CardPriorityIcon.vue';
import SLACardLabel from './components/SLACardLabel.vue';
import ContextMenu from 'dashboard/components/ui/ContextMenu.vue';
import VoiceCallStatus from './VoiceCallStatus.vue';
@@ -305,7 +305,7 @@ const deleteConversation = () => {
>
{
{{ assignee.name }}
-
+
-import { CONVERSATION_PRIORITY } from '../../../../shared/constants/messages';
-
-export default {
- name: 'PriorityMark',
- props: {
- priority: {
- type: String,
- default: '',
- validate: value =>
- [...Object.values(CONVERSATION_PRIORITY), ''].includes(value),
- },
- },
- data() {
- return {
- CONVERSATION_PRIORITY,
- };
- },
- computed: {
- tooltipText() {
- return this.$t(
- `CONVERSATION.PRIORITY.OPTIONS.${this.priority.toUpperCase()}`
- );
- },
- isUrgent() {
- return this.priority === CONVERSATION_PRIORITY.URGENT;
- },
- },
-};
-
-
-
-
-
-
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index 4c14ba2ab..718a990bb 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -36,27 +36,27 @@ export default {
{
id: null,
name: this.$t('CONVERSATION.PRIORITY.OPTIONS.NONE'),
- thumbnail: `/assets/images/dashboard/priority/none.svg`,
+ icon: 'i-woot-priority-empty',
},
{
id: CONVERSATION_PRIORITY.URGENT,
name: this.$t('CONVERSATION.PRIORITY.OPTIONS.URGENT'),
- thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.URGENT}.svg`,
+ icon: 'i-woot-priority-urgent',
},
{
id: CONVERSATION_PRIORITY.HIGH,
name: this.$t('CONVERSATION.PRIORITY.OPTIONS.HIGH'),
- thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.HIGH}.svg`,
+ icon: 'i-woot-priority-high',
},
{
id: CONVERSATION_PRIORITY.MEDIUM,
name: this.$t('CONVERSATION.PRIORITY.OPTIONS.MEDIUM'),
- thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.MEDIUM}.svg`,
+ icon: 'i-woot-priority-medium',
},
{
id: CONVERSATION_PRIORITY.LOW,
name: this.$t('CONVERSATION.PRIORITY.OPTIONS.LOW'),
- thumbnail: `/assets/images/dashboard/priority/${CONVERSATION_PRIORITY.LOW}.svg`,
+ icon: 'i-woot-priority-low',
},
],
};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
index 4e576e5ad..0b916a4ab 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroEditor.vue
@@ -128,7 +128,7 @@ const saveMacro = async macroData => {
-
+
{
}
return false;
});
+
+const hasIcon = computed(() => {
+ return props.selectedItem?.icon || false;
+});
@@ -83,7 +88,7 @@ const hasValue = computed(() => {
{
hide-offline-status
rounded-full
/>
+
+
diff --git a/public/assets/images/dashboard/priority/high.svg b/public/assets/images/dashboard/priority/high.svg
deleted file mode 100644
index 9196db1b7..000000000
--- a/public/assets/images/dashboard/priority/high.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/public/assets/images/dashboard/priority/low.svg b/public/assets/images/dashboard/priority/low.svg
deleted file mode 100644
index 5b6d70a69..000000000
--- a/public/assets/images/dashboard/priority/low.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/public/assets/images/dashboard/priority/medium.svg b/public/assets/images/dashboard/priority/medium.svg
deleted file mode 100644
index ffb17d44c..000000000
--- a/public/assets/images/dashboard/priority/medium.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/public/assets/images/dashboard/priority/none.svg b/public/assets/images/dashboard/priority/none.svg
deleted file mode 100644
index e215fda39..000000000
--- a/public/assets/images/dashboard/priority/none.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/public/assets/images/dashboard/priority/urgent.svg b/public/assets/images/dashboard/priority/urgent.svg
deleted file mode 100644
index fc4f16b50..000000000
--- a/public/assets/images/dashboard/priority/urgent.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/theme/icons.js b/theme/icons.js
index ebf5d6b56..37b0121e4 100644
--- a/theme/icons.js
+++ b/theme/icons.js
@@ -149,6 +149,34 @@ export const icons = {
height: 11,
},
+ /** Conversation Priority Starts */
+ 'priority-empty': {
+ body: ``,
+ width: 24,
+ height: 24,
+ },
+ 'priority-low': {
+ body: ``,
+ width: 24,
+ height: 24,
+ },
+ 'priority-medium': {
+ body: ``,
+ width: 24,
+ height: 24,
+ },
+ 'priority-high': {
+ body: ``,
+ width: 24,
+ height: 24,
+ },
+ 'priority-urgent': {
+ body: ``,
+ width: 24,
+ height: 24,
+ },
+ /** Ends */
+
/** Channels Starts */
website: {
body: ``,