in new credential dialog, add credentials to root project too

Author: josephjclark

lib/lightning_web/live/credential_live/credential_index_component.ex

@@ -91,15 +91,9 @@ defmodule LightningWeb.CredentialLive.CredentialIndexComponent do
   def handle_event("show_modal", %{"target" => "new_credential"}, socket) do
     if socket.assigns.can_create_project_credential do
       project_credentials =
-        if socket.assigns.project do
-          [
-            %Lightning.Projects.ProjectCredential{
-              project_id: socket.assigns.project.id
-            }
-          ]
-        else
-          []
-        end
+        LightningWeb.CredentialLive.Helpers.default_project_credentials(
+          socket.assigns.project
+        )
 
       {:noreply,
        assign(socket,

lib/lightning_web/live/credential_live/helpers.ex

@@ -145,6 +145,24 @@ defmodule LightningWeb.CredentialLive.Helpers do
     }
   end
 
+  @doc """
+  Builds the `project_credentials` to pre-select when creating a credential in
+  a project context: the active project plus its root parent project (when the
+  active project is a sandbox), deduplicated and order-preserving.
+
+  Returns an empty list when there is no project context.
+  """
+  @spec default_project_credentials(Lightning.Projects.Project.t() | nil) ::
+          [Lightning.Projects.ProjectCredential.t()]
+  def default_project_credentials(nil), do: []
+
+  def default_project_credentials(%Lightning.Projects.Project{} = project) do
+    [project, Lightning.Projects.root_of(project)]
+    |> Enum.map(& &1.id)
+    |> Enum.uniq()
+    |> Enum.map(&%Lightning.Projects.ProjectCredential{project_id: &1})
+  end
+
   def handle_save_response(socket, credential) do
     if socket.assigns[:on_save] do
       socket.assigns[:on_save].(credential)

lib/lightning_web/live/workflow_live/collaborate.ex

@@ -18,6 +18,7 @@ defmodule LightningWeb.WorkflowLive.Collaborate do
   alias Lightning.Workflows.WebhookAuthMethod
   alias Lightning.Workflows.Workflow
   alias LightningWeb.Channels.WorkflowJSON
+  alias LightningWeb.CredentialLive
 
   on_mount({LightningWeb.Hooks, :project_scope})
   on_mount({LightningWeb.Hooks, :check_limits})
@@ -45,6 +46,8 @@ defmodule LightningWeb.WorkflowLive.Collaborate do
        show_credential_modal: false,
        credential_schema: nil,
        credential_to_edit: nil,
+       new_credential_project_credentials:
+         CredentialLive.Helpers.default_project_credentials(project),
        show_webhook_auth_modal: false,
        webhook_auth_method: nil,
        ai_assistant_enabled: AiAssistant.enabled?()
@@ -223,11 +226,7 @@ defmodule LightningWeb.WorkflowLive.Collaborate do
           %Lightning.Credentials.Credential{
             schema: @credential_schema,
             user_id: @current_user.id,
-            project_credentials: [
-              %Lightning.Projects.ProjectCredential{
-                project_id: @project.id
-              }
-            ]
+            project_credentials: @new_credential_project_credentials
           }
       }
       on_save={

lib/lightning_web/live/workflow_live/edit.ex

@@ -454,11 +454,7 @@ defmodule LightningWeb.WorkflowLive.Edit do
             credential={
               %Lightning.Credentials.Credential{
                 user_id: @current_user.id,
-                project_credentials: [
-                  %Lightning.Projects.ProjectCredential{
-                    project_id: @project.id
-                  }
-                ]
+                project_credentials: @new_credential_project_credentials
               }
             }
             current_user={@current_user}
@@ -1462,6 +1458,10 @@ defmodule LightningWeb.WorkflowLive.Edit do
        show_canvas_placeholder: assigns.live_action == :new,
        show_workflow_ai_chat: false,
        show_job_credential_modal: false,
+       new_credential_project_credentials:
+         LightningWeb.CredentialLive.Helpers.default_project_credentials(
+           assigns.project
+         ),
        active_modal: nil,
        active_modal_assigns: nil,
        admin_contacts: Projects.list_project_admin_emails(assigns.project.id),

test/lightning_web/live/credential_live_helpers_test.exs

@@ -247,4 +247,33 @@ defmodule LightningWeb.CredentialLive.HelpersTest do
       assert updated.available_projects == projects
     end
   end
+
+  describe "default_project_credentials/1" do
+    test "returns an empty list without a project context" do
+      assert Helpers.default_project_credentials(nil) == []
+    end
+
+    test "returns only the project itself for a root project" do
+      project = insert(:project)
+
+      assert [%{project_id: project_id}] =
+               Helpers.default_project_credentials(project)
+
+      assert project_id == project.id
+    end
+
+    test "returns the sandbox and its root parent for a sandbox" do
+      root = insert(:project)
+      child = insert(:project, parent_id: root.id)
+      grandchild = insert(:project, parent_id: child.id)
+
+      project_ids =
+        grandchild
+        |> Helpers.default_project_credentials()
+        |> Enum.map(& &1.project_id)
+
+      # The active (sandbox) project and the root parent, not the intermediate.
+      assert project_ids == [grandchild.id, root.id]
+    end
+  end
 end

test/lightning_web/live/project_live_test.exs

@@ -1021,6 +1021,50 @@ defmodule LightningWeb.ProjectLiveTest do
       end)
     end
 
+    test "new credential in a sandbox pre-selects the sandbox and its root parent",
+         %{conn: conn, user: user} do
+      root =
+        insert(:project,
+          name: "root-project",
+          project_users: [%{user_id: user.id, role: :admin}]
+        )
+
+      intermediate = insert(:project, name: "intermediate", parent_id: root.id)
+
+      sandbox =
+        insert(:project,
+          name: "sandbox-project",
+          parent_id: intermediate.id,
+          project_users: [%{user_id: user.id, role: :admin}]
+        )
+
+      {:ok, view, _html} =
+        live(conn, ~p"/projects/#{sandbox}/settings#credentials",
+          on_error: :raise
+        )
+
+      view |> element("#new-credential-option-menu-item") |> render_click()
+      view |> select_credential_type("http")
+      view |> click_continue()
+
+      # Both the active sandbox and the root parent are pre-selected; the
+      # intermediate project in the chain is not.
+      assert has_element?(
+               view,
+               "#remove-project-credential-button-new-#{sandbox.id}"
+             )
+
+      assert has_element?(
+               view,
+               "#remove-project-credential-button-new-#{root.id}"
+             )
+
+      refute has_element?(
+               view,
+               "#remove-project-credential-button-new-#{intermediate.id}"
+             )
+    end
+
     test "support users can create new credentials in the project credentials page",
          %{
            conn: conn,