From 402be278026be2b0381a547f9b077de590d69faa Mon Sep 17 00:00:00 2001 From: Jamil Date: Wed, 5 Jun 2024 16:19:33 -0700 Subject: [PATCH] fix(ux): Adjust table column widths and overflow badges by truncating them (#5258) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #5230 Fixes #5244 Fixes #5233 Fixes #5245 Fixes #5247 Fixes #5237 Fixes #5235 Fixes #5252 Updates the sidebar to collapse at the `xl` breakpoint, allowing to stay closed for more screen realestate on smaller screens. Screenshot 2024-06-05 at 1 06 49 PM --------- Signed-off-by: Jamil --- .../web/lib/web/components/core_components.ex | 29 +++++-------- .../lib/web/components/layouts/app.html.heex | 6 +-- .../web/components/navigation_components.ex | 8 ++-- elixir/apps/web/lib/web/live/actors/groups.ex | 2 +- elixir/apps/web/lib/web/live/actors/index.ex | 6 ++- elixir/apps/web/lib/web/live/actors/show.ex | 43 ++++++++++--------- elixir/apps/web/lib/web/live/clients/index.ex | 6 +-- elixir/apps/web/lib/web/live/clients/show.ex | 12 +++--- elixir/apps/web/lib/web/live/flows/show.ex | 12 +++--- .../web/lib/web/live/groups/edit_actors.ex | 4 +- elixir/apps/web/lib/web/live/groups/index.ex | 4 +- elixir/apps/web/lib/web/live/groups/show.ex | 12 +++--- .../apps/web/lib/web/live/policies/index.ex | 12 +++--- elixir/apps/web/lib/web/live/policies/show.ex | 12 +++--- .../web/lib/web/live/relay_groups/index.ex | 6 +-- .../web/lib/web/live/relay_groups/show.ex | 4 +- .../apps/web/lib/web/live/resources/index.ex | 6 +-- .../apps/web/lib/web/live/resources/show.ex | 18 ++++---- .../live/settings/identity_providers/index.ex | 8 ++-- .../web/lib/web/live/sites/gateways/index.ex | 6 +-- elixir/apps/web/lib/web/live/sites/index.ex | 2 +- elixir/apps/web/lib/web/live/sites/show.ex | 10 ++--- 22 files changed, 114 insertions(+), 114 deletions(-) diff --git a/elixir/apps/web/lib/web/components/core_components.ex b/elixir/apps/web/lib/web/components/core_components.ex index 0e6dc3629..7b5fbaa01 100644 --- a/elixir/apps/web/lib/web/components/core_components.ex +++ b/elixir/apps/web/lib/web/components/core_components.ex @@ -834,13 +834,13 @@ defmodule Web.CoreComponents do def identity_identifier(assigns) do ~H""" - + <.link navigate={ Web.Settings.IdentityProviders.Components.view_provider(@account, @identity.provider) } data-provider-id={@identity.provider.id} - title={@identity.provider.adapter} + title={get_identity_email(@identity)} class={~w[ text-xs rounded-l @@ -854,23 +854,16 @@ defmodule Web.CoreComponents do <.provider_icon adapter={@identity.provider.adapter} class="h-3.5 w-3.5" /> - <%= get_identity_email(@identity) %> - - - (deleted) - - - (provider disabled) - - - (provider deleted) + + <%= get_identity_email(@identity) %> + """ @@ -893,33 +886,31 @@ defmodule Web.CoreComponents do def group(assigns) do ~H""" - + <.link :if={Actors.group_synced?(@group)} navigate={Web.Settings.IdentityProviders.Components.view_provider(@account, @group.provider)} data-provider-id={@group.provider_id} title={@group.provider.adapter} class={~w[ - text-xs rounded-l py-0.5 px-1.5 text-neutral-900 bg-neutral-50 border-neutral-100 border - whitespace-nowrap ]} > <.provider_icon adapter={@group.provider.adapter} class="h-3.5 w-3.5" /> - <.link navigate={~p"/#{@account}/groups/#{@group}"} class={~w[ - flex items-center + <.link title={@group.name} navigate={~p"/#{@account}/groups/#{@group}"} class={~w[ text-xs + truncate + min-w-0 #{if(Actors.group_synced?(@group), do: "rounded-r pl-1.5 pr-2.5", else: "rounded px-1.5")} py-0.5 text-neutral-800 bg-neutral-100 - whitespace-nowrap ]}> <%= @group.name %> diff --git a/elixir/apps/web/lib/web/components/layouts/app.html.heex b/elixir/apps/web/lib/web/components/layouts/app.html.heex index f881d1289..061df7848 100644 --- a/elixir/apps/web/lib/web/components/layouts/app.html.heex +++ b/elixir/apps/web/lib/web/components/layouts/app.html.heex @@ -85,14 +85,14 @@ Docs Status @@ -100,7 +100,7 @@ -
+
<.flash :if={@account.warning} kind={:warning}> <%= @account.warning %>. diff --git a/elixir/apps/web/lib/web/components/navigation_components.ex b/elixir/apps/web/lib/web/components/navigation_components.ex index 63e631b33..20c1a661f 100644 --- a/elixir/apps/web/lib/web/components/navigation_components.ex +++ b/elixir/apps/web/lib/web/components/navigation_components.ex @@ -15,7 +15,7 @@ defmodule Web.NavigationComponents do data-drawer-toggle="drawer-navigation" aria-controls="drawer-navigation" class={[ - "p-2 mr-2 text-neutral-600 rounded cursor-pointer md:hidden", + "p-2 mr-2 text-neutral-600 rounded cursor-pointer lg:hidden", "hover:text-neutral-900 hover:bg-neutral-100" ]} > @@ -33,14 +33,14 @@ defmodule Web.NavigationComponents do @@ -108,7 +108,7 @@ defmodule Web.NavigationComponents do pt-14 pb-8 transition-transform -translate-x-full bg-white border-r border-neutral-200 - md:translate-x-0 + lg:translate-x-0 ]} aria-label="Sidenav" id="drawer-navigation">
    diff --git a/elixir/apps/web/lib/web/live/actors/groups.ex b/elixir/apps/web/lib/web/live/actors/groups.ex index f6c433114..620f18493 100644 --- a/elixir/apps/web/lib/web/live/actors/groups.ex +++ b/elixir/apps/web/lib/web/live/actors/groups.ex @@ -79,7 +79,7 @@ defmodule Web.Actors.EditGroups do ordered_by={@order_by_table_id["groups"]} metadata={@groups_metadata} > - <:col :let={group} label="GROUP"> + <:col :let={group} label="group"> <.icon :if={removed?(group, @removed)} name="hero-minus" diff --git a/elixir/apps/web/lib/web/live/actors/index.ex b/elixir/apps/web/lib/web/live/actors/index.ex index c1c729c53..20ed3022d 100644 --- a/elixir/apps/web/lib/web/live/actors/index.ex +++ b/elixir/apps/web/lib/web/live/actors/index.ex @@ -68,7 +68,9 @@ defmodule Web.Actors.Index do metadata={@actors_metadata} > <:col :let={actor} field={{:actors, :name}} label="name"> - <.actor_name_and_role account={@account} actor={actor} /> + + <.actor_name_and_role account={@account} actor={actor} /> + <:col :let={actor} label="identifiers"> @@ -81,7 +83,7 @@ defmodule Web.Actors.Index do
- <:col :let={actor} label="groups"> + <:col :let={actor} label="groups" class="w-4/12"> <.peek peek={@actor_groups[actor.id]}> <:empty> None diff --git a/elixir/apps/web/lib/web/live/actors/show.ex b/elixir/apps/web/lib/web/live/actors/show.ex index 3581f94f2..31188537f 100644 --- a/elixir/apps/web/lib/web/live/actors/show.ex +++ b/elixir/apps/web/lib/web/live/actors/show.ex @@ -224,24 +224,27 @@ defmodule Web.Actors.Show do ordered_by={@order_by_table_id["identities"]} metadata={@identities_metadata} > - <:col :let={identity} label="IDENTITY"> + <:col :let={identity} label="identity"> <.identity_identifier account={@account} identity={identity} /> - <:col :let={identity} label="CREATED"> + <:col :let={identity} label="created"> <.created_by account={@account} schema={identity} /> - <:col :let={identity} label="LAST SIGNED IN"> + <:col :let={identity} label="last signed in"> <.relative_datetime datetime={identity.last_seen_at} /> <:action :let={identity}> <.button :if={identity_has_email?(identity)} size="xs" + title="Send Welcome Email" icon="hero-envelope" phx-click="send_welcome_email" phx-value-id={identity.id} > - Send Welcome Email +   <:action :let={identity}> @@ -318,19 +321,19 @@ defmodule Web.Actors.Show do ordered_by={@order_by_table_id["tokens"]} metadata={@tokens_metadata} > - <:col :let={token} label="TYPE" class="w-1/12"> + <:col :let={token} label="type" class="w-1/12"> <%= token.type %> - <:col :let={token} :if={@actor.type != :service_account} label="IDENTITY" class="w-2/12"> + <:col :let={token} :if={@actor.type != :service_account} label="identity" class="w-3/12"> <.identity_identifier account={@account} identity={token.identity} /> - <:col :let={token} :if={@actor.type == :service_account} label="NAME" class="w-2/12"> + <:col :let={token} :if={@actor.type == :service_account} label="name" class="w-2/12"> <%= token.name %> - <:col :let={token} label="CREATED"> + <:col :let={token} label="created"> <.created_by account={@account} schema={token} /> - <:col :let={token} label="LAST USED" class="w-3/12"> + <:col :let={token} label="last used">

<.relative_datetime datetime={token.last_seen_at} />

@@ -338,10 +341,10 @@ defmodule Web.Actors.Show do <.last_seen schema={token} />

- <:col :let={token} label="EXPIRES"> + <:col :let={token} label="expires"> <.relative_datetime datetime={token.expires_at} /> - <:col :let={token} label="CLIENT"> + <:col :let={token} label="client"> <.intersperse_blocks :if={token.type == :client}> <:separator>,  @@ -385,12 +388,12 @@ defmodule Web.Actors.Show do ordered_by={@order_by_table_id["clients"]} metadata={@clients_metadata} > - <:col :let={client} label="NAME"> + <:col :let={client} label="name"> <.link navigate={~p"/#{@account}/clients/#{client.id}"} class={[link_style()]}> <%= client.name %> - <:col :let={client} label="STATUS"> + <:col :let={client} label="status"> <.connection_status schema={client} /> <:empty> @@ -415,32 +418,32 @@ defmodule Web.Actors.Show do ordered_by={@order_by_table_id["flows"]} metadata={@flows_metadata} > - <:col :let={flow} label="AUTHORIZED"> + <:col :let={flow} label="authorized" class="xl:w-1/12"> <.relative_datetime datetime={flow.inserted_at} /> - <:col :let={flow} label="EXPIRES"> + <:col :let={flow} label="expires" class="xl:w-1/12"> <.relative_datetime datetime={flow.expires_at} /> - <:col :let={flow} label="POLICY"> + <:col :let={flow} label="policy" class="w-3/12"> <.link navigate={~p"/#{@account}/policies/#{flow.policy_id}"} class={[link_style()]}> - <:col :let={flow} label="CLIENT" class="w-3/12"> + <:col :let={flow} label="client"> <.link navigate={~p"/#{@account}/clients/#{flow.client_id}"} class={link_style()}> <%= flow.client.name %>
<%= flow.client_remote_ip %> - <:col :let={flow} label="GATEWAY" class="w-3/12"> + <:col :let={flow} label="gateway"> <.link navigate={~p"/#{@account}/gateways/#{flow.gateway_id}"} class={[link_style()]}> <%= flow.gateway.group.name %>-<%= flow.gateway.name %>
<%= flow.gateway_remote_ip %> - <:col :let={flow} :if={@flow_activities_enabled?} label="ACTIVITY"> + <:col :let={flow} :if={@flow_activities_enabled?} label="activity" class="w-1/12"> <.link navigate={~p"/#{@account}/flows/#{flow.id}"} class={[link_style()]}> Show @@ -471,7 +474,7 @@ defmodule Web.Actors.Show do ordered_by={@order_by_table_id["groups"]} metadata={@groups_metadata} > - <:col :let={group} label="NAME"> + <:col :let={group} label="name"> <.link navigate={~p"/#{@account}/groups/#{group.id}"} class={[link_style()]}> <%= group.name %> diff --git a/elixir/apps/web/lib/web/live/clients/index.ex b/elixir/apps/web/lib/web/live/clients/index.ex index c9dcb55e3..355181c88 100644 --- a/elixir/apps/web/lib/web/live/clients/index.ex +++ b/elixir/apps/web/lib/web/live/clients/index.ex @@ -61,17 +61,17 @@ defmodule Web.Clients.Index do ordered_by={@order_by_table_id["clients"]} metadata={@clients_metadata} > - <:col :let={client} field={{:clients, :name}} label="NAME"> + <:col :let={client} field={{:clients, :name}} label="name"> <.link navigate={~p"/#{@account}/clients/#{client.id}"} class={[link_style()]}> <%= client.name %> - <:col :let={client} label="USER"> + <:col :let={client} label="user"> <.link navigate={~p"/#{@account}/actors/#{client.actor.id}"} class={[link_style()]}> <%= client.actor.name %> - <:col :let={client} label="STATUS"> + <:col :let={client} label="status"> <.connection_status schema={client} /> <:empty> diff --git a/elixir/apps/web/lib/web/live/clients/show.ex b/elixir/apps/web/lib/web/live/clients/show.ex index 75d6b901d..5cdf9d179 100644 --- a/elixir/apps/web/lib/web/live/clients/show.ex +++ b/elixir/apps/web/lib/web/live/clients/show.ex @@ -170,28 +170,28 @@ defmodule Web.Clients.Show do ordered_by={@order_by_table_id["flows"]} metadata={@flows_metadata} > - <:col :let={flow} label="AUTHORIZED"> + <:col :let={flow} label="authorized"> <.relative_datetime datetime={flow.inserted_at} /> - <:col :let={flow} label="EXPIRES"> + <:col :let={flow} label="expires"> <.relative_datetime datetime={flow.expires_at} /> - <:col :let={flow} label="REMOTE IP" class="w-3/12"> + <:col :let={flow} label="remote ip" class="w-3/12"> <%= flow.client_remote_ip %> - <:col :let={flow} label="POLICY"> + <:col :let={flow} label="policy"> <.link navigate={~p"/#{@account}/policies/#{flow.policy_id}"} class={[link_style()]}> <.policy_name policy={flow.policy} /> - <:col :let={flow} label="GATEWAY" class="w-3/12"> + <:col :let={flow} label="gateway" class="w-3/12"> <.link navigate={~p"/#{@account}/gateways/#{flow.gateway_id}"} class={[link_style()]}> <%= flow.gateway.group.name %>-<%= flow.gateway.name %>
<%= flow.gateway_remote_ip %> - <:col :let={flow} :if={@flow_activities_enabled?} label="ACTIVITY"> + <:col :let={flow} :if={@flow_activities_enabled?} label="activity"> <.link navigate={~p"/#{@account}/flows/#{flow.id}"} class={[link_style()]}> Show diff --git a/elixir/apps/web/lib/web/live/flows/show.ex b/elixir/apps/web/lib/web/live/flows/show.ex index 7325efc76..89c057bfc 100644 --- a/elixir/apps/web/lib/web/live/flows/show.ex +++ b/elixir/apps/web/lib/web/live/flows/show.ex @@ -155,22 +155,22 @@ defmodule Web.Flows.Show do ordered_by={@order_by_table_id["activities"]} metadata={@activities_metadata} > - <:col :let={activity} label="STARTED AT"> + <:col :let={activity} label="started at"> <.relative_datetime datetime={activity.window_started_at} /> - <:col :let={activity} label="ENDED AT"> + <:col :let={activity} label="ended at"> <.relative_datetime datetime={activity.window_ended_at} /> - <:col :let={activity} label="DESTINATION"> + <:col :let={activity} label="destination"> <%= activity.destination %> - <:col :let={activity} label="CONNECTIVITY TYPE"> + <:col :let={activity} label="connectivity type"> <%= activity.connectivity_type %> - <:col :let={activity} label="RX"> + <:col :let={activity} label="rx"> <%= Sizeable.filesize(activity.rx_bytes) %> - <:col :let={activity} label="TX"> + <:col :let={activity} label="tx"> <%= Sizeable.filesize(activity.tx_bytes) %> <:empty> diff --git a/elixir/apps/web/lib/web/live/groups/edit_actors.ex b/elixir/apps/web/lib/web/live/groups/edit_actors.ex index 6e0c290e2..46fe8bdbc 100644 --- a/elixir/apps/web/lib/web/live/groups/edit_actors.ex +++ b/elixir/apps/web/lib/web/live/groups/edit_actors.ex @@ -82,7 +82,7 @@ defmodule Web.Groups.EditActors do ordered_by={@order_by_table_id["actors"]} metadata={@actors_metadata} > - <:col :let={actor} label="ACTOR"> + <:col :let={actor} label="actor"> <.icon :if={removed?(actor, @removed)} name="hero-minus" @@ -106,7 +106,7 @@ defmodule Web.Groups.EditActors do } /> - <:col :let={actor} label="IDENTITIES"> + <:col :let={actor} label="identities"> <.identity_identifier :for={identity <- actor.identities} diff --git a/elixir/apps/web/lib/web/live/groups/index.ex b/elixir/apps/web/lib/web/live/groups/index.ex index e1ed7b195..c6409032b 100644 --- a/elixir/apps/web/lib/web/live/groups/index.ex +++ b/elixir/apps/web/lib/web/live/groups/index.ex @@ -66,7 +66,7 @@ defmodule Web.Groups.Index do ordered_by={@order_by_table_id["groups"]} metadata={@groups_metadata} > - <:col :let={group} field={{:groups, :name}} label="NAME" class="w-2/4"> + <:col :let={group} field={{:groups, :name}} label="name" class="w-2/4"> <.link navigate={~p"/#{@account}/groups/#{group.id}"} class={[link_style()]}> <%= group.name %> @@ -75,7 +75,7 @@ defmodule Web.Groups.Index do (deleted) - <:col :let={group} label="ACTORS"> + <:col :let={group} label="actors"> <.peek peek={Map.fetch!(@group_actors, group.id)}> <:empty> None diff --git a/elixir/apps/web/lib/web/live/groups/show.ex b/elixir/apps/web/lib/web/live/groups/show.ex index 242f3b628..b8f7dd3f7 100644 --- a/elixir/apps/web/lib/web/live/groups/show.ex +++ b/elixir/apps/web/lib/web/live/groups/show.ex @@ -150,11 +150,11 @@ defmodule Web.Groups.Show do ordered_by={@order_by_table_id["actors"]} metadata={@actors_metadata} > - <:col :let={actor} label="ACTOR"> + <:col :let={actor} label="actor"> <.actor_name_and_role account={@account} actor={actor} /> - <:col :let={actor} label="IDENTITIES"> - + <:col :let={actor} label="identities"> + <.identity_identifier :for={identity <- actor.identities} account={@account} @@ -200,17 +200,17 @@ defmodule Web.Groups.Show do ordered_by={@order_by_table_id["policies"]} metadata={@policies_metadata} > - <:col :let={policy} label="ID"> + <:col :let={policy} label="id"> <.link class={link_style()} navigate={~p"/#{@account}/policies/#{policy}"}> <%= policy.id %> - <:col :let={policy} label="RESOURCE"> + <:col :let={policy} label="resource"> <.link class={link_style()} navigate={~p"/#{@account}/resources/#{policy.resource_id}"}> <%= policy.resource.name %> - <:col :let={policy} label="STATUS"> + <:col :let={policy} label="status"> <%= if is_nil(policy.deleted_at) do %> <%= if is_nil(policy.disabled_at) do %> Active diff --git a/elixir/apps/web/lib/web/live/policies/index.ex b/elixir/apps/web/lib/web/live/policies/index.ex index 30c7b59f9..892db6393 100644 --- a/elixir/apps/web/lib/web/live/policies/index.ex +++ b/elixir/apps/web/lib/web/live/policies/index.ex @@ -64,22 +64,24 @@ defmodule Web.Policies.Index do ordered_by={@order_by_table_id["policies"]} metadata={@policies_metadata} > - <:col :let={policy} label="ID"> + <:col :let={policy} label="id" class="w-3/12"> <.link class={link_style()} navigate={~p"/#{@account}/policies/#{policy}"}> - <%= policy.id %> + + <%= policy.id %> + - <:col :let={policy} label="GROUP"> + <:col :let={policy} label="group" class="w-3/12"> <.group account={@account} group={policy.actor_group} /> - <:col :let={policy} label="RESOURCE"> + <:col :let={policy} label="resource" class="w-2/12"> <.link class={link_style()} navigate={~p"/#{@account}/resources/#{policy.resource_id}"}> <%= policy.resource.name %> - <:col :let={policy} label="STATUS"> + <:col :let={policy} label="status"> <%= if is_nil(policy.deleted_at) do %> <%= if is_nil(policy.disabled_at) do %> Active diff --git a/elixir/apps/web/lib/web/live/policies/show.ex b/elixir/apps/web/lib/web/live/policies/show.ex index 5c90aa546..84b6ff671 100644 --- a/elixir/apps/web/lib/web/live/policies/show.ex +++ b/elixir/apps/web/lib/web/live/policies/show.ex @@ -63,7 +63,7 @@ defmodule Web.Policies.Show do <.section> <:title> - Policy: <%= @policy.id %> + <.policy_name policy={@policy} /> (disabled) (deleted) @@ -169,13 +169,13 @@ defmodule Web.Policies.Show do ordered_by={@order_by_table_id["flows"]} metadata={@flows_metadata} > - <:col :let={flow} label="AUTHORIZED"> + <:col :let={flow} label="authorized"> <.relative_datetime datetime={flow.inserted_at} /> - <:col :let={flow} label="EXPIRES"> + <:col :let={flow} label="expires"> <.relative_datetime datetime={flow.expires_at} /> - <:col :let={flow} label="CLIENT, ACTOR" class="w-3/12"> + <:col :let={flow} label="client, actor" class="w-3/12"> <.link navigate={~p"/#{@account}/clients/#{flow.client_id}"} class={link_style()}> <%= flow.client.name %> @@ -185,14 +185,14 @@ defmodule Web.Policies.Show do <%= flow.client_remote_ip %> - <:col :let={flow} label="GATEWAY" class="w-3/12"> + <:col :let={flow} label="gateway" class="w-3/12"> <.link navigate={~p"/#{@account}/gateways/#{flow.gateway_id}"} class={link_style()}> <%= flow.gateway.group.name %>-<%= flow.gateway.name %>
<%= flow.gateway_remote_ip %> - <:col :let={flow} :if={@flow_activities_enabled?} label="ACTIVITY"> + <:col :let={flow} :if={@flow_activities_enabled?} label="activity"> <.link navigate={~p"/#{@account}/flows/#{flow.id}"} class={link_style()}> Show diff --git a/elixir/apps/web/lib/web/live/relay_groups/index.ex b/elixir/apps/web/lib/web/live/relay_groups/index.ex index 441213c10..7387c7834 100644 --- a/elixir/apps/web/lib/web/live/relay_groups/index.ex +++ b/elixir/apps/web/lib/web/live/relay_groups/index.ex @@ -74,7 +74,7 @@ defmodule Web.RelayGroups.Index do - <:col :let={relay} label="INSTANCE"> + <:col :let={relay} label="instance"> <.link :if={relay.account_id} navigate={~p"/#{@account}/relays/#{relay.id}"} @@ -100,11 +100,11 @@ defmodule Web.RelayGroups.Index do - <:col :let={relay} label="TYPE"> + <:col :let={relay} label="type"> <%= if relay.account_id, do: "self-hosted", else: "firezone-owned" %> - <:col :let={relay} label="STATUS"> + <:col :let={relay} label="status"> <.connection_status schema={relay} /> <:empty> diff --git a/elixir/apps/web/lib/web/live/relay_groups/show.ex b/elixir/apps/web/lib/web/live/relay_groups/show.ex index 47b117799..ae1c4ea2f 100644 --- a/elixir/apps/web/lib/web/live/relay_groups/show.ex +++ b/elixir/apps/web/lib/web/live/relay_groups/show.ex @@ -117,7 +117,7 @@ defmodule Web.RelayGroups.Show do ordered_by={@order_by_table_id["relays"]} metadata={@relays_metadata} > - <:col :let={relay} label="INSTANCE"> + <:col :let={relay} label="instance"> <.link navigate={~p"/#{@account}/relays/#{relay.id}"} class={[link_style()]}> <%= relay.name %> @@ -130,7 +130,7 @@ defmodule Web.RelayGroups.Show do - <:col :let={relay} label="STATUS"> + <:col :let={relay} label="status"> <.connection_status schema={relay} /> <:empty> diff --git a/elixir/apps/web/lib/web/live/resources/index.ex b/elixir/apps/web/lib/web/live/resources/index.ex index 4ac8c0d24..ca0dedb19 100644 --- a/elixir/apps/web/lib/web/live/resources/index.ex +++ b/elixir/apps/web/lib/web/live/resources/index.ex @@ -73,12 +73,12 @@ defmodule Web.Resources.Index do ordered_by={@order_by_table_id["resources"]} metadata={@resources_metadata} > - <:col :let={resource} field={{:resources, :name}} label="NAME"> + <:col :let={resource} field={{:resources, :name}} label="Name"> <.link navigate={~p"/#{@account}/resources/#{resource.id}"} class={link_style()}> <%= resource.name %> - <:col :let={resource} field={{:resources, :address}} label="ADDRESS"> + <:col :let={resource} field={{:resources, :address}} label="Address"> <%= resource.address %> @@ -94,7 +94,7 @@ defmodule Web.Resources.Index do - <:col :let={resource} label="Authorized groups"> + <:col :let={resource} label="Authorized groups" class="w-4/12"> <.peek peek={Map.fetch!(@resource_actor_groups_peek, resource.id)}> <:empty> None - diff --git a/elixir/apps/web/lib/web/live/resources/show.ex b/elixir/apps/web/lib/web/live/resources/show.ex index 842b613a2..0a1f7d67c 100644 --- a/elixir/apps/web/lib/web/live/resources/show.ex +++ b/elixir/apps/web/lib/web/live/resources/show.ex @@ -207,15 +207,15 @@ defmodule Web.Resources.Show do ordered_by={@order_by_table_id["policies"]} metadata={@policies_metadata} > - <:col :let={policy} label="ID"> + <:col :let={policy} label="id"> <.link class={link_style()} navigate={~p"/#{@account}/policies/#{policy}"}> <%= policy.id %> - <:col :let={policy} label="GROUP"> + <:col :let={policy} label="group"> <.group account={@account} group={policy.actor_group} /> - <:col :let={policy} label="STATUS"> + <:col :let={policy} label="status"> <%= if is_nil(policy.deleted_at) do %> <%= if is_nil(policy.disabled_at) do %> Active @@ -267,18 +267,18 @@ defmodule Web.Resources.Show do ordered_by={@order_by_table_id["flows"]} metadata={@flows_metadata} > - <:col :let={flow} label="AUTHORIZED"> + <:col :let={flow} label="authorized"> <.relative_datetime datetime={flow.inserted_at} /> - <:col :let={flow} label="EXPIRES"> + <:col :let={flow} label="expires"> <.relative_datetime datetime={flow.expires_at} /> - <:col :let={flow} label="POLICY"> + <:col :let={flow} label="policy"> <.link navigate={~p"/#{@account}/policies/#{flow.policy_id}"} class={[link_style()]}> <.policy_name policy={flow.policy} /> - <:col :let={flow} label="CLIENT, ACTOR" class="w-3/12"> + <:col :let={flow} label="client, actor" class="w-3/12"> <.link navigate={~p"/#{@account}/clients/#{flow.client_id}"} class={[link_style()]}> <%= flow.client.name %> @@ -288,14 +288,14 @@ defmodule Web.Resources.Show do <%= flow.client_remote_ip %> - <:col :let={flow} label="GATEWAY" class="w-3/12"> + <:col :let={flow} label="gateway" class="w-3/12"> <.link navigate={~p"/#{@account}/gateways/#{flow.gateway_id}"} class={[link_style()]}> <%= flow.gateway.group.name %>-<%= flow.gateway.name %>
<%= flow.gateway_remote_ip %> - <:col :let={flow} :if={@flow_activities_enabled?} label="ACTIVITY"> + <:col :let={flow} :if={@flow_activities_enabled?} label="activity"> <.link navigate={~p"/#{@account}/flows/#{flow.id}"} class={[link_style()]}> Show diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex index 5d7ce86f7..2dfc8ed40 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex @@ -78,13 +78,15 @@ defmodule Web.Settings.IdentityProviders.Index do ordered_by={@order_by_table_id["providers"]} metadata={@providers_metadata} > - <:col :let={provider} field={{:providers, :name}} label="Name"> + <:col :let={provider} field={{:providers, :name}} label="Name" class="w-2/12"> <.link navigate={view_provider(@account, provider)} class={[link_style()]}> <%= provider.name %> - <:col :let={provider} label="Type"><%= adapter_name(provider.adapter) %> - <:col :let={provider} label="Status"> + <:col :let={provider} label="Type" class="w-2/12"> + <%= adapter_name(provider.adapter) %> + + <:col :let={provider} label="Status" class="w-2/12"> <.status provider={provider} /> <:col :let={provider} label="Sync Status"> diff --git a/elixir/apps/web/lib/web/live/sites/gateways/index.ex b/elixir/apps/web/lib/web/live/sites/gateways/index.ex index b149c16de..d01c22c6c 100644 --- a/elixir/apps/web/lib/web/live/sites/gateways/index.ex +++ b/elixir/apps/web/lib/web/live/sites/gateways/index.ex @@ -79,17 +79,17 @@ defmodule Web.Sites.Gateways.Index do ordered_by={@order_by_table_id["gateways"]} metadata={@gateways_metadata} > - <:col :let={gateway} field={{:gateways, :name}} label="INSTANCE"> + <:col :let={gateway} field={{:gateways, :name}} label="instance"> <.link navigate={~p"/#{@account}/gateways/#{gateway.id}"} class={[link_style()]}> <%= gateway.name %> - <:col :let={gateway} label="REMOTE IP"> + <:col :let={gateway} label="remote iP"> <%= gateway.last_seen_remote_ip %> - <:col :let={gateway} label="STATUS"> + <:col :let={gateway} label="status"> <.connection_status schema={gateway} /> <:empty> diff --git a/elixir/apps/web/lib/web/live/sites/index.ex b/elixir/apps/web/lib/web/live/sites/index.ex index 017f43463..80f699ebf 100644 --- a/elixir/apps/web/lib/web/live/sites/index.ex +++ b/elixir/apps/web/lib/web/live/sites/index.ex @@ -112,7 +112,7 @@ defmodule Web.Sites.Index do - <:col :let={group} label="online gateways"> + <:col :let={group} label="online gateways" class="w-1/6"> <% gateways = Enum.filter(group.gateways, & &1.online?) peek = %{count: length(gateways), items: Enum.take(gateways, 5)} %> <.peek peek={peek}> diff --git a/elixir/apps/web/lib/web/live/sites/show.ex b/elixir/apps/web/lib/web/live/sites/show.ex index 523779f4a..b91d64a13 100644 --- a/elixir/apps/web/lib/web/live/sites/show.ex +++ b/elixir/apps/web/lib/web/live/sites/show.ex @@ -154,17 +154,17 @@ defmodule Web.Sites.Show do ordered_by={@order_by_table_id["gateways"]} metadata={@gateways_metadata} > - <:col :let={gateway} label="INSTANCE"> + <:col :let={gateway} label="instance"> <.link navigate={~p"/#{@account}/gateways/#{gateway.id}"} class={[link_style()]}> <%= gateway.name %> - <:col :let={gateway} label="REMOTE IP"> + <:col :let={gateway} label="remote ip"> <%= gateway.last_seen_remote_ip %> - <:col :let={gateway} label="STATUS"> + <:col :let={gateway} label="status"> <.connection_status schema={gateway} /> <:empty> @@ -209,7 +209,7 @@ defmodule Web.Sites.Show do ordered_by={@order_by_table_id["resources"]} metadata={@resources_metadata} > - <:col :let={resource} label="NAME" field={{:resources, :name}}> + <:col :let={resource} label="name" field={{:resources, :name}}> <.link navigate={~p"/#{@account}/resources/#{resource}?site_id=#{@group}"} class={[link_style()]} @@ -217,7 +217,7 @@ defmodule Web.Sites.Show do <%= resource.name %> - <:col :let={resource} label="ADDRESS" field={{:resources, :address}}> + <:col :let={resource} label="address" field={{:resources, :address}}> <%= resource.address %>