From 3a6e85fcea397f51d419d6b168ec3be9daab5807 Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Thu, 22 Jan 2026 17:34:59 +0530 Subject: [PATCH 1/2] feat: automations --- desk/package.json | 2 +- desk/src/components/Settings/settingsModal.ts | 47 +++++++++++-------- frappe-ui | 2 +- helpdesk/hooks.py | 3 ++ 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/desk/package.json b/desk/package.json index 0deee1a2b2..a1514db58b 100644 --- a/desk/package.json +++ b/desk/package.json @@ -18,7 +18,7 @@ "@vueuse/core": "^13.8.0", "@vueuse/integrations": "^13.8.0", "dayjs": "^1.11.7", - "frappe-ui": "0.1.235", + "frappe-ui": "github:frappe/frappe-ui#f8e4db7e7528ebb772add55b67b3956a355ef8c2", "gemoji": "^8.1.0", "mime": "^3.0.0", "pinia": "^2.0.33", diff --git a/desk/src/components/Settings/settingsModal.ts b/desk/src/components/Settings/settingsModal.ts index 0e01860b3d..852efbc38b 100644 --- a/desk/src/components/Settings/settingsModal.ts +++ b/desk/src/components/Settings/settingsModal.ts @@ -1,33 +1,35 @@ +import { FieldDependencyIcon, PhoneIcon } from "@/components/icons"; +import { useAuthStore } from "@/stores/auth"; +import { __ } from "@/translation"; +import { Avatar } from "frappe-ui"; +import { AutomationRule } from "frappe-ui/frappe"; +import { AutomationIcon } from "frappe-ui/icons"; import { computed, h, markRaw, ref } from "vue"; -import Agents from "./Agents.vue"; -import EmailConfig from "./EmailConfig.vue"; -import TeamsConfig from "./Teams/TeamsConfig.vue"; -import Sla from "./Sla/Sla.vue"; -import HolidayList from "./Holiday/Holiday.vue"; -import FieldDependencyConfig from "./FieldDependency/FieldDependencyConfig.vue"; -import InviteAgents from "./InviteAgents.vue"; +import Briefcase from "~icons/lucide/briefcase"; import LucideMail from "~icons/lucide/mail"; import LucideMailOpen from "~icons/lucide/mail-open"; +import SettingsGear from "~icons/lucide/settings"; +import Settings from "~icons/lucide/settings-2"; +import ShieldCheck from "~icons/lucide/shield-check"; import LucideUser from "~icons/lucide/user"; import LucideUserPlus from "~icons/lucide/user-plus"; import LucideUsers from "~icons/lucide/users"; -import ShieldCheck from "~icons/lucide/shield-check"; -import Briefcase from "~icons/lucide/briefcase"; +import SavedReplyIcon from "../icons/SavedReplyIcon.vue"; +import Agents from "./Agents.vue"; import AssignmentRules from "./Assignment Rules/AssignmentRules.vue"; -import Settings from "~icons/lucide/settings-2"; -import { FieldDependencyIcon, PhoneIcon } from "@/components/icons"; -import Telephony from "./Telephony/Telephony.vue"; +import EmailConfig from "./EmailConfig.vue"; import { EmailNotifications } from "./EmailNotifications"; -import { __ } from "@/translation"; -import SavedReplies from "./SavedReplies/SavedReplies.vue"; -import Profile from "./Profile/Profile.vue"; -import { Avatar } from "frappe-ui"; -import { useAuthStore } from "@/stores/auth"; +import FieldDependencyConfig from "./FieldDependency/FieldDependencyConfig.vue"; import General from "./General/General.vue"; -import SettingsGear from "~icons/lucide/settings"; -import SavedReplyIcon from "../icons/SavedReplyIcon.vue"; +import HolidayList from "./Holiday/Holiday.vue"; +import InviteAgents from "./InviteAgents.vue"; +import Profile from "./Profile/Profile.vue"; +import SavedReplies from "./SavedReplies/SavedReplies.vue"; +import Sla from "./Sla/Sla.vue"; +import TeamsConfig from "./Teams/TeamsConfig.vue"; +import Telephony from "./Telephony/Telephony.vue"; -export const showSettingsModal = ref(false); +export const showSettingsModal = ref(true); const auth = useAuthStore(); @@ -37,6 +39,11 @@ export const tabs = computed(() => { label: __("User Settings"), hideLabel: true, items: [ + { + label: __("Automation Rules"), + icon: markRaw(AutomationIcon), + component: markRaw(AutomationRule), + }, { label: __("Profile"), icon: h(Avatar, { diff --git a/frappe-ui b/frappe-ui index 241407b5d2..f8e4db7e75 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 241407b5d223cb161a1996102ba7abd47642dfec +Subproject commit f8e4db7e7528ebb772add55b67b3956a355ef8c2 diff --git a/helpdesk/hooks.py b/helpdesk/hooks.py index b3f6d4f109..318d9fe55d 100644 --- a/helpdesk/hooks.py +++ b/helpdesk/hooks.py @@ -54,6 +54,9 @@ }, "after_accept": "helpdesk.helpdesk.hooks.user_invitation.after_accept", } +automation_rule_config = { + "allowed_doctypes": ["HD Ticket"], +} doc_events = { "Contact": { From 5d0e992555ed772c0afb7b2a625ecf6bc8e4d825 Mon Sep 17 00:00:00 2001 From: Ritvik Sardana Date: Thu, 22 Jan 2026 18:33:26 +0530 Subject: [PATCH 2/2] chore: update frappe-ui commit version --- desk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desk/package.json b/desk/package.json index a1514db58b..60bd29831b 100644 --- a/desk/package.json +++ b/desk/package.json @@ -18,7 +18,7 @@ "@vueuse/core": "^13.8.0", "@vueuse/integrations": "^13.8.0", "dayjs": "^1.11.7", - "frappe-ui": "github:frappe/frappe-ui#f8e4db7e7528ebb772add55b67b3956a355ef8c2", + "frappe-ui": "github:frappe/frappe-ui#a8e3a47f08c0971d7e46c7616b61cec6cf469acd", "gemoji": "^8.1.0", "mime": "^3.0.0", "pinia": "^2.0.33",