Skip to content

Commit

Permalink
fix: Modals opened by apps won't close when executeViewCloseHandler
Browse files Browse the repository at this point in the history
… is not implemented (#32374)
  • Loading branch information
KevLehman committed May 7, 2024
1 parent a951502 commit b94ca7c
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 32 deletions.
15 changes: 15 additions & 0 deletions .changeset/plenty-turkeys-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/apps": patch
"@rocket.chat/core-services": patch
"@rocket.chat/core-typings": patch
"@rocket.chat/fuselage-ui-kit": patch
"@rocket.chat/rest-typings": patch
"@rocket.chat/ddp-streamer": patch
"@rocket.chat/presence": patch
"rocketchat-services": patch
---

Fixed an issue with some apps that didn't implement executeViewCloseHandler. This causes opened modals to be open forever on UI (unless Esc was clicked). This is because when the UI attempts to close it, it calls the aforementioned handler, and since it didn't exist, apps engine errored out.

This returned an empty response to the UI, which ignored the response and continued to show the view.
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"author": "Rocket.Chat",
"license": "MIT",
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"@rocket.chat/agenda": "workspace:^",
"@rocket.chat/api-client": "workspace:^",
"@rocket.chat/apps": "workspace:^",
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/base64": "workspace:^",
"@rocket.chat/cas-validate": "workspace:^",
"@rocket.chat/core-services": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/ddp-streamer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"author": "Rocket.Chat",
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "~0.31.25",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/presence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@babel/core": "~7.22.20",
"@babel/preset-env": "~7.22.20",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@types/node": "^14.18.63",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/model-typings": "workspace:^"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"extends": "../../package.json"
},
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/message-parser": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/icons": "^0.34.0",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~"
Expand Down
2 changes: 1 addition & 1 deletion packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@babel/preset-env": "~7.22.20",
"@babel/preset-react": "~7.22.15",
"@babel/preset-typescript": "~7.22.15",
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "^1.42.2",
"@rocket.chat/eslint-config": "workspace:^",
"@rocket.chat/fuselage": "^0.53.4",
"@rocket.chat/fuselage-hooks": "^0.33.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/rest-typings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"/dist"
],
"dependencies": {
"@rocket.chat/apps-engine": "^1.42.1",
"@rocket.chat/apps-engine": "1.42.2",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/message-parser": "workspace:^",
"@rocket.chat/ui-kit": "workspace:~",
Expand Down
46 changes: 23 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8340,9 +8340,9 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/apps-engine@npm:^1.42.1":
version: 1.42.1
resolution: "@rocket.chat/apps-engine@npm:1.42.1"
"@rocket.chat/apps-engine@npm:1.42.2, @rocket.chat/apps-engine@npm:^1.42.2":
version: 1.42.2
resolution: "@rocket.chat/apps-engine@npm:1.42.2"
dependencies:
adm-zip: ^0.5.9
cryptiles: ^4.1.3
Expand All @@ -8354,15 +8354,15 @@ __metadata:
vm2: ^3.9.19
peerDependencies:
"@rocket.chat/ui-kit": "*"
checksum: b38265f53a0d64e8de9862b2039a93cde600b6111f04435301994c95aab252364c0490d1da8cd9a357f80828f75efd83f11e4cea966a1ca86a150bf6439a5de0
checksum: d7aa23249823e37072b6b7af16a40d9a4e7cb6b8047f2a87e52163dfe516d6c8a09b21cafd4f28dfbe4dd3da9cd0190d71f7623fec8c573a3f215ca4f9529b56
languageName: node
linkType: hard

"@rocket.chat/apps@workspace:^, @rocket.chat/apps@workspace:packages/apps":
version: 0.0.0-use.local
resolution: "@rocket.chat/apps@workspace:packages/apps"
dependencies:
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/model-typings": "workspace:^"
"@types/jest": ~29.5.7
Expand Down Expand Up @@ -8441,7 +8441,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ^0.34.0
Expand All @@ -8467,7 +8467,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
dependencies:
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/icons": ^0.34.0
"@rocket.chat/message-parser": "workspace:^"
Expand Down Expand Up @@ -8544,7 +8544,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
dependencies:
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25
Expand Down Expand Up @@ -8740,7 +8740,7 @@ __metadata:
"@babel/preset-env": ~7.22.20
"@babel/preset-react": ~7.22.15
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": ^1.42.2
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/fuselage": ^0.53.4
"@rocket.chat/fuselage-hooks": ^0.33.1
Expand Down Expand Up @@ -8792,10 +8792,10 @@ __metadata:
"@rocket.chat/icons": "*"
"@rocket.chat/prettier-config": "*"
"@rocket.chat/styled": "*"
"@rocket.chat/ui-avatar": 2.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-avatar": 2.0.0-rc.1
"@rocket.chat/ui-contexts": 6.0.0-rc.1
"@rocket.chat/ui-kit": 0.33.0
"@rocket.chat/ui-video-conf": 6.0.0-rc.0
"@rocket.chat/ui-video-conf": 6.0.0-rc.1
"@tanstack/react-query": "*"
react: "*"
react-dom: "*"
Expand Down Expand Up @@ -8884,8 +8884,8 @@ __metadata:
"@rocket.chat/fuselage-tokens": "*"
"@rocket.chat/message-parser": 0.31.29
"@rocket.chat/styled": "*"
"@rocket.chat/ui-client": 6.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-client": 6.0.0-rc.1
"@rocket.chat/ui-contexts": 6.0.0-rc.1
katex: "*"
react: "*"
languageName: unknown
Expand Down Expand Up @@ -9181,7 +9181,7 @@ __metadata:
"@rocket.chat/agenda": "workspace:^"
"@rocket.chat/api-client": "workspace:^"
"@rocket.chat/apps": "workspace:^"
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/base64": "workspace:^"
"@rocket.chat/cas-validate": "workspace:^"
"@rocket.chat/core-services": "workspace:^"
Expand Down Expand Up @@ -9819,7 +9819,7 @@ __metadata:
"@babel/core": ~7.22.20
"@babel/preset-env": ~7.22.20
"@babel/preset-typescript": ~7.22.15
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
Expand Down Expand Up @@ -9934,7 +9934,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
dependencies:
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/eslint-config": "workspace:^"
"@rocket.chat/message-parser": "workspace:^"
Expand Down Expand Up @@ -10103,7 +10103,7 @@ __metadata:
typescript: ~5.3.3
peerDependencies:
"@rocket.chat/fuselage": "*"
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.1
react: ~17.0.2
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -10156,7 +10156,7 @@ __metadata:
"@rocket.chat/fuselage": "*"
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/icons": "*"
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.1
react: ~17.0.2
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -10332,8 +10332,8 @@ __metadata:
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/icons": "*"
"@rocket.chat/styled": "*"
"@rocket.chat/ui-avatar": 2.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-avatar": 2.0.0-rc.1
"@rocket.chat/ui-contexts": 6.0.0-rc.1
react: ^17.0.2
react-dom: ^17.0.2
languageName: unknown
Expand Down Expand Up @@ -10423,7 +10423,7 @@ __metadata:
peerDependencies:
"@rocket.chat/layout": "*"
"@rocket.chat/tools": 0.2.1
"@rocket.chat/ui-contexts": 6.0.0-rc.0
"@rocket.chat/ui-contexts": 6.0.0-rc.1
"@tanstack/react-query": "*"
react: "*"
react-hook-form: "*"
Expand Down Expand Up @@ -36854,7 +36854,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
dependencies:
"@rocket.chat/apps-engine": ^1.42.1
"@rocket.chat/apps-engine": 1.42.2
"@rocket.chat/core-services": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/emitter": ~0.31.25
Expand Down

0 comments on commit b94ca7c

Please sign in to comment.