cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix groups for existing compositions

Browse Source
This commit is contained in:
Yusef Napora 2020-06-22 17:33:54 -04:00
parent 7bbde459f3
commit a60a4c507a
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
composer/app/composition.py
View File

@ -179,8 +179,8 @@ class Group(Base):
params=params_class.from_dict(d.get('params', {})), params=params_class.from_dict(d.get('params', {})),
) )
@param.depends('id', watch=True)
def panel(self): def panel(self):
print('rendering groups panel for ' + self.id)
return pn.Column( return pn.Column(
"**Group: {}**".format(self.id), "**Group: {}**".format(self.id),
self.instances, self.instances,
@ -219,7 +219,8 @@ class Composition(param.Parameterized):
metadata=Metadata.from_dict(d.get('metadata', {})), metadata=Metadata.from_dict(d.get('metadata', {})),
global_config=Global.from_dict(d.get('global', {})), global_config=Global.from_dict(d.get('global', {})),
) )
c.setup_groups() params_class = c._params_class_for_current_testcase()
c.groups = [Group.from_dict(g, params_class=params_class) for g in d.get('groups', [])]
return c return c
@ -234,7 +235,7 @@ class Composition(param.Parameterized):
add_group_button = pn.widgets.Button(name='Add Group') add_group_button = pn.widgets.Button(name='Add Group')
add_group_button.on_click(self._add_group) add_group_button.on_click(self._add_group)
self.group_tabs[:] = [(g.id, g.panel()) for g in self.groups] self._refresh_tabs()
if self.groups_ui is None: if self.groups_ui is None:
self.groups_ui = pn.Column( self.groups_ui = pn.Column(
@ -257,12 +258,6 @@ class Composition(param.Parameterized):
for tc in manifest.get('testcases', []): for tc in manifest.get('testcases', []):
self.testcase_param_classes[tc['name']] = make_group_params_class(tc) self.testcase_param_classes[tc['name']] = make_group_params_class(tc)
def setup_groups(self):
params_class = self._params_class_for_current_testcase()
groups = [Group.from_dict(g, params_class=params_class) for g in self.manifest.get('groups', [])]
self.groups = groups
@param.depends("global_config.case", watch=True)
def _params_class_for_current_testcase(self): def _params_class_for_current_testcase(self):
case = self.global_config.case case = self.global_config.case
cls = self.testcase_param_classes.get(case, None) cls = self.testcase_param_classes.get(case, None)
@ -278,6 +273,18 @@ class Composition(param.Parameterized):
self.groups = groups self.groups = groups
self.group_tabs.active = len(groups)-1 self.group_tabs.active = len(groups)-1
@param.depends("global_config.case", watch=True)
def _test_case_changed(self):
print('test case changed', self.global_config.case)
cls = self._params_class_for_current_testcase()
for g in self.groups:
g.params = cls()
self._refresh_tabs()
def _refresh_tabs(self):
self.group_tabs[:] = [(g.id, g.panel()) for g in self.groups]
def to_dict(self): def to_dict(self):
return { return {
'metadata': value_dict(self.metadata, renames={'composition_name': 'name'}), 'metadata': value_dict(self.metadata, renames={'composition_name': 'name'}),