From b94ca7c30b77df8e13828b396df694d222b949b9 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Tue, 7 May 2024 07:56:09 -0600 Subject: [PATCH] fix: Modals opened by apps won't close when `executeViewCloseHandler` is not implemented (#32374) --- .changeset/plenty-turkeys-move.md | 15 +++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/ddp-streamer/package.json | 2 +- ee/packages/presence/package.json | 2 +- packages/apps/package.json | 2 +- packages/core-services/package.json | 2 +- packages/core-typings/package.json | 2 +- packages/fuselage-ui-kit/package.json | 2 +- packages/rest-typings/package.json | 2 +- yarn.lock | 46 ++++++++++----------- 11 files changed, 47 insertions(+), 32 deletions(-) create mode 100644 .changeset/plenty-turkeys-move.md diff --git a/.changeset/plenty-turkeys-move.md b/.changeset/plenty-turkeys-move.md new file mode 100644 index 00000000000..6452ab772e6 --- /dev/null +++ b/.changeset/plenty-turkeys-move.md @@ -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. diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 457e0364bec..7b4d1b8d4f9 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -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", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 5e89c04dc67..2b161e2560e 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -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:^", diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index e4217e46950..6c7d03ba225 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -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", diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 4bb1d2afdaf..68af246524a 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -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", diff --git a/packages/apps/package.json b/packages/apps/package.json index fb706213918..729f8c1ccd6 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -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:^" } diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 56676805e2b..c6fcbec5d49 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -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:^", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 5c7b712f26a..efe11ce8e5f 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -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:~" diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 18fcf6f7d80..7f64149babd 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -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", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 70669030254..4f971345f88 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -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:~", diff --git a/yarn.lock b/yarn.lock index e5c6cc4701b..c25963765b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -8354,7 +8354,7 @@ __metadata: vm2: ^3.9.19 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: b38265f53a0d64e8de9862b2039a93cde600b6111f04435301994c95aab252364c0490d1da8cd9a357f80828f75efd83f11e4cea966a1ca86a150bf6439a5de0 + checksum: d7aa23249823e37072b6b7af16a40d9a4e7cb6b8047f2a87e52163dfe516d6c8a09b21cafd4f28dfbe4dd3da9cd0190d71f7623fec8c573a3f215ca4f9529b56 languageName: node linkType: hard @@ -8362,7 +8362,7 @@ __metadata: 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 @@ -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 @@ -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:^" @@ -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 @@ -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 @@ -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: "*" @@ -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 @@ -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:^" @@ -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:^" @@ -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:^" @@ -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 @@ -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 @@ -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 @@ -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: "*" @@ -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