From 590ce86c719e940e10af3d53c2030e040d63511f Mon Sep 17 00:00:00 2001
From: Viktor Baranov <baranov.viktor.27@gmail.com>
Date: Fri, 4 Nov 2022 17:46:12 +0300
Subject: [PATCH] Apps embedded links

---
 .../templates/layout/_topnav.html.eex            | 16 ++++++++++------
 .../lib/block_scout_web/views/layout_view.ex     |  9 +++++----
 config/runtime.exs                               |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 34188f8494..494934049d 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -132,12 +132,16 @@
             </a>
             <div class="dropdown-menu" aria-labeledby="navbarAppsDropdown">
               <%= if apps_menu == true do %>
-                <%= for %{url: url, title: title} <- external_apps_list() do %> 
-                    <a href="<%= url %>" class="dropdown-item" target="_blank"><%= title %>
-                      <span class="external-link-icon">
-                        <%= render BlockScoutWeb.IconsView, "_external_link.html" %>
-                      </span>
-                    </a>
+                <%= for %{url: url, title: title} = app <- apps_list() do %>
+                    <%= if Map.has_key?(app, :embedded?) && app.embedded? do %>
+                      <a href="<%= url %>" class="dropdown-item" target="_self"><%= title %></a>
+                    <% else %>
+                      <a href="<%= url %>" class="dropdown-item" target="_blank"><%= title %>
+                        <span class="external-link-icon">
+                          <%= render BlockScoutWeb.IconsView, "_external_link.html" %>
+                        </span>
+                      </a>
+                    <% end %>
                 <% end %>
               <% end %>
             </div>
diff --git a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
index f60152575b..e94cbc05f6 100644
--- a/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
+++ b/apps/block_scout_web/lib/block_scout_web/views/layout_view.ex
@@ -229,11 +229,12 @@ defmodule BlockScoutWeb.LayoutView do
     end
   end
 
-  def external_apps_list do
-    if Application.get_env(:block_scout_web, :external_apps) do
+  def apps_list do
+    apps = Application.get_env(:block_scout_web, :apps)
+
+    if apps do
       try do
-        :block_scout_web
-        |> Application.get_env(:external_apps)
+        apps
         |> Parser.parse!(%{keys: :atoms!})
       rescue
         _ ->
diff --git a/config/runtime.exs b/config/runtime.exs
index f649937b3d..2a9c8bfa15 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -87,7 +87,7 @@ config :block_scout_web,
   webapp_url: System.get_env("WEBAPP_URL"),
   api_url: System.get_env("API_URL"),
   apps_menu: if(System.get_env("APPS_MENU", "false") == "true", do: true, else: false),
-  external_apps: System.get_env("EXTERNAL_APPS"),
+  apps: System.get_env("APPS") || System.get_env("EXTERNAL_APPS"),
   gas_price: System.get_env("GAS_PRICE", nil),
   restricted_list: System.get_env("RESTRICTED_LIST", nil),
   restricted_list_key: System.get_env("RESTRICTED_LIST_KEY", nil),