Skip to content

Commit ad3f02c

Browse files
committed
add corrections
remove unnecessary ToolTip and error definition. Replace init function with flush
1 parent 40c7231 commit ad3f02c

File tree

2 files changed

+22
-37
lines changed

2 files changed

+22
-37
lines changed

src/fourc_webviewer/fourc_webserver.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,15 +1110,22 @@ def delete_row(self, item_key, **kwargs):
11101110
del self.state.general_sections[self.state.selected_main_section_name][
11111111
self.state.selected_section_name
11121112
][item_key]
1113-
self.init_general_sections_state_and_server_vars()
1113+
self.state.dirty("general_sections")
1114+
self.state.flush()
11141115

11151116
@controller.set("add_row")
11161117
def add_row(self, **kwargs):
11171118
"""Adds a row to the table."""
1118-
self.state.general_sections[self.state.selected_main_section_name][
1119-
self.state.selected_section_name
1120-
][self.state.add_key] = self.state.add_value
1121-
self.init_general_sections_state_and_server_vars()
1119+
if self.state.add_key:
1120+
general_sections = dict(self.state.general_sections or {})
1121+
general_sections[self.state.selected_main_section_name][
1122+
self.state.selected_section_name
1123+
][self.state.add_key] = self.state.add_value
1124+
self.state.general_sections = general_sections
1125+
self.state.add_key = ""
1126+
self.state.add_value = ""
1127+
self.state.dirty("general_sections")
1128+
self.state.flush()
11221129

11231130
@controller.set("click_info_button")
11241131
def click_info_button(self, **kwargs):

src/fourc_webviewer/gui_utils.py

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ def _prop_value_table(server):
609609
v_if="edit_mode == all_edit_modes['edit_mode'] && !json_schema['properties']?.[selected_section_name]?.['required']?.includes(item_key)",
610610
tag="a",
611611
v_bind="{...props, target: '_blank'}",
612-
v_tooltip="Delete this property",
613612
click=(server.controller.delete_row, "[item_key]"),
614613
icon=True,
615614
ripple=False,
@@ -656,7 +655,6 @@ def _prop_value_table(server):
656655
with vuetify.VBtn(
657656
tag="a",
658657
v_bind="{...props, target: '_blank'}",
659-
v_tooltip="Add this property",
660658
click=(server.controller.add_row),
661659
icon=True,
662660
ripple=False,
@@ -669,38 +667,18 @@ def _prop_value_table(server):
669667
size=26,
670668
color="#4a4",
671669
)
672-
item_error = "wada"
673-
(
674-
vuetify.VAutocomplete(
675-
v_model=("add_key",),
676-
update_modelValue="flushState('general_sections')",
677-
# bind the enum array as items
678-
items=(
679-
"Object.keys(json_schema['properties']?.[selected_section_name]?.['properties'])",
680-
),
681-
dense=True,
682-
solo=True,
683-
filterable=True,
684-
classes="pb-1 ml-16",
685-
color=f"{item_error} && error",
686-
bg_color=(f"{item_error} ? 'rgba(255, 0, 0, 0.2)' : ''",),
687-
error_messages=(
688-
f"{item_error}?.length > 100 ? {item_error}?.slice(0, 97)+' ...' : {item_error}",
689-
),
670+
vuetify.VAutocomplete(
671+
v_model=("add_key",),
672+
update_modelValue="flushState('general_sections')",
673+
# bind the enum array as items
674+
items=(
675+
"Object.keys(json_schema['properties']?.[selected_section_name]?.['properties'])",
690676
),
677+
dense=True,
678+
solo=True,
679+
filterable=True,
680+
classes="pb-1 ml-16",
691681
)
692-
with vuetify.VTooltip(location="bottom"):
693-
with html.Template(v_slot_activator="{ props }"):
694-
html.Span(v_text=("item_key",), v_bind="props")
695-
html.P(
696-
v_text=(
697-
"json_schema['properties']?.[selected_section_name]?.['properties']?.[item_key]?.['description'] || 'no description'",
698-
),
699-
v_if=(
700-
"json_schema['properties']?.[selected_section_name]?.['properties']?.[item_key]?.['description']",
701-
),
702-
style="max-width: 450px;",
703-
)
704682
html.Td(
705683
v_if="edit_mode == all_edit_modes['view_mode']",
706684
v_text=("item_val",),

0 commit comments

Comments
 (0)