From 73a07afbd86136d2b78473093769b70f901920fe Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Mon, 21 Apr 2025 13:17:26 -0600 Subject: [PATCH] reasoning message should not be clickable until it has a message --- .../organizations/interfaces.ts | 3 +- .../api/asset_interfaces/users/interfaces.ts | 4 +- .../[userId]/_overview/UserDefaultAccess.tsx | 47 +++++++++++-------- .../ChatResponseReasoning.tsx | 2 + 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/web/src/api/asset_interfaces/organizations/interfaces.ts b/web/src/api/asset_interfaces/organizations/interfaces.ts index 9e3fbb7d2..0a7bbeeed 100644 --- a/web/src/api/asset_interfaces/organizations/interfaces.ts +++ b/web/src/api/asset_interfaces/organizations/interfaces.ts @@ -12,5 +12,6 @@ export enum BusterOrganizationRole { WORKSPACE_ADMIN = 'workspaceAdmin', DATA_ADMIN = 'dataAdmin', QUERIER = 'querier', - RESTRICTED_QUERIER = 'restrictedQuerier' + RESTRICTED_QUERIER = 'restrictedQuerier', + VIEWER = 'viewer' } diff --git a/web/src/api/asset_interfaces/users/interfaces.ts b/web/src/api/asset_interfaces/users/interfaces.ts index 55e6ae6fb..1b40099a1 100644 --- a/web/src/api/asset_interfaces/users/interfaces.ts +++ b/web/src/api/asset_interfaces/users/interfaces.ts @@ -1,4 +1,4 @@ -import type { BusterOrganization } from '../organizations'; +import type { BusterOrganization, BusterOrganizationRole } from '../organizations'; import type { BusterPermissionUser } from '../permission'; import type { ShareAssetType } from '../share'; @@ -70,7 +70,7 @@ export interface OrganizationUser { email: string; name: string; status: 'active' | 'inactive'; - role: 'dataAdmin' | 'workspaceAdmin' | 'querier' | 'restrictedQuerier' | 'viewer'; + role: BusterOrganizationRole; datasets: OrganizationUserDataset[]; } diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx index ace1ca3ea..c74e6d231 100644 --- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx +++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx @@ -1,4 +1,8 @@ -import { type BusterUser, type OrganizationUser } from '@/api/asset_interfaces'; +import { + BusterOrganizationRole, + type BusterUser, + type OrganizationUser +} from '@/api/asset_interfaces'; import React from 'react'; import { Title, Text } from '@/components/ui/typography'; import { @@ -41,10 +45,11 @@ export const UserDefaultAccess: React.FC<{ }; const accessOptions: SelectItem[] = [ - { label: 'Data Admin', value: 'dataAdmin' }, - { label: 'Workspace Admin', value: 'workspaceAdmin' }, - { label: 'Querier', value: 'querier' }, - { label: 'Restricted Querier', value: 'restrictedQuerier' } + { label: 'Data Admin', value: BusterOrganizationRole.DATA_ADMIN }, + { label: 'Workspace Admin', value: BusterOrganizationRole.WORKSPACE_ADMIN }, + { label: 'Querier', value: BusterOrganizationRole.QUERIER }, + { label: 'Restricted Querier', value: BusterOrganizationRole.RESTRICTED_QUERIER }, + { label: 'Viewer', value: BusterOrganizationRole.VIEWER } ]; const DefaultAccessCard = React.memo( @@ -74,21 +79,23 @@ const DefaultAccessCard = React.memo(
Access level - - + +
diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx index f4ac9897b..470f1dc7a 100644 --- a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx +++ b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx @@ -50,6 +50,8 @@ export const ChatResponseReasoning: React.FC<{ }, [lastMessageTitle, finalReasoningMessage, blackBoxMessage]); const href = useMemo(() => { + if (!messageId) return ''; + if (isReasonginFileSelected) { return createBusterRoute({ route: BusterRoutes.APP_CHAT_ID,