Skip to content

Commit c1ca6ea

Browse files
liuruibinliuruibin
committed
refactor: enhance workspace authorization handling in shared knowledge, model, and tool
1 parent 0af7da3 commit c1ca6ea

File tree

6 files changed

+95
-81
lines changed

6 files changed

+95
-81
lines changed

‎apps/knowledge/sql/list_knowledge.sql‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@ SELECT *
22
FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
33
"temp_knowledge".desc,
44
"temp_knowledge".type,
5-
'knowledge' as resource_type,
5+
'knowledge' as resource_type,
66
"temp_knowledge".workspace_id,
77
"temp_knowledge".folder_id,
88
"temp_knowledge".user_id,
9+
"user"."nick_name" as nick_name,
910
"temp_knowledge".create_time,
1011
"temp_knowledge".update_time,
1112
"temp_knowledge".file_size_limit,
1213
"temp_knowledge".file_count_limit,
1314
"temp_knowledge"."scope",
14-
"temp_knowledge"."embedding_model_id"::text,
15-
"document_temp"."char_length",
16-
to_json("temp_knowledge".meta)::jsonb as meta,
17-
CASE
18-
WHEN
19-
"app_knowledge_temp"."count" IS NULL THEN 0
20-
ELSE "app_knowledge_temp"."count" END AS application_mapping_count,
15+
"temp_knowledge"."embedding_model_id"::text, "document_temp"."char_length",
16+
to_json("temp_knowledge".meta)::jsonb as meta, CASE
17+
WHEN
18+
"app_knowledge_temp"."count" IS NULL THEN 0
19+
ELSE "app_knowledge_temp"."count" END AS application_mapping_count,
2120
"document_temp".document_count
2221
FROM (SELECT knowledge.*
2322
FROM knowledge knowledge ${knowledge_custom_sql}) temp_knowledge
@@ -28,24 +27,27 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
2827
FROM application_knowledge_mapping
2928
GROUP BY knowledge_id) app_knowledge_temp
3029
ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id
30+
left join "user" on "user".id = temp_knowledge.user_id
3131
UNION
32-
SELECT "id",
33-
"name",
34-
"desc",
35-
0 as "type",
36-
'folder' as "resource_type",
37-
"workspace_id",
38-
"parent_id" as "folder_id",
39-
"user_id",
40-
"create_time",
41-
"update_time",
42-
0 as file_size_limit,
43-
0 as file_count_limit,
44-
'WORKSPACE' as "scope",
45-
'' as "embedding_model_id",
32+
SELECT knowledge_folder."id",
33+
knowledge_folder."name",
34+
knowledge_folder."desc",
35+
0 as "type",
36+
'folder' as "resource_type",
37+
knowledge_folder."workspace_id",
38+
knowledge_folder."parent_id" as "folder_id",
39+
knowledge_folder."user_id",
40+
"user"."nick_name" as "nick_name",
41+
knowledge_folder."create_time",
42+
knowledge_folder."update_time",
43+
0 as file_size_limit,
44+
0 as file_count_limit,
45+
'WORKSPACE' as "scope",
46+
'' as "embedding_model_id",
4647
0 as char_length,
4748
'{}'::jsonb as meta,
4849
0 as application_mapping_count,
4950
0 as document_count
50-
from knowledge_folder ${folder_query_set}) temp
51+
from knowledge_folder left join "user"
52+
on "user".id = user_id ${folder_query_set}) temp
5153
${default_sql}

‎apps/knowledge/sql/list_knowledge_user.sql‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
66
"temp_knowledge".workspace_id,
77
"temp_knowledge".folder_id,
88
"temp_knowledge".user_id,
9+
"user"."nick_name" as nick_name,
910
"temp_knowledge".create_time,
1011
"temp_knowledge".update_time,
1112
"temp_knowledge".file_size_limit,
@@ -30,22 +31,25 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
3031
FROM application_knowledge_mapping
3132
GROUP BY knowledge_id) app_knowledge_temp
3233
ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id
34+
left join "user" on "user".id = temp_knowledge.user_id
3335
UNION
34-
SELECT "id",
35-
"name",
36-
"desc",
37-
0 as "type",
38-
'folder' as "resource_type",
39-
"workspace_id",
40-
"parent_id" as "folder_id",
41-
"user_id",
42-
"create_time",
43-
"update_time",
44-
0 as file_size_limit,
45-
0 as file_count_limit,
46-
'WORKSPACE' as "scope",
36+
SELECT knowledge_folder."id",
37+
knowledge_folder."name",
38+
knowledge_folder."desc",
39+
0 as "type",
40+
'folder' as "resource_type",
41+
knowledge_folder."workspace_id",
42+
knowledge_folder."parent_id" as "folder_id",
43+
knowledge_folder."user_id",
44+
"user".nick_name as "nick_name",
45+
knowledge_folder."create_time",
46+
knowledge_folder."update_time",
47+
0 as file_size_limit,
48+
0 as file_count_limit,
49+
'WORKSPACE' as "scope",
4750
0 as char_length,
4851
0 as application_mapping_count,
4952
0 as document_count
50-
from knowledge_folder ${folder_query_set}) temp
53+
from knowledge_folder left join "user"
54+
on "user".id = user_id ${folder_query_set}) temp
5155
${default_sql}

‎apps/knowledge/sql/list_knowledge_user_ee.sql‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
66
"temp_knowledge".workspace_id,
77
"temp_knowledge".folder_id,
88
"temp_knowledge".user_id,
9+
"user"."nick_name" as nick_name,
910
"temp_knowledge".create_time,
1011
"temp_knowledge".update_time,
1112
"temp_knowledge".file_size_limit,
@@ -39,22 +40,25 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
3940
FROM application_knowledge_mapping
4041
GROUP BY knowledge_id) app_knowledge_temp
4142
ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id
43+
left join "user" on "user".id = temp_knowledge.user_id
4244
UNION
43-
SELECT "id",
44-
"name",
45-
"desc",
46-
0 as "type",
47-
'folder' as "resource_type",
48-
"workspace_id",
49-
"parent_id" as "folder_id",
50-
"user_id",
51-
"create_time",
52-
"update_time",
53-
0 as file_size_limit,
54-
0 as file_count_limit,
55-
'WORKSPACE' as "scope",
45+
SELECT knowledge_folder."id",
46+
knowledge_folder."name",
47+
knowledge_folder."desc",
48+
0 as "type",
49+
'folder' as "resource_type",
50+
knowledge_folder."workspace_id",
51+
knowledge_folder."parent_id" as "folder_id",
52+
knowledge_folder."user_id",
53+
"user".nick_name as "nick_name",
54+
knowledge_folder."create_time",
55+
knowledge_folder."update_time",
56+
0 as file_size_limit,
57+
0 as file_count_limit,
58+
'WORKSPACE' as "scope",
5659
0 as char_length,
5760
0 as application_mapping_count,
5861
0 as document_count
59-
from knowledge_folder ${folder_query_set}) temp
62+
from knowledge_folder left join "user"
63+
on "user".id = user_id ${folder_query_set}) temp
6064
${default_sql}

‎apps/tools/sql/list_tool.sql‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
select *
2-
from (select "id"::text,
3-
"name",
4-
"desc",
5-
"tool_type",
6-
'tool' as "resource_type",
7-
"workspace_id",
8-
"folder_id",
9-
"user_id",
10-
"icon",
11-
"create_time",
12-
"update_time",
13-
"is_active"
14-
from tool ${tool_scope_query_set}
2+
from (select tool."id"::text,
3+
tool."name",
4+
tool."desc",
5+
tool."tool_type",
6+
'tool' as "resource_type",
7+
tool."workspace_id",
8+
tool."folder_id",
9+
tool."user_id",
10+
"user".nick_name as "nick_name",
11+
tool."icon",
12+
tool."create_time",
13+
tool."update_time",
14+
tool."is_active"
15+
from tool
16+
left join "user" on "user".id = user_id ${tool_scope_query_set}
1517
UNION
16-
select "id",
17-
"name",
18-
"desc",
19-
'folder' as "tool_type",
20-
'folder' as "resource_type",
21-
"workspace_id",
22-
"parent_id" as "folder_id",
23-
"user_id",
24-
'' as "icon",
25-
"create_time",
26-
"update_time",
27-
'true' as "is_active"
28-
from tool_folder ${folder_query_set}) temp
18+
select tool_folder."id",
19+
tool_folder."name",
20+
tool_folder."desc",
21+
'folder' as "tool_type",
22+
'folder' as "resource_type",
23+
tool_folder."workspace_id",
24+
tool_folder."parent_id" as "folder_id",
25+
tool_folder."user_id",
26+
"user".nick_name as "nick_name",
27+
'' as "icon",
28+
tool_folder."create_time",
29+
tool_folder."update_time",
30+
'true' as "is_active"
31+
from tool_folder
32+
left join "user" on "user".id = user_id ${folder_query_set}) temp
2933
${tool_query_set}

‎ui/src/views/knowledge/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
</template>
180180
<template #subTitle>
181181
<el-text class="color-secondary lighter" size="small">
182-
{{ $t('common.creator') }}: {{ item.username }}
182+
{{ $t('common.creator') }}: {{ item.nick_name }}
183183
</el-text>
184184
</template>
185185
</CardBox>
@@ -199,7 +199,7 @@
199199
</template>
200200
<template #subTitle>
201201
<el-text class="color-secondary" size="small">
202-
{{ $t('common.creator') }}: {{ item.username }}
202+
{{ $t('common.creator') }}: {{ item.nick_name }}
203203
</el-text>
204204
</template>
205205

‎ui/src/views/tool/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</template>
126126
<template #subTitle>
127127
<el-text class="color-secondary lighter" size="small">
128-
{{ $t('common.creator') }}: {{ item.username }}
128+
{{ $t('common.creator') }}: {{ item.nick_name }}
129129
</el-text>
130130
</template>
131131
</CardBox>
@@ -148,7 +148,7 @@
148148
</template>
149149
<template #subTitle>
150150
<el-text class="color-secondary lighter" size="small">
151-
{{ $t('common.creator') }}: {{ item.username }}
151+
{{ $t('common.creator') }}: {{ item.nick_name }}
152152
</el-text>
153153
</template>
154154

0 commit comments

Comments
 (0)