diff --git a/packages/react-ui/src/app/routes/openops-analytics/index.tsx b/packages/react-ui/src/app/routes/openops-analytics/index.tsx
index ba69c312eb..b39fe8fb0e 100644
--- a/packages/react-ui/src/app/routes/openops-analytics/index.tsx
+++ b/packages/react-ui/src/app/routes/openops-analytics/index.tsx
@@ -1,6 +1,5 @@
-import { Navigate } from 'react-router-dom';
+import { useCheckAccessAndRedirect } from '@/app/common/hooks/authorization-hooks';
-import { useAuthorization } from '@/app/common/hooks/authorization-hooks';
import { flagsHooks } from '@/app/common/hooks/flags-hooks';
import { useDefaultSidebarState } from '@/app/common/hooks/use-default-sidebar-state';
import { useCandu } from '@/app/features/extensions/candu/use-candu';
@@ -17,7 +16,7 @@ import { useEmbedDashboard } from './use-embed-dashboard';
const OpenOpsAnalyticsPage = () => {
useDefaultSidebarState('minimized');
- const { checkAccess } = useAuthorization();
+ useCheckAccessAndRedirect(Permission.WRITE_ANALYTICS);
const { isCanduEnabled, canduClientToken, canduUserId } = useCandu();
const { data: analyticsPublicUrl } = flagsHooks.useFlag(
FlagId.ANALYTICS_PUBLIC_URL,
@@ -39,10 +38,6 @@ const OpenOpsAnalyticsPage = () => {
canduUserId,
});
- if (!checkAccess(Permission.WRITE_ANALYTICS)) {
- return ;
- }
-
if (!analyticsPublicUrl) {
console.error('OpenOps Analytics URL is not defined');
return null;
diff --git a/packages/react-ui/src/app/routes/openops-tables/index.tsx b/packages/react-ui/src/app/routes/openops-tables/index.tsx
index bb7b53504d..811a53b0f2 100644
--- a/packages/react-ui/src/app/routes/openops-tables/index.tsx
+++ b/packages/react-ui/src/app/routes/openops-tables/index.tsx
@@ -1,7 +1,7 @@
import { t } from 'i18next';
-import { Navigate, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
-import { useAuthorization } from '@/app/common/hooks/authorization-hooks';
+import { useCheckAccessAndRedirect } from '@/app/common/hooks/authorization-hooks';
import { flagsHooks } from '@/app/common/hooks/flags-hooks';
import { useDefaultSidebarState } from '@/app/common/hooks/use-default-sidebar-state';
import { useCandu } from '@/app/features/extensions/candu/use-candu';
@@ -9,7 +9,7 @@ import { FlagId, Permission } from '@openops/shared';
const OpenOpsTablesPage = () => {
useDefaultSidebarState('minimized');
- const { checkAccess } = useAuthorization();
+ useCheckAccessAndRedirect(Permission.WRITE_TABLE);
const { isCanduEnabled, canduClientToken, canduUserId } = useCandu();
const parentData = encodeURIComponent(
JSON.stringify({ isCanduEnabled, userId: canduUserId, canduClientToken }),
@@ -24,10 +24,6 @@ const OpenOpsTablesPage = () => {
FlagId.OPENOPS_TABLES_PUBLIC_URL,
);
- if (!checkAccess(Permission.WRITE_TABLE)) {
- return ;
- }
-
if (!openopsTablesUrl) {
console.error('OpenOps Tables URL is not defined');
return null;