+ ? `
${frappe.utils.icon(value, "md")}
${value}
`
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 29b3f239f5..25b1087070 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -384,7 +384,6 @@ export default class GridRow {
add_column_configure_button() {
if (this.grid.df.in_place_edit && !this.frm) return;
-
if (this.configure_columns && this.frm) {
this.configure_columns_button = $(`
diff --git a/frappe/public/js/frappe/icon_picker/icon_picker.js b/frappe/public/js/frappe/icon_picker/icon_picker.js
index 8d8cccd748..0f2f5dc212 100644
--- a/frappe/public/js/frappe/icon_picker/icon_picker.js
+++ b/frappe/public/js/frappe/icon_picker/icon_picker.js
@@ -5,6 +5,7 @@ class Picker {
this.height = opts.height;
this.set_icon(opts.icon);
this.icons = opts.icons;
+ this.include_emoji = opts.include_emoji;
this.setup_picker();
}
@@ -19,7 +20,7 @@ class Picker {
${frappe.utils.icon("search", "sm")}
-
@@ -29,8 +30,106 @@ class Picker {
this.search_input = this.icon_picker_wrapper.find(".search-icons > input");
this.refresh();
this.setup_icons();
+ if (this.include_emoji) {
+ this.setup_emojis();
+ }
}
+ setup_emojis() {
+ console.log("Making emojis");
+ // setup tab
+ this.setup_tab();
+ // setup emoji container
+ this.setup_emoji_container();
+ // emojis
+ this.emoji_wrapper = this.icon_picker_wrapper.find(".emojis");
+ gemoji.forEach((emoji, i) => {
+ let $icon = $(
+ `
${gemoji[i].emoji}
`
+ );
+ this.emoji_wrapper.append($icon);
+ const set_values = () => {
+ this.set_icon(gemoji[i].emoji);
+ this.update_icon_selected();
+ };
+ $icon.on("click", () => {
+ set_values();
+ });
+ // $icon.keydown((e) => {
+ // const key_code = e.keyCode;
+ // if ([13, 32].includes(key_code)) {
+ // e.preventDefault();
+ // set_values();
+ // }
+ // });
+ });
+ this.search_input.on("input", (e) => {
+ e.preventDefault();
+ this.filter_emojis();
+ });
+ }
+ filter_emojis() {
+ let value = this.search_input.val();
+ let filtered_emoji_names = [];
+ if (value) {
+ gemoji.forEach((g) => {
+ g.tags.forEach((t) => {
+ if (t.includes(value)) {
+ filtered_emoji_names.push(g);
+ }
+ });
+ g.names.forEach((t) => {
+ if (t.includes(value)) {
+ filtered_emoji_names.push(g);
+ }
+ });
+ });
+ }
+ if (filtered_emoji_names.length == 0) {
+ this.emoji_wrapper.find(".emoji-wrapper").removeClass("hidden");
+ } else {
+ this.emoji_wrapper.find(".emoji-wrapper").addClass("hidden");
+ filtered_emoji_names.forEach((g) => {
+ this.emoji_wrapper.find(`.emoji-wrapper[id*='${g.emoji}']`).removeClass("hidden");
+ });
+ }
+ }
+ setup_emoji_container() {
+ this.icon_picker_wrapper.find(".icon-section")
+ .after(`
`);
+ }
+ setup_tab() {
+ this.icon_picker_wrapper.find(".search-icons").after(`
`);
+ let icon_types = ["icon", "emoji"];
+ const me = this;
+
+ this.icon_picker_wrapper.find(".nav-item").on("click", function (e) {
+ let container_name = $(this).text().trim().toLowerCase();
+
+ icon_types.forEach((type) => {
+ if (type === container_name) {
+ me.icon_picker_wrapper.find(`.${type}-section`).removeClass("hidden");
+ } else {
+ me.icon_picker_wrapper.find(`.${type}-section`).addClass("hidden");
+ }
+ });
+ });
+ }
setup_icons() {
this.icons.forEach((icon) => {
let $icon = $(
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index a96219d632..73f6c06b88 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1234,7 +1234,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
return this.settings.get_form_link(doc);
}
- return `/app/${encodeURIComponent(
+ return `/desk/${encodeURIComponent(
frappe.router.slug(frappe.router.doctype_layout || this.doctype)
)}/${encodeURIComponent(cstr(doc.name))}`;
}
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 01d983d493..b0ac7676e5 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -107,7 +107,7 @@ frappe.router = {
if (path.substr(0, 1) === "/") path = path.substr(1);
path = path.split("/");
if (path[0]) {
- return path[0] === "app";
+ return path[0] === "desk";
}
},
@@ -144,11 +144,11 @@ frappe.router = {
this.current_sub_path = sub_path;
this.current_route = await this.parse();
+
this.set_history(sub_path);
- this.set_active_sidebar_item();
this.render();
this.set_title(sub_path);
- this.trigger("change");
+ this.trigger("change", this);
},
async parse(route) {
@@ -202,7 +202,7 @@ frappe.router = {
return frappe.model.with_doctype(doctype_route.doctype).then(() => {
// doctype route
let meta = frappe.get_meta(doctype_route.doctype);
-
+ this.meta = meta;
if (route[1] && route[1] === "view" && route[2]) {
route = this.get_standard_route_for_list(
route,
@@ -289,10 +289,6 @@ frappe.router = {
frappe.ui.hide_open_dialog();
},
- async set_active_sidebar_item() {
- frappe.app.sidebar.set_active_workspace_item();
- },
-
render() {
if (this.current_route[0]) {
this.render_page();
@@ -308,7 +304,6 @@ frappe.router = {
const route = this.current_route;
const factory = frappe.utils.to_title_case(route[0]);
-
if (route[1] && frappe.views[factory + "Factory"]) {
route[0] = factory;
// has a view generator, generate!
@@ -467,9 +462,12 @@ frappe.router = {
}).join("/");
if (path_string) {
- return "/app/" + path_string;
+ return "/desk/" + path_string;
}
+ if (params.length == 0) {
+ return "/desk";
+ }
// Resolution order
// 1. User's default workspace in user doctype
// 2. Private home
@@ -488,11 +486,13 @@ frappe.router = {
if (workspace) {
return (
- "/app/" + (workspace.public ? "" : "private/") + frappe.router.slug(workspace.name)
+ "/desk/" +
+ (workspace.public ? "" : "private/") +
+ frappe.router.slug(workspace.name)
);
}
- return "/app";
+ return "/desk";
},
/**
@@ -525,8 +525,8 @@ frappe.router = {
strip_prefix(route) {
if (route.substr(0, 1) == "/") route = route.substr(1); // for /app/sub
- if (route == "app") route = route.substr(4); // for app
- if (route.startsWith("app/")) route = route.substr(4); // for desk/sub
+ if (route == "desk") route = route.substr(4); // for app
+ if (route.startsWith("desk/")) route = route.substr(4); // for desk/sub
if (route.substr(0, 1) == "/") route = route.substr(1);
if (route.substr(0, 1) == "#") route = route.substr(1);
if (route.substr(0, 1) == "!") route = route.substr(1);
diff --git a/frappe/public/js/frappe/ui/apps_switcher.html b/frappe/public/js/frappe/ui/apps_switcher.html
deleted file mode 100644
index 69ab6242d8..0000000000
--- a/frappe/public/js/frappe/ui/apps_switcher.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/apps_switcher.js b/frappe/public/js/frappe/ui/apps_switcher.js
deleted file mode 100644
index 643e47cd07..0000000000
--- a/frappe/public/js/frappe/ui/apps_switcher.js
+++ /dev/null
@@ -1,197 +0,0 @@
-frappe.ui.AppsSwitcher = class AppsSwitcher {
- constructor(sidebar) {
- this.sidebar = sidebar;
- this.sidebar_wrapper = $(this.sidebar.wrapper.find(".body-sidebar"));
- this.drop_down_expanded = false;
- this.make();
- this.setup_app_switcher();
- this.set_hover();
- }
-
- make() {
- this.wrapper = $(
- frappe.render_template("apps_switcher", {
- app_logo_url: frappe.boot.app_data[0].app_logo_url,
- app_title: __(frappe.boot.app_data[0].app_title),
- })
- ).prependTo(this.sidebar_wrapper);
- this.app_switcher_dropdown = $(".app-switcher-dropdown");
- }
-
- setup_app_switcher() {
- this.app_switcher_menu = $(".app-switcher-menu");
- $(".app-switcher-dropdown").on("click", (e) => {
- this.toggle_app_menu();
- e.stopImmediatePropagation();
- });
- }
- toggle_app_menu() {
- this.toggle_active();
- this.app_switcher_menu.toggleClass("hidden");
- }
- create_app_data_map() {
- frappe.boot.app_data_map = {};
- for (var app of frappe.boot.app_data) {
- frappe.boot.app_data_map[app.app_name] = app;
- if (app.workspaces?.length) {
- this.add_app_item(app);
- }
- }
- }
- populate_apps_menu() {
- this.add_private_app();
-
- this.add_website_select();
- this.add_settings_select();
- this.setup_select_app();
- }
-
- add_app_item(app) {
- $(`
`).appendTo(this.app_switcher_menu);
- }
-
- add_private_app() {
- let private_pages = this.sidebar.all_pages.filter((p) => p.public === 0);
- if (private_pages.length === 0) return;
-
- const app = {
- app_name: "private",
- app_title: __("My Workspaces"),
- app_route: "/app/private",
- app_logo_url: "/assets/frappe/images/frappe-framework-logo.svg",
- workspaces: private_pages,
- };
-
- frappe.boot.app_data_map["private"] = app;
- $(`
`).prependTo(this.app_switcher_menu);
- $(`
`).prependTo(this.app_switcher_menu);
- }
-
- setup_select_app() {
- this.app_switcher_menu.find(".app-item").on("click", (e) => {
- let item = $(e.delegateTarget);
- let route = item.attr("data-app-route");
- this.app_switcher_menu.toggleClass("hidden");
- this.toggle_active();
-
- if (item.attr("data-app-name") == "settings") {
- frappe.quick_edit("Workspace Settings");
- return;
- }
- if (route.startsWith("/app/private")) {
- this.set_current_app("private");
- let ws = Object.values(frappe.workspace_map).find((ws) => ws.public === 0);
- route += "/" + frappe.router.slug(ws.title);
- frappe.set_route(route);
- } else if (route.startsWith("/app")) {
- frappe.set_route(route);
- this.set_current_app(item.attr("data-app-name"));
- } else {
- // new page
- window.open(route);
- }
- });
- }
- // refactor them into one single function
- add_website_select() {
- $(`
`).appendTo(this.app_switcher_menu);
- this.add_app_item(
- {
- app_name: "website",
- app_title: __("Website"),
- app_route: "/",
- app_logo_url: "/assets/frappe/images/web.svg",
- },
- this.app_switcher_menu
- );
- }
-
- add_settings_select() {
- $(`
`).appendTo(this.app_switcher_menu);
- this.add_app_item({
- app_name: "settings",
- app_title: __("Settings"),
- app_logo_url: "/assets/frappe/images/settings-gear.svg",
- });
- let settings_item = this.app_switcher_menu.children().last();
- }
-
- set_current_app(app) {
- if (!app) {
- console.warn("set_current_app: app not defined");
- return;
- }
- let app_data = frappe.boot.app_data_map[app] || frappe.boot.app_data_map["frappe"];
-
- this.sidebar_wrapper
- .find(".app-switcher-dropdown .sidebar-item-icon img")
- .attr("src", app_data.app_logo_url);
- this.sidebar_wrapper
- .find(".app-switcher-dropdown .sidebar-item-label")
- .html(app_data.app_title);
-
- frappe.frappe_toolbar.set_app_logo(app_data.app_logo_url);
-
- if (frappe.current_app === app) return;
- frappe.current_app = app;
-
- // re-render the sidebar
- frappe.app.sidebar.make_sidebar();
- }
-
- set_hover() {
- const me = this;
-
- this.app_switcher_dropdown.on("mouseover", function () {
- if ($(this).hasClass("active-sidebar")) return;
- $(this).addClass("hover");
-
- if (!me.sidebar.sidebar_expanded) {
- $(this).removeClass("hover");
- }
- });
-
- this.app_switcher_dropdown.on("mouseleave", function () {
- $(this).removeClass("hover");
- });
- }
-
- toggle_active() {
- this.toggle_dropdown();
- this.app_switcher_dropdown.toggleClass("active-sidebar");
- if (!this.sidebar.sidebar_expanded) {
- this.app_switcher_dropdown.removeClass("active-sidebar");
- }
- }
- toggle_dropdown() {
- if (this.drop_down_expanded) {
- this.drop_down_expanded = false;
- } else {
- this.drop_down_expanded = true;
- }
- }
-};
diff --git a/frappe/public/js/frappe/ui/desktop_icon.html b/frappe/public/js/frappe/ui/desktop_icon.html
new file mode 100644
index 0000000000..61489dfa15
--- /dev/null
+++ b/frappe/public/js/frappe/ui/desktop_icon.html
@@ -0,0 +1,21 @@
+
+ {% if (icon.logo_url) { %}
+
+
+
+
+
+ {% } else { %}
+
+ {%= frappe.utils.icon(icon.icon || "list-alt" , "lg", "", "", "text-ink-gray-7 current-color", true)%}
+
+ {% } %}
+ {% if (!in_folder) { %}
+
+ {% } %}
+
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index d40385bb85..714edade37 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -249,7 +249,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
show() {
// show it
- if (window.location.pathname.startsWith("/app")) {
+ if (window.location.pathname.startsWith("/desk")) {
this.handle_focus();
}
diff --git a/frappe/public/js/frappe/ui/keyboard.js b/frappe/public/js/frappe/ui/keyboard.js
index 020999f768..a824074298 100644
--- a/frappe/public/js/frappe/ui/keyboard.js
+++ b/frappe/public/js/frappe/ui/keyboard.js
@@ -217,6 +217,16 @@ frappe.ui.keys.add_shortcut({
description: __("Open Awesomebar"),
});
+frappe.ui.keys.add_shortcut({
+ shortcut: "ctrl+g",
+ action: function (e) {
+ $("#navbar-search").focus();
+ e.preventDefault();
+ return false;
+ },
+ description: __("Open Awesomebar"),
+});
+
frappe.ui.keys.add_shortcut({
shortcut: "alt+s",
action: function (e) {
diff --git a/frappe/public/js/frappe/ui/menu.js b/frappe/public/js/frappe/ui/menu.js
new file mode 100644
index 0000000000..c188fe7035
--- /dev/null
+++ b/frappe/public/js/frappe/ui/menu.js
@@ -0,0 +1,162 @@
+import "../dom";
+frappe.provide("frappe.ui");
+
+frappe.ui.menu = class ContextMenu {
+ constructor(menu_items, left) {
+ this.template = $(``);
+ this.menu_items = menu_items;
+ this.open_on_left = left;
+ }
+
+ make() {
+ this.template.empty();
+
+ this.menu_items.forEach((f) => {
+ this.add_menu_item(f);
+ });
+
+ if (!$.contains(document.body, this.template[0])) {
+ $(document.body).append(this.template);
+ }
+ }
+ add_menu_item(item) {
+ const me = this;
+ let item_wrapper = $(``);
+ if (!item.url) {
+ item_wrapper.on("click", function () {
+ item.onClick();
+ me.hide();
+ });
+ } else {
+ $(item_wrapper).attr("href", item.url);
+ }
+ item_wrapper.appendTo(this.template);
+ }
+ show(element) {
+ this.close_all_other_menu();
+
+ this.make();
+
+ const offset = $(element).offset();
+ const height = $(element).outerHeight();
+ this.left_offset = 0;
+
+ this.template.css({
+ display: "block",
+ position: "absolute",
+ top: offset.top + height + "px",
+ left: offset.left,
+ });
+ if (this.open_on_left) {
+ this.left_offset = element.getBoundingClientRect().width;
+ this.template.css({
+ left:
+ offset.left -
+ this.template.get(0).getBoundingClientRect().width +
+ this.left_offset +
+ "px",
+ });
+ }
+
+ this.visible = true;
+ }
+ close_all_other_menu() {
+ $(".context-menu").hide();
+ }
+ hide() {
+ this.template.css("display", "none");
+ this.visible = false;
+ }
+ mouseX(evt) {
+ if (evt.pageX) {
+ return evt.pageX;
+ } else if (evt.clientX) {
+ return (
+ evt.clientX +
+ (document.documentElement.scrollLeft
+ ? document.documentElement.scrollLeft
+ : document.body.scrollLeft)
+ );
+ } else {
+ return null;
+ }
+ }
+
+ mouseY(evt) {
+ if (evt.pageY) {
+ return evt.pageY;
+ } else if (evt.clientY) {
+ return (
+ evt.clientY +
+ (document.documentElement.scrollTop
+ ? document.documentElement.scrollTop
+ : document.body.scrollTop)
+ );
+ } else {
+ return null;
+ }
+ }
+};
+
+frappe.menu_map = {};
+
+frappe.ui.create_menu = function attachContextMenuToElement(
+ element,
+ menuItems,
+ right_click,
+ open_on_left
+) {
+ let contextMenu = new frappe.ui.menu(menuItems, open_on_left);
+
+ frappe.menu_map[$(element).data("menu")] = contextMenu;
+ if (right_click) {
+ $(element).on("contextmenu", function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ if (
+ frappe.menu_map[$(element).data("menu")] &&
+ frappe.menu_map[$(element).data("menu")].visible
+ ) {
+ frappe.menu_map[$(element).data("menu")].hide();
+ } else {
+ frappe.menu_map[$(element).data("menu")].show(this);
+ }
+ });
+ } else {
+ $(element).on("click", function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ if (frappe.menu_map[$(element).data("menu")].visible) {
+ frappe.menu_map[$(element).data("menu")].hide();
+ } else {
+ frappe.menu_map[$(element).data("menu")].show(this);
+ }
+ });
+ }
+
+ $(document).on("click", function () {
+ if (frappe.menu_map[$(element).data("menu")].visible) {
+ frappe.menu_map[$(element).data("menu")].hide();
+ }
+ });
+
+ $(document).on("keydown", function (e) {
+ if (e.key === "Escape" && frappe.menu_map[$(element).data("menu")].visible) {
+ frappe.menu_map[$(element).data("menu")].hide();
+ }
+ });
+};
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index c069f5974c..ed0225a35b 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -36,6 +36,7 @@ frappe.ui.Page = class Page {
this.views = {};
this.make();
+ if (!Object.keys(opts).includes("hide_sidebar")) this.hide_sidebar = false;
frappe.ui.pages[frappe.get_route_str()] = this;
}
@@ -136,7 +137,7 @@ frappe.ui.Page = class Page {
this.page_actions = this.wrapper.find(".page-actions");
this.filters = this.wrapper.find(".filters");
-
+ this.page_head = this.wrapper.find(".page-head");
this.btn_primary = this.page_actions.find(".primary-action");
this.btn_secondary = this.page_actions.find(".btn-secondary");
diff --git a/frappe/public/js/frappe/ui/sidebar.html b/frappe/public/js/frappe/ui/sidebar.html
deleted file mode 100644
index 1f427d438f..0000000000
--- a/frappe/public/js/frappe/ui/sidebar.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
+