Skip to content

Guided mode #1867

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.

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
merged 132 commits into from
Oct 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
959f684
'dummy' state property added
odeimaiz Oct 7, 2020
0ccca3d
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 7, 2020
f5aa9fc
refactoring
odeimaiz Oct 7, 2020
a4256cf
make populateTree reusable
odeimaiz Oct 7, 2020
d6a3126
open NodesSlidesTree
odeimaiz Oct 7, 2020
a0a9b49
minor
odeimaiz Oct 8, 2020
0c8766c
refactoring
odeimaiz Oct 8, 2020
dbb7810
minor
odeimaiz Oct 8, 2020
70da840
back to private
odeimaiz Oct 8, 2020
3e02019
reverting
odeimaiz Oct 8, 2020
2669ab7
minor
odeimaiz Oct 8, 2020
ff61978
Move up & down working
odeimaiz Oct 8, 2020
88296ee
showing all buttons
odeimaiz Oct 8, 2020
3f9a06a
cleanup
odeimaiz Oct 8, 2020
fa96d8a
minor
odeimaiz Oct 8, 2020
6cbbfcd
refactoring
odeimaiz Oct 8, 2020
13bb052
Save button added
odeimaiz Oct 8, 2020
7801fca
looking better
odeimaiz Oct 8, 2020
5238cdd
postion calculated
odeimaiz Oct 9, 2020
f213ab5
migration script added
odeimaiz Oct 9, 2020
197d8cc
project model and schemas updated
odeimaiz Oct 9, 2020
f597dc1
project and schemas updated
odeimaiz Oct 9, 2020
b39e278
project and schemas updated
odeimaiz Oct 9, 2020
4e61330
serialize/desirialize node position
odeimaiz Oct 9, 2020
3aa54a3
Update projects.py
odeimaiz Oct 9, 2020
12bff72
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 12, 2020
42775fe
position is not required anymore
odeimaiz Oct 12, 2020
7e562d5
position is not required anymore II
odeimaiz Oct 12, 2020
ecae08c
deserialize position
odeimaiz Oct 12, 2020
3b95da6
position required for ui.workbench and ui.slideShow
odeimaiz Oct 12, 2020
f518489
Serialize slideshow
odeimaiz Oct 12, 2020
9ca6fe9
Slide's position is int
odeimaiz Oct 12, 2020
d52b402
refactoring
odeimaiz Oct 12, 2020
a613546
renamings
odeimaiz Oct 12, 2020
78df3a1
deserialize slideShow
odeimaiz Oct 12, 2020
ae0e374
slideType out
odeimaiz Oct 12, 2020
c8bfaa7
minor
odeimaiz Oct 12, 2020
914a902
slides menu moved to Navigation bar
odeimaiz Oct 12, 2020
9686191
minor
odeimaiz Oct 12, 2020
f19f2db
cleanup
odeimaiz Oct 12, 2020
e0df516
minor
odeimaiz Oct 12, 2020
29fa6ef
refactoring
odeimaiz Oct 12, 2020
19961e9
minor
odeimaiz Oct 12, 2020
40f76c2
towards breadcrumb navigation
odeimaiz Oct 12, 2020
0265a98
more refactoring
odeimaiz Oct 12, 2020
a8817d2
close after save
odeimaiz Oct 12, 2020
8e8f242
typo
odeimaiz Oct 12, 2020
fe0dc94
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 13, 2020
782c116
refactoring
odeimaiz Oct 13, 2020
1b6ddd9
hide inputs/outputs in slideshow
odeimaiz Oct 13, 2020
6191283
allow additionalProperties
odeimaiz Oct 13, 2020
800d053
StudyUI data model created
odeimaiz Oct 13, 2020
5345e6c
NavBar listens to changeCurrentNodeId
odeimaiz Oct 13, 2020
edbced3
more refactoring
odeimaiz Oct 13, 2020
9342a41
minor
odeimaiz Oct 14, 2020
298845b
NavBar buttons, ok
odeimaiz Oct 14, 2020
f3df875
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 14, 2020
bc6c54e
gray out SlidesBtns
odeimaiz Oct 14, 2020
50dc6ef
Slides buttons are radioToolbar
odeimaiz Oct 14, 2020
89a3eed
typo
odeimaiz Oct 14, 2020
a448d9d
minor fixes
odeimaiz Oct 14, 2020
c15d65d
NavigationBar's PageContext is set from MainPage
odeimaiz Oct 14, 2020
806d474
refactoring
odeimaiz Oct 14, 2020
bd5ad4d
minor
odeimaiz Oct 14, 2020
4912341
pageContext added to StudyEditor
odeimaiz Oct 14, 2020
69158c1
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 14, 2020
419dc76
minor
odeimaiz Oct 14, 2020
d278074
minor fix
odeimaiz Oct 14, 2020
91cb465
FilePicker is shown in the nodeView
odeimaiz Oct 14, 2020
2031999
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 14, 2020
1fd974c
minor fix
odeimaiz Oct 14, 2020
5219521
minor
odeimaiz Oct 15, 2020
978d6ec
StudyEditor splitted into WorkbenchView + SlideShowView
odeimaiz Oct 15, 2020
010a5bf
editSlides moved to NodesTree
odeimaiz Oct 15, 2020
8ad929f
first working version
odeimaiz Oct 15, 2020
47774f7
this is looking good
odeimaiz Oct 15, 2020
edfd850
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 15, 2020
9e50218
minor
odeimaiz Oct 15, 2020
8cb65ac
Merge branch 'feature/guided-mode' of github.com:odeimaiz/osparc-simc…
odeimaiz Oct 15, 2020
b5f092b
missed in merge
odeimaiz Oct 16, 2020
cf6c906
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 16, 2020
9cb5b10
Mark Position in Workbench model as depracted
odeimaiz Oct 16, 2020
57d9de4
Merge branch 'feature/guided-mode' of github.com:odeimaiz/osparc-simc…
odeimaiz Oct 16, 2020
80b80bd
Update project-v0.0.1.json
odeimaiz Oct 16, 2020
1fc004d
Mark Position in Workbench model as depracted II
odeimaiz Oct 16, 2020
051a8da
For now, enable slides in only "master" and "dev"
odeimaiz Oct 16, 2020
020229d
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 16, 2020
66af71d
minor
odeimaiz Oct 16, 2020
e93c31e
linting
odeimaiz Oct 16, 2020
548f5d6
Update 27c6a30d7c24_add_ui_in_projects_table.py
odeimaiz Oct 16, 2020
0a77b77
Merge branch 'feature/guided-mode' of github.com:odeimaiz/osparc-simc…
odeimaiz Oct 16, 2020
67473a0
Update NavigationBar.js
odeimaiz Oct 16, 2020
c44ca53
Allow disabling slideshow
odeimaiz Oct 16, 2020
efbdb0b
Start/Stop slides react to model changes
odeimaiz Oct 16, 2020
3864cb5
minor
odeimaiz Oct 16, 2020
f8af107
Working on Optionals
odeimaiz Oct 16, 2020
380c5c3
Working on Optionals II
odeimaiz Oct 16, 2020
c7431d8
Update project-v0.0.1.json
odeimaiz Oct 16, 2020
1758af2
Update project-v0.0.1.json
odeimaiz Oct 16, 2020
7a6e6b0
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 16, 2020
7e81dd5
renaming
odeimaiz Oct 16, 2020
8342351
refactoring
odeimaiz Oct 16, 2020
c4cc3ba
Merge branch 'feature/guided-mode' of github.com:odeimaiz/osparc-simc…
odeimaiz Oct 16, 2020
731ed44
Only study owner can edit slides
odeimaiz Oct 16, 2020
bf7277b
renamings
odeimaiz Oct 16, 2020
f8b40d3
more refactoring
odeimaiz Oct 16, 2020
b1ea51b
state missing from projects
sanderegg Oct 16, 2020
bb31a68
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 19, 2020
7c3f5ca
Merge pull request #74 from sanderegg/fix_project_jsonschema
odeimaiz Oct 19, 2020
4d927c5
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 19, 2020
7b28478
add more info to "startStudy" Event
odeimaiz Oct 19, 2020
3554724
minor
odeimaiz Oct 19, 2020
457d450
Allow starting in slideshow mode
odeimaiz Oct 19, 2020
d38d84b
Merge branch 'feature/guided-mode' of github.com:odeimaiz/osparc-simc…
odeimaiz Oct 19, 2020
371a6a6
"slides" -> "slideshow"
odeimaiz Oct 19, 2020
bfefaef
minor
odeimaiz Oct 19, 2020
b0bc06e
ui field added to fixture projects
odeimaiz Oct 19, 2020
ccbfd6c
Update sleepers_project_template_sql.csv
odeimaiz Oct 19, 2020
5d6661f
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 20, 2020
4764871
Visuals
odeimaiz Oct 20, 2020
7eded82
start in workbench mode by default
odeimaiz Oct 20, 2020
4ac7151
more uniform buttons
odeimaiz Oct 20, 2020
3840575
maxWidth + tooltip for Navigation buttons
odeimaiz Oct 20, 2020
ed6eab7
cropping node labels
odeimaiz Oct 20, 2020
f7fa881
Added visuals
ignapas Oct 20, 2020
1d56af2
Merge pull request #75 from ignapas/odeimaiz-feature/guided-mode
odeimaiz Oct 20, 2020
7adbede
clean up
odeimaiz Oct 20, 2020
aa3f568
eslint
odeimaiz Oct 20, 2020
865e09d
crop label also in NodeTree
odeimaiz Oct 20, 2020
9bc8632
Update NavigationBar.js
odeimaiz Oct 20, 2020
967fc21
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 20, 2020
256fa21
Merge branch 'master' into feature/guided-mode
odeimaiz Oct 20, 2020
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
43 changes: 42 additions & 1 deletion api/specs/common/schemas/project-v0.0.1-converted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ properties:
- key
- version
- label
- position
properties:
key:
type: string
Expand Down Expand Up @@ -230,6 +229,7 @@ properties:
type: integer
'y':
type: integer
deprecated: true
state:
title: RunningState
description: the node's running state
Expand All @@ -244,6 +244,47 @@ properties:
- FAILURE
type: string
additionalProperties: true
ui:
type: object
additionalProperties: true
properties:
workbench:
type: object
x-patternProperties:
^\S+$:
type: object
additionalProperties: false
required:
- position
properties:
position:
type: object
additionalProperties: false
required:
- x
- 'y'
properties:
x:
type: integer
'y':
type: integer
additionalProperties: true
slideshow:
type: object
x-patternProperties:
^\S+$:
type: object
additionalProperties: false
required:
- position
properties:
position:
type: integer
description: Slide's position
example:
- 0
- 2
additionalProperties: true
tags:
type: array
items:
Expand Down
86 changes: 80 additions & 6 deletions api/specs/common/schemas/project-v0.0.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,13 @@
"workbench": {
"type": "object",
"patternProperties": {
"^\\S+$": {
"^\\d+$": {
"type": "object",
"additionalProperties": false,
"required": [
"key",
"version",
"label",
"position"
"label"
],
"properties": {
"key": {
Expand Down Expand Up @@ -316,12 +315,21 @@
],
"properties": {
"x": {
"type": "integer"
"type": "integer",
"description": "The x position",
"example": [
"12"
]
},
"y": {
"type": "integer"
"type": "integer",
"description": "The y position",
"example": [
"15"
]
}
}
},
"deprecated": true
},
"state": {
"title": "RunningState",
Expand All @@ -342,6 +350,72 @@
}
}
},
"ui": {
"type": "object",
"additionalProperties": true,
"properties": {
"workbench": {
"type": "object",
"patternProperties": {
"^\\S+$": {
"type": "object",
"additionalProperties": false,
"required": [
"position"
],
"properties": {
"position": {
"type": "object",
"additionalProperties": false,
"required": [
"x",
"y"
],
"properties": {
"x": {
"type": "integer",
"description": "The x position",
"example": [
"12"
]
},
"y": {
"type": "integer",
"description": "The y position",
"example": [
"15"
]
}
}
}
}
}
}
},
"slideshow": {
"type": "object",
"patternProperties": {
"^\\S+$": {
"type": "object",
"additionalProperties": false,
"required": [
"position"
],
"properties": {
"position": {
"type": "integer",
"description": "Slide's position",
"examples": [
0,
2
]
}
}
}
}
}
}
},
"tags": {
"type": "array",
"items": {
Expand Down
1 change: 1 addition & 0 deletions api/tests/test_repo_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def test_project_against_schema(data_path, project_schema, this_repo_root_dir):
"thumbnail": "labore incid",
"accessRights": {},
"workbench": data["workbench"],
"ui": {},
"dev": {},
}
data = prj
Expand Down
Loading