Skip to content

Meetings iframe and iframe URL#8096

Merged
leio10 merged 44 commits intodevelopfrom
feat/meetings-iframe
Jul 22, 2021
Merged

Meetings iframe and iframe URL#8096
leio10 merged 44 commits intodevelopfrom
feat/meetings-iframe

Conversation

@ferblape
Copy link
Copy Markdown
Contributor

@ferblape ferblape commented Jun 3, 2021

🎩 What? Why?

This PR:

  • adds a new setting to show the Iframe in a meeting
  • adds a warning message informing about the permissions the user will be asked
  • links the new setting with the CTA block, so it's only visible when the setting is active
  • adds an iframe in the live meeting section
  • if the streaming service is Youtube or Twitch, updates the iframe to embed it properly

📌 Related Issues

Testing

As an admin check the setting is available in meeting form. Check it disappears when the meeting is physical.

Check different values in the online url: youtube, twitch, another service (jitsi?)

As a user review how the CTA block behaves with the different combinations of values:

  • if the show iframe setting is disabled, the join button links to the meeting itself (meeting online url attribute)
  • if the show iframe setting is enabled, the join button will enable the live event page with an iframe, and the meeting streaming service will be embedded in that iframe

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • AVOID breaking the continuous integration build.
  • AVOID making significant changes to the overall architecture.

📷 Screenshots

The new setting available in meetings form:

Screenshot from 2021-06-02 14-47-30

The CTA updated:

Screenshot from 2021-06-03 05-49-50

The live event with questions sidebar and an iframe integrating a jitsi call:

Screenshot from 2021-06-03 09-40-33

♥️ Thank you!

@ferblape ferblape force-pushed the feat/meetings-iframe branch from 119e084 to 83c10e9 Compare June 3, 2021 03:27
<head>
<title><%= decidim_page_title %></title>
<%= render partial: "layouts/decidim/head" %>
<%= render partial: "layouts/decidim/js_configuration" %>
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I needed to move this to the head tag because when embedding an iframe it wasn't being executed, and I couldn't find the reason why. Let me know if you want me to get deeper on the reasons

@ferblape ferblape force-pushed the feat/meetings-iframe branch from 8ddfc96 to 1ad1fb1 Compare June 24, 2021 14:41
@ferblape ferblape force-pushed the feat/meetings-iframe branch from ccd3724 to 5cf83ce Compare July 8, 2021 07:53
@leio10 leio10 force-pushed the feat/meetings-iframe branch from 70e9913 to 90aa4a5 Compare July 22, 2021 08:37
@leio10 leio10 force-pushed the feat/meetings-iframe branch from 90aa4a5 to 58e2423 Compare July 22, 2021 08:42
Copy link
Copy Markdown
Contributor

@leio10 leio10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@leio10 leio10 merged commit a6aa596 into develop Jul 22, 2021
@leio10 leio10 deleted the feat/meetings-iframe branch July 22, 2021 10:39
entantoencuanto added a commit that referenced this pull request Jul 26, 2021
* develop: (32 commits)
  Remove obsolete rake webpack task (#8237)
  Active storage migrations service (#7902)
  Fix content type delegation to blank attachments (#8230)
  Evote bug fixing (#8220)
  Fix the proposal data migration for proposals without authors or organization (#8015)
  Bump addressable version because security issues (#8229)
  Online meetings iframe visibility with time (#8097)
  Meetings iframe and iframe URL (#8096)
  Remove flaky test on meetings (#8226)
  Fix broken tests after problematic PRs (#8224)
  Apply permissions system to comments (#8035)
  Set current_component as commentable when commentable is a participatory space (#8189)
  Fix don't require inactive authorization handlers (#8122)
  Improve metrics calculations performance (#8215)
  Fix performance issue in notification settings page (#8155)
  Active storage migration (#7598)
  Update manual installation guide in documentation (#8217)
  Load JS configuration in elections focus mode layout (#8213)
  Fix user activity pagination when there are hidden items (#8202)
  Make it possible to define SCSS settings overrides from modules (#8198)
  ...
roxanaopr pushed a commit to i-need-another-coffee/decidim that referenced this pull request Jul 29, 2021
* Make questions publicable

* Introduce polls in meetings model and admin management

* Revert "Make questions publicable"

This reverts commit b8b38c8.

* Create specific question/answer models for meetings

* Live event view

* Manage questions in the live event page

* List questions to users

* Questions polling

* Answer questions

* Remove animations for better UI when polling

* Show answers results

* Export answers in the admin

* Refactor and clear Ruby offenses

* Normalize translations

* JS offenses

* ERB offenses

* Force factories to create published meetings

* Increase capybara wait time for ajax requests

* Adjust markup to fix styles

* ERB offense

* Fix bad merge

* Performance: remove N+1 and optimize answer options results calculation

* Fix param assignment

* Show validation error

* Deal with nils

* Fix translation

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Add show iframe options in meetings

* Transform iframe URL

* Add embeddable logic to embed the iframe inline

* Remove partial call from bad merge

* Refactor conditions to reduce complexity

* Move JS config to top

* Refactor aspect-ratio class to prevent adding classed to child element

* Update attribute meaning

* Add validation message when trying to embed a meeting that can't be embedded

* Always show embedded iframe if check is enabled

* Cell refactor

* style: fix lint issue

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
Co-authored-by: Leonardo Diez <leiodd@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Online meetings iframe: transform URL Online meetings with iframes

2 participants