Skip to content
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

Jump to bottom

Feature: Dashboard panel improvements: timeline view, external frame #173

Merged
merged 23 commits into from
Apr 29, 2020
Merged

Feature: Dashboard panel improvements: timeline view, external frame #173

merged 23 commits into from
Apr 29, 2020

Conversation

eol-account
Copy link
Contributor

@eol-account eol-account commented Feb 4, 2020 •
edited by jstarpl
Loading

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
    Feature
  • What is the new behavior (if this is a feature change)?
  • Improves dashboard / shelf layouts to allow for "toggling" adlibs.
  • Provides a "timeline" view whereby an indicator is given of which adlibs belong to a particular piont in a show.
  • Adds an option of using an "External frame" panel, that is an iframe with an API to exchange events with Sofie

Timeline view:
image

Adlib toggle:
image
image

eol-account and others added 13 commits February 4, 2020 14:23
@eol-account
feat: ExternalFramePanel in both Dashboard and AdLib list
79c542c
@jstarpl @eol-account
feat: some more work on the ExternalFrame API
1b4b856 
(cherry picked from commit d533430)
@jstarpl @eol-account
fix: ExternalFrame three-way handshake
20f3e62 
(cherry picked from commit 014b616)
@jstarpl @eol-account
fix: ExternalFramePanel more assertions
4ba86d8 
(cherry picked from commit 1eb5e2b)
@jstarpl @eol-account
fix: improve ExternalFramePanel API handling
0dc8891 
(cherry picked from commit f2e23a1)
@jstarpl @eol-account
feat(ExternalFramePanel): focus_in message for taking back focus from…
82b26f9 
… iframe

(cherry picked from commit 85902e3)
@eol-account
feat: TimelineDashboardPanel
98f8a69
@eol-account
feat(TimelineDashboard): support overflowHorizontally
4b2eb33
@eol-account
feat(TimelineDashboard): show "next" line if no "live" line present
2ebffb3
@jstarpl @eol-account
fix(dashboard): always trigger adlib if clearKeyaboardHotkey is not set
8f358cc 
(cherry picked from commit b8fd6fb)
@jstarpl @eol-account
fix: use enable.duration as a fallback for Dashboard button status
1a4e3d5 
(cherry picked from commit bd6cdb0)
@jstarpl @eol-account
fix(dashboard status): use playoutDuration & userDuration.duration fo…
3430e2e 
…r fallback

(cherry picked from commit 32ba2be)
@jstarpl @eol-account
fix(dashboard status): use userDuration.end for infinites fallback
128b60f 
(cherry picked from commit cbddb04)
@nytamin nytamin added the Contribution from TV 2 Danmark Contributions sponsored by TV 2 Danmark (tv2.dk) label Feb 4, 2020
@jesperstarkar
Copy link
Contributor

@thomasslee97 your fixes from yesterday, should they be added here too?

@jstarpl jstarpl changed the title Feature: Dashboard panel improvements Feature: Dashboard panel improvements: timeline view, external frame Feb 12, 2020
jstarpl added a commit that referenced this pull request Feb 12, 2020
@jstarpl
feat: merge dashboard improvements from #173
61dd000
@jstarpl
Copy link
Member

jstarpl commented Feb 12, 2020

Code from this PR has been included in commit 61dd000. I think that if feat/adlib-mos-plugin is merged into master then we should just close this one.

@Julusian Julusian merged commit f8fed9d into nrkno:master Apr 29, 2020
jstarpl added a commit that referenced this pull request May 7, 2020
@jstarpl
feat: merge dashboard improvements from #173
cd1d432
jstarpl added a commit that referenced this pull request May 26, 2020
@jstarpl @gundelsby
@Julusian @jesperstarkar @eol-account @nytamin
feat: Buckets & MOS plugins in ExternalFrames in Dashboard (#195)
4103c99 
* Created Shelf Inspector component

* fix: typings for xml2js, also when running tests

* wip: adlibs shelf inspector with editor for Nora content

* wip: xml generation for nora editor

* chore: make XMLSerializer available for client code when running tests

* Utility to create XML for Nora plugin based on content payload from AdLibPiece

* wip: Send payload to Nora browser plugin

* wip: loading Nora plugin in editor iframe

* wip: Started on communication with the Nora browser module

* Communicating with Nora plugin without error messages :D

* added support for bakskjerm type

* chore: developify version

* wip: initial db structure for buckets

* feat: bucket adlib ingest and basic playout

* chore: blueprints integration

* fix: refactor inspector

* feat: add inspector to Global AdLib tab

* chore: update package.lock

* chore: refactor mos-specific helper methods away from Nora inspector

* feat: merge dashboard improvements from #173

* chore: add test case of real mos data

* feat: generate and parse mos-plugin xml via mos-connection

* fix: some xml parsing issues

* feat: support MOS Plugin drag-and-drop

* chore: add some debug logging for integration development

* chore: refactor to static properties

* chore: refactor Shelf

* feat: show links to shelf layouts in settings

* feat: add API to add new buckets

* feat: show drag-drop hotspots

* chore: add the quantel browser mos plugin for testing into public/

* fix: make sure the origin is correct in sendMOSMessage

* chore: update quantel-browser plugin

* chore: another fix in quantel plugin

* chore: another fix for quantel-browser

* chore: update quantel-browser

* chore: update quantel-browser

* chore: update quantel-browser

* chore: update quantel-plugin

* chore: update quantel-browser

* feat(Prompter): Initial support for Nintendo Joy-con controller thorugh HTML5 Gamepad API

* chore: refactor to static properties

* feat(Prompter): Initial support for Nintendo Joy-con controller thorugh HTML5 Gamepad API

* chore: update quantel-plugin

* chore: update quantel-browser

* fix: some mos item xml parsing

* chore: update quantel-browser

* fix: use xml2js from mos-connection

* feat: create expectedMedaItems for bucket AdLibs

* fix(Prompter): Allow for multiple controllers.

Might need some more logic to avoid conflicts.

* fix: remove bucketAdLibs along with the bucket

* fix: missing import

* feat(dashboard): allow hiding utility panels

* fix: Shelf hiding

* fix: dashboard panel max-height with search box enabled

* fix: minor tweaks

* feat: add more bucket management APIs

* fix: some unruly condition in DashboardPieceButton

* feat: UI properties for Buckets

* feat: refactor Buckets

* feat: bucket management

* feat: sorting buckets

* feat: support dropping into multiple buckets

* fix: bucket creation auto-rename

* fix: empty a bucket

* fix: disable press-down for context-menu if not a touch-only device

* fix: streamdeck stylesheet

* feat: moving across buckets (WIP)

* feat: finish bucket adlib management functions

* chore: update blueprints-integration package

* wip: initial db structure for buckets

* feat: bucket adlib ingest and basic playout

* Created Shelf Inspector component

* chore: blueprints integration

* fix: typings for xml2js, also when running tests

* wip: adlibs shelf inspector with editor for Nora content

* wip: xml generation for nora editor

* chore: make XMLSerializer available for client code when running tests

* Utility to create XML for Nora plugin based on content payload from AdLibPiece

* wip: Send payload to Nora browser plugin

* wip: loading Nora plugin in editor iframe

* wip: Started on communication with the Nora browser module

* Communicating with Nora plugin without error messages :D

* added support for bakskjerm type

* fix: refactor inspector

* feat: add inspector to Global AdLib tab

* chore: refactor mos-specific helper methods away from Nora inspector

* feat: merge dashboard improvements from #173

* chore: add test case of real mos data

* feat: generate and parse mos-plugin xml via mos-connection

* fix: some xml parsing issues

* feat: support MOS Plugin drag-and-drop

* chore: add some debug logging for integration development

* chore: refactor Shelf

* feat: show links to shelf layouts in settings

* feat: add API to add new buckets

* feat: show drag-drop hotspots

* chore: add the quantel browser mos plugin for testing into public/

* fix: make sure the origin is correct in sendMOSMessage

* chore: update quantel-browser plugin

* chore: another fix in quantel plugin

* chore: another fix for quantel-browser

* chore: update quantel-browser

* chore: update quantel-browser

* chore: update quantel-browser

* chore: update quantel-plugin

* chore: update quantel-browser

* chore: refactor to static properties

* feat(Prompter): Initial support for Nintendo Joy-con controller thorugh HTML5 Gamepad API

* chore: update quantel-plugin

* chore: update quantel-browser

* fix: some mos item xml parsing

* chore: update quantel-browser

* fix: use xml2js from mos-connection

* feat: create expectedMedaItems for bucket AdLibs

* fix: remove bucketAdLibs along with the bucket

* fix: missing import

* fix(Prompter): Allow for multiple controllers.

Might need some more logic to avoid conflicts.

* feat(dashboard): allow hiding utility panels

* fix: dashboard panel max-height with search box enabled

* fix: minor tweaks

* feat: add more bucket management APIs

* feat: UI properties for Buckets

* feat: refactor Buckets

* feat: bucket management

* feat: sorting buckets

* feat: support dropping into multiple buckets

* fix: bucket creation auto-rename

* fix: empty a bucket

* fix: disable press-down for context-menu if not a touch-only device

* fix: streamdeck stylesheet

* feat: moving across buckets (WIP)

* feat: finish bucket adlib management functions

* feat: remove unused imports

* fix: import

* chore: fix tests running

Co-authored-by: Johan Nyman <johan@nytamin.se>

* fix: check getAdLibItem method

* feat: get buckets branch to work again

* fix: subscribe only to relevant buckets

* chore: fix tests

* chore: update blueprints-integration

* fix: problem with buckets management calls

* fix: target rundown selection when importing for bucket adlibs

* fix: adlib bucket rundown selection when playlist inactive

* fix: allow the same adLib in multiple buckets

Co-authored-by: Ola Christian Gundelsby <Ola.Christian.Gundelsby@nrk.no>
Co-authored-by: Julian Waller <git@julusian.co.uk>
Co-authored-by: Jesper Stærkær <jesper@starkar.no>
Co-authored-by: Tom Lee <thomasslee97@gmail.com>
Co-authored-by: Johan Nyman <johan@nytamin.se>
jstarpl added a commit that referenced this pull request Jun 1, 2020
@jstarpl
feat: merge dashboard improvements from #173
3e6445e
nytamin pushed a commit that referenced this pull request Oct 21, 2022
@andr9528
Merge pull request #173 from andr9528/SOF-1129/shortenNames
f3be312 
SOF-1129: shortened names with use of ellipsis
@andr9528 andr9528 deleted the contribute/dashboard-panel branch October 28, 2022 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Contribution from TV 2 Danmark Contributions sponsored by TV 2 Danmark (tv2.dk) Contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@eol-account @jesperstarkar @jstarpl @Julusian @nytamin