close #1059, release v0.8.0

OpenFn · Aug 31, 2023 · b1e1aea · b1e1aea
1 parent e554378
commit b1e1aea
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,10 +10,17 @@ and this project adheres to
 
 ### Added
 
+### Changed
+
+### Fixed
+
+## [v0.8.0]
+
+### Added
+
 - Introduces Github sync feature, users can now setup our github app on their
   instance and sync projects using our latest portability spec
   [#970](https://github.com/OpenFn/Lightning/issues/970)
-
 - Support Backup Codes for Multi-Factor Authentication
   [937](https://github.com/OpenFn/Lightning/issues/937)
 - Log a warning in the console when the Editor/docs component is given latest
@@ -24,6 +31,8 @@ and this project adheres to
   [#957](https://github.com/OpenFn/Lightning/issues/957)
 - Reimplement skipped CredentialLive tests
   [#962](https://github.com/OpenFn/Lightning/issues/962)
+- Show GitHub installation ID and repo link to help setup/debugging for version
+  control [1059](https://github.com/OpenFn/Lightning/issues/1059)
 
 ### Changed
 

diff --git a/lib/lightning_web/live/project_live/settings.ex b/lib/lightning_web/live/project_live/settings.ex
@@ -101,8 +101,9 @@ defmodule LightningWeb.ProjectLive.Settings do
         %{repo: nil} ->
           {false, true, false, project_repo_connection}
 
-        %{repo: r, branch: b} ->
-          {false, true, true, %{"repo" => r, "branch" => b}}
+        %{repo: r, branch: b, github_installation_id: g} ->
+          {false, true, true,
+           %{"repo" => r, "branch" => b, "github_installation_id" => g}}
       end
 
     repo_settings
@@ -327,7 +328,8 @@ defmodule LightningWeb.ProjectLive.Settings do
        show_sync_button: true,
        project_repo_connection: %{
          "branch" => params["branch"],
-         "repo" => params["repo"]
+         "repo" => params["repo"],
+         "github_installation_id" => params["github_installation_id"]
        }
      )}
   end

diff --git a/lib/lightning_web/live/project_live/settings.html.heex b/lib/lightning_web/live/project_live/settings.html.heex
@@ -376,7 +376,17 @@
               <div :if={!@show_github_setup} class="bg-white p-4 rounded-md">
                 <h6 class="font-medium text-black">Sync to Github</h6>
                 <small class="block my-1 text-xs text-gray-600">
-                  Configure the settings below to start Syncing
+                  Configure a two-way sync between this lightning project and a
+                  GitHub repo. See
+                  <.link
+                    href="https://docs.openfn.org/documentation/portability"
+                    target="_blank"
+                    class="hover:underline text-primary-600"
+                  >
+                    portability docs
+                  </.link>
+                  for full documentation on associated GitHub actions and
+                  automated workflows.
                 </small>
 
                 <.form
@@ -396,7 +406,14 @@
                             Repository
                           <% end %>
                           <%= if @show_sync_button do %>
-                            Repository: <%= @project_repo_connection["repo"] %>
+                            Repository:
+                            <.link
+                              href={"https://www.github.com/" <> @project_repo_connection["repo"]}
+                              target="_blank"
+                              class="hover:underline text-primary-600"
+                            >
+                              <%= @project_repo_connection["repo"] %>
+                            </.link>
                           <% end %>
                         </span>
                       </small>
@@ -427,7 +444,10 @@
                             Branch
                           <% end %>
                           <%= if @show_sync_button do %>
-                            Branch: <%= @project_repo_connection["branch"] %>
+                            Branch:
+                            <span class="text-xs font-mono bg-gray-200 rounded-md p-1">
+                              <%= @project_repo_connection["branch"] %>
+                            </span>
                           <% end %>
                         </span>
                       </small>
@@ -445,6 +465,38 @@
                       />
                     </div>
                   </div>
+                  <%= if @show_sync_button do %>
+                    <div class="hidden sm:block" aria-hidden="true">
+                      <div class="py-1"></div>
+                    </div>
+                    <div class="grid grid-cols gap-6">
+                      <div class="md:col-span-2">
+                        <small class="font-medium my-1 text-xs text-black">
+                          <span>
+                            GitHub Installation ID:
+                            <span class="text-xs font-mono bg-gray-200 rounded-md p-1">
+                              <%= @project_repo_connection[
+                                "github_installation_id"
+                              ] %>
+                            </span>
+                          </span>
+                        </small>
+                        <Form.select_field
+                          :if={@show_repo_setup && !@show_sync_button}
+                          form={f}
+                          disabled={@loading_branches}
+                          phx-change="branch_selected"
+                          name={:branch}
+                          id="project-branch"
+                          values={@branches}
+                          prompt={
+                            @project_repo_connection["branch"] ||
+                              "Select a branch"
+                          }
+                        />
+                      </div>
+                    </div>
+                  <% end %>
                   <div class="hidden sm:block" aria-hidden="true">
                     <div class="py-4"></div>
                   </div>

diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Lightning.MixProject do
   def project do
     [
       app: :lightning,
-      version: "0.7.3",
+      version: "0.8.0",
       elixir: "~> 1.15",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

diff --git a/test/lightning_web/live/project_live_test.exs b/test/lightning_web/live/project_live_test.exs
@@ -663,7 +663,7 @@ defmodule LightningWeb.ProjectLiveTest do
 
       assert view
              |> render_click("save_repo", %{branch: "b", repo: "r"}) =~
-               "Repository: r"
+               "Repository:\n                            <a href=\"https://www.github.com/r\" target=\"_blank\" class=\"hover:underline text-primary-600\">\nr"
     end
 
     @tag role: :admin