Skip to content

Commit 8d73f11

Browse files
authored
Merge pull request #34 from RonasIT/PRD-2154-knowledge-sheet-styling-fix
PRD-2154: Fix knowledge sheet
2 parents 609ee2c + 47fc01a commit 8d73f11

6 files changed

Lines changed: 29 additions & 6 deletions

File tree

i18n/mobile/folder/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"TEXT_UNSUPPORTED_TYPE": "Unsupported type."
2929
},
3030
"SELECT_KNOWLEDGE_SHEET": {
31+
"TEXT_SEARCH_KNOWLEDGE": "Search knowledge",
3132
"TEXT_SELECT_KNOWLEDGE": "Select Knowledge",
3233
"TEXT_NO_KNOWLEDGE": "There is no knowledge."
3334
}

libs/mobile/folder/features/select-knowledge-sheet/src/lib/component.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,13 @@ export function SelectKnowledgeSheet({ onConfirm, ref, ...props }: SelectKnowled
9393
title={translate('TEXT_SELECT_KNOWLEDGE')}
9494
onGoBack={closeModal}
9595
onConfirmPress={handleConfirm}
96-
className='px-16'
9796
/>
9897
<SearchInput
9998
value={query}
10099
onChangeText={setQuery}
101100
isInBottomSheet
102-
className='px-16'
103101
onCancel={onCancelPress}
102+
placeholder={translate('TEXT_SEARCH_KNOWLEDGE')}
104103
/>
105104
{isLoading ? (
106105
<View className='flex-1'>

libs/mobile/folder/features/select-knowledge-sheet/src/lib/components/knowledge-row/component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export interface KnowledgeRowProps {
1010

1111
export function KnowledgeRow({ item, onPress, isSelected }: KnowledgeRowProps): ReactElement {
1212
return (
13-
<AppPressable onPress={onPress} className='px-16 py-12 gap-16 flex-row items-center justify-between'>
13+
<AppPressable onPress={onPress} className='py-12 gap-16 flex-row items-center justify-between'>
1414
<Icon name={item.isDocument ? 'file' : 'database'} />
1515
<View className='flex-1 gap-4'>
1616
<AppText>{item.name}</AppText>

libs/shared/data-access/api/src/lib/knowledge/models/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ export * from './knowledge-file';
33
export * from './knowledge-data';
44
export * from './knowledge-access-control';
55
export * from './knowledge-access-control-groups';
6+
export * from './knowledge-response';
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Expose } from 'class-transformer';
2+
import { Knowledge } from './knowledge';
3+
4+
export class KnowledgeResponse {
5+
@Expose()
6+
public items: Array<Knowledge>;
7+
8+
@Expose()
9+
public total: number;
10+
11+
constructor(response: Partial<KnowledgeResponse> = {}) {
12+
Object.assign(this, response);
13+
}
14+
}

libs/shared/data-access/api/src/lib/knowledge/service.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { plainToInstance } from 'class-transformer';
22
import { getApiService } from '@open-webui-react-native/shared/data-access/api-client';
33
import { EntityPromiseService } from '@open-webui-react-native/shared/data-access/base-entity';
44
import { knowledgeApiConfig } from './config';
5-
import { Knowledge } from './models';
5+
import { Knowledge, KnowledgeResponse } from './models';
66

77
class KnowledgeService extends EntityPromiseService<Knowledge> {
88
constructor() {
@@ -14,9 +14,17 @@ class KnowledgeService extends EntityPromiseService<Knowledge> {
1414
}
1515

1616
public async getKnowledge(): Promise<Array<Knowledge>> {
17-
const response = await getApiService().get<Array<Knowledge>>(`${knowledgeApiConfig.route}/`);
17+
const response = await getApiService().get<KnowledgeResponse>(`${knowledgeApiConfig.route}/`);
1818

19-
return response.map((item) => plainToInstance(Knowledge, item));
19+
const transformed = plainToInstance(KnowledgeResponse, response, {
20+
excludeExtraneousValues: true,
21+
});
22+
23+
return transformed.items.map((item) =>
24+
plainToInstance(Knowledge, item, {
25+
excludeExtraneousValues: true,
26+
}),
27+
);
2028
}
2129
}
2230

0 commit comments

Comments
 (0)