Skip to content

Commit b7adf61

Browse files
committed
Simplify active configuration selection and clean up web configuration parameter naming
- use css mixin instad of [Fragment] - should not highlight first configuration when there is no last used one ├── apps │ └── editor │ └── src │ └── views │ └── prompt │ └── frontend │ ├── Home │ │ ├── Home.module.scss │ │ └── Home.tsx │ ├── Main │ │ └── MainView │ │ ├── MainView.module.scss │ │ ├── MainView.tsx │ │ └── components │ │ └── Header │ │ ├── Header.module.scss │ │ └── Header.tsx │ └── hooks │ └── use-is-landscape.ts └── packages └── ui └── src └── components └── editor └── prompt └── Configurations └── Configurations.tsx
1 parent 4764440 commit b7adf61

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ export const MainView: React.FC<Props> = (props) => {
188188

189189
const last_choice_tooltip = use_last_choice_tooltip({
190190
target: props.target,
191-
selected_web_configuration_or_group_name:
192-
props.selected_web_configuration_name,
191+
selected_web_configuration_name: props.selected_web_configuration_name,
193192
web_configurations: props.web_configurations,
194193
selected_api_configuration_id: props.selected_api_configuration_id,
195194
api_configurations: props.api_configurations

‎apps/editor/src/views/prompt/frontend/Main/MainView/hooks/use-last-choice-tooltip.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import { WebConfiguration } from '@shared/types/web-configuration'
66

77
export const use_last_choice_tooltip = (params: {
88
target: Target
9-
selected_web_configuration_or_group_name?: string
9+
selected_web_configuration_name?: string
1010
web_configurations: WebConfiguration[]
1111
selected_api_configuration_id?: string
1212
api_configurations: ApiConfiguration[]
1313
}): { name: string; details?: string } | undefined => {
1414
return useMemo(() => {
1515
if (params.target == TARGET.WEB) {
16-
if (params.selected_web_configuration_or_group_name) {
17-
if (params.selected_web_configuration_or_group_name == 'Ungrouped') {
16+
if (params.selected_web_configuration_name) {
17+
if (params.selected_web_configuration_name == 'Ungrouped') {
1818
return { name: 'Ungrouped' }
1919
} else {
2020
const web_configuration = params.web_configurations.find(
21-
(p) => p.name == params.selected_web_configuration_or_group_name
21+
(p) => p.name == params.selected_web_configuration_name
2222
)
2323
if (web_configuration) {
2424
const is_unnamed =
@@ -68,10 +68,9 @@ export const use_last_choice_tooltip = (params: {
6868
}
6969
}
7070
} else {
71-
// MODE.API
7271
if (params.selected_api_configuration_id !== undefined) {
7372
const configuration = params.api_configurations.find(
74-
(c) => c.id === params.selected_api_configuration_id
73+
(c) => c.id == params.selected_api_configuration_id
7574
)
7675
if (configuration) {
7776
const description_parts = [configuration.provider_name]
@@ -86,7 +85,7 @@ export const use_last_choice_tooltip = (params: {
8685
return undefined
8786
}, [
8887
params.target,
89-
params.selected_web_configuration_or_group_name,
88+
params.selected_web_configuration_name,
9089
params.web_configurations,
9190
params.selected_api_configuration_id,
9291
params.api_configurations

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ export namespace Configurations {
4141

4242
export const Configurations: React.FC<Configurations.Props> = (props) => {
4343
const pinned_configurations = props.configurations.filter((c) => c.is_pinned)
44-
const active_configuration_id =
45-
props.selected_configuration_id ?? props.configurations[0]?.id
44+
const active_configuration_id = props.selected_configuration_id
4645

4746
const render_configuration_item = (
4847
configuration: Configurations.Configuration,

0 commit comments

Comments
 (0)