Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix: show pending tenant invitations (#21763)

buua436293936c4f5c7
diff --git a/internal/dao/user_tenant.go b/internal/dao/user_tenant.go
index 0c183861d8..bd5360a25b 100644
--- a/internal/dao/user_tenant.go
+++ b/internal/dao/user_tenant.go
@@ -154,6 +154,7 @@ func (dao *UserTenantDAO) GetNumMembers(ctx context.Context, db *gorm.DB, tenant
type TenantInfoByUserID struct {
TenantID string `json:"tenant_id"`
Role string `json:"role"`
+ Status string `json:"status"`
Nickname string `json:"nickname"`
Email string `json:"email"`
Avatar string `json:"avatar"`
@@ -200,9 +201,12 @@ func (dao *UserTenantDAO) GetMembersByTenantID(ctx context.Context, db *gorm.DB,
func (dao *UserTenantDAO) GetTenantsByUserID(ctx context.Context, db *gorm.DB, userID string) ([]*TenantInfoByUserID, error) {
var results []*TenantInfoByUserID
err := db.WithContext(ctx).Table("user_tenant").
- Select("user_tenant.tenant_id, user_tenant.role, user.nickname, user.email, user.avatar, user.update_date").
- Joins("JOIN user ON user_tenant.tenant_id = user.id AND user_tenant.user_id = ? AND user_tenant.status = ?", userID, "1").
- Where("user_tenant.status = ?", "1").
+ Select("user_tenant.tenant_id, user_tenant.role, user_tenant.status, user.nickname, user.email, user.avatar, user.update_date").
+ Joins("JOIN user ON user_tenant.tenant_id = user.id").
+ Where("user_tenant.user_id = ? AND user_tenant.status IN ?", userID, []string{
+ entity.TenantMembershipStatusJoined,
+ entity.TenantMembershipStatusInvited,
+ }).
Scan(&results).Error
return results, err
}
diff --git a/internal/service/tenant.go b/internal/service/tenant.go
index 88e15b4d9e..3e3370f469 100644
--- a/internal/service/tenant.go
+++ b/internal/service/tenant.go
@@ -161,6 +161,7 @@ func (s *TenantService) GetTenantInfo(ctx context.Context, userID string) (*Tena
type TenantListItem struct {
TenantID string `json:"tenant_id"`
Role string `json:"role"`
+ Status string `json:"status"`
Nickname string `json:"nickname"`
Email string `json:"email"`
Avatar string `json:"avatar"`
@@ -250,6 +251,7 @@ func (s *TenantService) GetTenantList(ctx context.Context, userID string) ([]*Te
result[i] = &TenantListItem{
TenantID: t.TenantID,
Role: t.Role,
+ Status: t.Status,
Nickname: t.Nickname,
Email: t.Email,
Avatar: t.Avatar,
diff --git a/web/src/interfaces/database/user-setting.ts b/web/src/interfaces/database/user-setting.ts
index ff4094d4b4..c42005509a 100644
--- a/web/src/interfaces/database/user-setting.ts
+++ b/web/src/interfaces/database/user-setting.ts
@@ -91,6 +91,7 @@ export interface ITenant {
email: string;
nickname: string;
role: string;
+ status: string;
tenant_id: string;
update_date: string;
}
diff --git a/web/src/pages/user-setting/constants.tsx b/web/src/pages/user-setting/constants.tsx
index 2ba1b1d769..cdc5a39109 100644
--- a/web/src/pages/user-setting/constants.tsx
+++ b/web/src/pages/user-setting/constants.tsx
@@ -59,6 +59,11 @@ export const LocalLlmFactories = [
LLMFactory.FunASR,
];
+export enum TenantMembershipStatus {
+ Joined = '1',
+ Invited = '2',
+}
+
export enum TenantRole {
Owner = 'owner',
Invite = 'invite',
diff --git a/web/src/pages/user-setting/setting-team/tenant-table.tsx b/web/src/pages/user-setting/setting-team/tenant-table.tsx
index 0a5c5e492e..1195d4b580 100644
--- a/web/src/pages/user-setting/setting-team/tenant-table.tsx
+++ b/web/src/pages/user-setting/setting-team/tenant-table.tsx
@@ -33,7 +33,7 @@ import { formatDate } from '@/utils/date';
import { ArrowDown, ArrowUp, ArrowUpDown, LogOut } from 'lucide-react';
import { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { TenantRole } from '../constants';
+import { TenantMembershipStatus, TenantRole } from '../constants';
import { useHandleAgreeTenant, useHandleQuitUser } from './hooks';
const TenantTable = ({ searchTerm }: { searchTerm: string }) => {
const { t } = useTranslation();
@@ -138,7 +138,7 @@ const TenantTable = ({ searchTerm }: { searchTerm: string }) => {
<SearchHighlight text={tenant.email} query={searchTerm} />
</TableCell>
<TableCell className="p-4">
- {tenant.role === TenantRole.Invite ? (
+ {tenant.status === TenantMembershipStatus.Invited ? (
<div className="flex gap-2">
<Button
variant="link"
diff --git a/web/src/pages/user-setting/setting-team/user-table.tsx b/web/src/pages/user-setting/setting-team/user-table.tsx
index 10fcf25808..44d940137e 100644
--- a/web/src/pages/user-setting/setting-team/user-table.tsx
+++ b/web/src/pages/user-setting/setting-team/user-table.tsx
@@ -36,7 +36,7 @@ import { upperFirst } from 'lodash';
import { ArrowDown, ArrowUp, ArrowUpDown, Trash2 } from 'lucide-react';
import { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { TenantRole } from '../constants';
+import { TenantMembershipStatus, TenantRole } from '../constants';
import { useHandleDeleteUser } from './hooks';
const ColorMap: Record<string, string> = {
@@ -153,12 +153,15 @@ const UserTable = ({ searchUser }: { searchUser: string }) => {
<SearchHighlight text={record.email} query={searchUser} />
</TableCell>
<TableCell className="p-4">
- {record.role === TenantRole.Normal && (
+ {record.status === TenantMembershipStatus.Invited ? (
+ <Badge className={ColorMap[TenantRole.Invite]}>
+ {upperFirst(TenantRole.Invite)}
+ </Badge>
+ ) : record.role === TenantRole.Normal ? (
<Badge className={ColorMap[record.role]}>
{upperFirst('Member')}
</Badge>
- )}
- {record.role !== TenantRole.Normal && (
+ ) : (
<Badge className={ColorMap[record.role]}>
{upperFirst(record.role)}
</Badge>