From efaefbe3f584822181c78d9990c88cee4f484545 Mon Sep 17 00:00:00 2001
From: Harshit Soora <soora.iitkgp@gmail.com>
Date: Thu, 30 Apr 2026 17:17:51 -0400
Subject: [PATCH 1/4] Workflows now support Advanced features to override
 launcher related params and environment variables

---
 .../app/controllers/workflows_controller.rb   |  47 ++++-
 .../app/javascript/workflow_advanced.js       | 160 ++++++++++++++++++
 apps/dashboard/app/models/workflow.rb         |  48 +++++-
 .../app/views/workflows/_advanced.html.erb    |  84 +++++++++
 .../app/views/workflows/_form.html.erb        |  46 ++++-
 apps/dashboard/config/locales/en.yml          |   4 +
 6 files changed, 371 insertions(+), 18 deletions(-)
 create mode 100644 apps/dashboard/app/javascript/workflow_advanced.js
 create mode 100644 apps/dashboard/app/views/workflows/_advanced.html.erb

diff --git a/apps/dashboard/app/controllers/workflows_controller.rb b/apps/dashboard/app/controllers/workflows_controller.rb
index e72b8219e7..46ab30d741 100644
--- a/apps/dashboard/app/controllers/workflows_controller.rb
+++ b/apps/dashboard/app/controllers/workflows_controller.rb
@@ -16,12 +16,14 @@ def show
   def new
     @workflow = Workflow.new(index_params)
     @launchers = Launcher.all(project_directory)
+    @workflow_overrides = @workflow.overrides_attributes
   end
 
   # GET /projects/:id/workflows/edit
   def edit
     return unless load_project_and_workflow_objects
     @launchers = Launcher.all(project_directory)
+    @workflow_overrides = @workflow.overrides_attributes
   end
 
   # TODO to remove this with launcher_ids as we will need them after new UI
@@ -54,9 +56,11 @@ def clone
     cloned = @workflow.deep_dup
     cloned.name += " (Copy)"
     session[:cloned_metadata] = cloned.metadata.to_h.deep_stringify_keys
+    session[:cloned_advanced_overrides] = cloned.advanced_overrides.to_h.deep_stringify_keys
 
     @workflow = cloned
     @launchers = Launcher.all(project_directory)
+    @workflow_overrides = @workflow.overrides_attributes
 
     render :new
   end
@@ -146,16 +150,46 @@ def workflow_id
   end
 
   def permit_params
-    params
+    base = params
       .require(:workflow)
       .permit(:name, :description, :id, :sync_key_enabled, launcher_ids: [])
-      .merge(project_dir: project_directory, metadata: session.delete(:cloned_metadata) || {})
+
+    base.merge(
+      project_dir: project_directory,
+      metadata: session.delete(:cloned_metadata) || {},
+      advanced_overrides: extract_advanced_overrides ||
+                          session.delete(:cloned_advanced_overrides) || {}
+    )
   end
 
   def update_params
-    params
+    base = params
       .require(:workflow)
       .permit(:name, :description, :id, :sync_key_enabled, launcher_ids: [])
+      .to_h
+
+    base[:advanced_overrides] = extract_advanced_overrides || {}
+    base
+  end
+
+  # The override form re-uses the per-launcher smart-attribute widgets, which
+  # render their fields with name="launcher[<smart_attribute_id>]". So when
+  # the workflow form is submitted, the overrides arrive at params[:launcher],
+  # not under params[:workflow]. We pull them out here.
+  #
+  # Drops blank values and the *_min / *_max / *_exclude / *_fixed config
+  # keys (those are launcher-edit-time only). Returns nil when no launcher
+  # hash was submitted at all, so callers can fall back to cloned values.
+  def extract_advanced_overrides
+    raw = params[:launcher]
+    return nil if raw.blank?
+    raw = raw.to_unsafe_h if raw.respond_to?(:to_unsafe_h)
+    raw.to_h.each_with_object({}) do |(k, v), h|
+      key = k.to_s
+      next if key.end_with?('_min', '_max', '_exclude', '_fixed')
+      next if v.nil? || v.to_s.strip.empty?
+      h[key] = v
+    end
   end
 
   def project_directory
@@ -163,7 +197,9 @@ def project_directory
   end
 
   def permit_json_data
-    params.permit(:project_id, :id, :zoom, :saved_at, :start_launcher, boxes: [:id, :title, :row, :col], edges: [:from, :to]).to_h
+    params.permit(:project_id, :id, :zoom, :saved_at, :start_launcher,
+                  boxes: [:id, :title, :row, :col],
+                  edges: [:from, :to]).to_h
   end
 
   def metadata_params(json)
@@ -191,6 +227,7 @@ def handle_workflow_error(operation)
 
     flash.now[:alert] = message
     @launchers = Launcher.all(project_directory)
+    @workflow_overrides = @workflow.overrides_attributes
     render operation == :create ? :new : :edit
   end
-end
\ No newline at end of file
+end
diff --git a/apps/dashboard/app/javascript/workflow_advanced.js b/apps/dashboard/app/javascript/workflow_advanced.js
new file mode 100644
index 0000000000..0bff0d1510
--- /dev/null
+++ b/apps/dashboard/app/javascript/workflow_advanced.js
@@ -0,0 +1,160 @@
+'use strict';
+
+/*
+ * Workflow advanced overrides — dropdown filter & repeatable fields.
+ *
+ * launcher_edit.js drives the "Add new option" dropdown from its own
+ * newFieldData object, which lists every launcher field. On the workflow
+ * page we only want to expose six of them, so we filter the dropdown
+ * after launcher_edit.js has populated it. The same hook also re-evaluates
+ * the Add/No-more-options button label based on the filtered list.
+ *
+ * auto_environment_variable is a special case: a launcher can carry
+ * arbitrarily many env vars (each one's id gets the variable name
+ * appended once the user types into the name field). To support adding
+ * multiple env vars on the workflow page too, we treat env var as
+ * always-available — never filtered out of the dropdown, never used to
+ * decide that "no more options" remain.
+ */
+
+const ALLOWED = [
+  'auto_accounts',
+  'auto_environment_variable',
+  'auto_queues',
+  'auto_batch_clusters',
+  'bc_num_hours',
+  'auto_job_name'
+];
+
+// Fields that may be added repeatedly. Their dropdown entry is never
+// filtered out, and they don't count toward the "no more options"
+// check — so the Add button stays enabled even after one is on the page.
+const REPEATABLE = ['auto_environment_variable'];
+
+// Mirrors the labels in launcher_edit.js's newFieldData, used when we
+// need to re-insert a repeatable option that launcher_edit.js skipped.
+const REPEATABLE_LABELS = {
+  auto_environment_variable: 'Environment Variable'
+};
+
+function filterDropdown(selectEl) {
+  Array.from(selectEl.options).forEach((opt) => {
+    if (ALLOWED.indexOf(opt.value) === -1) {
+      opt.remove();
+    }
+  });
+
+  // launcher_edit.js's updateNewFieldOptions skips a field if
+  // #launcher_<id> already exists. For repeatable fields we want
+  // them to keep showing up, so re-add any that got skipped.
+  REPEATABLE.forEach((id) => {
+    if (ALLOWED.indexOf(id) === -1) return;
+    const present = Array.from(selectEl.options).some((opt) => opt.value === id);
+    if (!present) {
+      const opt = document.createElement('option');
+      opt.value = id;
+      opt.text = REPEATABLE_LABELS[id] || id;
+      selectEl.add(opt);
+    }
+  });
+}
+
+function refreshAddButtonLabel() {
+  const btn = document.getElementById('add_new_field_button');
+  if (!btn) return;
+
+  // Repeatable fields always count as "still addable". For the rest,
+  // an option remains as long as #launcher_<id> isn't on the page yet.
+  const remaining = ALLOWED.some((id) => {
+    if (REPEATABLE.indexOf(id) !== -1) return true;
+    return document.getElementById('launcher_' + id) === null;
+  });
+  btn.textContent = remaining ? 'Add new option' : 'No more options';
+  btn.disabled = !remaining;
+}
+
+// launcher_edit.js wires its remove/edit click handlers like:
+//   $('.new_launcher').find('.editable-form-field').find('.btn-danger')...
+// The workflow form has no `.new_launcher` ancestor, so server-rendered
+// fields (the ones loaded from saved advanced_overrides on edit) never
+// get those handlers — meaning their Remove button does nothing.
+// Newly-added fields are unaffected because addInProgressField attaches
+// handlers inline as it inserts each field.
+//
+// We re-bind here, scoped to the advanced overrides card, so existing
+// fields behave the same as freshly-added ones.
+function wireExistingFieldHandlers() {
+  const card = document.getElementById('workflow_advanced_card');
+  if (!card) return;
+
+  // Remove (trash) buttons: drop the field from the DOM, then refresh
+  // the Add-button label. Removed fields aren't submitted, so the
+  // controller's extract_advanced_overrides will leave them out of the
+  // saved hash on the next save.
+  card.querySelectorAll('.editable-form-field .btn-danger').forEach((btn) => {
+    btn.addEventListener('click', (event) => {
+      const entireDiv = event.target.parentElement;
+      entireDiv.remove();
+      refreshAddButtonLabel();
+    });
+  });
+
+  // Edit (pencil) buttons toggle the edit panel open, mirroring
+  // launcher_edit.js's showEditField/saveEdit pair.
+  card.querySelectorAll('.editable-form-field .btn-primary').forEach((editBtn) => {
+    editBtn.addEventListener('click', (event) => {
+      const entireDiv = event.target.parentElement;
+      const editField = entireDiv.querySelector('.edit-group');
+      if (editField) editField.classList.remove('d-none');
+
+      const saveButton = entireDiv.querySelector('.btn-success');
+      if (saveButton) saveButton.classList.remove('d-none');
+      event.target.disabled = true;
+
+      if (saveButton) {
+        saveButton.onclick = (e) => {
+          const div = e.target.parentElement;
+          const ef = div.querySelector('.edit-group');
+          if (ef) ef.classList.add('d-none');
+          const sb = div.querySelector('.btn-success');
+          const eb = div.querySelector('.btn-primary');
+          if (sb) sb.classList.add('d-none');
+          if (eb) eb.disabled = false;
+        };
+      }
+    });
+  });
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+  const btn = document.getElementById('add_new_field_button');
+  if (!btn) return;
+
+  // launcher_edit.js attaches a click handler that builds the <select>.
+  // We wait one tick after that click fires so the options exist, then
+  // trim the ones we don't want.
+  btn.addEventListener('click', () => {
+    setTimeout(() => {
+      const sel = document.getElementById('add_new_field_select');
+      if (sel) filterDropdown(sel);
+    }, 0);
+  });
+
+  // Wire remove/edit handlers on server-rendered fields (saved overrides
+  // loaded on the edit page). Newly-added fields handle this themselves.
+  wireExistingFieldHandlers();
+
+  // Also correct the button label on initial load: launcher_edit.js
+  // checks against its full newFieldData, but our allowed list is shorter.
+  refreshAddButtonLabel();
+
+  // And recompute the label when an in-progress field is committed
+  // or removed. The simplest signal is a click anywhere inside the
+  // advanced card; the button text is cheap to recompute.
+  const card = document.getElementById('workflow_advanced_card');
+  if (card) {
+    card.addEventListener('click', () => {
+      setTimeout(refreshAddButtonLabel, 0);
+    });
+  }
+});
\ No newline at end of file
diff --git a/apps/dashboard/app/models/workflow.rb b/apps/dashboard/app/models/workflow.rb
index 7326ecf83a..7958d9d4c8 100644
--- a/apps/dashboard/app/models/workflow.rb
+++ b/apps/dashboard/app/models/workflow.rb
@@ -51,7 +51,8 @@ def generate_sync_key
     end
   end
 
-  attr_accessor :id, :name, :description, :project_dir, :created_at, :launcher_ids, :metadata, :sync_key_enabled
+  attr_accessor :id, :name, :description, :project_dir, :created_at,
+                :launcher_ids, :metadata, :sync_key_enabled, :advanced_overrides
 
   validates :name, presence: true
   validates :launcher_ids, length: {minimum: 1}
@@ -65,6 +66,11 @@ def initialize(attributes = {})
     @launcher_ids = attributes[:launcher_ids] || []
     @metadata = attributes[:metadata] || {}
     @sync_key_enabled = attributes[:sync_key_enabled] || "0"
+    # advanced_overrides is a flat hash keyed by smart-attribute id, e.g.
+    #   { "auto_accounts" => "PAS1234",
+    #     "bc_num_hours" => "2",
+    #     "auto_environment_variable_count" => "100" }
+    @advanced_overrides = (attributes[:advanced_overrides] || {}).to_h.stringify_keys
   end
 
   def to_h
@@ -76,7 +82,8 @@ def to_h
       :project_dir => project_dir,
       :launcher_ids => launcher_ids,
       :metadata => metadata,
-      :sync_key_enabled => sync_key_enabled
+      :sync_key_enabled => sync_key_enabled,
+      :advanced_overrides => advanced_overrides
     }
   end
 
@@ -127,9 +134,11 @@ def update(attributes, override = false)
   end
 
   def update_attrs(attributes, override = false)
-    [:name, :description, :launcher_ids, :metadata, :sync_key_enabled].each do |attribute|
+    [:name, :description, :launcher_ids, :metadata, :sync_key_enabled, :advanced_overrides].each do |attribute|
       next unless override || attributes.key?(attribute)
-      instance_variable_set("@#{attribute}".to_sym, attributes.fetch(attribute, ''))
+      value = attributes.fetch(attribute, '')
+      value = value.to_h.stringify_keys if attribute == :advanced_overrides && value.respond_to?(:to_h)
+      instance_variable_set("@#{attribute}".to_sym, value)
     end
   end
 
@@ -137,6 +146,23 @@ def editable?
     manifest_file.writable? || !shared?(manifest_file)
   end
 
+  # Build the smart-attribute objects that drive the Advanced Overrides form.
+  #
+  # We deliberately do NOT go through Launcher.new here: that constructor
+  # force-adds auto_batch_clusters and auto_scripts via add_required_fields,
+  # which we don't want on the workflow override form. Instead we just build
+  # the SmartAttribute objects directly from whatever the user has already
+  # configured in advanced_overrides. An empty workflow starts with no fields;
+  # the user adds them via "Add new option".
+  #
+  # Returns an array of SmartAttribute objects. The view treats this list
+  # the same way it treats a Launcher's cacheless_attributes.
+  def overrides_attributes
+    advanced_overrides.map do |id, value|
+      SmartAttributes::AttributeFactory.build(id.to_s, { value: value })
+    end
+  end
+
   def submit(attributes = {})
     graph = Dag.new(attributes)
     if graph.has_cycle
@@ -163,7 +189,11 @@ def submit(attributes = {})
       begin
         jobs = dependent_launchers.map { |id| job_id_hash.dig(id, :job_id) }.compact
         opts = submit_launcher_params(launcher, jobs, sync_key).to_h.symbolize_keys
+        # NOTE: write_cache: false here means the override values applied
+        # below do NOT pollute the per-launcher cache, so a solo run of the
+        # same launcher remains unaffected by these workflow-level overrides.
         job_id = launcher.submit(opts, write_cache: false)
+          Rails.logger.warn("HARSHIT #{id} with opts #{opts}.")
         if job_id.nil?
           Rails.logger.warn("Launcher #{id} with opts #{opts} did not return a job ID.")
         else
@@ -188,6 +218,16 @@ def submit_launcher_params(launcher, dependent_jobs, sync_key)
     end
     launcher_data["afterok"] = Array(dependent_jobs)
     launcher_data["ood_workflow_sync_key"] = sync_key if sync_key
+
+    # Apply workflow-level advanced overrides last, so they win against
+    # whatever the per-launcher form.yml provided. Only non-blank values
+    # override; blank fields are treated as "not set" rather than as
+    # "force this launcher's value to empty".
+    advanced_overrides.each do |key, value|
+      next if value.nil? || value.to_s.strip.empty?
+      launcher_data[key.to_s] = value
+    end
+
     launcher_data
   end
 
diff --git a/apps/dashboard/app/views/workflows/_advanced.html.erb b/apps/dashboard/app/views/workflows/_advanced.html.erb
new file mode 100644
index 0000000000..a52ef15928
--- /dev/null
+++ b/apps/dashboard/app/views/workflows/_advanced.html.erb
@@ -0,0 +1,84 @@
+<%#
+  Advanced overrides form for a workflow.
+
+  Renders a collapsible card whose body re-uses the same launcher
+  smart-attribute widgets, restricted to the six fields that make sense
+  to override at the workflow level: account, environment variable, queue,
+  cluster, hours, job name.
+
+  Fields here render with their native launcher[<id>] name, just like on
+  the launcher edit page. The workflows controller re-maps params[:launcher]
+  into workflow.advanced_overrides on submit, so the same launcher_edit.js
+  works unchanged.
+
+  Values stored in advanced_overrides are merged over each launcher's own
+  params at workflow submit time. They do NOT mutate the per-launcher
+  form.yml or its cache, so a solo launch of the same launcher is unaffected.
+
+  The companion workflow_advanced.js trims launcher_edit.js's "Add new
+  option" dropdown to our six allowed fields and keeps env vars repeatable.
+%>
+<%= javascript_include_tag 'launcher_edit', nonce: true, defer: true %>
+<%= javascript_include_tag 'workflow_advanced', nonce: true, defer: true %>
+
+<div class="card mt-3" id="workflow_advanced_card">
+  <div class="card-body">
+    <h5 class="card-title">
+      <%= t('dashboard.jobs_workflow_advanced_overrides_title') %>
+      <%= form_label_tooltip(t('dashboard.jobs_workflow_advanced_overrides_help')).html_safe %>
+    </h5>
+
+    <p class="text-muted small mb-3">
+      <%= t('dashboard.jobs_workflow_advanced_overrides_description') %>
+    </p>
+
+    <%# Render each currently-configured override using the same widget
+        renderer the launcher edit page uses. We pass a launcher-bound
+        FormBuilder (script_form_double from LaunchersHelper) so the
+        widgets render their fields with name="launcher[<id>]" — matching
+        what launcher_edit.js expects and what the controller re-maps into
+        advanced_overrides on submit. %>
+    <% @workflow_overrides.each do |attrib| %>
+      <%= create_editable_widget(script_form_double, attrib, format: nil) %>
+    <% end %>
+
+    <%# Re-use the launcher "add new option" partial verbatim so the same
+        templates (#bc_num_hours_template, #auto_queues_template, ...) drive
+        the dropdown of additional fields the user can add. %>
+    <%= render partial: 'launchers/add_new_field' %>
+  </div>
+</div>
+
+<%# launcher_edit.js clones a <template> by id (e.g. #auto_queues_template)
+    when the user clicks "Add". Those <template> blocks live on the launcher
+    edit page; the workflow page doesn't have them. Re-render only the six
+    we want to expose at the workflow level so "Add" actually inserts a
+    field. Anything not rendered here also won't be installable, even if
+    launcher_edit.js's newFieldData lists it. %>
+<template id="bc_num_hours_template">
+  <%= bc_num_hours_template %>
+</template>
+
+<template id="auto_queues_template">
+  <%= auto_queues_template %>
+</template>
+
+<template id="auto_accounts_template">
+  <%= auto_accounts_template %>
+</template>
+
+<template id="auto_job_name_template">
+  <%= auto_job_name_template %>
+</template>
+
+<template id="auto_environment_variable_template">
+  <%= auto_environment_variable_template %>
+</template>
+
+<template id="auto_batch_clusters_template">
+  <%# Re-use the same widget renderer the launcher edit page uses.
+      LaunchersHelper doesn't ship an auto_batch_clusters_template helper,
+      so we build the smart attribute inline. %>
+  <%= create_editable_widget(script_form_double,
+        SmartAttributes::AttributeFactory.build('auto_batch_clusters', {})) %>
+</template>
diff --git a/apps/dashboard/app/views/workflows/_form.html.erb b/apps/dashboard/app/views/workflows/_form.html.erb
index a869a0c19e..0e76d82914 100644
--- a/apps/dashboard/app/views/workflows/_form.html.erb
+++ b/apps/dashboard/app/views/workflows/_form.html.erb
@@ -43,15 +43,32 @@
 
           <div class="field mt-3">
             <strong>Synchronization</strong><br>
-            <div class="form-check form-switch mt-2">
-              <%= hidden_field_tag "workflow[sync_key_enabled]", "0" %>
-              <%= check_box_tag "workflow[sync_key_enabled]", "1",
-                                @workflow.sync_key_enabled == "1",
-                                id: "workflow_sync_key_enabled",
-                                class: "form-check-input" %>
-              <%= label_tag "workflow_sync_key_enabled",
-                            "Enable OOD_WORKFLOW_SYNC_KEY #{form_label_tooltip(I18n.t('dashboard.jobs_workflow_sync_key_help'))}".html_safe,
-                            class: "form-check-label" %>
+            <div class="row align-items-center mt-2">
+              <div class="col">
+                <div class="form-check form-switch">
+                  <%= hidden_field_tag "workflow[sync_key_enabled]", "0" %>
+                  <%= check_box_tag "workflow[sync_key_enabled]", "1",
+                                    @workflow.sync_key_enabled == "1",
+                                    id: "workflow_sync_key_enabled",
+                                    class: "form-check-input" %>
+                  <%= label_tag "workflow_sync_key_enabled",
+                                "Enable OOD_WORKFLOW_SYNC_KEY #{form_label_tooltip(I18n.t('dashboard.jobs_workflow_sync_key_help'))}".html_safe,
+                                class: "form-check-label" %>
+                </div>
+              </div>
+              <div class="col-auto">
+                <%# Only the Advanced button is shown on the right-hand side.
+                    Clicking it expands the override form rendered below. %>
+                <button class="btn btn-outline-secondary btn-sm"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#workflow_advanced_collapse"
+                        aria-expanded="false"
+                        aria-controls="workflow_advanced_collapse"
+                        id="workflow_advanced_toggle">
+                  <%= I18n.t('dashboard.jobs_workflow_advanced_button') %>
+                </button>
+              </div>
             </div>
           </div>
         </div>
@@ -59,6 +76,17 @@
     </div>
   </div>
 </div>
+
+<%# Collapsible Advanced overrides form, in its own partial.
+    The override widgets keep their native launcher[<id>] field names; the
+    workflows controller re-maps params[:launcher] into advanced_overrides
+    on save/update. %>
+<% if @workflow_overrides %>
+  <div class="collapse" id="workflow_advanced_collapse">
+    <%= render partial: 'advanced' %>
+  </div>
+<% end %>
+
 <br>
 <p>
   <%= form.submit I18n.t('dashboard.save'), class: 'btn btn-primary', title: 'Save project' %>
diff --git a/apps/dashboard/config/locales/en.yml b/apps/dashboard/config/locales/en.yml
index c06e652d18..020a9ecbb4 100644
--- a/apps/dashboard/config/locales/en.yml
+++ b/apps/dashboard/config/locales/en.yml
@@ -243,6 +243,10 @@ en:
     jobs_workflow_submitted: Workflow successfully submitted!
     jobs_workflow_help: Click title to select and drag. Connect by clicking two launchers with 'Connect Launchers' selected
     jobs_workflow_sync_key_help: When enabled, every launcher in this workflow receives the same <code>OOD_WORKFLOW_SYNC_KEY</code> environment variable (a random token unique to each workflow run). Useful for generating synchronized filenames, lock files, or shared identifiers across dependent jobs.
+    jobs_workflow_advanced_button: Advanced
+    jobs_workflow_advanced_overrides_title: Advanced Overrides
+    jobs_workflow_advanced_overrides_help: Values set here override the matching field on every launcher in this workflow at submit time. They are not written back to the launcher form, so a solo launch of the same launcher is unaffected.
+    jobs_workflow_advanced_overrides_description: Optional. Use these fields to fix common values (account, queue, cluster, hours, environment variables, ...) across all launchers in this workflow run.
     jobs_workflows: Workflows
     launch: Launch
     logo_alt_text: Welcome to Open OnDemand

From 6d66905999eb8111bb3d1d30045ca593562c30a6 Mon Sep 17 00:00:00 2001
From: Harshit Soora <soora.iitkgp@gmail.com>
Date: Mon, 4 May 2026 13:50:43 -0400
Subject: [PATCH 2/4] Cleaned the code

---
 .../app/controllers/workflows_controller.rb   | 52 ++++++-----------
 .../app/javascript/workflow_advanced.js       | 56 ++-----------------
 apps/dashboard/app/models/workflow.rb         | 37 ++----------
 .../app/views/workflows/_advanced.html.erb    | 41 +-------------
 .../app/views/workflows/_form.html.erb        |  6 --
 apps/dashboard/config/locales/en.yml          |  3 +-
 6 files changed, 33 insertions(+), 162 deletions(-)

diff --git a/apps/dashboard/app/controllers/workflows_controller.rb b/apps/dashboard/app/controllers/workflows_controller.rb
index 46ab30d741..6ff11720fc 100644
--- a/apps/dashboard/app/controllers/workflows_controller.rb
+++ b/apps/dashboard/app/controllers/workflows_controller.rb
@@ -16,14 +16,14 @@ def show
   def new
     @workflow = Workflow.new(index_params)
     @launchers = Launcher.all(project_directory)
-    @workflow_overrides = @workflow.overrides_attributes
+    @workflow_overrides = @workflow.override_attributes
   end
 
   # GET /projects/:id/workflows/edit
   def edit
     return unless load_project_and_workflow_objects
     @launchers = Launcher.all(project_directory)
-    @workflow_overrides = @workflow.overrides_attributes
+    @workflow_overrides = @workflow.override_attributes
   end
 
   # TODO to remove this with launcher_ids as we will need them after new UI
@@ -60,7 +60,7 @@ def clone
 
     @workflow = cloned
     @launchers = Launcher.all(project_directory)
-    @workflow_overrides = @workflow.overrides_attributes
+    @workflow_overrides = @workflow.override_attributes
 
     render :new
   end
@@ -150,45 +150,31 @@ def workflow_id
   end
 
   def permit_params
-    base = params
+    params
       .require(:workflow)
       .permit(:name, :description, :id, :sync_key_enabled, launcher_ids: [])
-
-    base.merge(
-      project_dir: project_directory,
-      metadata: session.delete(:cloned_metadata) || {},
-      advanced_overrides: extract_advanced_overrides ||
-                          session.delete(:cloned_advanced_overrides) || {}
-    )
+      .merge(
+        project_dir: project_directory, metadata: session.delete(:cloned_metadata) || {},
+        advanced_overrides: (extract_advanced_overrides || session.delete(:cloned_advanced_overrides) || {}).stringify_keys
+      )
   end
 
   def update_params
-    base = params
+    params
       .require(:workflow)
       .permit(:name, :description, :id, :sync_key_enabled, launcher_ids: [])
-      .to_h
-
-    base[:advanced_overrides] = extract_advanced_overrides || {}
-    base
+      .merge(advanced_overrides: (extract_advanced_overrides || {}).stringify_keys)
   end
 
-  # The override form re-uses the per-launcher smart-attribute widgets, which
-  # render their fields with name="launcher[<smart_attribute_id>]". So when
-  # the workflow form is submitted, the overrides arrive at params[:launcher],
-  # not under params[:workflow]. We pull them out here.
-  #
-  # Drops blank values and the *_min / *_max / *_exclude / *_fixed config
-  # keys (those are launcher-edit-time only). Returns nil when no launcher
-  # hash was submitted at all, so callers can fall back to cloned values.
+  # We use launcher's smart-attribute widgets, which render fields with name="launcher[<smart_attribute_id>]".
+  # The overrides arrive as params[:launcher], not under params[:workflow].
   def extract_advanced_overrides
     raw = params[:launcher]
     return nil if raw.blank?
     raw = raw.to_unsafe_h if raw.respond_to?(:to_unsafe_h)
-    raw.to_h.each_with_object({}) do |(k, v), h|
-      key = k.to_s
-      next if key.end_with?('_min', '_max', '_exclude', '_fixed')
-      next if v.nil? || v.to_s.strip.empty?
-      h[key] = v
+
+    raw.to_h.reject do |k, v|
+      k.to_s.end_with?('_min', '_max', '_exclude', '_fixed') || v.blank?
     end
   end
 
@@ -197,9 +183,7 @@ def project_directory
   end
 
   def permit_json_data
-    params.permit(:project_id, :id, :zoom, :saved_at, :start_launcher,
-                  boxes: [:id, :title, :row, :col],
-                  edges: [:from, :to]).to_h
+    params.permit(:project_id, :id, :zoom, :saved_at, :start_launcher, boxes: [:id, :title, :row, :col], edges: [:from, :to]).to_h
   end
 
   def metadata_params(json)
@@ -227,7 +211,7 @@ def handle_workflow_error(operation)
 
     flash.now[:alert] = message
     @launchers = Launcher.all(project_directory)
-    @workflow_overrides = @workflow.overrides_attributes
+    @workflow_overrides = @workflow.override_attributes
     render operation == :create ? :new : :edit
   end
-end
+end
\ No newline at end of file
diff --git a/apps/dashboard/app/javascript/workflow_advanced.js b/apps/dashboard/app/javascript/workflow_advanced.js
index 0bff0d1510..3073bae28d 100644
--- a/apps/dashboard/app/javascript/workflow_advanced.js
+++ b/apps/dashboard/app/javascript/workflow_advanced.js
@@ -1,20 +1,8 @@
 'use strict';
 
 /*
- * Workflow advanced overrides — dropdown filter & repeatable fields.
- *
- * launcher_edit.js drives the "Add new option" dropdown from its own
- * newFieldData object, which lists every launcher field. On the workflow
- * page we only want to expose six of them, so we filter the dropdown
- * after launcher_edit.js has populated it. The same hook also re-evaluates
- * the Add/No-more-options button label based on the filtered list.
- *
- * auto_environment_variable is a special case: a launcher can carry
- * arbitrarily many env vars (each one's id gets the variable name
- * appended once the user types into the name field). To support adding
- * multiple env vars on the workflow page too, we treat env var as
- * always-available — never filtered out of the dropdown, never used to
- * decide that "no more options" remain.
+ * launcher_edit.js drives the "Add new option" dropdown from its own newFieldData object, 
+ * which lists every launcher field. On the workflow page we only want to expose a subset of the options.
  */
 
 const ALLOWED = [
@@ -25,10 +13,6 @@ const ALLOWED = [
   'bc_num_hours',
   'auto_job_name'
 ];
-
-// Fields that may be added repeatedly. Their dropdown entry is never
-// filtered out, and they don't count toward the "no more options"
-// check — so the Add button stays enabled even after one is on the page.
 const REPEATABLE = ['auto_environment_variable'];
 
 // Mirrors the labels in launcher_edit.js's newFieldData, used when we
@@ -44,9 +28,6 @@ function filterDropdown(selectEl) {
     }
   });
 
-  // launcher_edit.js's updateNewFieldOptions skips a field if
-  // #launcher_<id> already exists. For repeatable fields we want
-  // them to keep showing up, so re-add any that got skipped.
   REPEATABLE.forEach((id) => {
     if (ALLOWED.indexOf(id) === -1) return;
     const present = Array.from(selectEl.options).some((opt) => opt.value === id);
@@ -63,8 +44,6 @@ function refreshAddButtonLabel() {
   const btn = document.getElementById('add_new_field_button');
   if (!btn) return;
 
-  // Repeatable fields always count as "still addable". For the rest,
-  // an option remains as long as #launcher_<id> isn't on the page yet.
   const remaining = ALLOWED.some((id) => {
     if (REPEATABLE.indexOf(id) !== -1) return true;
     return document.getElementById('launcher_' + id) === null;
@@ -73,24 +52,13 @@ function refreshAddButtonLabel() {
   btn.disabled = !remaining;
 }
 
-// launcher_edit.js wires its remove/edit click handlers like:
-//   $('.new_launcher').find('.editable-form-field').find('.btn-danger')...
-// The workflow form has no `.new_launcher` ancestor, so server-rendered
-// fields (the ones loaded from saved advanced_overrides on edit) never
-// get those handlers — meaning their Remove button does nothing.
-// Newly-added fields are unaffected because addInProgressField attaches
-// handlers inline as it inserts each field.
-//
-// We re-bind here, scoped to the advanced overrides card, so existing
-// fields behave the same as freshly-added ones.
+// launcher_edit.js remove/edit click handler uses: $('.new_launcher').find('.editable-form-field')...
+// The workflow form has no `.new_launcher` thus Remove button does nothing.
+// Newly-added fields are unaffected because addInProgressField attache handlers.
 function wireExistingFieldHandlers() {
   const card = document.getElementById('workflow_advanced_card');
   if (!card) return;
 
-  // Remove (trash) buttons: drop the field from the DOM, then refresh
-  // the Add-button label. Removed fields aren't submitted, so the
-  // controller's extract_advanced_overrides will leave them out of the
-  // saved hash on the next save.
   card.querySelectorAll('.editable-form-field .btn-danger').forEach((btn) => {
     btn.addEventListener('click', (event) => {
       const entireDiv = event.target.parentElement;
@@ -99,8 +67,6 @@ function wireExistingFieldHandlers() {
     });
   });
 
-  // Edit (pencil) buttons toggle the edit panel open, mirroring
-  // launcher_edit.js's showEditField/saveEdit pair.
   card.querySelectorAll('.editable-form-field .btn-primary').forEach((editBtn) => {
     editBtn.addEventListener('click', (event) => {
       const entireDiv = event.target.parentElement;
@@ -130,9 +96,7 @@ document.addEventListener('DOMContentLoaded', () => {
   const btn = document.getElementById('add_new_field_button');
   if (!btn) return;
 
-  // launcher_edit.js attaches a click handler that builds the <select>.
-  // We wait one tick after that click fires so the options exist, then
-  // trim the ones we don't want.
+  // We wait one tick after that click fires so the options exist
   btn.addEventListener('click', () => {
     setTimeout(() => {
       const sel = document.getElementById('add_new_field_select');
@@ -140,17 +104,9 @@ document.addEventListener('DOMContentLoaded', () => {
     }, 0);
   });
 
-  // Wire remove/edit handlers on server-rendered fields (saved overrides
-  // loaded on the edit page). Newly-added fields handle this themselves.
   wireExistingFieldHandlers();
-
-  // Also correct the button label on initial load: launcher_edit.js
-  // checks against its full newFieldData, but our allowed list is shorter.
   refreshAddButtonLabel();
 
-  // And recompute the label when an in-progress field is committed
-  // or removed. The simplest signal is a click anywhere inside the
-  // advanced card; the button text is cheap to recompute.
   const card = document.getElementById('workflow_advanced_card');
   if (card) {
     card.addEventListener('click', () => {
diff --git a/apps/dashboard/app/models/workflow.rb b/apps/dashboard/app/models/workflow.rb
index 7958d9d4c8..f4583f41e8 100644
--- a/apps/dashboard/app/models/workflow.rb
+++ b/apps/dashboard/app/models/workflow.rb
@@ -51,8 +51,8 @@ def generate_sync_key
     end
   end
 
-  attr_accessor :id, :name, :description, :project_dir, :created_at,
-                :launcher_ids, :metadata, :sync_key_enabled, :advanced_overrides
+  attr_accessor :id, :name, :description, :project_dir, :created_at, :launcher_ids,
+                :metadata, :sync_key_enabled, :advanced_overrides
 
   validates :name, presence: true
   validates :launcher_ids, length: {minimum: 1}
@@ -66,11 +66,7 @@ def initialize(attributes = {})
     @launcher_ids = attributes[:launcher_ids] || []
     @metadata = attributes[:metadata] || {}
     @sync_key_enabled = attributes[:sync_key_enabled] || "0"
-    # advanced_overrides is a flat hash keyed by smart-attribute id, e.g.
-    #   { "auto_accounts" => "PAS1234",
-    #     "bc_num_hours" => "2",
-    #     "auto_environment_variable_count" => "100" }
-    @advanced_overrides = (attributes[:advanced_overrides] || {}).to_h.stringify_keys
+    @advanced_overrides = attributes[:advanced_overrides] || {}
   end
 
   def to_h
@@ -136,9 +132,7 @@ def update(attributes, override = false)
   def update_attrs(attributes, override = false)
     [:name, :description, :launcher_ids, :metadata, :sync_key_enabled, :advanced_overrides].each do |attribute|
       next unless override || attributes.key?(attribute)
-      value = attributes.fetch(attribute, '')
-      value = value.to_h.stringify_keys if attribute == :advanced_overrides && value.respond_to?(:to_h)
-      instance_variable_set("@#{attribute}".to_sym, value)
+      instance_variable_set("@#{attribute}", attributes.fetch(attribute, ''))
     end
   end
 
@@ -146,18 +140,7 @@ def editable?
     manifest_file.writable? || !shared?(manifest_file)
   end
 
-  # Build the smart-attribute objects that drive the Advanced Overrides form.
-  #
-  # We deliberately do NOT go through Launcher.new here: that constructor
-  # force-adds auto_batch_clusters and auto_scripts via add_required_fields,
-  # which we don't want on the workflow override form. Instead we just build
-  # the SmartAttribute objects directly from whatever the user has already
-  # configured in advanced_overrides. An empty workflow starts with no fields;
-  # the user adds them via "Add new option".
-  #
-  # Returns an array of SmartAttribute objects. The view treats this list
-  # the same way it treats a Launcher's cacheless_attributes.
-  def overrides_attributes
+  def override_attributes
     advanced_overrides.map do |id, value|
       SmartAttributes::AttributeFactory.build(id.to_s, { value: value })
     end
@@ -189,11 +172,7 @@ def submit(attributes = {})
       begin
         jobs = dependent_launchers.map { |id| job_id_hash.dig(id, :job_id) }.compact
         opts = submit_launcher_params(launcher, jobs, sync_key).to_h.symbolize_keys
-        # NOTE: write_cache: false here means the override values applied
-        # below do NOT pollute the per-launcher cache, so a solo run of the
-        # same launcher remains unaffected by these workflow-level overrides.
         job_id = launcher.submit(opts, write_cache: false)
-          Rails.logger.warn("HARSHIT #{id} with opts #{opts}.")
         if job_id.nil?
           Rails.logger.warn("Launcher #{id} with opts #{opts} did not return a job ID.")
         else
@@ -219,12 +198,8 @@ def submit_launcher_params(launcher, dependent_jobs, sync_key)
     launcher_data["afterok"] = Array(dependent_jobs)
     launcher_data["ood_workflow_sync_key"] = sync_key if sync_key
 
-    # Apply workflow-level advanced overrides last, so they win against
-    # whatever the per-launcher form.yml provided. Only non-blank values
-    # override; blank fields are treated as "not set" rather than as
-    # "force this launcher's value to empty".
     advanced_overrides.each do |key, value|
-      next if value.nil? || value.to_s.strip.empty?
+      next if value.blank?
       launcher_data[key.to_s] = value
     end
 
diff --git a/apps/dashboard/app/views/workflows/_advanced.html.erb b/apps/dashboard/app/views/workflows/_advanced.html.erb
index a52ef15928..9f4a5f7f6a 100644
--- a/apps/dashboard/app/views/workflows/_advanced.html.erb
+++ b/apps/dashboard/app/views/workflows/_advanced.html.erb
@@ -1,23 +1,3 @@
-<%#
-  Advanced overrides form for a workflow.
-
-  Renders a collapsible card whose body re-uses the same launcher
-  smart-attribute widgets, restricted to the six fields that make sense
-  to override at the workflow level: account, environment variable, queue,
-  cluster, hours, job name.
-
-  Fields here render with their native launcher[<id>] name, just like on
-  the launcher edit page. The workflows controller re-maps params[:launcher]
-  into workflow.advanced_overrides on submit, so the same launcher_edit.js
-  works unchanged.
-
-  Values stored in advanced_overrides are merged over each launcher's own
-  params at workflow submit time. They do NOT mutate the per-launcher
-  form.yml or its cache, so a solo launch of the same launcher is unaffected.
-
-  The companion workflow_advanced.js trims launcher_edit.js's "Add new
-  option" dropdown to our six allowed fields and keeps env vars repeatable.
-%>
 <%= javascript_include_tag 'launcher_edit', nonce: true, defer: true %>
 <%= javascript_include_tag 'workflow_advanced', nonce: true, defer: true %>
 
@@ -25,36 +5,21 @@
   <div class="card-body">
     <h5 class="card-title">
       <%= t('dashboard.jobs_workflow_advanced_overrides_title') %>
-      <%= form_label_tooltip(t('dashboard.jobs_workflow_advanced_overrides_help')).html_safe %>
     </h5>
 
     <p class="text-muted small mb-3">
       <%= t('dashboard.jobs_workflow_advanced_overrides_description') %>
     </p>
 
-    <%# Render each currently-configured override using the same widget
-        renderer the launcher edit page uses. We pass a launcher-bound
-        FormBuilder (script_form_double from LaunchersHelper) so the
-        widgets render their fields with name="launcher[<id>]" — matching
-        what launcher_edit.js expects and what the controller re-maps into
-        advanced_overrides on submit. %>
     <% @workflow_overrides.each do |attrib| %>
       <%= create_editable_widget(script_form_double, attrib, format: nil) %>
     <% end %>
 
-    <%# Re-use the launcher "add new option" partial verbatim so the same
-        templates (#bc_num_hours_template, #auto_queues_template, ...) drive
-        the dropdown of additional fields the user can add. %>
     <%= render partial: 'launchers/add_new_field' %>
   </div>
 </div>
 
-<%# launcher_edit.js clones a <template> by id (e.g. #auto_queues_template)
-    when the user clicks "Add". Those <template> blocks live on the launcher
-    edit page; the workflow page doesn't have them. Re-render only the six
-    we want to expose at the workflow level so "Add" actually inserts a
-    field. Anything not rendered here also won't be installable, even if
-    launcher_edit.js's newFieldData lists it. %>
+<%# Refer app/lib/smart_attributes.rb to check for other attributes to add here%>
 <template id="bc_num_hours_template">
   <%= bc_num_hours_template %>
 </template>
@@ -76,9 +41,7 @@
 </template>
 
 <template id="auto_batch_clusters_template">
-  <%# Re-use the same widget renderer the launcher edit page uses.
-      LaunchersHelper doesn't ship an auto_batch_clusters_template helper,
-      so we build the smart attribute inline. %>
+  <%# Re-use the same widget renderer the launcher edit page uses. %>
   <%= create_editable_widget(script_form_double,
         SmartAttributes::AttributeFactory.build('auto_batch_clusters', {})) %>
 </template>
diff --git a/apps/dashboard/app/views/workflows/_form.html.erb b/apps/dashboard/app/views/workflows/_form.html.erb
index 0e76d82914..33077b7e0e 100644
--- a/apps/dashboard/app/views/workflows/_form.html.erb
+++ b/apps/dashboard/app/views/workflows/_form.html.erb
@@ -57,8 +57,6 @@
                 </div>
               </div>
               <div class="col-auto">
-                <%# Only the Advanced button is shown on the right-hand side.
-                    Clicking it expands the override form rendered below. %>
                 <button class="btn btn-outline-secondary btn-sm"
                         type="button"
                         data-bs-toggle="collapse"
@@ -77,10 +75,6 @@
   </div>
 </div>
 
-<%# Collapsible Advanced overrides form, in its own partial.
-    The override widgets keep their native launcher[<id>] field names; the
-    workflows controller re-maps params[:launcher] into advanced_overrides
-    on save/update. %>
 <% if @workflow_overrides %>
   <div class="collapse" id="workflow_advanced_collapse">
     <%= render partial: 'advanced' %>
diff --git a/apps/dashboard/config/locales/en.yml b/apps/dashboard/config/locales/en.yml
index 020a9ecbb4..563375bb74 100644
--- a/apps/dashboard/config/locales/en.yml
+++ b/apps/dashboard/config/locales/en.yml
@@ -245,8 +245,7 @@ en:
     jobs_workflow_sync_key_help: When enabled, every launcher in this workflow receives the same <code>OOD_WORKFLOW_SYNC_KEY</code> environment variable (a random token unique to each workflow run). Useful for generating synchronized filenames, lock files, or shared identifiers across dependent jobs.
     jobs_workflow_advanced_button: Advanced
     jobs_workflow_advanced_overrides_title: Advanced Overrides
-    jobs_workflow_advanced_overrides_help: Values set here override the matching field on every launcher in this workflow at submit time. They are not written back to the launcher form, so a solo launch of the same launcher is unaffected.
-    jobs_workflow_advanced_overrides_description: Optional. Use these fields to fix common values (account, queue, cluster, hours, environment variables, ...) across all launchers in this workflow run.
+    jobs_workflow_advanced_overrides_description: Optional. Use these fields to match/override (account, cluster, environment variables..) across all launchers at workflow submit. They are not written back to launcher form.
     jobs_workflows: Workflows
     launch: Launch
     logo_alt_text: Welcome to Open OnDemand

From c5f5c1c2acd522a81502d04922266f5aac149e99 Mon Sep 17 00:00:00 2001
From: Harshit Soora <soora.iitkgp@gmail.com>
Date: Mon, 4 May 2026 13:53:39 -0400
Subject: [PATCH 3/4] Minor cosmetic changes

---
 apps/dashboard/app/javascript/workflow_advanced.js | 2 +-
 apps/dashboard/app/models/workflow.rb              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/app/javascript/workflow_advanced.js b/apps/dashboard/app/javascript/workflow_advanced.js
index 3073bae28d..0fa379f35e 100644
--- a/apps/dashboard/app/javascript/workflow_advanced.js
+++ b/apps/dashboard/app/javascript/workflow_advanced.js
@@ -113,4 +113,4 @@ document.addEventListener('DOMContentLoaded', () => {
       setTimeout(refreshAddButtonLabel, 0);
     });
   }
-});
\ No newline at end of file
+});
diff --git a/apps/dashboard/app/models/workflow.rb b/apps/dashboard/app/models/workflow.rb
index f4583f41e8..1b6243f0a6 100644
--- a/apps/dashboard/app/models/workflow.rb
+++ b/apps/dashboard/app/models/workflow.rb
@@ -132,7 +132,7 @@ def update(attributes, override = false)
   def update_attrs(attributes, override = false)
     [:name, :description, :launcher_ids, :metadata, :sync_key_enabled, :advanced_overrides].each do |attribute|
       next unless override || attributes.key?(attribute)
-      instance_variable_set("@#{attribute}", attributes.fetch(attribute, ''))
+      instance_variable_set("@#{attribute}".to_sym, attributes.fetch(attribute, ''))
     end
   end
 
@@ -197,7 +197,6 @@ def submit_launcher_params(launcher, dependent_jobs, sync_key)
     end
     launcher_data["afterok"] = Array(dependent_jobs)
     launcher_data["ood_workflow_sync_key"] = sync_key if sync_key
-
     advanced_overrides.each do |key, value|
       next if value.blank?
       launcher_data[key.to_s] = value

From c5da183c5e3623e6551e0733923cc4d5f105fc33 Mon Sep 17 00:00:00 2001
From: Harshit Soora <soora.iitkgp@gmail.com>
Date: Mon, 4 May 2026 14:30:10 -0400
Subject: [PATCH 4/4] Fix spell

---
 apps/dashboard/app/javascript/workflow_advanced.js    | 2 +-
 apps/dashboard/app/views/workflows/_advanced.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dashboard/app/javascript/workflow_advanced.js b/apps/dashboard/app/javascript/workflow_advanced.js
index 0fa379f35e..4eb523c53f 100644
--- a/apps/dashboard/app/javascript/workflow_advanced.js
+++ b/apps/dashboard/app/javascript/workflow_advanced.js
@@ -54,7 +54,7 @@ function refreshAddButtonLabel() {
 
 // launcher_edit.js remove/edit click handler uses: $('.new_launcher').find('.editable-form-field')...
 // The workflow form has no `.new_launcher` thus Remove button does nothing.
-// Newly-added fields are unaffected because addInProgressField attache handlers.
+// Newly-added fields are unaffected because addInProgressField attach handlers.
 function wireExistingFieldHandlers() {
   const card = document.getElementById('workflow_advanced_card');
   if (!card) return;
diff --git a/apps/dashboard/app/views/workflows/_advanced.html.erb b/apps/dashboard/app/views/workflows/_advanced.html.erb
index 9f4a5f7f6a..c09064a391 100644
--- a/apps/dashboard/app/views/workflows/_advanced.html.erb
+++ b/apps/dashboard/app/views/workflows/_advanced.html.erb
@@ -41,7 +41,7 @@
 </template>
 
 <template id="auto_batch_clusters_template">
-  <%# Re-use the same widget renderer the launcher edit page uses. %>
+  <%# Reuse the same widget renderer the launcher edit page uses. %>
   <%= create_editable_widget(script_form_double,
         SmartAttributes::AttributeFactory.build('auto_batch_clusters', {})) %>
 </template>