From a67d44e7b2b7c542c877bd6725eb3c2fe32e320f Mon Sep 17 00:00:00 2001 From: Cristine Guadelupe Date: Sun, 3 Sep 2023 20:48:33 +0700 Subject: [PATCH] Metadata typo (#2195) --- lib/livebook/hubs.ex | 6 +++--- lib/livebook/hubs/personal.ex | 2 +- lib/livebook/live_markdown/export.ex | 4 ++-- lib/livebook/live_markdown/import.ex | 8 ++++---- lib/livebook/teams.ex | 4 ++-- lib/livebook_web/live/hooks/sidebar_hook.ex | 8 ++++---- test/livebook_teams/hubs_test.exs | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/livebook/hubs.ex b/lib/livebook/hubs.ex index a35630a8e..9281f3f7a 100644 --- a/lib/livebook/hubs.ex +++ b/lib/livebook/hubs.ex @@ -27,10 +27,10 @@ defmodule Livebook.Hubs do end @doc """ - Gets a list of metadatas from storage. + Gets a list of metadata from storage. """ - @spec get_metadatas() :: list(Metadata.t()) - def get_metadatas do + @spec get_metadata() :: list(Metadata.t()) + def get_metadata do for hub <- get_hubs() do Provider.to_metadata(hub) end diff --git a/lib/livebook/hubs/personal.ex b/lib/livebook/hubs/personal.ex index 0240c741f..4eb9256cf 100644 --- a/lib/livebook/hubs/personal.ex +++ b/lib/livebook/hubs/personal.ex @@ -53,7 +53,7 @@ defmodule Livebook.Hubs.Personal do @doc """ Updates a Hub. - With success, notifies interested processes about hub metadatas data change. + With success, notifies interested processes about hub metadata data change. Otherwise, it will return an error tuple with changeset. """ @spec update_hub(t(), map()) :: {:ok, t()} | {:error, Ecto.Changeset.t()} diff --git a/lib/livebook/live_markdown/export.ex b/lib/livebook/live_markdown/export.ex index 1384fbbbf..3dcc446c9 100644 --- a/lib/livebook/live_markdown/export.ex +++ b/lib/livebook/live_markdown/export.ex @@ -107,14 +107,14 @@ defmodule Livebook.LiveMarkdown.Export do app_settings_metadata = app_settings_metadata(notebook.app_settings) - file_entry_metadatas = + file_entry_metadata = notebook.file_entries |> Enum.sort_by(& &1.name) |> Enum.map(&file_entry_metadata/1) put_unless_default( metadata, - %{app_settings: app_settings_metadata, file_entries: file_entry_metadatas}, + %{app_settings: app_settings_metadata, file_entries: file_entry_metadata}, %{app_settings: %{}, file_entries: []} ) end diff --git a/lib/livebook/live_markdown/import.ex b/lib/livebook/live_markdown/import.ex index ef457d317..7315cb9f4 100644 --- a/lib/livebook/live_markdown/import.ex +++ b/lib/livebook/live_markdown/import.ex @@ -410,10 +410,10 @@ defmodule Livebook.LiveMarkdown.Import do {Map.put(attrs, :app_settings, app_settings), messages} - {"file_entries", file_entry_metadatas}, {attrs, messages} - when is_list(file_entry_metadatas) -> + {"file_entries", file_entry_metadata}, {attrs, messages} + when is_list(file_entry_metadata) -> file_system_by_id = - if Enum.any?(file_entry_metadatas, &(&1["type"] == "file")) do + if Enum.any?(file_entry_metadata, &(&1["type"] == "file")) do for file_system <- Livebook.Settings.file_systems(), do: {file_system.id, file_system}, into: %{} @@ -422,7 +422,7 @@ defmodule Livebook.LiveMarkdown.Import do end {file_entries, file_entry_messages} = - for file_entry_metadata <- file_entry_metadatas, reduce: {[], []} do + for file_entry_metadata <- file_entry_metadata, reduce: {[], []} do {file_entries, warnings} -> case file_entry_metadata_to_attrs(file_entry_metadata, file_system_by_id) do {:ok, file_entry} -> {[file_entry | file_entries], warnings} diff --git a/lib/livebook/teams.ex b/lib/livebook/teams.ex index 7463a0eed..8c962935f 100644 --- a/lib/livebook/teams.ex +++ b/lib/livebook/teams.ex @@ -156,7 +156,7 @@ defmodule Livebook.Teams do @doc """ Creates a Hub. - It notifies interested processes about hub metadatas data change. + It notifies interested processes about hub metadata data change. """ @spec create_hub!(map()) :: Team.t() def create_hub!(attrs) do @@ -169,7 +169,7 @@ defmodule Livebook.Teams do @doc """ Updates a Hub. - With success, notifies interested processes about hub metadatas data change. + With success, notifies interested processes about hub metadata data change. Otherwise, it will return an error tuple with changeset. """ @spec update_hub(Team.t(), map()) :: {:ok, Team.t()} | {:error, Ecto.Changeset.t()} diff --git a/lib/livebook_web/live/hooks/sidebar_hook.ex b/lib/livebook_web/live/hooks/sidebar_hook.ex index 45b5ca151..bf680cb81 100644 --- a/lib/livebook_web/live/hooks/sidebar_hook.ex +++ b/lib/livebook_web/live/hooks/sidebar_hook.ex @@ -13,7 +13,7 @@ defmodule LivebookWeb.SidebarHook do socket = socket - |> assign(saved_hubs: Livebook.Hubs.get_metadatas()) + |> assign(saved_hubs: Livebook.Hubs.get_metadata()) |> attach_hook(:hubs, :handle_info, &handle_info/2) |> attach_hook(:shutdown, :handle_info, &handle_info/2) |> attach_hook(:shutdown, :handle_event, &handle_event/3) @@ -28,17 +28,17 @@ defmodule LivebookWeb.SidebarHook do @connection_events ~w(hub_connected hub_changed)a defp handle_info(event, socket) when elem(event, 0) in @connection_events do - {:cont, assign(socket, saved_hubs: Livebook.Hubs.get_metadatas())} + {:cont, assign(socket, saved_hubs: Livebook.Hubs.get_metadata())} end defp handle_info({:hub_connection_failed, _hub_id, _reason}, socket) do - {:cont, assign(socket, saved_hubs: Livebook.Hubs.get_metadatas())} + {:cont, assign(socket, saved_hubs: Livebook.Hubs.get_metadata())} end defp handle_info({:hub_server_error, _hub_id, error}, socket) do {:cont, socket - |> assign(saved_hubs: Livebook.Hubs.get_metadatas()) + |> assign(saved_hubs: Livebook.Hubs.get_metadata()) |> put_flash(:error, error)} end diff --git a/test/livebook_teams/hubs_test.exs b/test/livebook_teams/hubs_test.exs index a6f85223b..539625d60 100644 --- a/test/livebook_teams/hubs_test.exs +++ b/test/livebook_teams/hubs_test.exs @@ -11,14 +11,14 @@ defmodule Livebook.HubsTest do refute team in Hubs.get_hubs() end - test "get_metadatas/0 returns a list of persisted hubs normalized", %{user: user, node: node} do + test "get_metadata/0 returns a list of persisted hubs normalized", %{user: user, node: node} do team = create_team_hub(user, node) metadata = Hubs.Provider.to_metadata(team) - assert metadata in Hubs.get_metadatas() + assert metadata in Hubs.get_metadata() Hubs.delete_hub(team.id) - refute metadata in Hubs.get_metadatas() + refute metadata in Hubs.get_metadata() end test "fetch_hub!/1 returns one persisted team", %{user: user, node: node} do