Merge pull request #1358 from OpenFn/worker_and_save_run_glitch

close #1356 and close #1357
OpenFn · Nov 10, 2023 · 3f5b680 · 3f5b680
2 parents 8a6f463 + 3d8eb25
commit 3f5b680
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/assets/package-lock.json b/assets/package-lock.json
diff --git a/assets/package.json b/assets/package.json
@@ -35,7 +35,7 @@
     "zustand": "^4.3.7"
   },
   "devDependencies": {
-    "@openfn/ws-worker": "^0.2.0",
+    "@openfn/ws-worker": "^0.2.1",
     "@types/marked": "^4.0.8",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",

diff --git a/lib/lightning_web/live/workflow_live/edit.ex b/lib/lightning_web/live/workflow_live/edit.ex
@@ -121,7 +121,7 @@ defmodule LightningWeb.WorkflowLive.Edit do
                       form={@manual_run_form.id}
                       disabled={@save_and_run_disabled}
                     >
-                      <.icon name="hero-play-solid" class="w-4 h-4" /> Save + Run
+                      <.icon name="hero-play-solid" class="w-4 h-4" /> Save & Run
                     </.button>
                   </div>
 
@@ -762,7 +762,16 @@ defmodule LightningWeb.WorkflowLive.Edit do
         can_edit_job: can_edit_job,
         can_run_job: can_run_job
       } ->
-        manual_run_form.source.errors |> Enum.any?() or
+        form_valid =
+          if manual_run_form.source.errors == [
+               created_by: {"can't be blank", [validation: :required]}
+             ] and Map.get(manual_run_form.params, "dataclip_id") do
+            true
+          else
+            !Enum.any?(manual_run_form.source.errors)
+          end
+
+        !form_valid or
           !changeset.valid? or
           !(can_edit_job or can_run_job)
     end

diff --git a/test/lightning_web/live/workflow_live/editor_test.exs b/test/lightning_web/live/workflow_live/editor_test.exs
@@ -300,6 +300,12 @@ defmodule LightningWeb.WorkflowLive.EditorTest do
         )
 
       assert render(element) =~ "selected"
+
+      refute view
+             |> element(
+               ~s{button[type='submit'][form='manual_run_form'][disabled]}
+             )
+             |> has_element?()
     end
   end