Added zoom to metadata, tested rigorously

harshit-soora · harshit-soora · commit a90a6dce98f3 · 2025-10-17T23:24:32.000-04:00
diff --git a/apps/dashboard/app/controllers/workflows_controller.rb b/apps/dashboard/app/controllers/workflows_controller.rb
@@ -6,8 +6,7 @@ class WorkflowsController < ApplicationController
   
   # GET /projects/:id/workflows/:id
   def show
-    @project = Project.find(project_id)
-    @workflow = Workflow.find(workflow_id, project_directory)
+    return unless load_project_and_workflow_objects
     launcher_ids = @workflow.launcher_ids
 
     @launchers = Launcher.all(project_directory).select { |l| launcher_ids.include?(l.id) }
@@ -21,22 +20,14 @@ def new
 
   # GET /projects/:id/workflows/edit
   def edit
-    @workflow = Workflow.find(workflow_id, project_directory)
+    return unless load_project_and_workflow_objects
     @launchers = Launcher.all(project_directory)
-
-    return unless @workflow.nil?
-    redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_not_found', workflow_id: workflow_id)
   end
 
   # TODO to remove this with launcher_ids as we will need them after new UI
   # PATCH /projects/:id/workflows/patch
   def update
-    @workflow = Workflow.find(workflow_id, project_directory)
-
-    if @workflow.nil?
-      redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_not_found', workflow_id: workflow_id)
-      return
-    end
+    return unless load_project_and_workflow_objects
 
     if @workflow.update(update_params, true)
       redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_manifest_updated')
@@ -58,12 +49,7 @@ def create
 
   # DELETE /projects/:id/workflows/:id
   def destroy
-    @workflow = Workflow.find(workflow_id, project_directory)
-
-    if @workflow.nil?
-      redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_not_found', workflow_id: workflow_id)
-      return
-    end
+    return unless load_project_and_workflow_objects
 
     if @workflow.destroy!
       redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_deleted')
@@ -74,18 +60,8 @@ def destroy
 
   # POST /projects/:project_id/workflows/:id/save
   def save
-    @project = Project.find(project_id)
-    @workflow = Workflow.find(workflow_id, project_directory)
-    if @workflow.nil?
-      return render json: { status: 'error', message: not_found_msg }, status: :not_found
-    end
-
-    data = permit_json_data
-    boxes = data["boxes"] || []
-    edges = data["edges"] || []
-    saved_at = data["saved_at"] || Time.now.to_i
-
-    status = @workflow.update(metadata_params(boxes, edges, saved_at))
+    return unless load_project_and_workflow_objects(render_json: true)
+    status = @workflow.update(metadata_params(permit_json_data))
     if status
       render json: { status: "ok", message: "Workflow saved successfully" }
     else
@@ -95,41 +71,30 @@ def save
 
   # GET /projects/:project_id/workflows/:id/load
   def load
-    @project = Project.find(project_id)
-    @workflow = Workflow.find(workflow_id, project_directory)
-    if @workflow.nil?
-      return render json: { status: 'error', message: not_found_msg }, status: :not_found
-    end
-
+    return unless load_project_and_workflow_objects(render_json: true)
     manifest_path = @workflow.manifest_file
     unless File.exist?(manifest_path)
       return render json: { status: 'error', message: 'No saved workflow manifest found.' }, status: :not_found
     end
 
     data = YAML.load_file(manifest_path)
     metadata = data['metadata'] || {}
-
     render json: {
       status: 'ok',
       boxes: metadata['boxes'] || [],
       edges: metadata['edges'] || [],
+      zoom: metadata['zoom'] || 1.0,
       saved_at: metadata['saved_at'] || nil
     }
   end
 
 
   # POST /projects/:project_id/workflows/:id/submit
   def submit
-    @project = Project.find(project_id)
-    @workflow = Workflow.find(workflow_id, project_directory)
-
-    data = permit_json_data
-    boxes = data["boxes"] || []
-    edges = data["edges"] || []
-    saved_at = data["saved_at"] || Time.now.to_i
-
-    @workflow.update(metadata_params(boxes, edges, saved_at))
-    result = @workflow.submit(submit_params(boxes, edges))
+    return unless load_project_and_workflow_objects(render_json: true)
+    metadata = metadata_params(permit_json_data)
+    @workflow.update(metadata)
+    result = @workflow.submit(submit_params(metadata))
     if result
       render json: { status: "ok", message: "Workflow submitted successfully" }
     else
@@ -140,6 +105,19 @@ def submit
 
   private
 
+  def load_project_and_workflow_objects(render_json: false)
+    @project = Project.find(project_id)
+    @workflow = Workflow.find(workflow_id, project_directory)
+    return true if @workflow.present?
+    
+    if render_json
+      render json: { status: 'error', message: I18n.t('dashboard.jobs_workflow_not_found', workflow_id: workflow_id) }, status: :not_found
+    else 
+      redirect_to project_path(project_id), notice: I18n.t('dashboard.jobs_workflow_not_found', workflow_id: workflow_id)
+    end
+    false
+  end
+
   def index_params
     params.permit(:project_id).to_h.symbolize_keys
   end
@@ -165,11 +143,12 @@ def update_params
       .permit(:name, :description, :id, launcher_ids: [])
   end
 
-  def submit_params(boxes, edges)
+  def submit_params(metadata)
+    meta = metadata[:metadata] || {}
     { 
-      launcher_ids: boxes.map { |b| b["id"] },
-      source_ids: edges.map { |e| e["from"] },
-      target_ids: edges.map { |e| e["to"] },
+      launcher_ids: meta[:boxes].map { |b| b["id"] },
+      source_ids: meta[:edges].map { |e| e["from"] },
+      target_ids: meta[:edges].map { |e| e["to"] },
       project_dir: project_directory 
     }
   end
@@ -179,11 +158,19 @@ def project_directory
   end
 
   def permit_json_data
-    params.permit(:project_id, :id, :saved_at, boxes: [:id, :title, :row, :col], edges: [:from, :to]).to_h
+    params.permit(:project_id, :id, :zoom, :saved_at, boxes: [:id, :title, :row, :col], edges: [:from, :to]).to_h
   end
 
-  def metadata_params(boxes, edges, saved_at)
-    { metadata: { boxes: boxes, edges: edges, saved_at: saved_at} }
+  def metadata_params(json)
+    { 
+      metadata: 
+      { 
+        boxes: json["boxes"] || [], 
+        edges: json["edges"] || [], 
+        zoom: json["zoom"] || 1.0, 
+        saved_at: json["saved_at"] || Time.now.to_i
+      } 
+    }
   end
 
   def handle_workflow_error(operation)
diff --git a/apps/dashboard/app/javascript/workflows.js b/apps/dashboard/app/javascript/workflows.js
@@ -6,15 +6,17 @@ import { DAG } from './dag.js';
 
 // Handles boxes, edges, auto-save, auto-load and saving to workflow model
 class WorkflowState {
-  constructor(projectId, workflowId, boxes, edges, dag, saveUrl, submitUrl, loadUrl) {
+  constructor(projectId, workflowId, boxes, edges, dag, pointer, baseUrl) {
     this.projectId = projectId;
     this.workflowId = workflowId;
     this.boxes = boxes;
     this.edges = edges;
     this.dag = dag;
-    this.saveUrl = saveUrl;
-    this.submitUrl = submitUrl;
-    this.loadUrl = loadUrl;
+    this.pointer = pointer;
+    this.baseUrl = baseUrl;
+    this.saveUrl = `${baseUrl}/save`;
+    this.submitUrl = `${baseUrl}/submit`;
+    this.loadUrl = `${baseUrl}/load`;
     this.STORAGE_KEY = `project_${projectId}_workflow_${workflowId}_state`;
   }
 
@@ -24,6 +26,7 @@ class WorkflowState {
     this.edges.forEach(e => e.el.remove());
     this.edges.length = 0;
     this.dag.reset();
+    this.pointer.resetZoom();
     this.#clearSession();
     alert('Workflow reset.');
   }
@@ -90,9 +93,9 @@ class WorkflowState {
       if (metadata.edges) {
         metadata.edges.forEach(e => createEdge(e.from, e.to));
       }
-
-      if(metadata == backendMetadata) {
-        this.saveToSession();
+      if (metadata.zoom) {
+        this.pointer.zoomRef.value = metadata.zoom;
+        this.pointer.applyZoomCb();
       }
       console.info('Workflow restored correctly.');
     } catch (err) {
@@ -112,6 +115,7 @@ class WorkflowState {
         from: e.fromBox.id,
         to: e.toBox.id
       })),
+      zoom: this.pointer.zoomRef.value,
       saved_at: new Date().toISOString()
     };
   }
@@ -377,9 +381,7 @@ class DragController {
   const saveWorkflowButton = document.getElementById('btn-save-workflow');
   const projectId = document.getElementById('project-id').value;
   const workflowId = document.getElementById('workflow-id').value;
-  const saveWorkflowUrl = document.getElementById('save-workflow-url').value;
-  const submitWorkflowUrl = document.getElementById('submit-workflow-url').value;
-  const loadWorkflowUrl = document.getElementById('load-workflow-url').value;
+  const baseWorkflowUrl = document.getElementById('base-workflow-url').value;
   const baseLauncherUrl = document.getElementById('base-launcher-url').value;
   const styles = getComputedStyle(document.documentElement);
   const stageZoom = document.getElementById('stage-zoom');
@@ -407,7 +409,7 @@ class DragController {
   const boxes = new Map();
   const edges = [];
   const pointer = new Pointer(stage, zoomState, zoomStep, zoomMax, zoomMin, applyZoom);
-  const workflowState = new WorkflowState(projectId, workflowId, boxes, edges, dag, saveWorkflowUrl, submitWorkflowUrl, loadWorkflowUrl);
+  const workflowState = new WorkflowState(projectId, workflowId, boxes, edges, dag, pointer, baseWorkflowUrl);
   const workflowSaveCb = () => workflowState.saveToSession();
   const drag = new DragController(pointer, boxes, edges, gridCols, gridRows, cell_w, cell_h, halfGap, workflowSaveCb);
 
@@ -521,8 +523,6 @@ class DragController {
       line.classList.add('selected');
       selectedEdge = edge;
     });
-
-    workflowSaveCb();
   }
 
   function makeLauncher(row, col, id, title) {
@@ -568,10 +568,10 @@ class DragController {
             $(`#launcher_${fromId}`).removeClass('connect-queued');
             connectQueue = null;
             createEdge(fromId, toId);
+            workflowSaveCb();
           }
         });
 
-        workflowSaveCb();
         resolve();
       }).fail(function() {
         alert('Failed to load launcher HTML. Please try again.');
@@ -632,7 +632,8 @@ class DragController {
       const spawn = gridSpawn();
       if (spawn) {
         await makeLauncher(spawn.row, spawn.col, launcherId, title);
-        changeGridIfNeeded(); 
+        changeGridIfNeeded();
+        workflowSaveCb();
       }
     } finally {
       addLauncherButton.disabled = false;
diff --git a/apps/dashboard/app/views/workflows/show.html.erb b/apps/dashboard/app/views/workflows/show.html.erb
@@ -2,9 +2,7 @@
 
 <input type="hidden" id="project-id" value="<%= @project.id %>">
 <input type="hidden" id="workflow-id" value="<%= @workflow.id %>">
-<input type="hidden" id="save-workflow-url" value="<%= save_project_workflow_path(@project.id, @workflow.id) %>">
-<input type="hidden" id="submit-workflow-url" value="<%= submit_project_workflow_path(@project.id, @workflow.id) %>">
-<input type="hidden" id="load-workflow-url" value="<%= load_project_workflow_path(@project.id, @workflow.id) %>">
+<input type="hidden" id="base-workflow-url" value="<%= project_workflow_path(@project.id, @workflow.id) %>">
 <input type="hidden" id="base-launcher-url" value="<%= project_launchers_path(@project.id) %>">
 
 <div class="app" id="app">
