@@ -129,10 +126,10 @@ const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps) => {
diff --git a/apps/studio/components/interfaces/Database/Roles/Roles.constants.ts b/apps/studio/components/interfaces/Database/Roles/Roles.constants.ts
index a8b661eec69..377dd9589c6 100644
--- a/apps/studio/components/interfaces/Database/Roles/Roles.constants.ts
+++ b/apps/studio/components/interfaces/Database/Roles/Roles.constants.ts
@@ -33,35 +33,35 @@ export const SYSTEM_ROLES = [
] as const
export const ROLE_PERMISSIONS = {
- can_login: {
+ canLogin: {
disabled: false,
description: 'User can login',
grant_by_dashboard: true,
},
- can_create_role: {
+ canCreateRole: {
disabled: false,
description: 'User can create roles',
grant_by_dashboard: true,
},
- can_create_db: {
+ canCreateDb: {
disabled: false,
description: 'User can create databases',
grant_by_dashboard: true,
},
- can_bypass_rls: {
- disabled: true,
+ canBypassRls: {
+ disabled: false,
description: 'User bypasses every row level security policy',
- grant_by_dashboard: false,
+ grant_by_dashboard: true,
},
- is_superuser: {
+ isSuperuser: {
disabled: true,
description: 'User is a Superuser',
grant_by_dashboard: false,
},
- is_replication_role: {
- disabled: true,
+ isReplicationRole: {
+ disabled: false,
description:
'User can initiate streaming replication and put the system in and out of backup mode',
- grant_by_dashboard: false,
+ grant_by_dashboard: true,
},
} as const
diff --git a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx b/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
index 302328cac7c..089efbe930e 100644
--- a/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
+++ b/apps/studio/components/interfaces/Database/Roles/RolesList.tsx
@@ -42,19 +42,19 @@ const RolesList = () => {
const roles = sortBy(data ?? [], (r) => r.name.toLocaleLowerCase())
const filteredRoles = (
- filterType === 'active' ? roles.filter((role) => role.active_connections > 0) : roles
+ filterType === 'active' ? roles.filter((role) => role.activeConnections > 0) : roles
).filter((role) => role.name.includes(filterString))
const [supabaseRoles, otherRoles] = partition(filteredRoles, (role) =>
SUPABASE_ROLES.includes(role.name as SUPABASE_ROLE)
)
const totalActiveConnections = roles
- .map((role) => role.active_connections)
+ .map((role) => role.activeConnections)
.reduce((a, b) => a + b, 0)
// order the roles with active connections by number of connections, most connections first
const rolesWithActiveConnections = sortBy(
- roles.filter((role) => role.active_connections > 0),
- (r) => -r.active_connections
+ roles.filter((role) => role.activeConnections > 0),
+ (r) => -r.activeConnections
)
return (
@@ -145,7 +145,7 @@ const RolesList = () => {
diff --git a/apps/studio/components/interfaces/QueryPerformanceV2/IndexAdvisorDisabledState.tsx b/apps/studio/components/interfaces/QueryPerformanceV2/IndexAdvisorDisabledState.tsx
index 8f277142a18..f25c2cf93ce 100644
--- a/apps/studio/components/interfaces/QueryPerformanceV2/IndexAdvisorDisabledState.tsx
+++ b/apps/studio/components/interfaces/QueryPerformanceV2/IndexAdvisorDisabledState.tsx
@@ -3,23 +3,23 @@ import { ExternalLink } from 'lucide-react'
import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
import { useDatabaseExtensionEnableMutation } from 'data/database-extensions/database-extension-enable-mutation'
import { useDatabaseExtensionsQuery } from 'data/database-extensions/database-extensions-query'
-import { useIndexAdvisorEnableMutation } from 'data/database/index-advisor-enable-mutation'
import { AlertDescription_Shadcn_, AlertTitle_Shadcn_, Alert_Shadcn_, Button } from 'ui'
import { Markdown } from '../Markdown'
+import Link from 'next/link'
+import { useParams } from 'common'
export const IndexAdvisorDisabledState = () => {
+ const { ref } = useParams()
const { project } = useProjectContext()
const { data: extensions } = useDatabaseExtensionsQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
})
const hypopgExtension = (extensions ?? []).find((ext) => ext.name === 'hypopg')
+ const indexAdvisorExtension = (extensions ?? []).find((ext) => ext.name === 'index_advisor')
const { mutateAsync: enableExtension, isLoading: isEnablingExtension } =
useDatabaseExtensionEnableMutation()
- const { mutateAsync: enableIndexAdvisor, isLoading: isEnablingIndexAdvisor } =
- useIndexAdvisorEnableMutation()
- const isEnabling = isEnablingExtension || isEnablingIndexAdvisor
const onEnableIndexAdvisor = async () => {
if (project === undefined) return console.error('Project is required')
@@ -32,33 +32,56 @@ export const IndexAdvisorDisabledState = () => {
version: hypopgExtension.default_version,
})
}
-
- // [Joshen] Once index_advisor ext is ready, it'll just be enabling an extension
- await enableIndexAdvisor({
- projectRef: project.ref,
- connectionString: project.connectionString,
- })
+ if (indexAdvisorExtension?.installed_version === null) {
+ await enableExtension({
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ name: indexAdvisorExtension.name,
+ schema: indexAdvisorExtension?.schema ?? 'extensions',
+ version: indexAdvisorExtension.default_version,
+ })
+ }
}
return (
- 0 ? 'text-foreground' : 'text-foreground-light' + role.activeConnections > 0 ? 'text-foreground' : 'text-foreground-light' }`} > - {role.active_connections} connections + {role.activeConnections} connections
{!disabled && (Connections by roles:
{rolesWithActiveConnections.map((role) => (
- {role.name}: {role.active_connections}
+ {role.name}: {role.activeConnections}
))}