From d8057bfd5906d2a59b68d8aec97262da564c8b42 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Mon, 11 Sep 2023 13:55:52 +0200 Subject: [PATCH] Keep the state up to date when changing props --- lib/plausible_web/live/props_settings.ex | 9 ++++++--- lib/plausible_web/live/props_settings/form.ex | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/plausible_web/live/props_settings.ex b/lib/plausible_web/live/props_settings.ex index b37d7c1ed..e34c1e6ae 100644 --- a/lib/plausible_web/live/props_settings.ex +++ b/lib/plausible_web/live/props_settings.ex @@ -136,21 +136,24 @@ defmodule PlausibleWeb.Live.PropsSettings do add_prop?: false, filter_text: "", all_props: props, - displayed_props: props + displayed_props: props, + site: %{socket.assigns.site | allowed_event_props: props} ) |> put_flash(:success, "Properties added successfully") {:noreply, socket} end - def handle_info({:prop_allowed, prop}, socket) when is_binary(prop) do + def handle_info({:prop_allowed, prop}, %{assigns: %{site: site}} = socket) + when is_binary(prop) do socket = socket |> assign( add_prop?: false, filter_text: "", all_props: [prop | socket.assigns.all_props], - displayed_props: [prop | socket.assigns.all_props] + displayed_props: [prop | socket.assigns.all_props], + site: %{site | allowed_event_props: [prop | site.allowed_event_props]} ) |> put_flash(:success, "Property added successfully") diff --git a/lib/plausible_web/live/props_settings/form.ex b/lib/plausible_web/live/props_settings/form.ex index 4b065ba5d..f38cae2ab 100644 --- a/lib/plausible_web/live/props_settings/form.ex +++ b/lib/plausible_web/live/props_settings/form.ex @@ -143,7 +143,8 @@ defmodule PlausibleWeb.Live.PropsSettings.Form do {:noreply, assign(socket, site: site, - form: new_form(site) + form: new_form(site), + prop_key_options_count: 0 )} end