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

Add support for video calls to the talk sidebar in files app #1312

Merged
merged 8 commits into from
Dec 6, 2018
Merged

Add support for video calls to the talk sidebar in files app #1312

merged 8 commits into from
Dec 6, 2018

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Nov 28, 2018 •
edited by danxuliu
Loading

Follow up to #1323

@nickvergessen nickvergessen added 2. developing enhancement feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents labels Nov 28, 2018
@nickvergessen nickvergessen added this to the 💚 Next Major milestone Nov 28, 2018
@nickvergessen
Copy link
Member Author

nickvergessen commented Nov 28, 2018 •
edited
Loading

@nickvergessen
Copy link
Member Author

nickvergessen commented Nov 28, 2018 •
edited
Loading

@nickvergessen
Copy link
Member Author

nickvergessen commented Nov 28, 2018 •
edited
Loading

@danxuliu
Copy link
Member

Make the Chat not appear for folders

It should be easy, I will do it.

Make the Chat tab either always appear or automatically appear when the file is shared (so closing the sidebar and reopening is not required anymore)

I am not sure if this will be possible at all without changes in the Files app. I will see what I can do.

@Ivansss
Copy link
Member

Ivansss commented Nov 28, 2018 •
edited by nickvergessen
Loading

  • Add all participants (users who have access to the file) automatically when the room is created. @nickvergessen
  • Do not send "invite" notifications for this rooms. @nickvergessen
  • Do not send "call" notifications for this rooms. @nickvergessen
  • Allow autocomplete of share accessers @nickvergessen
  • Allow to join the room from notifications @nickvergessen

nickvergessen
nickvergessen commented Nov 28, 2018
View reviewed changes
css/chat.scss Outdated Show resolved Hide resolved
@danxuliu danxuliu force-pushed the add-support-for-video-calls-to-the-talk-sidebar-in-files-app branch 3 times, most recently from 730658c to ec86859 Compare November 28, 2018 18:22
@nickvergessen
Copy link
Member Author

  • Do not send "call" notifications for this rooms.
  • Allow autocomplete of share accessers

Done

  • Allow to join the room from notifications

already worked before

@nickvergessen
Copy link
Member Author

nickvergessen commented Nov 29, 2018 •
edited
Loading

  • "Share to start conversation"

@jancborchardt
Copy link
Member

Ideally there would be a view when there’s no one shared with yet:

💬
Start a conversation
Share this file with others to discuss
[ Share ]

The Share button will switch to the share tab.

@nickvergessen nickvergessen mentioned this pull request Dec 5, 2018
Closed
@danxuliu danxuliu force-pushed the add-support-for-video-calls-to-the-talk-sidebar-in-files-app branch from cae6455 to 557dac6 Compare December 6, 2018 11:41
@danxuliu
Make possible to customize the element that gets the "incall" CSS class
268d91c 
This is a temporal hack, as the proper change would be to move the
modification of elements out of Connection and WebRTC, but for the time
being it will make possible to prevent those objects from modifying
"#app-content" when video calls are added to the details view of Files
app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Extract model for joining and leaving the room for a file
e06ea89 
Although more a helper class than a model, this will make possible to
join and leave the room for a file from different views.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Delay reload of the message list
391bac6 
When "setFileInfo" is called the tab is not visible yet, so reloading
the message list does nothing; the reload needs to be delayed until the
next event loop to ensure that the tab will be visible.

Even without this fix the list was being shown as expected due to
joining the room causing the messages to be fetched and thus the list
being reloaded when received. However, joining to the room before
showing the tab would reveal the problem (as will happen once the call
button is added).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Add support for video calls to the Talk sidebar in Files app
fa2def6 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Guard condition against element not found
ecd0e74 
Although in the main Talk UI there will be always a "#screen" element
this may not be the case when embedded in the Files app, for example,
when changing to an unshared file while in a call in a different file.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Add local video and media controls
b6819e2 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Move call button from main file details to chat tab
7437d90 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Show message in the sidebar while waiting for others to join the call
e213c6d 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu danxuliu force-pushed the add-support-for-video-calls-to-the-talk-sidebar-in-files-app branch from 557dac6 to e213c6d Compare December 6, 2018 12:09
@nickvergessen nickvergessen merged commit 9ccb380 into master Dec 6, 2018
@nickvergessen nickvergessen deleted the add-support-for-video-calls-to-the-talk-sidebar-in-files-app branch December 6, 2018 14:29
@nickvergessen nickvergessen mentioned this pull request Dec 7, 2018
Closed
2 tasks
This was referenced Apr 14, 2019
Closed
Closed
marcoambrosini pushed a commit that referenced this pull request Oct 9, 2019
@dependabot @skjnldsv
Bump eslint-plugin-import from 2.16.0 to 2.17.1 (#347)
1433210 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.16.0 to 2.17.1.
<details>
<summary>Changelog</summary>

*Sourced from [eslint-plugin-import's changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md).*

> ## [2.17.1] - 2019-04-13
> 
> ### Fixed
> - require v2.4 of `eslint-module-utils` ([#1322])
> 
> ## [2.17.0] - 2019-04-13
> 
> ### Added
> - Autofixer for [`no-duplicates`] rule ([#1312], thanks [@&#8203;lydell])
> - [`no-useless-path-segments`]: Add `noUselessIndex` option ([#1290], thanks [@&#8203;timkraut])
> - [`no-duplicates`]: Add autofix ([#1312], thanks [@&#8203;lydell])
> - Add [`no-unused-modules`] rule ([#1142], thanks [@&#8203;rfermann])
> - support export type named exports from typescript ([#1304], thanks [@&#8203;bradennapier] and [@&#8203;schmod])
> 
> ### Fixed
> - [`order`]: Fix interpreting some external modules being interpreted as internal modules ([#793], [#794] thanks [@&#8203;ephys])
> - allow aliases that start with @ to be "internal" ([#1293], [#1294], thanks [@&#8203;jeffshaver])
> - aliased internal modules that look like core modules ([#1297], thanks [@&#8203;echenley])
> - [`namespace`]: add check for null ExportMap ([#1235], [#1144], thanks [@&#8203;ljqx])
> - [ExportMap] fix condition for checking if block comment ([#1234], [#1233], thanks [@&#8203;ljqx])
> - Fix overwriting of dynamic import() CallExpression ([`no-cycle`], [`no-relative-parent-import`], [`no-unresolved`], [`no-useless-path-segments`]) ([#1218], [#1166], [#1035], thanks [@&#8203;vikr01])
> - [`export`]: false positives for typescript type + value export ([#1319], thanks [@&#8203;bradzacher])
> - [`export`]: Support typescript namespaces ([#1320], [#1300], thanks [@&#8203;bradzacher])
> 
> ### Docs
> - Update readme for Typescript ([#1256], [#1277], thanks [[@&#8203;kirill](https://github.com/kirill)-konshin])
> - make rule names consistent ([#1112], thanks [@&#8203;feychenie])
> 
> ### Tests
> - fix broken tests on master ([#1295], thanks [@&#8203;jeffshaver] and [@&#8203;ljharb])
> - [`no-commonjs`]: add tests that show corner cases ([#1308], thanks [@&#8203;TakeScoop])
</details>
<details>
<summary>Commits</summary>

- [`b0c5e1a`](import-js/eslint-plugin-import@b0c5e1a) bump to v2.17.1
- [`f6716ad`](import-js/eslint-plugin-import@f6716ad) [fix] require v2.4 of `eslint-module-utils`
- [`5124dde`](import-js/eslint-plugin-import@5124dde) [utils] v2.4.0
- [`0499050`](import-js/eslint-plugin-import@0499050) bump to v2.17.0
- [`f479635`](import-js/eslint-plugin-import@f479635) [webpack] v0.11.1
- [`8a4226d`](import-js/eslint-plugin-import@8a4226d) Merge pull request [#1320](https://github-redirect.dependabot.com/benmosher/eslint-plugin-import/issues/1320) from bradzacher/export-ts-namespaces
- [`988e12b`](import-js/eslint-plugin-import@988e12b) fix(export): Support typescript namespaces
- [`70c3679`](import-js/eslint-plugin-import@70c3679) [docs] make rule names consistent
- [`6ab25ea`](import-js/eslint-plugin-import@6ab25ea) [Tests] skip a TS test in eslint < 4
- [`405900e`](import-js/eslint-plugin-import@405900e) [Tests] fix tests from [#1319](https://github-redirect.dependabot.com/benmosher/eslint-plugin-import/issues/1319)
- Additional commits viewable in [compare view](import-js/eslint-plugin-import@v2.16.0...v2.17.1)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=eslint-plugin-import&package-manager=npm_and_yarn&previous-version=2.16.0&new-version=2.17.1)](https://dependabot.com/compatibility-score.html?dependency-name=eslint-plugin-import&package-manager=npm_and_yarn&previous-version=2.16.0&new-version=2.17.1)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danxuliu danxuliu danxuliu left review comments

Assignees

@nickvergessen nickvergessen

@danxuliu danxuliu

Labels
2. developing enhancement feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nickvergessen @danxuliu @Ivansss @jancborchardt