diff --git a/CHANGELOG.md b/CHANGELOG.md index e575e36d6..680196652 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ All notable changes to this project will be documented in this file. ## Unreleased ### Added -- Call to action for tracking Goal Conversions and an option to hide the section from the dashboard - Add support for `with_imported=true` in Stats API aggregate endpoint - Ability to use '--' instead of '=' sign in the `tagged-events` classnames - 'Last updated X seconds ago' info to 'current visitors' tooltips diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js index 158f9a60f..165ca0838 100644 --- a/assets/js/dashboard/api.js +++ b/assets/js/dashboard/api.js @@ -71,11 +71,3 @@ export function get(url, query={}, ...extraQuery) { return response.json() }) } - -export function put(url, body) { - return fetch(url, { - method: "PUT", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(body) - }) -} diff --git a/assets/js/dashboard/components/notice.js b/assets/js/dashboard/components/notice.js deleted file mode 100644 index fd2d9876a..000000000 --- a/assets/js/dashboard/components/notice.js +++ /dev/null @@ -1,56 +0,0 @@ -import React from "react" -import { sectionTitles } from "../stats/behaviours" -import * as api from '../api' - -export function FeatureSetupNotice({ site, feature, shortFeatureName, title, info, settingsLink, onHideAction }) { - const sectionTitle = sectionTitles[feature] - - const requestHideSection = () => { - if (window.confirm(`Are you sure you want to hide ${sectionTitle}? You can make it visible again in your site settings later.`)) { - api.put(`/api/${encodeURIComponent(site.domain)}/disable-feature`, { feature: feature }) - .then(response => { - if (response.ok) { onHideAction() } - }) - } - } - - function setupButton() { - return ( - -

Set up {shortFeatureName}

- - - -
- ) - } - - function hideButton() { - return ( - - ) - } - - return ( -
-
-
- {title} -
- -
- {info} -
- -
- {hideButton()} - {setupButton()} -
-
-
- ) -} \ No newline at end of file diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js index 8f6dcdb90..524bcbab5 100644 --- a/assets/js/dashboard/historical.js +++ b/assets/js/dashboard/historical.js @@ -9,13 +9,25 @@ import Sources from './stats/sources' import Pages from './stats/pages' import Locations from './stats/locations'; import Devices from './stats/devices' -import Behaviours from './stats/behaviours' +import Conversions from './stats/conversions' import ComparisonInput from './comparison-input' import { withPinnedHeader } from './pinned-header-hoc'; function Historical(props) { const tooltipBoundary = React.useRef(null) + function renderConversions() { + if (props.site.hasGoals) { + return ( +
+ +
+ ) + } + + return null + } + return (
@@ -39,7 +51,7 @@ function Historical(props) {
- + { renderConversions() } ) } diff --git a/assets/js/dashboard/mount.js b/assets/js/dashboard/mount.js index 2f867b563..9c923a88b 100644 --- a/assets/js/dashboard/mount.js +++ b/assets/js/dashboard/mount.js @@ -16,10 +16,6 @@ if (container) { domain: container.dataset.domain, offset: container.dataset.offset, hasGoals: container.dataset.hasGoals === 'true', - conversionsEnabled: container.dataset.conversionsEnabled === 'true', - funnelsEnabled: container.dataset.funnelsEnabled === 'true', - propsEnabled: container.dataset.propsEnabled === 'true', - funnels: JSON.parse(container.dataset.funnels), statsBegin: container.dataset.statsBegin, nativeStatsBegin: container.dataset.nativeStatsBegin, embedded: container.dataset.embedded, diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js index ea1a283ef..1c85f8b8c 100644 --- a/assets/js/dashboard/realtime.js +++ b/assets/js/dashboard/realtime.js @@ -8,10 +8,22 @@ import Sources from './stats/sources' import Pages from './stats/pages' import Locations from './stats/locations' import Devices from './stats/devices' -import Behaviours from './stats/behaviours' +import Conversions from './stats/conversions' import { withPinnedHeader } from './pinned-header-hoc'; class Realtime extends React.Component { + renderConversions() { + if (this.props.site.hasGoals) { + return ( +
+ +
+ ) + } + + return null + } + render() { const navClass = this.props.site.embedded ? 'relative' : 'sticky' @@ -36,7 +48,8 @@ class Realtime extends React.Component { - + + { this.renderConversions() } ) } diff --git a/assets/js/dashboard/stats/behaviours/funnel.js b/assets/js/dashboard/stats/behaviours/funnel.js deleted file mode 100644 index 4d0ad135b..000000000 --- a/assets/js/dashboard/stats/behaviours/funnel.js +++ /dev/null @@ -1,4 +0,0 @@ -export default function Funnel(_props) { - // TODO - return null -} \ No newline at end of file diff --git a/assets/js/dashboard/stats/behaviours/index.js b/assets/js/dashboard/stats/behaviours/index.js deleted file mode 100644 index d5eabf5fe..000000000 --- a/assets/js/dashboard/stats/behaviours/index.js +++ /dev/null @@ -1,250 +0,0 @@ -import React, { Fragment, useState, useEffect } from 'react' -import { Menu, Transition } from '@headlessui/react' -import { ChevronDownIcon } from '@heroicons/react/20/solid' -import classNames from 'classnames' -import * as storage from '../../util/storage' - -import Conversions from './conversions' -import Funnel from './funnel' -import { FeatureSetupNotice } from '../../components/notice' - -const ACTIVE_CLASS = 'inline-block h-5 text-indigo-700 dark:text-indigo-500 font-bold active-prop-heading truncate text-left' -const DEFAULT_CLASS = 'hover:text-indigo-600 cursor-pointer truncate text-left' - -export const CONVERSIONS = 'conversions' -export const FUNNELS = 'funnels' -export const PROPS = 'props' - -export const sectionTitles = { - [CONVERSIONS]: 'Goal Conversions', - [FUNNELS]: 'Funnels', - [PROPS]: 'Custom Properties' -} - -export default function Behaviours(props) { - const site = props.site - const adminAccess = ['owner', 'admin', 'super_admin'].includes(props.currentUserRole) - const tabKey = `behavioursTab__${site.domain}` - const funnelKey = `behavioursTabFunnel__${site.domain}` - const [enabledModes, setEnabledModes] = useState(getEnabledModes()) - const [mode, setMode] = useState(defaultMode()) - - const [funnelNames, _setFunnelNames] = useState(site.funnels.map(({ name }) => name)) - const [selectedFunnel, setSelectedFunnel] = useState(storage.getItem(funnelKey)) - - useEffect(() => { - setMode(defaultMode()) - }, [enabledModes]) - - function disableMode(mode) { - setEnabledModes(enabledModes.filter((m) => { return m !== mode })) - } - - function setFunnel(selectedFunnel) { - return () => { - storage.setItem(tabKey, FUNNELS) - storage.setItem(funnelKey, selectedFunnel) - setMode(FUNNELS) - setSelectedFunnel(selectedFunnel) - } - } - - function hasFunnels() { - return site.funnels.length > 0 - } - - function tabFunnelPicker() { - return -
- - Funnels - -
- - - -
- {funnelNames.map((funnelName) => { - return ( - - {({ active }) => ( - - {funnelName} - - )} - - ) - })} -
-
-
-
- } - - function tabSwitcher(toMode, displayName) { - const className = classNames({ [ACTIVE_CLASS]: mode == toMode, [DEFAULT_CLASS]: mode !== toMode }) - const setTab = () => { - storage.setItem(tabKey, toMode) - setMode(toMode) - } - - return ( -
- {displayName} -
- ) - } - - function tabs() { - return ( -
- {isEnabled(CONVERSIONS) && tabSwitcher(CONVERSIONS, 'Goals')} - {isEnabled(FUNNELS) && (hasFunnels() ? tabFunnelPicker() : tabSwitcher(FUNNELS, 'Funnels'))} - {isEnabled(PROPS) && tabSwitcher(PROPS, 'Properties')} -
- ) - } - - function renderConversions() { - if (site.hasGoals) { return } - else if (adminAccess) { - return ( - - ) - } - else { return noDataYet() } - } - - function renderFunnels() { - if (selectedFunnel) { return } - else if (adminAccess) { - return ( - - ) - } - else { return noDataYet() } - } - - function renderProps() { - if (adminAccess) { - return ( - - ) - } else { return noDataYet() } - } - - function noDataYet() { - return ( -
- No data yet -
- ) - } - - function onHideAction(mode) { - return () => { disableMode(mode) } - } - - function renderContent() { - switch (mode) { - case CONVERSIONS: - return renderConversions() - case FUNNELS: - return renderFunnels() - case PROPS: - return renderProps() - } - } - - function defaultMode() { - if (enabledModes.length === 0) { return null } - - const storedMode = storage.getItem(tabKey) - if (storedMode && enabledModes.includes(storedMode)) { return storedMode } - - if (enabledModes.includes(CONVERSIONS)) { return CONVERSIONS } - if (enabledModes.includes(FUNNELS)) { return FUNNELS } - return PROPS - } - - function getEnabledModes() { - let enabledModes = [] - - if (site.conversionsEnabled) { - enabledModes.push(CONVERSIONS) - } - if (site.funnelsEnabled && !isRealtime() && site.flags.funnels) { - enabledModes.push(FUNNELS) - } - if (site.propsEnabled && !isRealtime() && site.flags.props) { - enabledModes.push(PROPS) - } - return enabledModes - } - - function isEnabled(mode) { - return enabledModes.includes(mode) - } - - function isRealtime() { - return props.query.period === 'realtime' - } - - if (mode) { - return ( -
-
-
-

- {sectionTitles[mode] + (isRealtime() ? ' (last 30min)' : '')} -

- {tabs()} -
- {renderContent()} -
-
- ) - } else { - return null - } -} diff --git a/assets/js/dashboard/stats/behaviours/conversions.js b/assets/js/dashboard/stats/conversions/index.js similarity index 93% rename from assets/js/dashboard/stats/behaviours/conversions.js rename to assets/js/dashboard/stats/conversions/index.js index 36a843b8b..4b0976803 100644 --- a/assets/js/dashboard/stats/behaviours/conversions.js +++ b/assets/js/dashboard/stats/conversions/index.js @@ -2,6 +2,7 @@ import React from 'react'; import { Link } from 'react-router-dom' import FlipMove from 'react-flip-move' + import Bar from '../bar' import PropBreakdown from './prop-breakdown' import numberFormatter from '../../util/number-formatter' @@ -99,6 +100,7 @@ export default class Conversions extends React.Component { } else if (this.state.goals) { return ( +

{this.props.title || "Goal Conversions"}

Goal
@@ -115,19 +117,11 @@ export default class Conversions extends React.Component { } } - renderConversions() { + render() { return ( - + { this.renderInner() } ) } - - render() { - return ( -
- { this.renderConversions() } -
- ) - } } diff --git a/assets/js/dashboard/stats/behaviours/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js similarity index 100% rename from assets/js/dashboard/stats/behaviours/prop-breakdown.js rename to assets/js/dashboard/stats/conversions/prop-breakdown.js diff --git a/lib/plausible/site.ex b/lib/plausible/site.ex index d51d7e19d..513a20fd8 100644 --- a/lib/plausible/site.ex +++ b/lib/plausible/site.ex @@ -18,9 +18,6 @@ defmodule Plausible.Site do field :stats_start_date, :date field :native_stats_start_at, :naive_datetime field :allowed_event_props, {:array, :string} - field :conversions_enabled, :boolean - field :props_enabled, :boolean - field :funnels_enabled, :boolean field :ingest_rate_limit_scale_seconds, :integer, default: 60 # default is set via changeset/2 @@ -169,14 +166,6 @@ defmodule Plausible.Site do change(site, allowed_event_props: list) end - def disable_feature(site, "conversions"), do: change(site, conversions_enabled: false) - def disable_feature(site, "funnels"), do: change(site, funnels_enabled: false) - def disable_feature(site, "props"), do: change(site, props_enabled: false) - - def enable_feature(site, "conversions"), do: change(site, conversions_enabled: true) - def enable_feature(site, "funnels"), do: change(site, funnels_enabled: true) - def enable_feature(site, "props"), do: change(site, props_enabled: true) - def remove_imported_data(site) do change(site, imported_data: nil) end diff --git a/lib/plausible_web/controllers/api/internal_controller.ex b/lib/plausible_web/controllers/api/internal_controller.ex index 751fcb6fc..40ea59b92 100644 --- a/lib/plausible_web/controllers/api/internal_controller.ex +++ b/lib/plausible_web/controllers/api/internal_controller.ex @@ -2,11 +2,9 @@ defmodule PlausibleWeb.Api.InternalController do use PlausibleWeb, :controller use Plausible.Repo alias Plausible.Stats.Clickhouse, as: Stats - alias Plausible.{Sites, Site, Auth} - alias Plausible.Auth.User def domain_status(conn, %{"domain" => domain}) do - site = Sites.get_by_domain(domain) + site = Plausible.Sites.get_by_domain(domain) if Stats.has_pageviews?(site) do json(conn, "READY") @@ -32,28 +30,11 @@ defmodule PlausibleWeb.Api.InternalController do end end - def disable_feature(conn, %{"domain" => domain, "feature" => feature}) do - with %User{id: user_id} <- conn.assigns[:current_user], - site <- Sites.get_by_domain(domain), - true <- Sites.has_admin_access?(user_id, site) || Auth.is_super_admin?(user_id) do - Site.disable_feature(site, feature) - |> Repo.update() - - json(conn, "ok") - else - _ -> - PlausibleWeb.Api.Helpers.unauthorized( - conn, - "You need to be logged in as the owner or admin account of this site" - ) - end - end - defp sites_for(user, params) do Repo.paginate( from( - s in Site, - join: sm in Site.Membership, + s in Plausible.Site, + join: sm in Plausible.Site.Membership, on: sm.site_id == s.id, where: sm.user_id == ^user.id, order_by: s.domain diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex index 2ee92f949..6de9010ec 100644 --- a/lib/plausible_web/controllers/site_controller.ex +++ b/lib/plausible_web/controllers/site_controller.ex @@ -171,34 +171,6 @@ defmodule PlausibleWeb.SiteController do end end - def set_feature_status(conn, %{"action" => action, "feature" => feature}) do - site = conn.assigns[:site] - - report_title = - case feature do - "conversions" -> "Goals" - "funnels" -> "Funnels" - "props" -> "Properties" - end - - {change, flash_msg} = - case action do - "enable" -> - {Plausible.Site.enable_feature(site, feature), - "#{report_title} are now visible again on your dashboard"} - - "disable" -> - {Plausible.Site.disable_feature(site, feature), - "#{report_title} are now hidden from your dashboard"} - end - - Repo.update(change) - - conn - |> put_flash(:success, flash_msg) - |> redirect(to: Routes.site_path(conn, :settings_goals, conn.assigns[:site].domain)) - end - def settings(conn, %{"website" => website}) do redirect(conn, to: Routes.site_path(conn, :settings_general, website)) end diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index b32d8c8d3..ad93738fb 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -64,7 +64,6 @@ defmodule PlausibleWeb.StatsController do |> render("stats.html", site: site, has_goals: Plausible.Sites.has_goals?(site), - funnels: [], stats_start_date: stats_start_date, native_stats_start_date: NaiveDateTime.to_date(site.native_stats_start_at), title: "Plausible · " <> site.domain, @@ -292,7 +291,6 @@ defmodule PlausibleWeb.StatsController do |> render("stats.html", site: shared_link.site, has_goals: Sites.has_goals?(shared_link.site), - funnels: [], stats_start_date: shared_link.site.stats_start_date, native_stats_start_date: NaiveDateTime.to_date(shared_link.site.native_stats_start_at), title: "Plausible · " <> shared_link.site.domain, @@ -326,11 +324,8 @@ defmodule PlausibleWeb.StatsController do defp shared_link_cookie_name(slug), do: "shared-link-" <> slug - defp get_flags(user) do - %{ - funnels: FunWithFlags.enabled?(:funnels, for: user), - props: FunWithFlags.enabled?(:props, for: user) - } + defp get_flags(_user) do + %{} end defp is_dbip() do diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 7ef5d2352..cd93e5fde 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -117,8 +117,6 @@ defmodule PlausibleWeb.Router do post "/paddle/webhook", Api.PaddleController, :webhook get "/:domain/status", Api.InternalController, :domain_status - put "/:domain/disable-feature", Api.InternalController, :disable_feature - get "/sites", Api.InternalController, :sites end @@ -253,7 +251,6 @@ defmodule PlausibleWeb.Router do get "/:website/goals/new", SiteController, :new_goal post "/:website/goals", SiteController, :create_goal delete "/:website/goals/:id", SiteController, :delete_goal - put "/:website/settings/features/:action/:feature", SiteController, :set_feature_status put "/:website/settings", SiteController, :update_settings put "/:website/settings/google", SiteController, :update_google_auth delete "/:website/settings/google-search", SiteController, :delete_google_auth diff --git a/lib/plausible_web/templates/site/new_goal.html.eex b/lib/plausible_web/templates/site/new_goal.html.eex index 0dae3ce57..0417c5a30 100644 --- a/lib/plausible_web/templates/site/new_goal.html.eex +++ b/lib/plausible_web/templates/site/new_goal.html.eex @@ -7,11 +7,6 @@
-
- Custom events are not tracked by default - you have to configure them on your site to be sent to Plausible. See examples and learn more in - our docs. -
-
<%= label f, :event_name, class: "block text-sm font-bold dark:text-gray-100" %> <%= text_input f, :event_name, class: "transition mt-3 bg-gray-100 dark:bg-gray-900 outline-none appearance-none border border-transparent rounded w-full p-2 text-gray-700 dark:text-gray-300 leading-normal focus:outline-none focus:bg-white dark:focus:bg-gray-800 focus:border-gray-300 dark:focus:border-gray-500", placeholder: "Signup" %> diff --git a/lib/plausible_web/templates/site/settings_goals.html.eex b/lib/plausible_web/templates/site/settings_goals.html.eex index 17630e120..9235dd5d2 100644 --- a/lib/plausible_web/templates/site/settings_goals.html.eex +++ b/lib/plausible_web/templates/site/settings_goals.html.eex @@ -2,26 +2,11 @@

Goals

Define actions that you want your users to take like visiting a certain page, submitting a form, etc.

- <%= link(to: "https://plausible.io/docs/goal-conversions", target: "_blank", rel: "noreferrer") do %> <% end %> - -
- <%= if @site.conversions_enabled do %> - <%= button(to: "/#{URI.encode_www_form(@site.domain)}/settings/features/disable/conversions", method: :put, class: "bg-indigo-600 relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring") do %> - - <% end %> - <% else %> - <%= button(to: "/#{URI.encode_www_form(@site.domain)}/settings/features/enable/conversions", method: :put, class: "bg-gray-200 dark:bg-gray-700 relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring") do %> - - <% end %> - <% end %> - Show goals in the dashboard -
- <%= if @site.conversions_enabled do %> <%= if Enum.count(@goals) > 0 do %>
<%= for goal <- @goals do %> @@ -34,9 +19,8 @@ <% end %>
<% else %> -
No goals configured for this site yet
+
No goals configured for this site yet
<% end %> - <%= link("+ Add goal", to: "/#{URI.encode_www_form(@site.domain)}/goals/new", class: "button mt-6") %> - <% end %> + <%= link("+ Add goal", to: "/#{URI.encode_www_form(@site.domain)}/goals/new", class: "button mt-6") %>
diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index 6f57a5cd7..2d8d4c65c 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -18,10 +18,6 @@ data-domain="<%= @site.domain %>" data-offset="<%= Plausible.Site.tz_offset(@site) %>" data-has-goals="<%= @has_goals %>" - data-conversions-enabled="<%= @site.conversions_enabled %>" - data-funnels-enabled="<%= @site.funnels_enabled %>" - data-props-enabled="<%= @site.props_enabled %>" - data-funnels="<%= Jason.encode!(@funnels) %>" data-logged-in="<%= !!@conn.assigns[:current_user] %>" data-stats-begin="<%= @stats_start_date %>" data-native-stats-begin="<%= @native_stats_start_date %>" diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exs index c7ce0800e..0c8b35721 100644 --- a/test/plausible_web/controllers/api/internal_controller_test.exs +++ b/test/plausible_web/controllers/api/internal_controller_test.exs @@ -45,92 +45,4 @@ defmodule PlausibleWeb.Api.InternalControllerTest do } end end - - describe "PUT /api/:domain/disable-feature" do - setup [:create_user, :log_in] - - test "when the logged-in user is an admin of the site", %{conn: conn, user: user} do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :admin) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 200) == "ok" - assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) - end - - test "can disable conversions, funnels, and props with admin access", %{ - conn: conn, - user: user - } do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :admin) - - put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "funnels"}) - put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "props"}) - - assert %{conversions_enabled: false, funnels_enabled: false, props_enabled: false} = - Plausible.Sites.get_by_domain(site.domain) - end - - test "when the logged-in user is an owner of the site", %{conn: conn, user: user} do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :owner) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 200) == "ok" - assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) - end - - test "when the logged-in user is an super-admin", %{conn: conn, user: user} do - site = insert(:site) - patch_env(:super_admin_user_ids, [user.id]) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 200) == "ok" - assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) - end - - test "returns 401 when the logged-in user is a viewer of the site", %{conn: conn, user: user} do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :viewer) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 401) == %{ - "error" => "You need to be logged in as the owner or admin account of this site" - } - - assert %{conversions_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - end - - test "returns 401 when the logged-in user doesn't have site access at all", %{conn: conn} do - site = insert(:site) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 401) == %{ - "error" => "You need to be logged in as the owner or admin account of this site" - } - - assert %{conversions_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - end - end - - describe "PUT /api/:domain/disable-feature - user not logged in" do - test "returns 401 unauthorized", %{conn: conn} do - site = insert(:site) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 401) == %{ - "error" => "You need to be logged in as the owner or admin account of this site" - } - - assert %{conversions_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - end - end end diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index bd8075ade..6c1e1338f 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -739,109 +739,6 @@ defmodule PlausibleWeb.SiteControllerTest do end end - describe "PUT /:website/settings/features/:action/:feature" do - setup [:create_user, :log_in] - - test "can disable conversions, funnels, and props with admin access", %{ - conn: conn, - user: user - } do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :admin) - - conn1 = put(conn, "/#{site.domain}/settings/features/disable/conversions") - conn2 = put(conn, "/#{site.domain}/settings/features/disable/funnels") - conn3 = put(conn, "/#{site.domain}/settings/features/disable/props") - - assert %{conversions_enabled: false, funnels_enabled: false, props_enabled: false} = - Plausible.Sites.get_by_domain(site.domain) - - assert Phoenix.Flash.get(conn1.assigns.flash, :success) == - "Goals are now hidden from your dashboard" - - assert Phoenix.Flash.get(conn2.assigns.flash, :success) == - "Funnels are now hidden from your dashboard" - - assert Phoenix.Flash.get(conn3.assigns.flash, :success) == - "Properties are now hidden from your dashboard" - - assert redirected_to(conn1, 302) =~ "/#{site.domain}/settings/goals" - end - - test "can enable conversions, funnels, and props with admin access", %{ - conn: conn, - user: user - } do - site = - insert(:site, conversions_enabled: false, funnels_enabled: false, props_enabled: false) - - insert(:site_membership, user: user, site: site, role: :owner) - - conn1 = put(conn, "/#{site.domain}/settings/features/enable/conversions") - conn2 = put(conn, "/#{site.domain}/settings/features/enable/funnels") - conn3 = put(conn, "/#{site.domain}/settings/features/enable/props") - - assert %{conversions_enabled: true, funnels_enabled: true, props_enabled: true} = - Plausible.Sites.get_by_domain(site.domain) - - assert Phoenix.Flash.get(conn1.assigns.flash, :success) == - "Goals are now visible again on your dashboard" - - assert Phoenix.Flash.get(conn2.assigns.flash, :success) == - "Funnels are now visible again on your dashboard" - - assert Phoenix.Flash.get(conn3.assigns.flash, :success) == - "Properties are now visible again on your dashboard" - - assert redirected_to(conn3, 302) =~ "/#{site.domain}/settings/goals" - end - - test "can enable and disable with super-admin access", %{ - conn: conn, - user: user - } do - site = insert(:site) - patch_env(:super_admin_user_ids, [user.id]) - - conn1 = put(conn, "/#{site.domain}/settings/features/disable/funnels") - assert %{funnels_enabled: false} = Plausible.Sites.get_by_domain(site.domain) - - assert Phoenix.Flash.get(conn1.assigns.flash, :success) == - "Funnels are now hidden from your dashboard" - - conn2 = put(conn, "/#{site.domain}/settings/features/enable/funnels") - assert %{funnels_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - - assert Phoenix.Flash.get(conn2.assigns.flash, :success) == - "Funnels are now visible again on your dashboard" - - assert redirected_to(conn1, 302) =~ "/#{site.domain}/settings/goals" - assert redirected_to(conn2, 302) =~ "/#{site.domain}/settings/goals" - end - - test "fails to set feature status with viewer access", %{ - conn: conn, - user: user - } do - site = insert(:site) - insert(:site_membership, user: user, site: site, role: :viewer) - - conn = put(conn, "/#{site.domain}/settings/features/disable/conversions") - - assert %{conversions_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - assert conn.status == 404 - end - - test "fails to set feature status for a foreign site", %{conn: conn} do - site = insert(:site) - - conn = put(conn, "/#{site.domain}/settings/features/disable/conversions") - - assert %{conversions_enabled: true} = Plausible.Sites.get_by_domain(site.domain) - assert conn.status == 404 - end - end - describe "POST /sites/:website/weekly-report/enable" do setup [:create_user, :log_in, :create_site]