diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue index 54ddbfb6e..7c4c4daaa 100644 --- a/app/javascript/dashboard/components/buttons/ResolveAction.vue +++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue @@ -54,7 +54,7 @@ const showAdditionalActions = computed( ); const showOpenButton = computed(() => { - return isResolved.value || isSnoozed.value; + return isPending.value || isSnoozed.value; }); const getConversationParams = () => { @@ -208,7 +208,7 @@ useEmitter(CMD_RESOLVE_CONVERSATION, onCmdResolveConversation); color-scheme="secondary" size="small" icon="book-clock" - @click="() => toggleStatus(STATUS_TYPE.PENDING)" + @click="() => toggleStatus(wootConstants.STATUS_TYPE.PENDING)" > {{ t('CONVERSATION.RESOLVE_DROPDOWN.MARK_PENDING') }} diff --git a/app/javascript/dashboard/routes/dashboard/commands/CmdBarConversationSnooze.vue b/app/javascript/dashboard/routes/dashboard/commands/CmdBarConversationSnooze.vue new file mode 100644 index 000000000..529b624b0 --- /dev/null +++ b/app/javascript/dashboard/routes/dashboard/commands/CmdBarConversationSnooze.vue @@ -0,0 +1,72 @@ + + + diff --git a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue index dcc25e223..dff1f53f4 100644 --- a/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue +++ b/app/javascript/dashboard/routes/dashboard/commands/commandbar.vue @@ -1,4 +1,3 @@ - + diff --git a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue index fe025ff8d..2093d6b05 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/InboxList.vue @@ -8,12 +8,14 @@ import InboxCard from './components/InboxCard.vue'; import InboxListHeader from './components/InboxListHeader.vue'; import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events'; import IntersectionObserver from 'dashboard/components/IntersectionObserver.vue'; +import CmdBarConversationSnooze from 'dashboard/routes/dashboard/commands/CmdBarConversationSnooze.vue'; export default { components: { InboxCard, InboxListHeader, IntersectionObserver, + CmdBarConversationSnooze, }, setup() { const { uiSettings } = useUISettings(); @@ -209,5 +211,6 @@ export default { +