Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ export const DashboardCreateDialog: React.FunctionComponent<DashboardCreateDialo
permissionsLoading,
permissionsError,
persesProjects,
defaultProject,
projectOptions,
} = useDashboardProjects();

const defaultProject = editableProjects ? editableProjects[0] : '';

const { ensureProjectExists, isCreatingProject } = useProjectCreation();
const { navigateToDashboard } = useDashboardNavigation();
const createDashboardMutation = useCreateDashboardMutation();
Expand Down
12 changes: 12 additions & 0 deletions web/src/components/dashboards/perses/dashboard-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
import { ProjectBar } from './project/ProjectBar';
import { Helmet } from 'react-helmet';
import { DashboardListPageHeader } from './dashboard-header';
import { useEditableProjects } from './hooks/useEditableProjects';
const perPageOptions = [
{ title: '10', value: 10 },
{ title: '20', value: 20 },
Expand All @@ -59,6 +60,7 @@ const DashboardActionsCell = React.memo(
emptyActions: any[];
}) => {
const { t } = useTranslation(process.env.I18N_NAMESPACE);
const { permissionsLoading } = useEditableProjects();
const { canEdit, loading } = usePersesEditPermissions(project);
const disabled = !canEdit;

Expand Down Expand Up @@ -90,6 +92,16 @@ const DashboardActionsCell = React.memo(
);
}

if (permissionsLoading) {
return (
<Tooltip content={t('Checking permissions...')}>
<div>
<ActionsColumn items={emptyActions} isDisabled={true} />
</div>
</Tooltip>
);
}

return <ActionsColumn items={rowSpecificActions} isDisabled={false} />;
},
);
Expand Down
10 changes: 5 additions & 5 deletions web/src/components/dashboards/perses/hooks/useDashboardsData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,16 @@ export const useDashboardsData = () => {

const params = new URLSearchParams(queryArguments);

let projectToUse = activeProject;
if (!activeProject) {
const dashboardMetadata = combinedDashboardsMetadata.find((item) => item.name === newBoard);
projectToUse = dashboardMetadata?.project;
}
const dashboard = combinedDashboardsMetadata.find((item) => item.name === newBoard);

const projectToUse = activeProject || dashboard?.project;

if (projectToUse) {
params.set(QueryParams.Project, projectToUse);
}
params.set(QueryParams.Dashboard, newBoard);
params.set(QueryParams.Start, dashboard?.persesDashboard?.spec?.duration);
params.set(QueryParams.Refresh, dashboard?.persesDashboard?.spec?.refreshInterval);

let url = getDashboardUrl(perspective);
url = `${url}?${params.toString()}`;
Expand Down
3 changes: 3 additions & 0 deletions web/src/components/query-params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ export enum QueryParams {
EndTime = 'endTime',
Datasource = 'datasource',
Project = 'project',
Edit = 'edit',
Start = 'start',
Refresh = 'refresh',
}