[Upstream Catchup] DO NOT MERGE UNTIL RC v5.x is available - Merge RC:master to master by github-actions[bot] · Pull Request #53 · WideChat/Rocket.Chat.Apps-engine

github-actions · 2022-07-18T00:23:41Z

Weekly Catchup PR to merge RC:master in master.

* Initial Implementation of Video Conf Providers * Accessor tests * Ensure permission to configure a videoconf provider * AppVideoConfProviderManager tests * AppVideoConfProvider tests * Optional user * Preventing a provider from being added twice caused issues when disabling and re-enabling apps. * Extra params for new url Co-authored-by: thassiov <tvmcarvalho@gmail.com>

* [NEW] Video Conference Read * Converted IVideoConference to a type literal * Extend Video Conference * Include provider data on url requests * Permissions

…at#510)

[FIX] Faulty redirect_uri path concatenation

* [NEW] Enable Multiple Video Conference Providers * Update tests/server/managers/AppVideoConfProviderManager.spec.ts Co-authored-by: Thassio Victor <tvmcarvalho@gmail.com>

[NEW] Livechat VideoConference type (RocketChat#514) 486e8f1 [NEW] Enable Multiple Video Conference Providers (RocketChat#513) d51bf47 [NEW] Video Conference Read and Extend (RocketChat#509) d20a1b8 [NEW] Video Conference Providers (RocketChat#508) 7b9a270

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…lers-after-disabling-app Keeping schedulers after disabling an app

* Enable authenticated endpoints * Comment improvement

Bumps [shell-quote](https://github.com/substack/node-shell-quote) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/substack/node-shell-quote/releases) - [Changelog](https://github.com/substack/node-shell-quote/blob/master/CHANGELOG.md) - [Commits](https://github.com/substack/node-shell-quote/compare/v1.7.2...1.7.3) --- updated-dependencies: - dependency-name: shell-quote dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow action dispatch when dealing with text input * Dispatch actions when static item is selected * Fix based on lint rules

* Revert "Revert Video Conference commits" This reverts commit 7415488. * [NEW] [VideoConference] Allow apps to end calls and add users (RocketChat#516) * [NEW] [VideoConference] Allow apps to create new video conferences (RocketChat#517) * Publish package when merging to new/videoconf (RocketChat#518) * [NEW] Extra test for video conference builder * New space on readme file * [NEW] [Video Conference] Configure Provider Capabilities (RocketChat#520) Co-authored-by: Thassio Victor <tvmcarvalho@gmail.com>

* [NEW] Allow apps to update their own settings' value * [NEW] Settings.incrementValue * Increment Value * use Manager to update settings * fix test

ear-dev · 2022-08-30T15:26:39Z

please add build files.

ear-dev · 2022-08-30T19:01:29Z

@AlexanderKanakis I was unable to use this branch in my testing. The server build failed with this error, can you take a look please?

TypeError: this.manager.getBridges(...).getVideoConferenceBridge is not a function
W20220830-14:59:42.543(-4)? (STDERR)     at new AppVideoConfProviderManager (/Users/erosenthal/Git/WideChat/Rocket.Chat/node_modules/@rocket.chat/apps-engine/server/managers/AppVideoConfProviderManager.js:21:49)
W20220830-14:59:42.544(-4)? (STDERR)     at new AppManager (/Users/erosenthal/Git/WideChat/Rocket.Chat/node_modules/@rocket.chat/apps-engine/server/AppManager.js:69:41)
W20220830-14:59:42.544(-4)? (STDERR)     at AppServerOrchestrator.initialize (app/apps/server/orchestrator.js:60:19)
W20220830-14:59:42.544(-4)? (STDERR)     at _appServerOrchestrator (app/apps/server/orchestrator.js:339:7)
W20220830-14:59:42.544(-4)? (STDERR)     at Function.time (/Users/erosenthal/Git/WideChat/Rocket.Chat/.meteor/local/build/programs/server/profile.js:273:30)
W20220830-14:59:42.544(-4)? (STDERR)     at /Users/erosenthal/Git/WideChat/Rocket.Chat/.meteor/local/build/programs/server/boot.js:415:15
W20220830-14:59:42.544(-4)? (STDERR)     at /Users/erosenthal/Git/WideChat/Rocket.Chat/.meteor/local/build/programs/server/boot.js:465:7
W20220830-14:59:42.544(-4)? (STDERR)     at Function.run (/Users/erosenthal/Git/WideChat/Rocket.Chat/.meteor/local/build/programs/server/profile.js:280:14)
W20220830-14:59:42.545(-4)? (STDERR)     at /Users/erosenthal/Git/WideChat/Rocket.Chat/.meteor/local/build/programs/server/boot.js:463:13

AlexanderKanakis · 2022-08-30T20:51:44Z

@ear-dev This is part of changes that need to be merged in our Rocket.Chat repo too. I have found the relevant PRs and added the code necessary to test locally.

I can push those changes on Rocket.chat develop_pwa, unless we want to wait for Aditya to finish the catch-up.

ear-dev · 2022-08-30T21:29:05Z

@AlexanderKanakis are there code changes, or just update in package.json? I did update my package.json to point at your this branch. Thanks.

AlexanderKanakis · 2022-08-30T21:32:36Z

@ear-dev They are code changes for the new video conference issues.
RocketChat#529

ear-dev · 2022-08-30T21:37:58Z

@AlexanderKanakis cool...... then please make a PR against develop_pwa to accommodate these changes, and add a link in the issue. Basically, since we can't start using the new apps-engine till we have the corresponding RC changes, then it's part of the requirement to get the changes into RC to accommodate. Thanks!

ear-dev · 2022-08-31T13:40:20Z

NOTE: It looks like this catchup is specifically compatible with the new RC v5.x refactor. I will mark this PR so that we wait until Aditya has completed that work. But for now @Shailesh351 please complete your review as best you can and approve if it seems good. Thanks.

Shailesh351 · 2022-09-01T10:16:50Z

@ear-dev @AlexanderKanakis Changes look good to me. Still, I'll prefer to wait until v5.x to do the testing and approve it. Thanks!

…-engine into master-catchup-864ce66

bhardwajaditya · 2022-10-31T19:54:56Z

@ear-dev I have fixed the merge conflicts. This one needs to be merged for 5.x catchup

ear-dev · 2022-10-31T20:47:27Z

@bhardwajaditya yep, thanks. We're going to hold off on this merge to the very last. In the meantime we will need to update package.json to use this apps-engine branch in any 5.x feature branch that we want to test.

ear-dev · 2023-01-03T16:10:39Z

Do not need this because we have a newer version ready to go.

thassiov and others added 30 commits April 3, 2022 19:51

Fix redirect_uri faulty path concatenation

4816974

[NEW] Video Conference Read and Extend (RocketChat#509)

d20a1b8

* [NEW] Video Conference Read * Converted IVideoConference to a type literal * Extend Video Conference * Include provider data on url requests * Permissions

[FIX] Wrong permission ID on Permission Denied notification (RocketCh…

8579eb6

…at#510)

1.33.0-alpha

84841fd

feat: adding logic to prevent site url that contains slash in the end

b63f84d

chore: changing the logic to check the last character

bbb4fd0

Merge pull request RocketChat#496 from RocketChat/fix/oauth

34b9ca2

[FIX] Faulty redirect_uri path concatenation

[NEW] Enable Multiple Video Conference Providers (RocketChat#513)

d51bf47

* [NEW] Enable Multiple Video Conference Providers * Update tests/server/managers/AppVideoConfProviderManager.spec.ts Co-authored-by: Thassio Victor <tvmcarvalho@gmail.com>

[NEW] Livechat VideoConference type (RocketChat#514)

486e8f1

Small spelling correction (RocketChat#495)

c8c70e6

feat: Keeping schedulers after disabling an app

4dc1ae4

fix: not removing scheduler only when the app is disabled

c8b4a16

[NEW] Add url prop in the OptionObject (RocketChat#511)

5f05881

Merge pull request RocketChat#525 from RocketChat/feat/keeping-schedu…

f3a236f

…lers-after-disabling-app Keeping schedulers after disabling an app

[NEW] Enable authenticated endpoints (RocketChat#523)

9c87dd7

* Enable authenticated endpoints * Comment improvement

Chore: Update dependencies (RocketChat#527)

aae905f

Update adm-zip package (RocketChat#528)

ad7ea18

[NEW] allow dispatchment of actions from input elements (RocketChat#524)

0fc04a2

* Allow action dispatch when dealing with text input * Dispatch actions when static item is selected * Fix based on lint rules

[NEW] Allow apps to update setting values (RocketChat#521)

fd9a4b3

* [NEW] Allow apps to update their own settings' value * [NEW] Settings.incrementValue * Increment Value * use Manager to update settings * fix test

Chore: Remove videoconf automations (RocketChat#530)

d170da4

Regression: Outdated call status list (RocketChat#532)

d812ee9

Revert typescript and typedoc updates

b2b1392

Update package-lock

ceb9cfc

Merge remote-tracking branch 'origin/alpha'

b573f80

Update docs

27df07e

1.33.0

864ce66

Shailesh351 mentioned this pull request Aug 23, 2022

[Blocked Until v5.x][Upstream Catchup] Rocket.Chat.Apps-engine WideChat/Rocket.Chat#1277

Closed

AlexanderKanakis added 2 commits August 30, 2022 13:46

Fix merge conflicts with master

9ac76ef

Fixed linting issues

a9f8da0

AlexanderKanakis marked this pull request as ready for review August 30, 2022 10:51

Build Files

14678d0

ear-dev changed the title ~~[Upstream Catchup] Merge RC:master to master~~ [Upstream Catchup] DO NOT MERGE UNTIL RC v5.x is available - Merge RC:master to master Aug 31, 2022

bhardwajaditya added 2 commits November 1, 2022 01:23

Merge branch 'master' of https://github.com/WideChat/Rocket.Chat.Apps…

6b4ce4b

…-engine into master-catchup-864ce66

Add build files

4440070

ear-dev closed this Jan 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Upstream Catchup] DO NOT MERGE UNTIL RC v5.x is available - Merge RC:master to master#53

[Upstream Catchup] DO NOT MERGE UNTIL RC v5.x is available - Merge RC:master to master#53
github-actions[bot] wants to merge 36 commits into
masterfrom
master-catchup-864ce66

github-actions Bot commented Jul 18, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

AlexanderKanakis commented Aug 30, 2022 •

edited

Loading

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

AlexanderKanakis commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 31, 2022

Uh oh!

Shailesh351 commented Sep 1, 2022

Uh oh!

bhardwajaditya commented Oct 31, 2022

Uh oh!

ear-dev commented Oct 31, 2022

Uh oh!

ear-dev commented Jan 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

github-actions Bot commented Jul 18, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

AlexanderKanakis commented Aug 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

AlexanderKanakis commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 30, 2022

Uh oh!

ear-dev commented Aug 31, 2022

Uh oh!

Shailesh351 commented Sep 1, 2022

Uh oh!

bhardwajaditya commented Oct 31, 2022

Uh oh!

ear-dev commented Oct 31, 2022

Uh oh!

ear-dev commented Jan 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

AlexanderKanakis commented Aug 30, 2022 •

edited

Loading