[IMP] vscode,server: add tooltip, fix disabled behavior

Author: mmahrouss

server/src/core/config.rs

@@ -473,7 +473,7 @@ fn process_version(var: Sourced<String>, ws_folders: &HashMap<String, String>, w
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct ConfigEntryRaw {
-    #[serde(default = "default_name")]
+    #[serde(default = "default_profile_name")]
     pub name: String,
 
     #[serde(default, serialize_with = "serialize_option_as_default")]
@@ -528,7 +528,7 @@ pub struct ConfigEntryRaw {
 impl Default for ConfigEntryRaw {
     fn default() -> Self {
         Self {
-            name: default_name(),
+            name: default_profile_name(),
             extends: None,
             odoo_path: None,
             addons_merge: None,
@@ -574,6 +574,7 @@ impl ConfigEntryRaw {
 
 #[derive(Debug, Clone)]
 pub struct ConfigEntry {
+    pub name: String,
     pub odoo_path: Option<String>,
     pub addons_paths: HashSet<String>,
     pub python_path: String,
@@ -592,6 +593,7 @@ pub struct ConfigEntry {
 impl Default for ConfigEntry {
     fn default() -> Self {
         Self {
+            name: default_profile_name(),
             odoo_path: None,
             addons_paths: HashSet::new(),
             python_path: S!(DEFAULT_PYTHON),
@@ -618,7 +620,7 @@ impl ConfigEntry {
 pub type ConfigNew = HashMap<String, ConfigEntry>;
 
 
-fn default_name() -> String {
+pub fn default_profile_name() -> String {
     "default".to_string()
 }
 
@@ -1104,8 +1106,9 @@ fn merge_all_workspaces(
     let mut final_config: ConfigNew = HashMap::new();
     for (key, raw_entry) in merged_raw_config {
         final_config.insert(
-            key,
+            key.clone(),
             ConfigEntry {
+                name: key.clone(),
                 odoo_path: raw_entry.odoo_path.map(|op| op.value),
                 addons_paths: raw_entry.addons_paths.into_iter().flatten().map(|op| op.value).collect(),
                 python_path: raw_entry.python_path.map(|op| op.value).unwrap_or(S!(DEFAULT_PYTHON)),

server/src/core/odoo.rs

@@ -25,7 +25,7 @@ use std::path::{Path, PathBuf};
 use std::env;
 use regex::Regex;
 use crate::{constants::*, oyarn, Sy};
-use super::config::{self, get_configuration, ConfigEntry, ConfigFile, RefreshMode};
+use super::config::{self, default_profile_name, get_configuration, ConfigEntry, ConfigFile, RefreshMode};
 use super::entry_point::{EntryPoint, EntryPointMgr};
 use super::file_mgr::FileMgr;
 use super::import_resolver::ImportCache;
@@ -983,23 +983,21 @@ impl Odoo {
             }
         };
         let selected_config = match maybe_selected_config {
-            None => {
-                session.show_message(MessageType::INFO, String::from("No Odoo configuration selected. Please select a configuration in the settings."));
-                return;
-            }
-            Some(c) if c == "" => {
-                session.show_message(MessageType::INFO, String::from("No Odoo configuration selected. Please select a configuration in the settings."));
-                return;
-            }
+            None => default_profile_name(),
+            Some(c) if c == "" => default_profile_name(),
             Some(config) => config,
         };
+        if selected_config == "Disabled" {
+            info!("OdooLS is disabled. Exiting...");
+            return;
+        }
         let config = config.and_then(|(ce, _)|{
             ce.get(&selected_config).cloned().ok_or(format!("Unable to find selected configuration \"{}\"", &selected_config))
         });
         match config {
             Ok(config) => {
                 if config.abstract_ {
-                    session.show_message(MessageType::ERROR, format!("Selected configuration ({}) is abstract. Please select a valid configuration and restart.", selected_config));
+                    session.show_message(MessageType::ERROR, format!("Selected configuration ({}) is abstract. Please select a valid configuration and restart.", config.name));
                     return;
                 }
                 SyncOdoo::init(session, config);
@@ -1470,9 +1468,7 @@ impl Odoo {
         if Odoo::is_config_workspace_file(session, path) {
             let config_result =  config::get_configuration(session.sync_odoo.get_file_mgr().borrow().get_workspace_folders())
                 .and_then(|(cfg_map, cfg_file)| {
-                    let Some(config_name) = Odoo::read_selected_configuration(session)? else {
-                      return Err(S!("No configuration selected"));
-                    };
+                    let config_name = Odoo::read_selected_configuration(session)?.unwrap_or(default_profile_name());
                     cfg_map.get(&config_name)
                         .cloned()
                         .ok_or_else(|| format!("Unable to find selected configuration \"{config_name}\""))

vscode/client/extension.ts

@@ -21,6 +21,7 @@ import {
     Range,
     TextEditor,
     DecorationOptions,
+    MarkdownString,
 } from "vscode";
 import {
     LanguageClientOptions,
@@ -50,11 +51,6 @@ import { ThemeIcon } from "vscode";
 let CONFIG_HTML_MAP: Record<string, string> = {};
 let CONFIG_FILE: any = undefined;
 
-function handleSetConfigurationNotification(payload: { html: Record<string, string>, configFile: any }) {
-    CONFIG_HTML_MAP = payload.html || {};
-    CONFIG_FILE = payload.configFile;
-}
-
 function getClientOptions(): LanguageClientOptions {
     return {
         // Register the server for plain text documents
@@ -206,18 +202,44 @@ function startLangServer(
     return new SafeLanguageClient('odooServer', 'Odoo Server', serverOptions, clientOptions);
 }
 
+const RESTART_COMMAND_MD = `[$(list-unordered) Show all configurations](command:odoo.showServerConfig "Show all configurations")\n
+[$(debug-restart) Reload Server and Configuration](command:odoo.restartServer "Reload Server and Configuration")`;
+
 async function setStatusConfig(context: ExtensionContext) {
     const config = await getCurrentConfig(context);
-    let text = (config ? `Odoo (${config})` : `Odoo (Disabled)`);
+    let text = (config ? `Odoo (${config})` : `Odoo (Default)`);
     global.STATUS_BAR.text = (global.IS_LOADING) ? "$(loading~spin) " + text : text;
-}
 
+    let tooltipMd = '';
+    if (config && config !== 'Disabled') {
+        let configEntry = getCurrentConfigEntry(context);
+        if (configEntry) {
+            const odooPath = configEntry.odoo_path?.value || configEntry.odoo_path || '';
+            const pythonPath = configEntry.python_path?.value || configEntry.python_path || '';
+            let addonsPaths: string[] = [];
+            if (Array.isArray(configEntry.addons_paths)) {
+                addonsPaths = configEntry.addons_paths.map((a: any) => a.value || a).filter(Boolean);
+            }
+            tooltipMd += `**Odoo Path:** ${odooPath || 'Not set'}  \n`;
+            tooltipMd += `**Addons Paths:**  \n`
 
+            if (addonsPaths.length > 0) {
+                for (const ap of addonsPaths) {
+                    tooltipMd += `  - ${ap}  \n`;
+                }
+            } else {
+                tooltipMd += `  Not set  \n`;
+            }
+            tooltipMd += `\n\n**Python Path:**  ${pythonPath || 'Not set'}  \n`;
+            tooltipMd += `\n---\n`;
+        }
+    }
+    tooltipMd += RESTART_COMMAND_MD;
+    global.STATUS_BAR.tooltip = new MarkdownString(tooltipMd, true);
+    global.STATUS_BAR.tooltip.isTrusted = {enabledCommands: ["odoo.restartServer", "odoo.showServerConfig"]};
+}
 async function changeSelectedConfig(context: ExtensionContext, configName: string) {
   try {
-    if (configName == "Disabled"){
-        configName = undefined;
-    }
     await workspace.getConfiguration().update("Odoo.selectedProfile", configName, ConfigurationTarget.Workspace);
     return true;
   } catch (err) {
@@ -323,7 +345,16 @@ async function initLanguageServerClient(context: ExtensionContext, outputChannel
             client.onNotification("$Odoo/setPid", async(params) => {
                 global.SERVER_PID = params["server_pid"];
             }),
-            client.onNotification("$Odoo/setConfiguration", handleSetConfigurationNotification),
+            client.onNotification("$Odoo/setConfiguration", async (payload: { html: Record<string, string>, configFile: any }) =>  {
+                CONFIG_HTML_MAP = payload.html || {};
+                CONFIG_FILE = payload.configFile;
+                const selected = workspace.getConfiguration().get("Odoo.selectedProfile") as string;
+                if (selected === "Disabled" ){
+                    // Stop the client if the selected profile is "Disabled"
+                    // We already got the configurations
+                    global.LSCLIENT.stop();
+                }
+            }),
             client.onNotification("$Odoo/invalid_python_path", async(params) => {
                 await window.showErrorMessage(
                     "The Odoo extension is unable to start Python with the path you provided. Verify your configuration"
@@ -385,18 +416,9 @@ function deleteOldFiles(context: ExtensionContext) {
 async function initStatusBar(context: ExtensionContext): Promise<void> {
     global.STATUS_BAR = window.createStatusBarItem(StatusBarAlignment.Left, 100);
     global.STATUS_BAR.command = "odoo.clickStatusBar";
-    global.STATUS_BAR.tooltip = "Odoo: Change Configuration";
     context.subscriptions.push(global.STATUS_BAR);
     await setStatusConfig(context);
     global.STATUS_BAR.show();
-
-    // Add a restart button to the status bar
-    global.STATUS_BAR_RESTART = window.createStatusBarItem(StatusBarAlignment.Left, 99);
-    global.STATUS_BAR_RESTART.text = "$(refresh)";
-    global.STATUS_BAR_RESTART.tooltip = "Odoo: Restart Language Server";
-    global.STATUS_BAR_RESTART.command = "odoo.restartServer";
-    context.subscriptions.push(global.STATUS_BAR_RESTART);
-    global.STATUS_BAR_RESTART.show();
 }