Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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#a8e3a47f08c0971d7e46c7616b61cec6cf469acd",
"gemoji": "^8.1.0",
"mime": "^3.0.0",
"pinia": "^2.0.33",
Expand Down
47 changes: 27 additions & 20 deletions desk/src/components/Settings/settingsModal.ts
Original file line number Diff line number Diff line change
@@ -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();

Expand All @@ -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, {
Expand Down
2 changes: 1 addition & 1 deletion frappe-ui
Submodule frappe-ui updated 79 files
+13 −7 .github/workflows/publish.yml
+108 −0 frappe/AutomationRule/AddBlock.vue
+253 −0 frappe/AutomationRule/Automation.vue
+28 −0 frappe/AutomationRule/AutomationLayout.vue
+42 −0 frappe/AutomationRule/AutomationList.vue
+117 −0 frappe/AutomationRule/BaseBlock.vue
+174 −0 frappe/AutomationRule/ConditionBlock.vue
+26 −0 frappe/AutomationRule/DropdownOptions.vue
+19 −0 frappe/AutomationRule/ElseBlock.vue
+120 −0 frappe/AutomationRule/EmailBlock.vue
+133 −0 frappe/AutomationRule/IfElseBlock.vue
+21 −0 frappe/AutomationRule/NameBlock.vue
+84 −0 frappe/AutomationRule/RuleBlock.vue
+35 −0 frappe/AutomationRule/ScopeBlock.vue
+104 −0 frappe/AutomationRule/SetFieldBlock.vue
+162 −0 frappe/AutomationRule/WhenBlock.vue
+325 −0 frappe/AutomationRule/automation.ts
+87 −0 frappe/AutomationRule/types.ts
+7 −7 frappe/DataImport/DataImport.vue
+8 −6 frappe/DataImport/PreviewStep.vue
+10 −4 frappe/Filter/utils.ts
+14 −0 frappe/Icons/ActionIcon.vue
+14 −0 frappe/Icons/AlignIcon.vue
+14 −0 frappe/Icons/BellIcon.vue
+14 −0 frappe/Icons/ConditionIcon.vue
+14 −0 frappe/Icons/EventIcon.vue
+14 −0 frappe/Icons/FocusIcon.vue
+14 −0 frappe/Icons/ScopeIcon.vue
+14 −0 frappe/Icons/TimerIcon.vue
+1 −0 frappe/index.d.ts
+3 −0 frappe/index.js
+14 −0 icons/AutomationIcon.vue
+1 −0 icons/index.ts
+2 −2 package.json
+1 −1 src/components/Dialog/Dialog.vue
+1 −0 src/components/MultiSelect/MultiSelect.vue
+41 −0 src/components/SettingsLayoutBase.vue
+10 −5 src/components/TextEditor/TextEditor.vue
+1 −0 src/data-fetching/index.ts
+124 −0 src/data-fetching/useDoctypeMeta.ts
+ src/fonts/Inter/Inter-Black.woff2
+ src/fonts/Inter/Inter-BlackItalic.woff2
+ src/fonts/Inter/Inter-Bold.woff2
+ src/fonts/Inter/Inter-BoldItalic.woff2
+ src/fonts/Inter/Inter-Display.woff2
+ src/fonts/Inter/Inter-DisplayBlack.woff2
+ src/fonts/Inter/Inter-DisplayBlackItalic.woff2
+ src/fonts/Inter/Inter-DisplayBold.woff2
+ src/fonts/Inter/Inter-DisplayBoldItalic.woff2
+ src/fonts/Inter/Inter-DisplayExtraBold.woff2
+ src/fonts/Inter/Inter-DisplayExtraBoldItalic.woff2
+ src/fonts/Inter/Inter-DisplayExtraLight.woff2
+ src/fonts/Inter/Inter-DisplayExtraLightItalic.woff2
+ src/fonts/Inter/Inter-DisplayItalic.woff2
+ src/fonts/Inter/Inter-DisplayLight.woff2
+ src/fonts/Inter/Inter-DisplayLightItalic.woff2
+ src/fonts/Inter/Inter-DisplayMedium.woff2
+ src/fonts/Inter/Inter-DisplayMediumItalic.woff2
+ src/fonts/Inter/Inter-DisplaySemiBold.woff2
+ src/fonts/Inter/Inter-DisplaySemiBoldItalic.woff2
+ src/fonts/Inter/Inter-DisplayThin.woff2
+ src/fonts/Inter/Inter-DisplayThinItalic.woff2
+ src/fonts/Inter/Inter-ExtraBold.woff2
+ src/fonts/Inter/Inter-ExtraBoldItalic.woff2
+ src/fonts/Inter/Inter-ExtraLight.woff2
+ src/fonts/Inter/Inter-ExtraLightItalic.woff2
+ src/fonts/Inter/Inter-Italic.woff2
+ src/fonts/Inter/Inter-Light.woff2
+ src/fonts/Inter/Inter-LightItalic.woff2
+ src/fonts/Inter/Inter-Medium.woff2
+ src/fonts/Inter/Inter-MediumItalic.woff2
+ src/fonts/Inter/Inter-Regular.woff2
+ src/fonts/Inter/Inter-SemiBold.woff2
+ src/fonts/Inter/Inter-SemiBoldItalic.woff2
+ src/fonts/Inter/Inter-Thin.woff2
+ src/fonts/Inter/Inter-ThinItalic.woff2
+18 −279 src/fonts/Inter/inter.css
+2 −7 src/tailwind/plugin.js
+0 −6 tsconfig.json
3 changes: 3 additions & 0 deletions helpdesk/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
},
"after_accept": "helpdesk.helpdesk.hooks.user_invitation.after_accept",
}
automation_rule_config = {
"allowed_doctypes": ["HD Ticket"],
}

doc_events = {
"Contact": {
Expand Down
Loading