From 06cd8ad0d55e43d77aa2055433589fa5d18418dd Mon Sep 17 00:00:00 2001
From: Ian Chua <iancrb00@gmail.com>
Date: Tue, 14 Jul 2026 14:42:32 +0800
Subject: [PATCH] chore: UI Updates

---
 .../web/dialog/PluginsConfigDialog/index.html |  6 +-
 .../web/dialog/PluginsConfigDialog/index.js   | 77 +++++++------------
 .../web/dialog/PluginsConfigDialog/styles.css | 27 -------
 resources/web/dialog/PluginsDialog/index.html |  4 +-
 resources/web/dialog/PluginsDialog/index.js   | 49 ++++++------
 src/slic3r/GUI/PluginsConfigDialog.cpp        |  2 -
 src/slic3r/Utils/OrcaCloudServiceAgent.cpp    | 23 +++---
 src/slic3r/plugin/PluginConfig.hpp            |  6 --
 src/slic3r/plugin/PresetPluginConfig.cpp      | 11 ---
 src/slic3r/plugin/PresetPluginConfig.hpp      |  3 -
 10 files changed, 67 insertions(+), 141 deletions(-)
diff --git a/resources/web/dialog/PluginsConfigDialog/index.html b/resources/web/dialog/PluginsConfigDialog/index.html
index 022af857cd..8e44bac35d 100644
--- a/resources/web/dialog/PluginsConfigDialog/index.html
+++ b/resources/web/dialog/PluginsConfigDialog/index.html
@@ -13,8 +13,7 @@
 <body>
   <main class="page">
     <header class="page-header">
-      <h1 id="pageTitle" class="page-title">Plugin configuration</h1>
-      <p id="pageSubtitle" class="page-subtitle"></p>
+      <h1 id="pagePresetName" class="page-title"></h1>
     </header>
 
     <div id="configEmpty" class="detail-empty">This preset does not use any plugin capabilities</div>
@@ -24,9 +23,6 @@
         aria-label="Capabilities used by this preset"></div>
       <div class="config-view">
         <div id="configError" class="config-error" role="status" aria-live="polite" hidden></div>
-        <div id="configMeta" class="config-meta" hidden>
-          <span id="configSourceBadge" class="config-source-badge"></span>
-        </div>
         <div id="configEditor" class="config-editor" hidden>
           <textarea id="configText" class="config-textarea thin-scroll" spellcheck="false"
             autocomplete="off" autocapitalize="off" aria-label="Capability configuration (JSON)"></textarea>
diff --git a/resources/web/dialog/PluginsConfigDialog/index.js b/resources/web/dialog/PluginsConfigDialog/index.js
index 342349e52c..013ec7ac16 100644
--- a/resources/web/dialog/PluginsConfigDialog/index.js
+++ b/resources/web/dialog/PluginsConfigDialog/index.js
@@ -65,13 +65,9 @@ function ShowStatusMessage(message, level) {
 function ApplyCapabilities(payload) {
   capabilities = Array.isArray(payload.data) ? payload.data : [];
 
-  const title = document.getElementById("pageTitle");
-  if (title)
-    title.textContent = String(payload.title || "Plugin configuration");
-
-  const subtitle = document.getElementById("pageSubtitle");
-  if (subtitle)
-    subtitle.textContent = String(payload.preset_name || "");
+  const presetName = document.getElementById("pagePresetName");
+  if (presetName)
+    presetName.textContent = String(payload.preset_name || "");
 
   RenderCapabilities();
 }
@@ -191,7 +187,6 @@ function ClearCapabilityConfigView() {
   const text = document.getElementById("configText");
   const error = document.getElementById("configError");
   const footer = document.getElementById("configFooter");
-  const meta = document.getElementById("configMeta");
 
   if (editor)
     editor.hidden = true;
@@ -207,32 +202,23 @@ function ClearCapabilityConfigView() {
   }
   if (footer)
     footer.hidden = true;
-  if (meta)
-    meta.hidden = true;
   selectedHasPresetOverride = false;
   selectedReadOnly = false;
   SetConfigValidation("");
 }
 
-function UpdateConfigMeta(payload) {
+// A read-only capability cannot be saved, and there is nothing to restore until the preset overrides
+// the global configuration.
+function UpdateConfigActions(payload) {
   selectedHasPresetOverride = payload?.has_preset_override === true;
   selectedReadOnly = payload?.read_only === true;
 
-  const meta = document.getElementById("configMeta");
-  const badge = document.getElementById("configSourceBadge");
   const save = document.getElementById("configSaveBtn");
   const restore = document.getElementById("configRestoreBtn");
-  if (!meta || !badge)
-    return;
-
-  const source = String(payload?.source || "none");
-  badge.textContent = source === "preset" ? "Preset override" :
-    (source === "base" ? "Inherited from global configuration" : "No saved configuration");
   if (save)
     save.disabled = selectedReadOnly;
   if (restore)
     restore.disabled = selectedReadOnly || !selectedHasPresetOverride;
-  meta.hidden = false;
 }
 
 function ApplyCapabilityConfig(payload) {
@@ -252,10 +238,13 @@ function ApplyCapabilityConfig(payload) {
 
   const config = payload && Object.prototype.hasOwnProperty.call(payload, "config") ? payload.config : {};
   const html = String(payload?.custom_html || "");
-  UpdateConfigMeta(payload);
+  UpdateConfigActions(payload);
 
-  // Restore applies to either editor; Save and validation belong to the JSON editor only.
-  ShowConfigFooter(!html);
+  // The footer belongs to the JSON editor. A custom UI owns its whole surface, including whatever
+  // save/restore controls it wants, and reaches the host through the window.orca bridge.
+  const footer = document.getElementById("configFooter");
+  if (footer)
+    footer.hidden = html !== "";
 
   if (html) {
     if (custom) {
@@ -279,20 +268,6 @@ function ApplyCapabilityConfig(payload) {
   SetConfigValidation("");
 }
 
-// withEditorControls is false for a custom UI, which saves through its own controls.
-function ShowConfigFooter(withEditorControls) {
-  const footer = document.getElementById("configFooter");
-  const save = document.getElementById("configSaveBtn");
-  const validation = document.getElementById("configValidation");
-
-  if (footer)
-    footer.hidden = false;
-  if (save)
-    save.hidden = !withEditorControls;
-  if (validation)
-    validation.hidden = !withEditorControls;
-}
-
 function SetConfigValidation(message) {
   const node = document.getElementById("configValidation");
   const save = document.getElementById("configSaveBtn");
@@ -379,8 +354,9 @@ function ApplyCapabilityConfigSaved(payload) {
   SetConfigValidation("");
 }
 
-// The whole host surface a custom config UI gets: read the config, save one, be told when a save
-// lands. The frame is sandboxed into an opaque origin, so this bridge is its only channel.
+// The whole host surface a custom config UI gets: read the config, save one, drop the preset's
+// override, and be told when either lands. The frame is sandboxed into an opaque origin, so this
+// bridge is its only channel.
 function BuildCustomConfigDocument(html, config) {
   // Inlined into a <script>: a stored "</script>" would close the tag early, so escape "<" — the
   // literal stays valid JSON.
@@ -392,6 +368,7 @@ function BuildCustomConfigDocument(html, config) {
   window.orca = {
     getConfig: function () { return current; },
     saveConfig: function (cfg) { parent.postMessage({ __orca: "save", config: cfg }, "*"); },
+    restoreDefaults: function () { parent.postMessage({ __orca: "restore" }, "*"); },
     onConfig: function (cb) {
       if (typeof cb !== "function") return;
       handlers.push(cb);
@@ -417,17 +394,21 @@ function OnCustomConfigMessage(event) {
     return;
 
   const data = event.data;
-  if (!data || data.__orca !== "save")
-    return;
-  if (!selectedPluginKey || !selectedCapabilityName)
+  if (!data || !selectedPluginKey || !selectedCapabilityName)
     return;
 
-  SendMessage("save_capability_config", {
-    plugin_key: selectedPluginKey,
-    capability_name: selectedCapabilityName,
-    capability_type: selectedCapabilityType,
-    config: data.config === undefined ? {} : data.config
-  });
+  if (data.__orca === "save") {
+    SendMessage("save_capability_config", {
+      plugin_key: selectedPluginKey,
+      capability_name: selectedCapabilityName,
+      capability_type: selectedCapabilityType,
+      config: data.config === undefined ? {} : data.config
+    });
+    return;
+  }
+
+  if (data.__orca === "restore")
+    RestoreCapabilityConfig();
 }
 
 document.addEventListener("DOMContentLoaded", () => {
diff --git a/resources/web/dialog/PluginsConfigDialog/styles.css b/resources/web/dialog/PluginsConfigDialog/styles.css
index 7fe45a721d..be5b5e2914 100644
--- a/resources/web/dialog/PluginsConfigDialog/styles.css
+++ b/resources/web/dialog/PluginsConfigDialog/styles.css
@@ -40,12 +40,6 @@ body {
   font-weight: 600;
 }
 
-.page-subtitle {
-  margin: 4px 0 0;
-  font-size: 12px;
-  opacity: 0.7;
-}
-
 /* ---- Ported from resources/web/dialog/PluginsDialog/styles.css (Config tab) ---- */
 
 .detail-empty {
@@ -138,27 +132,6 @@ body {
   display: none;
 }
 
-.config-meta {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.config-meta[hidden] {
-  display: none;
-}
-
-.config-source-badge {
-  display: inline-flex;
-  align-items: center;
-  min-height: 24px;
-  padding: 0 10px;
-  border: 1px solid var(--border);
-  border-radius: 999px;
-  color: var(--muted);
-  font-size: 11px;
-}
-
 .config-editor {
   display: flex;
   flex: 1;
diff --git a/resources/web/dialog/PluginsDialog/index.html b/resources/web/dialog/PluginsDialog/index.html
index 247c021dde..68f3eab3b0 100644
--- a/resources/web/dialog/PluginsDialog/index.html
+++ b/resources/web/dialog/PluginsDialog/index.html
@@ -157,8 +157,8 @@
                      window.orca bridge. -->
                 <iframe id="configCustom" class="config-custom" title="Plugin configuration"
                   sandbox="allow-scripts" referrerpolicy="no-referrer" hidden></iframe>
-                <!-- Host chrome for both editors: a custom UI needs Restore too, and keeping it here
-                     leaves it off the JS bridge. Save and validation are JSON-editor only. -->
+                <!-- JSON-editor chrome only: a custom UI renders its own save/restore controls and
+                     drives them through the window.orca bridge. -->
                 <div id="configFooter" class="config-view-footer" hidden>
                   <span id="configValidation" class="config-validation" role="status" aria-live="polite"></span>
                   <div class="config-actions">
diff --git a/resources/web/dialog/PluginsDialog/index.js b/resources/web/dialog/PluginsDialog/index.js
index 408bae8494..bb77411e1b 100644
--- a/resources/web/dialog/PluginsDialog/index.js
+++ b/resources/web/dialog/PluginsDialog/index.js
@@ -975,8 +975,11 @@ function ApplyCapabilityConfig(payload) {
   const config = (payload && typeof payload.config === "object" && payload.config !== null) ? payload.config : {};
   const html = String(payload?.custom_html || "");
 
-  // Restore applies to either editor; Save and validation belong to the JSON editor only.
-  ShowConfigFooter(!html);
+  // The footer belongs to the JSON editor. A custom UI owns its whole surface, including whatever
+  // save/restore controls it wants, and reaches the host through the window.orca bridge.
+  const footer = document.getElementById("configFooter");
+  if (footer)
+    footer.hidden = html !== "";
 
   if (html) {
     if (custom) {
@@ -1000,20 +1003,6 @@ function ApplyCapabilityConfig(payload) {
   SetConfigValidation("");
 }
 
-// withEditorControls is false for a custom UI, which saves through its own controls.
-function ShowConfigFooter(withEditorControls) {
-  const footer = document.getElementById("configFooter");
-  const save = document.getElementById("configSaveBtn");
-  const validation = document.getElementById("configValidation");
-
-  if (footer)
-    footer.hidden = false;
-  if (save)
-    save.hidden = !withEditorControls;
-  if (validation)
-    validation.hidden = !withEditorControls;
-}
-
 function SetConfigValidation(message) {
   const node = document.getElementById("configValidation");
   const save = document.getElementById("configSaveBtn");
@@ -1096,8 +1085,9 @@ function ApplyCapabilityConfigSaved(payload) {
   SetConfigValidation("");
 }
 
-// The whole host surface a custom config UI gets: read the config, save one, be told when a save
-// lands. The frame is sandboxed into an opaque origin, so this bridge is its only channel.
+// The whole host surface a custom config UI gets: read the config, save one, restore the plugin's
+// defaults, and be told when either lands. The frame is sandboxed into an opaque origin, so this
+// bridge is its only channel.
 function BuildCustomConfigDocument(html, config) {
   // Inlined into a <script>: a stored "</script>" would close the tag early, so escape "<" — the
   // literal stays valid JSON.
@@ -1109,6 +1099,7 @@ function BuildCustomConfigDocument(html, config) {
   window.orca = {
     getConfig: function () { return current; },
     saveConfig: function (cfg) { parent.postMessage({ __orca: "save", config: cfg }, "*"); },
+    restoreDefaults: function () { parent.postMessage({ __orca: "restore" }, "*"); },
     onConfig: function (cb) {
       if (typeof cb !== "function") return;
       handlers.push(cb);
@@ -1134,17 +1125,21 @@ function OnCustomConfigMessage(event) {
     return;
 
   const data = event.data;
-  if (!data || data.__orca !== "save")
-    return;
-  if (!selectedPluginId || !selectedCapabilityName)
+  if (!data || !selectedPluginId || !selectedCapabilityName)
     return;
 
-  SendMessage("save_capability_config", {
-    plugin_key: selectedPluginId,
-    capability_name: selectedCapabilityName,
-    capability_type: selectedCapabilityType,
-    config: data.config === undefined ? {} : data.config
-  });
+  if (data.__orca === "save") {
+    SendMessage("save_capability_config", {
+      plugin_key: selectedPluginId,
+      capability_name: selectedCapabilityName,
+      capability_type: selectedCapabilityType,
+      config: data.config === undefined ? {} : data.config
+    });
+    return;
+  }
+
+  if (data.__orca === "restore")
+    RestoreCapabilityConfig();
 }
 
 function RenderThumbnail(plugin) {
diff --git a/src/slic3r/GUI/PluginsConfigDialog.cpp b/src/slic3r/GUI/PluginsConfigDialog.cpp
index 6172be5e5c..930f219869 100644
--- a/src/slic3r/GUI/PluginsConfigDialog.cpp
+++ b/src/slic3r/GUI/PluginsConfigDialog.cpp
@@ -136,7 +136,6 @@ void PluginsConfigDialog::send_capabilities()
     nlohmann::json response;
     response["command"]     = "list_capabilities";
     response["preset_type"] = static_cast<int>(m_type);
-    response["title"]       = into_u8(preset_type_title(m_type));
     response["preset_name"] = preset->name;
     response["data"]        = PluginConfig::capabilities_payload(capabilities_in_use(m_type, *preset));
 
@@ -166,7 +165,6 @@ void PluginsConfigDialog::send_capability_config(const PluginCapabilityIdentifie
 
     const EffectiveCapabilityConfig effective = m_service.get_effective_config(m_overrides, id);
     response["config"]                 = effective.config;
-    response["source"]                 = plugin_config_source_to_string(effective.source);
     response["has_preset_override"]    = effective.has_preset_override;
     response["has_base_config"]        = effective.has_base_config;
     response["stored_plugin_version"]  = effective.stored_plugin_version;
diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
index fcbaa254c3..b3f05b429c 100644
--- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
+++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp
@@ -3094,6 +3094,17 @@ static bool cloud_media_is_image(const nlohmann::json& main_image)
     return lowered(get_json_string_field(main_image, "media_type")) == "image";
 }
 
+// creator_display_name degrades to the creator's username and then to their raw user id when the
+// cloud cannot resolve a profile, so a bare id is dropped rather than shown: the author then falls
+// back to the one the plugin's own manifest declares (see apply_plugin_metadata_fallbacks).
+static std::string parse_cloud_author(const nlohmann::json& item)
+{
+    std::string author = get_json_string_field(item, "creator_display_name");
+    if (author.empty() || is_uuid(author))
+        author = get_json_string_field(item, "creator_username");
+    return is_uuid(author) ? std::string() : author;
+}
+
 int OrcaCloudServiceAgent::fetch_subscribed_manifests_into_descriptors(std::vector<PluginDescriptor>& descriptors,
                                                             std::vector<std::string>& not_found,
                                                             std::vector<std::string>& unauthorized)
@@ -3137,11 +3148,7 @@ int OrcaCloudServiceAgent::fetch_subscribed_manifests_into_descriptors(std::vect
             descriptor.plugin_key  = uuid;
             // Cloud API "description" is intentionally not parsed: descriptions come only from the
             // plugin's Python header once installed. Cloud-only rows show a "View on OrcaCloud" link.
-            descriptor.author      = get_json_string_field(item, "author");
-            if (descriptor.author.empty())
-                descriptor.author = get_json_string_field(item, "creator_display_name");
-            if (descriptor.author.empty())
-                descriptor.author = get_json_string_field(item, "creator_username");
+            descriptor.author      = parse_cloud_author(item);
             descriptor.version    = get_json_string_field(item, "version");
             descriptor.latest_version = descriptor.version;
             // Cloud "type" is cosmetic (see parse_cloud_display_types); real capability_types are
@@ -3239,11 +3246,7 @@ int OrcaCloudServiceAgent::fetch_mine_manifests_into_descriptors(std::vector<Plu
                 descriptor.plugin_key  = uuid;
                 // Cloud API "description" is intentionally not parsed: descriptions come only from the
                 // plugin's Python header once installed. Cloud-only rows show a "View on OrcaCloud" link.
-                descriptor.author      = get_json_string_field(item, "author");
-                if (descriptor.author.empty())
-                    descriptor.author = get_json_string_field(item, "creator_display_name");
-                if (descriptor.author.empty())
-                    descriptor.author = get_json_string_field(item, "creator_username");
+                descriptor.author      = parse_cloud_author(item);
                 descriptor.version    = get_json_string_field(item, "version");
                 descriptor.latest_version = descriptor.version;
                 // Cloud "type" is cosmetic (see parse_cloud_display_types); real capability_types are
diff --git a/src/slic3r/plugin/PluginConfig.hpp b/src/slic3r/plugin/PluginConfig.hpp
index 39b16fe51b..d7cb513e49 100644
--- a/src/slic3r/plugin/PluginConfig.hpp
+++ b/src/slic3r/plugin/PluginConfig.hpp
@@ -18,12 +18,6 @@ namespace Slic3r {
 
 class PluginCapabilityInterface;
 
-enum class PluginConfigSource {
-    None,
-    Base,
-    Preset,
-};
-
 /*
 Example config.json shape
 {
diff --git a/src/slic3r/plugin/PresetPluginConfig.cpp b/src/slic3r/plugin/PresetPluginConfig.cpp
index 94683cb192..ee7154cf11 100644
--- a/src/slic3r/plugin/PresetPluginConfig.cpp
+++ b/src/slic3r/plugin/PresetPluginConfig.cpp
@@ -91,15 +91,6 @@ std::string serialize_plugin_overrides(const CapabilityConfigDocument& document)
     return document.empty() ? std::string() : document.serialize_entries().dump();
 }
 
-std::string plugin_config_source_to_string(PluginConfigSource source)
-{
-    switch (source) {
-    case PluginConfigSource::Preset: return "preset";
-    case PluginConfigSource::Base: return "base";
-    default: return "none";
-    }
-}
-
 EffectiveCapabilityConfig PresetPluginConfigService::get_effective_config(const CapabilityConfigDocument&   overrides,
                                                                          const PluginCapabilityIdentifier& id) const
 {
@@ -112,14 +103,12 @@ EffectiveCapabilityConfig PresetPluginConfigService::get_effective_config(const
 
     if (const auto entry = overrides.find(result.id)) {
         result.has_preset_override   = true;
-        result.source                = PluginConfigSource::Preset;
         result.config                = entry->cap_config;
         result.stored_plugin_version = entry->plugin_version;
         return result;
     }
 
     if (result.has_base_config) {
-        result.source                = PluginConfigSource::Base;
         result.config                = base.config;
         result.stored_plugin_version = base.plugin_version;
     }
diff --git a/src/slic3r/plugin/PresetPluginConfig.hpp b/src/slic3r/plugin/PresetPluginConfig.hpp
index b37e64de28..ca3a978629 100644
--- a/src/slic3r/plugin/PresetPluginConfig.hpp
+++ b/src/slic3r/plugin/PresetPluginConfig.hpp
@@ -30,7 +30,6 @@ struct EffectiveCapabilityConfig
 {
     CapabilityConfigId id;
     nlohmann::json     config = nlohmann::json::object();
-    PluginConfigSource source = PluginConfigSource::None;
 
     bool        has_preset_override = false;
     bool        has_base_config     = false;
@@ -46,8 +45,6 @@ struct MutationResult
     EffectiveCapabilityConfig effective;
 };
 
-std::string plugin_config_source_to_string(PluginConfigSource source);
-
 // Resolves a capability's effective config as `preset override -> base config -> none`, and mutates
 // the override layer. It works on a CapabilityConfigDocument the caller owns, never on a Preset and
 // never on the base config file, which keeps the two layers from writing to each other:
