From 22e790f836da8ff4cc96c7931564a0a482d8e4a7 Mon Sep 17 00:00:00 2001 From: Antoine Augusti Date: Tue, 9 Jul 2024 18:03:59 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Ajout=20d'une=20banni=C3=A8re=20pour?= =?UTF-8?q?=20annoncer=20NeTEx=20parkings=20(#4050)"=20(#4054)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f3272d53bfc5efb97f080f055313076d182b4860. --- .../templates/dataset/_banner.html.heex | 14 ------------ .../dataset/_custom_message.html.heex | 8 ------- .../templates/dataset/details.html.heex | 7 +++++- .../lib/transport_web/views/dataset_view.ex | 14 ------------ .../en/LC_MESSAGES/page-dataset-details.po | 4 ---- .../fr/LC_MESSAGES/page-dataset-details.po | 4 ---- .../priv/gettext/page-dataset-details.pot | 4 ---- .../transport/priv/search_custom_messages.yml | 11 ++++++++++ .../controllers/dataset_controller_test.exs | 22 +------------------ .../controllers/dataset_search_test.exs | 13 ----------- 10 files changed, 18 insertions(+), 83 deletions(-) delete mode 100644 apps/transport/lib/transport_web/templates/dataset/_banner.html.heex diff --git a/apps/transport/lib/transport_web/templates/dataset/_banner.html.heex b/apps/transport/lib/transport_web/templates/dataset/_banner.html.heex deleted file mode 100644 index 79a237b374..0000000000 --- a/apps/transport/lib/transport_web/templates/dataset/_banner.html.heex +++ /dev/null @@ -1,14 +0,0 @@ -

- <%= raw( - dgettext( - "page-dataset-details", - ~s(Due to the release of the French profile “Parkings” applicable to NeTEx, available on normes.transport.data.gouv.fr, the national datasets related to car parks and park-and-ride will be deleted on September 1st 2024.) - ) - ) %> -

-

- ℹ️ <%= dgettext( - "page-dataset-details", - "This transport service operates seasonally. The associated resources may be outdated depending on the time of year. Contact the data producer through Discussions for more information." - ) %> -

diff --git a/apps/transport/lib/transport_web/templates/dataset/_custom_message.html.heex b/apps/transport/lib/transport_web/templates/dataset/_custom_message.html.heex index d4b993abda..3f449144d6 100644 --- a/apps/transport/lib/transport_web/templates/dataset/_custom_message.html.heex +++ b/apps/transport/lib/transport_web/templates/dataset/_custom_message.html.heex @@ -1,12 +1,4 @@
-
- <%= raw( - dgettext( - "page-dataset-details", - ~s(Due to the release of the French profile “Parkings” applicable to NeTEx, available on normes.transport.data.gouv.fr, the national datasets related to car parks and park-and-ride will be deleted on September 1st 2024.) - ) - ) %> -
<%= markdown_to_safe_html!(@msg) %>
diff --git a/apps/transport/lib/transport_web/templates/dataset/details.html.heex b/apps/transport/lib/transport_web/templates/dataset/details.html.heex index 1c82d33000..6e9fba2fb1 100644 --- a/apps/transport/lib/transport_web/templates/dataset/details.html.heex +++ b/apps/transport/lib/transport_web/templates/dataset/details.html.heex @@ -81,7 +81,12 @@
- <%= render("_banner.html", dataset: @dataset) %> +

+ ℹ️ <%= dgettext( + "page-dataset-details", + "This transport service operates seasonally. The associated resources may be outdated depending on the time of year. Contact the data producer through Discussions for more information." + ) %> +

<%= description(@dataset) %>
diff --git a/apps/transport/lib/transport_web/views/dataset_view.ex b/apps/transport/lib/transport_web/views/dataset_view.ex index 3b7ed96922..34931b75a5 100644 --- a/apps/transport/lib/transport_web/views/dataset_view.ex +++ b/apps/transport/lib/transport_web/views/dataset_view.ex @@ -550,20 +550,6 @@ defmodule TransportWeb.DatasetView do """ def seasonal_warning?(%Dataset{} = dataset), do: DB.Dataset.has_custom_tag?(dataset, "saisonnier") - @doc """ - Should we display a banner highlighting that the NeTEx profile for parkings will be the standard soon. - - https://github.com/etalab/transport-site/issues/4043 - """ - @spec parking_profile_warning?(DB.Dataset.t() | Plug.Conn.t()) :: boolean() - def parking_profile_warning?(%DB.Dataset{type: "private-parking", datagouv_id: datagouv_id}) do - datagouv_id in ["5ea1add4a5a7dac3af82310a", "63692c99da0527c2b541e02b"] - end - - def parking_profile_warning?(%Plug.Conn{params: %{"type" => "private-parking"}}), do: true - - def parking_profile_warning?(_), do: false - @doc """ iex> heart_class(%{42 => :producer}, %DB.Dataset{id: 42}) "fa fa-heart producer" diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/page-dataset-details.po b/apps/transport/priv/gettext/en/LC_MESSAGES/page-dataset-details.po index d81c25d911..10a9158ba0 100644 --- a/apps/transport/priv/gettext/en/LC_MESSAGES/page-dataset-details.po +++ b/apps/transport/priv/gettext/en/LC_MESSAGES/page-dataset-details.po @@ -705,7 +705,3 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Manage services for this dataset" msgstr "" - -#, elixir-autogen, elixir-format -msgid "Due to the release of the French profile “Parkings” applicable to NeTEx, available on normes.transport.data.gouv.fr, the national datasets related to car parks and park-and-ride will be deleted on September 1st 2024." -msgstr "" diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-dataset-details.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-dataset-details.po index ab343b8bde..f99238a832 100644 --- a/apps/transport/priv/gettext/fr/LC_MESSAGES/page-dataset-details.po +++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/page-dataset-details.po @@ -705,7 +705,3 @@ msgstr "Suivre ce jeu de données" #, elixir-autogen, elixir-format msgid "Manage services for this dataset" msgstr "Gérez les services liés à ce jeu de données" - -#, elixir-autogen, elixir-format -msgid "Due to the release of the French profile “Parkings” applicable to NeTEx, available on normes.transport.data.gouv.fr, the national datasets related to car parks and park-and-ride will be deleted on September 1st 2024." -msgstr "En raison de la publication du profil France Parkings de la norme NeTEx disponible sur normes.transport.data.gouv.fr, les bases nationales des lieux de stationnements hors voirie et des parcs relais seront supprimées le 1er septembre 2024." diff --git a/apps/transport/priv/gettext/page-dataset-details.pot b/apps/transport/priv/gettext/page-dataset-details.pot index b482d9b652..ee326b34c6 100644 --- a/apps/transport/priv/gettext/page-dataset-details.pot +++ b/apps/transport/priv/gettext/page-dataset-details.pot @@ -705,7 +705,3 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Manage services for this dataset" msgstr "" - -#, elixir-autogen, elixir-format -msgid "Due to the release of the French profile “Parkings” applicable to NeTEx, available on normes.transport.data.gouv.fr, the national datasets related to car parks and park-and-ride will be deleted on September 1st 2024." -msgstr "" diff --git a/apps/transport/priv/search_custom_messages.yml b/apps/transport/priv/search_custom_messages.yml index f4bfbcdfb4..936db357ff 100644 --- a/apps/transport/priv/search_custom_messages.yml +++ b/apps/transport/priv/search_custom_messages.yml @@ -95,9 +95,20 @@ msg: fr: | Les données concernant le stationnement hors-voirie en France sont produites par différentes collectivités et gestionnaires de parking. + + Ces données, lorsqu’elles sont normalisées, sont assemblées et consolidées dans un jeu de données national : [la Base Nationale des Lieux de Stationnement (BNLS)](https://transport.data.gouv.fr/datasets/base-nationale-des-lieux-de-stationnement/). + + Cette base ne référence que les parkings accessibles au public dont l’accès est limité par une barrière ; certaines bases locales référencées ici ont une définition plus larges et comprennent des parkings pour lesquelles l’accès est libre, sans barrière. + en: | + This category aims to describe the location of car-parks across France, and provide general traveller information (such as access information or an estimate of parking fees for each car-park). + Data for private car-parks in France are produced by different local authorities or parking operators. + These data, when published in a normalized format described [here](https://schema.data.gouv.fr/etalab/schema-stationnement/latest.html), are aggregated into a national dataset called [Base Nationale des Lieux de Stationnement (BNLS)](https://transport.data.gouv.fr/datasets/base-nationale-des-lieux-de-stationnement/). + + This dataset only describes parking spaces accessible to the general public, with barrier entrance. Other datasets referenced here can have a broader definition and might include freely accessible car-parks, (ie. with no entrance barrier), in addition to the parking spaces with barrier entrance included in the “Base Nationale des Lieux de Stationnement” (BNLS). + - category: carpooling-areas search_params: - key: type diff --git a/apps/transport/test/transport_web/controllers/dataset_controller_test.exs b/apps/transport/test/transport_web/controllers/dataset_controller_test.exs index 0cb40bc90b..8fbd75091f 100644 --- a/apps/transport/test/transport_web/controllers/dataset_controller_test.exs +++ b/apps/transport/test/transport_web/controllers/dataset_controller_test.exs @@ -653,36 +653,16 @@ defmodule TransportWeb.DatasetControllerTest do assert TransportWeb.DatasetView.seasonal_warning?(dataset) - content = + [{"p", [{"class", "notification"}], [content]}] = conn |> get(dataset_path(conn, :details, dataset.slug)) |> html_response(200) |> Floki.parse_document!() |> Floki.find(".notification") - |> Floki.text() assert content =~ "Le service de transport de ce jeu de donnée ne fonctionne pas toute l'année" end - test "banner for parking datasets", %{conn: conn} do - # See https://github.com/etalab/transport-site/issues/4043 - # This datagouv_id is for a target parking dataset - dataset = insert(:dataset, is_active: true, type: "private-parking", datagouv_id: "5ea1add4a5a7dac3af82310a") - mock_empty_history_resources() - - assert TransportWeb.DatasetView.parking_profile_warning?(dataset) - - content = - conn - |> get(dataset_path(conn, :details, dataset.slug)) - |> html_response(200) - |> Floki.parse_document!() - |> Floki.find(".notification") - |> Floki.text() - - assert content =~ "En raison de la publication du profil France Parkings de la norme NeTEx" - end - test "custom logo is displayed when set", %{conn: conn} do dataset = insert(:dataset, diff --git a/apps/transport/test/transport_web/controllers/dataset_search_test.exs b/apps/transport/test/transport_web/controllers/dataset_search_test.exs index c175f7544b..ccaba0c83e 100644 --- a/apps/transport/test/transport_web/controllers/dataset_search_test.exs +++ b/apps/transport/test/transport_web/controllers/dataset_search_test.exs @@ -322,17 +322,4 @@ defmodule TransportWeb.DatasetSearchControllerTest do refute hidden_dataset.id in (%{} |> DB.Dataset.list_datasets() |> DB.Repo.all() |> Enum.map(& &1.id)) end - - test "NeTEx profile banner for private parking", %{conn: conn} do - content = - conn - |> get(dataset_path(conn, :index), %{type: "private-parking"}) - |> html_response(200) - |> Floki.parse_document!() - |> Floki.find(".notification.error") - |> Floki.text() - - assert content =~ - "En raison de la publication du profil France Parkings de la norme NeTEx disponible sur normes.transport.data.gouv.fr" - end end