Skip to content

SmythOS Studio: Open-Source Visual AI Agent Builder and deployable runtime stack from SmythOS. Start with an intuitive drag-and-drop workspace, extend with custom code, and deploy your agents anywhere — local, cloud, or edge — with full governance and control.

Refactor button handling in settings editor and dialogs to streamline save actions. Removed redundant save button logic and adjusted close button functionality to trigger saves when appropriate, enhancing UI clarity.

Muhammad Hamza Khane705aae0c0ee
diff --git a/packages/app/src/builder-ui/components/Component.class/settings-editor.ts b/packages/app/src/builder-ui/components/Component.class/settings-editor.ts
index 43ab0106..c9eeb661 100644
--- a/packages/app/src/builder-ui/components/Component.class/settings-editor.ts
+++ b/packages/app/src/builder-ui/components/Component.class/settings-editor.ts
@@ -36,11 +36,9 @@ async function onComponentLoad(sidebar) {
if (component.workspace?.locked) {
setReadonlyMode(sidebar, ['close-btn', 'action-help']);
- sidebar.querySelector('.action-save')?.classList.add('hidden');
sidebar.querySelector('.del-btn')?.classList.add('hidden');
} else {
// Always hide the top save button for manual save/cancel flow
- sidebar.querySelector('.action-save')?.classList.remove('hidden');
sidebar.querySelector('.del-btn')?.classList.remove('hidden');
sidebar.querySelector('.close-btn')?.classList.remove('hidden');
}
@@ -68,9 +66,6 @@ function onTemplateCreateLoad(sidebar) {
const closeButton: HTMLButtonElement = titleRightActions.querySelector('button.close-btn');
closeButton.classList.remove('hidden');
- const saveButton: HTMLButtonElement = titleRightActions.querySelector('button.action-save');
- saveButton.classList.add('hidden');
-
const deleteButton: HTMLButtonElement = actionElement.querySelector('button.del-btn');
deleteButton.classList.add('hidden');
//deleteButton.onclick = component.delete.bind(this, false);
@@ -960,37 +955,13 @@ export async function editSettings(component: Component) {
helpTooltip = '';
}
//show settings
- // Build bottom actions (Cancel/Save) for component settings
- const bottomActions = {
- cancel: {
- type: 'button',
- label: 'Cancel',
- class:
- 'action-cancel items-center ml-2 py-2 text-sm font-medium text-gray-500 bg-transparent hover:text-gray-900',
- click: () => {
- const closeBtn: HTMLButtonElement = document.querySelector(
- '#right-sidebar .close-btn',
- ) as HTMLButtonElement;
- closeBtn && closeBtn.click();
- },
- },
- save: {
- type: 'button',
- label: 'Save',
- class:
- 'action-save items-center py-2 text-sm font-medium bg-transparent text-blue-500 hover:text-blue-600',
- click: () => {},
- },
- };
-
- // Merge template action (if any) with bottom actions
- const mergedActions = sidebarActions ? { ...sidebarActions, ...bottomActions } : bottomActions;
+ // Remove bottom Save/Cancel actions; saving will be handled by the close 'x' button
sidebarEditValues({
title: sidebarTitleHTML,
entriesObject: { Settings: component.settingsEntries },
features: { templateVars: true },
- actions: mergedActions,
+ actions: sidebarActions || null,
onSave: onSave.bind(component),
onDraft: async function (values) {
await onDraft.apply(component, [values]);
diff --git a/packages/app/src/builder-ui/ui/dialogs.ts b/packages/app/src/builder-ui/ui/dialogs.ts
index d7dd323f..b5553cd7 100644
--- a/packages/app/src/builder-ui/ui/dialogs.ts
+++ b/packages/app/src/builder-ui/ui/dialogs.ts
@@ -112,7 +112,6 @@ export async function createRightSidebar(title?, content?, actions?, trActions?,
const titleRightActions = rightSidebar.querySelector('.title-right-buttons');
const titleLeftActions = rightSidebar.querySelector('.title-left-buttons');
const closeBtn: HTMLButtonElement = rightSidebar.querySelector('.close-btn');
- const saveBtn: HTMLButtonElement = rightSidebar.querySelector('.action-save');
if (title) sidebarTitle.innerText = title;
// Ensure title container doesn't affect vertical alignment of adjacent actions
@@ -192,12 +191,6 @@ export async function createRightSidebar(title?, content?, actions?, trActions?,
}
}
- if (saveBtn) {
- saveBtn.onclick = async () => {
- closeRightSidebar();
- };
- }
-
if (actions) {
for (let btn in actions) {
const action = actions[btn];
@@ -602,18 +595,12 @@ export async function createEmbodimentSidebar(title?, content?, actions?, toolti
sidebarActions = sidebarTitle?.querySelector?.('.actions .action-content');
const closeBtn: HTMLButtonElement = sidebarTitle.querySelector('.close-btn');
- const saveBtn: HTMLButtonElement = embodimentSidebar.querySelector('.action-save');
if (content) sidebarContent.querySelector(`.${contentCls}`).innerHTML = content;
if (closeBtn) {
closeBtn.onclick = async () => {
closeEmbodimentSidebar();
};
}
- if (saveBtn) {
- saveBtn.onclick = async () => {
- closeEmbodimentSidebar();
- };
- }
sidebarActions && toggleChildren(sidebarActions, 'action-btn-emb', 'hidden', true);
if (actions) {
@@ -1225,57 +1212,60 @@ export function sidebarEditValues({
handleTemplateVars(sidebarContent);
}
- const saveBtn: HTMLButtonElement = sidebar.querySelector('.action-save');
- if (saveBtn) {
- saveBtn.onclick = async (e) => {
- const result = {};
- let saveBeforeCloseState = 0;
- let validationToastShown = false;
+ const performSaveAndClose = async (e?: MouseEvent) => {
+ const result = {};
+ let saveBeforeCloseState = 0;
+ let validationToastShown = false;
- for (let tab in forms) {
- const form = forms[tab].form;
- const formFields = forms[tab].fields;
+ for (let tab in forms) {
+ const form = forms[tab].form;
+ const formFields = forms[tab].fields;
- dispatchSubmitEvent(form); // to trigger validation
+ dispatchSubmitEvent(form); // to trigger validation
- await delay(30);
- const invalidElements = [...form.querySelectorAll('.invalid')] as HTMLElement[];
+ await delay(30);
+ const invalidElements = [...form.querySelectorAll('.invalid')] as HTMLElement[];
- const invalid = invalidElements[0];
- const closestScrollable = form.closest('.overflow-y-auto');
- if (invalid && closestScrollable) {
- closestScrollable.scrollTo({ top: invalid.offsetTop - 50, behavior: 'smooth' });
- }
- if (invalid) {
- if (!validationToastShown) {
- errorToast('Please fix the highlighted fields and try again.', 'Validation Error');
- validationToastShown = true;
- }
- saveBeforeCloseState = 2;
- }
-
- const values = readFormValues(form, formFields);
- result[tab] = values;
+ const invalid = invalidElements[0];
+ const closestScrollable = form.closest('.overflow-y-auto');
+ if (invalid && closestScrollable) {
+ closestScrollable.scrollTo({ top: invalid.offsetTop - 50, behavior: 'smooth' });
}
- if (saveBeforeCloseState == 1) {
- closeRightSidebar();
- resolve(null);
- e.stopPropagation();
- return;
- } else if (saveBeforeCloseState == 2) {
- return false;
+ if (invalid) {
+ if (!validationToastShown) {
+ errorToast('Please fix the highlighted fields and try again.', 'Validation Error');
+ validationToastShown = true;
+ }
+ saveBeforeCloseState = 2;
}
- if (typeof onSave === 'function') onSave.apply({ sidebar }, [result]);
+
+ const values = readFormValues(form, formFields);
+ result[tab] = values;
+ }
+ if (saveBeforeCloseState == 1) {
closeRightSidebar();
- window['workspace']?.emit?.('componentUpdated', result);
- resolve(result);
- };
- saveBtn.classList.remove('hidden');
- }
+ resolve(null);
+ e?.stopPropagation?.();
+ return;
+ } else if (saveBeforeCloseState == 2) {
+ return false;
+ }
+ if (typeof onSave === 'function') onSave.apply({ sidebar }, [result]);
+ closeRightSidebar();
+ window['workspace']?.emit?.('componentUpdated', result);
+ resolve(result);
+ };
const closeBtn: HTMLButtonElement = sidebar.querySelector('.close-btn');
if (closeBtn) {
- closeBtn.onclick = async () => {
+ closeBtn.onclick = async (e) => {
+ // Save on 'x' only for standard single-tab Settings sidebars
+ const tabKeys = Object.keys(forms || {});
+ const isStandardSettings = tabKeys.length === 1 && tabKeys[0] === 'Settings';
+ if (isStandardSettings) {
+ return performSaveAndClose(e as any);
+ }
+
if (typeof onBeforeCancel === 'function') {
const canClose = await onBeforeCancel.apply({ sidebar }, [sidebar]);
if (!canClose) return;
diff --git a/packages/app/src/builder-ui/utils/component.utils/index.ts b/packages/app/src/builder-ui/utils/component.utils/index.ts
index b1bcef0a..477afccc 100644
--- a/packages/app/src/builder-ui/utils/component.utils/index.ts
+++ b/packages/app/src/builder-ui/utils/component.utils/index.ts
@@ -255,15 +255,10 @@ export async function promptVaultInfo(
target.removeAttribute('href');
target.setAttribute('data-waiting', 'true');
- const sidebarContainer = target.closest('.sidebar-container');
- const saveBtn = sidebarContainer.querySelector('.action-save') as HTMLButtonElement;
-
const spinner = createSpinner('black', 'absolute top-[5px] right-[20px]');
const fieldActions = formGroup.querySelector('.smyth-field-actions');
fieldActions.prepend(spinner);
- if (saveBtn) saveBtn.disabled = true;
-
try {
const result = await addVaultKey(
keyName || EXTENSION_COMP_NAMES.huggingFaceModel,
diff --git a/packages/app/src/builder-ui/utils/vault.utils.ts b/packages/app/src/builder-ui/utils/vault.utils.ts
index 8baa5365..92d49393 100644
--- a/packages/app/src/builder-ui/utils/vault.utils.ts
+++ b/packages/app/src/builder-ui/utils/vault.utils.ts
@@ -340,12 +340,6 @@ const _innerLink = (targetField: HTMLInputElement, message: string = '', keyName
actionBtn.appendChild(spinner);
actionBtn.disabled = true;
- const saveBtn = formGroup
- .closest('#right-sidebar')
- ?.querySelector('.action-save') as HTMLButtonElement;
-
- if (saveBtn) saveBtn.disabled = true;
-
try {
let selectedText = '';