Skip to content

[OCTRL-988] Add rows attribute for editBox widgets #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justonedev1 merged 1 commit into from
Feb 27, 2025
Merged

[OCTRL-988] Add rows attribute for editBox widgets #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
521 changes: 265 additions & 256 deletions coconut/protos/o2control.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion coconut/protos/o2control_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/gera/map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ pdp_workflow_parameters: !public
widget: editBox
panel: "EPNs_Workflows"
index: 603
rows: 10
user: flp
extra_env_vars: ""
`
Expand Down Expand Up @@ -274,7 +275,6 @@ pdp_workflow_parameters: ""
})
})
When("wrapping and unwrapping maps", func() {

defaults1 := MakeMap[string, string]()
Expect(defaults1).NotTo(BeNil())

Expand Down
521 changes: 265 additions & 256 deletions core/protos/o2control.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/protos/o2control.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ message VarSpecMessage {
int32 index = 8;
string visibleIf = 9; // JS expression that evaluates to bool
string enabledIf = 10; // JS expression that evaluates to bool
uint32 rows = 11; // this field is used only if widget == editBox
}

message WorkflowTemplateInfo {
Expand Down
2 changes: 1 addition & 1 deletion core/protos/o2control_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions core/repos/repoutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type VarSpec struct {
Panel string `yaml:"panel" `
AllowedValues []string `yaml:"values"`
Index int32 `yaml:"index"`
Rows uint32 `yaml:"rows"`
VisibleIf string `yaml:"visibleif"`
EnabledIf string `yaml:"enabledif"`
}
Expand Down
3 changes: 2 additions & 1 deletion core/serverutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/AliceO2Group/Control/core/repos"

"github.com/AliceO2Group/Control/common"
"github.com/AliceO2Group/Control/core/protos"
pb "github.com/AliceO2Group/Control/core/protos"
"github.com/AliceO2Group/Control/core/task/channel"

"github.com/AliceO2Group/Control/core/task"
Expand Down Expand Up @@ -204,6 +204,7 @@ func VarSpecMapToPbVarSpecMap(varSpecMap map[string]repos.VarSpec) map[string]*p
Index: v.Index,
VisibleIf: v.VisibleIf,
EnabledIf: v.EnabledIf,
Rows: v.Rows,
}
ret[k] = vsm
}
Expand Down
14 changes: 9 additions & 5 deletions core/workflow/role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ func complexRoleTree() (root Role, leaves map[string]Role) {
defaultState := sm.RUNNING
call1 := &callRole{
roleBase: roleBase{Name: "call1", state: SafeState{state: defaultState}},
Traits: task.Traits{Critical: true}}
Traits: task.Traits{Critical: true},
}
task1 := &taskRole{
roleBase: roleBase{Name: "task1", state: SafeState{state: defaultState}},
Traits: task.Traits{Critical: true},
Expand All @@ -21,15 +22,18 @@ func complexRoleTree() (root Role, leaves map[string]Role) {
agg1task_noncritical := &taskRole{
roleBase: roleBase{Name: "agg1task_noncritical", state: SafeState{state: defaultState}},
Traits: task.Traits{Critical: false},
Task: nil}
Task: nil,
}
agg1task_critical := &taskRole{
roleBase: roleBase{Name: "agg1task_critical", state: SafeState{state: defaultState}},
Traits: task.Traits{Critical: true},
Task: &task.Task{}}
Task: &task.Task{},
}
agg2task_noncritical := &taskRole{
roleBase: roleBase{Name: "agg2task_noncritical", state: SafeState{state: defaultState}},
Traits: task.Traits{Critical: false},
Task: &task.Task{}}
Task: &task.Task{},
}

root = &aggregatorRole{
roleBase{Name: "root", state: SafeState{state: defaultState}},
Expand Down Expand Up @@ -238,7 +242,6 @@ var _ = Describe("role", func() {
})

Describe("GetTasks", func() {

When("getting the slice with roles for a complex tree", func() {
var root Role
BeforeEach(func() {
Expand Down Expand Up @@ -445,6 +448,7 @@ roles:
panel: DCS
index: 2
visibleif: $$dcs_enabled === "true"
rows: 5
dcs_eor_parameters: !public
value: "{}"
type: string
Expand Down
Loading