Skip to content

Commit b4a9777

Browse files
committed
Refactor SelectedFiles component to display file count and token count separately
- simplify `packages/ui/src/components/editor/prompt/SelectedFiles/SelectedFiles.tsx` css as we no longer have left/right sides - add exclamation mark after 'Disabled attaching selected files' and translations - change 'attaching x tokens in y files' to 'attaching y files' 'x' (token count is dimmed) ├── apps │ └── editor │ └── src │ └── views │ └── prompt │ └── frontend │ ├── Main │ │ └── MainView │ │ └── MainView.tsx │ └── i18n │ └── translations │ └── selected-files.ts └── packages └── ui └── src ├── components │ └── editor │ └── prompt │ └── SelectedFiles │ ├── SelectedFiles.module.scss │ ├── SelectedFiles.stories.tsx │ ├── SelectedFiles.tsx │ └── index.ts └── styles └── foundation └── _colors.scss
1 parent 1e2ecf6 commit b4a9777

5 files changed

Lines changed: 93 additions & 98 deletions

File tree

‎apps/editor/src/views/prompt/frontend/Main/MainView/MainView.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,7 @@ export const MainView: React.FC<Props> = (props) => {
378378
}
379379
translations={{
380380
attach_selected_files: t('selected-files.attach-selected-files'),
381-
tokens_in_selected_files: t(
382-
'selected-files.tokens-in-selected-files'
383-
),
381+
attaching_files: t('selected-files.attaching-files'),
384382
disabled_attaching_selected_files: t(
385383
'selected-files.disabled-attaching-selected-files'
386384
)

‎apps/editor/src/views/prompt/frontend/i18n/translations/selected-files.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,40 @@ export const selected_files = {
1717
hu: 'Kiválasztott fájlok csatolása',
1818
bg: 'Прикачване на избраните файлове'
1919
},
20-
'selected-files.tokens-in-selected-files': {
21-
en: 'Attaching {tokens} tokens in {files} files',
22-
pl: 'Dołączanie {tokens} tokenów w {files} plikach',
23-
'zh-cn': '附加 {files} 个文件中的 {tokens} 个令牌',
24-
ja: '{files} 個のファイルの {tokens} トークンを添付',
25-
'zh-tw': '附加 {files} 個檔案中的 {tokens} 個代幣',
26-
de: '{tokens} Token in {files} Dateien anhängen',
27-
es: 'Adjuntando {tokens} tokens en {files} archivos',
28-
fr: 'Jointure de {tokens} jetons dans {files} fichiers',
29-
'pt-br': 'Anexando {tokens} tokens em {files} arquivos',
30-
ru: 'Прикрепление {tokens} токенов в {files} файлах',
31-
ko: '{files}개의 파일에서 {tokens}개의 토큰 첨부',
32-
it: 'Allegando {tokens} token in {files} file',
33-
tr: '{files} dosyadaki {tokens} jeton ekleniyor',
34-
cs: 'Připojování {tokens} tokenů ve {files} souborech',
35-
hu: '{tokens} token csatolása {files} fájlból',
36-
bg: 'Прикачване на {tokens} токена в {files} файла'
20+
'selected-files.attaching-files': {
21+
en: 'Attaching {files} files',
22+
pl: 'Dołączanie {files} plików',
23+
'zh-cn': '附加 {files} 个文件',
24+
ja: '{files} 個のファイルを添付',
25+
'zh-tw': '附加 {files} 個檔案',
26+
de: '{files} Dateien anhängen',
27+
es: 'Adjuntando {files} archivos',
28+
fr: 'Jointure de {files} fichiers',
29+
'pt-br': 'Anexando {files} arquivos',
30+
ru: 'Прикрепление {files} файлов',
31+
ko: '{files}개의 파일 첨부',
32+
it: 'Allegando {files} file',
33+
tr: '{files} dosya ekleniyor',
34+
cs: 'Připojování {files} souborů',
35+
hu: '{files} fájl csatolása',
36+
bg: 'Прикачване на {files} файла'
3737
},
3838
'selected-files.disabled-attaching-selected-files': {
39-
en: 'Disabled attaching selected files',
40-
pl: 'Wyłączono dołączanie wybranych plików',
41-
'zh-cn': '已禁用附加所选文件',
42-
ja: '選択したファイルの添付が無効です',
43-
'zh-tw': '已停用附加選取的檔案',
44-
de: 'Anhängen ausgewählter Dateien deaktiviert',
45-
es: 'Desactivado el adjuntar archivos seleccionados',
46-
fr: 'Jointure des fichiers sélectionnés désactivée',
47-
'pt-br': 'Anexo de arquivos selecionados desativado',
48-
ru: 'Прикрепление выбранных файлов отключено',
49-
ko: '선택한 파일 첨부 비활성화됨',
50-
it: 'Allegato file selezionati disabilitato',
51-
tr: 'Seçili dosyaları ekleme devre dışı bırakıldı',
52-
cs: 'Připojování vybraných souborů zakázáno',
53-
hu: 'Kiválasztott fájlok csatolása letiltva',
54-
bg: 'Прикачването на избраните файлове е деактивирано'
39+
en: 'Disabled attaching selected files!',
40+
pl: 'Wyłączono dołączanie wybranych plików!',
41+
'zh-cn': '已禁用附加所选文件!',
42+
ja: '選択したファイルの添付が無効です!',
43+
'zh-tw': '已停用附加選取的檔案!',
44+
de: 'Anhängen ausgewählter Dateien deaktiviert!',
45+
es: 'Desactivado el adjuntar archivos seleccionados!',
46+
fr: 'Jointure des fichiers sélectionnés désactivée!',
47+
'pt-br': 'Anexo de arquivos selecionados desativado!',
48+
ru: 'Прикрепление выбранных файлов отключено!',
49+
ko: '선택한 파일 첨부 비활성화됨!',
50+
it: 'Allegato file selezionati disabilitato!',
51+
tr: 'Seçili dosyaları ekleme devre dışı bırakıldı!',
52+
cs: 'Připojování vybraných souborů zakázáno!',
53+
hu: 'Kiválasztott fájlok csatolása letiltva!',
54+
bg: 'Прикачването на избраните файлове е деактивирано!'
5555
}
5656
} as const

‎packages/ui/src/components/editor/prompt/SelectedFiles/SelectedFiles.module.scss‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,32 @@
11
.container {
22
--height: 24px;
33
display: flex;
4-
justify-content: space-between;
4+
align-items: center;
55
border-bottom-left-radius: 6px;
66
border-bottom-right-radius: 6px;
77
color: var(--cwc-text-color);
88
background-color: var(--cwc-bg-tertiary);
99
overflow: hidden;
1010
height: var(--height);
11+
padding: 0 8px 0 5px;
1112
margin: 0 20px;
1213

1314
:global([data-modern-ui='true']) & {
1415
margin: 0 18px;
1516
}
1617
}
1718

18-
.left {
19-
flex: 1;
20-
display: flex;
21-
align-items: center;
19+
.label {
2220
overflow: hidden;
23-
padding: 0 8px 0 5px;
24-
min-width: 0;
25-
26-
&__label {
27-
overflow: hidden;
28-
text-overflow: ellipsis;
29-
white-space: nowrap;
30-
font-size: 12px;
31-
cursor: pointer;
32-
height: 100%;
33-
display: block;
34-
line-height: var(--height);
35-
padding-left: 6px;
36-
}
21+
text-overflow: ellipsis;
22+
white-space: nowrap;
23+
font-size: 12px;
24+
cursor: pointer;
25+
height: 100%;
26+
display: block;
27+
line-height: var(--height);
28+
padding-left: 6px;
29+
color: var(--cwc-text-color);
3730
}
3831

3932
.warning {
@@ -63,3 +56,8 @@
6356
color: var(--cwc-text-color-dimmed);
6457
font-style: italic;
6558
}
59+
60+
.tokens {
61+
color: var(--cwc-text-color-dimmed);
62+
margin-left: 5px;
63+
}

‎packages/ui/src/components/editor/prompt/SelectedFiles/SelectedFiles.stories.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export const Default = () => {
1616
on_toggle_include_selected_files={set_include}
1717
translations={{
1818
attach_selected_files: 'Attach selected files',
19-
tokens_in_selected_files: 'Attaching {tokens} tokens in {files} files',
20-
disabled_attaching_selected_files: 'Disabled attaching selected files'
19+
attaching_files: 'Attaching {files} files',
20+
disabled_attaching_selected_files: 'Disabled attaching selected files!'
2121
}}
2222
/>
2323
)
@@ -34,8 +34,8 @@ export const ZeroTokens = () => {
3434
on_toggle_include_selected_files={set_include}
3535
translations={{
3636
attach_selected_files: 'Attach selected files',
37-
tokens_in_selected_files: 'Attaching {tokens} tokens in {files} files',
38-
disabled_attaching_selected_files: 'Disabled attaching selected files'
37+
attaching_files: 'Attaching {files} files',
38+
disabled_attaching_selected_files: 'Disabled attaching selected files!'
3939
}}
4040
/>
4141
)

‎packages/ui/src/components/editor/prompt/SelectedFiles/SelectedFiles.tsx‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export namespace SelectedFiles {
1111
on_toggle_include_selected_files: (include: boolean) => void
1212
translations: {
1313
attach_selected_files: string
14-
tokens_in_selected_files: string
14+
attaching_files: string
1515
disabled_attaching_selected_files: string
1616
}
1717
}
@@ -20,44 +20,43 @@ export namespace SelectedFiles {
2020
export const SelectedFiles: React.FC<SelectedFiles.Props> = (props) => {
2121
return (
2222
<div className={styles.container}>
23-
<div className={styles.left}>
24-
<span className={styles.attach}>
25-
<span className="codicon codicon-attach" />
26-
</span>
27-
<Checkbox
28-
checked={props.include_selected_files}
29-
on_change={props.on_toggle_include_selected_files}
30-
title={props.translations.attach_selected_files}
31-
/>
32-
<label
33-
className={styles.left__label}
34-
onClick={() =>
35-
props.on_toggle_include_selected_files(
36-
!props.include_selected_files
37-
)
38-
}
39-
>
40-
{!props.include_selected_files ? (
41-
<>
42-
<span className={styles.warning}>
43-
<span className="codicon codicon-warning" />
44-
</span>
45-
<span className={styles['wont-send']}>
46-
{props.translations.disabled_attaching_selected_files}
47-
</span>
48-
</>
49-
) : (
50-
<>
51-
{props.translations.tokens_in_selected_files
52-
.replace(
53-
'{tokens}',
54-
display_token_count(props.selected_files_token_count)
55-
)
56-
.replace('{files}', String(props.selected_files_count))}
57-
</>
58-
)}
59-
</label>
60-
</div>
23+
<span className={styles.attach}>
24+
<span className="codicon codicon-attach" />
25+
</span>
26+
<Checkbox
27+
checked={props.include_selected_files}
28+
on_change={props.on_toggle_include_selected_files}
29+
title={props.translations.attach_selected_files}
30+
/>
31+
<label
32+
className={styles.label}
33+
onClick={() =>
34+
props.on_toggle_include_selected_files(!props.include_selected_files)
35+
}
36+
>
37+
{!props.include_selected_files ? (
38+
<>
39+
<span className={styles.warning}>
40+
<span className="codicon codicon-warning" />
41+
</span>
42+
<span className={styles['wont-send']}>
43+
{props.translations.disabled_attaching_selected_files}
44+
</span>
45+
</>
46+
) : (
47+
<>
48+
<span>
49+
{props.translations.attaching_files.replace(
50+
'{files}',
51+
String(props.selected_files_count)
52+
)}
53+
</span>
54+
<span className={styles.tokens}>
55+
{display_token_count(props.selected_files_token_count)}
56+
</span>
57+
</>
58+
)}
59+
</label>
6160
</div>
6261
)
6362
}

0 commit comments

Comments
 (0)