Skip to content

Commit 9ed0e7b

Browse files
authored
Switch all Product nested UIs to the updated design (#2374)
This PR removes the 'New UI' switch, making the new UI available, and default, to all users. This temporarily removes the Pinned devices UI on the Orgs list page, which will be added back in a separate PR as this one is already big enough.
1 parent 374b05a commit 9ed0e7b

File tree

82 files changed

+2501
-6588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2501
-6588
lines changed

lib/nerves_hub_web.ex

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ defmodule NervesHubWeb do
8585

8686
defp live_view_setup() do
8787
quote do
88-
use NervesHubWeb.LiveView,
88+
use Phoenix.LiveView,
8989
layout: {NervesHubWeb.LayoutView, :live},
9090
container: {:div, class: "h-screen"}
9191

@@ -142,23 +142,15 @@ defmodule NervesHubWeb do
142142
defp tab_component_functions() do
143143
quote do
144144
defp setup_tab_components(socket, tabs \\ []) do
145-
if socket.assigns[:new_ui] do
146-
tabs
147-
|> Enum.reduce(socket, fn component, socket -> component.connect(socket) end)
148-
|> put_private(:tabs, tabs)
149-
else
150-
socket
151-
end
145+
tabs
146+
|> Enum.reduce(socket, fn component, socket -> component.connect(socket) end)
147+
|> put_private(:tabs, tabs)
152148
end
153149

154150
defp update_tab_component_hooks(socket) do
155-
if socket.assigns[:new_ui] do
156-
socket
157-
|> detach_hooks()
158-
|> attach_hooks()
159-
else
160-
socket
161-
end
151+
socket
152+
|> detach_hooks()
153+
|> attach_hooks()
162154
end
163155

164156
defp detach_hooks(socket) do

lib/nerves_hub_web/components/deployment_group_page/settings.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ defmodule NervesHubWeb.Components.DeploymentGroupPage.Settings do
294294
# TODO: if we move away from slugs with deployment names we won't need
295295
# to use `push_navigate` here.
296296
socket
297-
|> put_flash(:info, "Deployment group updated")
297+
|> put_flash(:info, "Deployment Group updated")
298298
|> push_navigate(to: ~p"/org/#{org}/#{product}/deployment_groups/#{updated}")
299299
|> noreply()
300300

lib/nerves_hub_web/components/device_page/details_tab.ex

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,11 @@ defmodule NervesHubWeb.Components.DevicePage.DetailsTab do
300300
Deployment Groups
301301
</div>
302302
303-
<div class="flex flex-col pt-2 px-4 pb-6 gap-4">
303+
<div :if={is_nil(@device.deployment_group) && Enum.empty?(@deployment_groups)} class="flex pt-2 px-4 pb-6 gap-4 items-center">
304+
<span class="text-sm text-nerves-gray-500">No deployment groups match the devices platform and architecture.</span>
305+
</div>
306+
307+
<div :if={@device.deployment_group} class="flex flex-col pt-2 px-4 pb-6 gap-4">
304308
<div class="text-sm font-medium leading-6 text-zinc-300">
305309
<form id="toggle-priority-updates">
306310
<input type="hidden" name="device[priority_updates]" value="false" />
@@ -324,7 +328,7 @@ defmodule NervesHubWeb.Components.DevicePage.DetailsTab do
324328
</div>
325329
</form>
326330
</div>
327-
<div :if={@device.deployment_group} class="flex pt-2 gap-4 items-center">
331+
<div class="flex pt-2 gap-4 items-center">
328332
<span class="text-sm text-nerves-gray-500">Assigned deployment group:</span>
329333
<.link
330334
navigate={~p"/org/#{@org}/#{@product}/deployment_groups/#{@device.deployment_group}"}
@@ -354,6 +358,7 @@ defmodule NervesHubWeb.Components.DevicePage.DetailsTab do
354358
</button>
355359
</div>
356360
</div>
361+
357362
<div :if={@device.status == :registered && @device.deployment_id} class="flex pt-2 px-4 pb-6 gap-4 items-center">
358363
<span class="text-sm text-nerves-gray-500">Please note: The device will be removed from the deployment group upon connection if the arch and platform don't match.</span>
359364
</div>
@@ -772,12 +777,8 @@ defmodule NervesHubWeb.Components.DevicePage.DetailsTab do
772777

773778
def hooked_event(_event, _params, socket), do: {:cont, socket}
774779

775-
def hooked_info(%Broadcast{event: "health_check_report"}, %{assigns: %{device: device}} = socket) do
776-
latest_metrics = Metrics.get_latest_metric_set(device.id)
777-
778-
socket
779-
|> assign(:latest_metrics, latest_metrics)
780-
|> assign_metadata()
780+
def hooked_info(:platform_or_architecture_updated, %{assigns: %{device: device}} = socket) do
781+
assign(socket, :firmwares, Firmwares.get_firmware_for_device(device))
781782
|> halt()
782783
end
783784

@@ -790,6 +791,15 @@ defmodule NervesHubWeb.Components.DevicePage.DetailsTab do
790791
|> halt()
791792
end
792793

794+
def hooked_info(%Broadcast{event: "health_check_report"}, %{assigns: %{device: device}} = socket) do
795+
latest_metrics = Metrics.get_latest_metric_set(device.id)
796+
797+
socket
798+
|> assign(:latest_metrics, latest_metrics)
799+
|> assign_metadata()
800+
|> halt()
801+
end
802+
793803
def hooked_info(_event, socket), do: {:cont, socket}
794804

795805
def hooked_async({:run_script, id}, result, socket) do

lib/nerves_hub_web/components/device_page/health_tab.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ defmodule NervesHubWeb.Components.DevicePage.HealthTab do
251251

252252
types(charts) != types(data) ->
253253
push_patch(socket,
254-
to: ~p"/org/#{org}/#{product}/devices/#{device}/healthz"
254+
to: ~p"/org/#{org}/#{product}/devices/#{device}/health"
255255
)
256256

257257
true ->

lib/nerves_hub_web/dynamic_template_renderer.ex

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)