Skip to content

feat: scope project view to dashboards while View As is active #9365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
royendo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: scope project view to dashboards while View As is active #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 54 additions & 42 deletions web-admin/src/features/projects/ProjectTabs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
} from "@rilldata/web-admin//components/nav/Tab.svelte";
import Tab from "@rilldata/web-admin/components/nav/Tab.svelte";
import { removeBranchFromPath } from "@rilldata/web-admin/features/branches/branch-utils";
import { viewAsUserStore } from "@rilldata/web-admin/features/view-as-user/viewAsUserStore";
import { featureFlags } from "@rilldata/web-common/features/feature-flags";
import { type V1ProjectPermissions } from "../../client";

Expand All @@ -16,48 +17,59 @@

const { chat, reports, alerts } = featureFlags;

$: tabs = [
{
route: `/${organization}/${project}${branchPrefix}`,
label: "Home",
hasPermission: true,
},
{
route: `/${organization}/${project}${branchPrefix}/-/ai`,
label: "AI",
hasPermission: $chat,
},
{
route: `/${organization}/${project}${branchPrefix}/-/dashboards`,
label: "Dashboards",
hasPermission: true,
},
{
route: `/${organization}/${project}${branchPrefix}/-/query`,
label: "Query",
hasPermission: false,
},
{
route: `/${organization}/${project}${branchPrefix}/-/reports`,
label: "Reports",
hasPermission: $reports,
},
{
route: `/${organization}/${project}${branchPrefix}/-/alerts`,
label: "Alerts",
hasPermission: $alerts,
},
{
route: `/${organization}/${project}${branchPrefix}/-/status`,
label: "Status",
hasPermission: projectPermissions.manageProject,
},
{
route: `/${organization}/${project}${branchPrefix}/-/settings`,
label: "Settings",
hasPermission: projectPermissions.manageProject,
},
];
// While "View As" is active, the project view is scoped to dashboards
// only — other tabs (Home, AI, Reports, Alerts, Status, Settings) are
// hidden and their routes redirect in the project layout.
$: tabs = $viewAsUserStore
? [
{
route: `/${organization}/${project}${branchPrefix}/-/dashboards`,
label: "Dashboards",
hasPermission: true,
},
]
: [
{
route: `/${organization}/${project}${branchPrefix}`,
label: "Home",
hasPermission: true,
},
{
route: `/${organization}/${project}${branchPrefix}/-/ai`,
label: "AI",
hasPermission: $chat,
},
{
route: `/${organization}/${project}${branchPrefix}/-/dashboards`,
label: "Dashboards",
hasPermission: true,
},
{
route: `/${organization}/${project}${branchPrefix}/-/query`,
label: "Query",
hasPermission: false,
},
{
route: `/${organization}/${project}${branchPrefix}/-/reports`,
label: "Reports",
hasPermission: $reports,
},
{
route: `/${organization}/${project}${branchPrefix}/-/alerts`,
label: "Alerts",
hasPermission: $alerts,
},
{
route: `/${organization}/${project}${branchPrefix}/-/status`,
label: "Status",
hasPermission: projectPermissions.manageProject,
},
{
route: `/${organization}/${project}${branchPrefix}/-/settings`,
label: "Settings",
hasPermission: projectPermissions.manageProject,
},
];

$: selectedIndex = tabs?.findLastIndex((t) => isSelected(t.route, pathname));

Expand Down
16 changes: 16 additions & 0 deletions web-admin/src/routes/[organization]/[project]/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
branchPathPrefix,
extractBranchFromPath,
handleBranchNavigation,
removeBranchFromPath,
} from "@rilldata/web-admin/features/branches/branch-utils";
import {
V1DeploymentStatus,
Expand Down Expand Up @@ -109,6 +110,21 @@
};
});

// While "View As" is active, scope the project view to dashboards only.
// Any other project page (Home, AI, Reports, Alerts, Status, Settings) is
// redirected — entering View As is a deliberate "see what they see" mode,
// and admin surfaces aren't part of that.
$effect(() => {
if (!$viewAsUserStore) return;
if (!onProjectPage) return;
const dashboardsPath = `/${organization}/${project}${branchPrefix}/-/dashboards`;
const normalizedPath = removeBranchFromPath(page.url.pathname);
const normalizedDashboards = removeBranchFromPath(dashboardsPath);
if (!normalizedPath.startsWith(normalizedDashboards)) {
void goto(dashboardsPath);
}
});

// --- Queries (three auth strategies; cookie and token are mutually exclusive,
// mock is an overlay that runs in parallel when View As is active) ---

Expand Down
Loading