Redirect the modal_close event to the App

d-gubert · d-gubert · commit e192f80d9817 · 2020-02-04T17:36:56.000-03:00
diff --git a/app/apps/server/communication/uikit.js b/app/apps/server/communication/uikit.js
@@ -91,9 +91,37 @@ export class AppUIKitInteractionApi {
 					break;
 				}
 
-				case UIKitIncomingInteractionType.VIEW_CLOSED:
-					res.sendStatus(200);
+				case UIKitIncomingInteractionType.VIEW_CLOSED: {
+					const {
+						type,
+						actionId,
+						view,
+						isCleared,
+					} = req.body;
+
+					const user = this.orch.getConverters().get('users').convertToApp(req.user);
+
+					const action = {
+						type,
+						appId,
+						actionId,
+						user,
+						payload: {
+							view,
+							isCleared,
+						},
+					};
+
+					try {
+						Promise.await(this.orch.getBridges().getListenerBridge().uiKitInteractionEvent('IUIKitInteractionHandler', action));
+
+						res.send(200);
+					} catch (e) {
+						console.log(e);
+						res.status(500).send(e.message);
+					}
 					break;
+				}
 
 				case UIKitIncomingInteractionType.VIEW_SUBMIT: {
 					const {
diff --git a/app/ui-message/client/ActionManager.js b/app/ui-message/client/ActionManager.js
@@ -133,14 +133,14 @@ export const triggerSubmitView = async ({ viewId, ...options }) => {
 		close();
 	}
 };
-export const triggerCancel = async ({ viewId, ...options }) => {
-	const instance = instances.get(viewId);
+export const triggerCancel = async ({ view, ...options }) => {
+	const instance = instances.get(view.id);
 	try {
-		await triggerAction({ type: UIKitIncomingInteractionType.VIEW_CLOSED, viewId, ...options });
+		await triggerAction({ type: UIKitIncomingInteractionType.VIEW_CLOSED, view, ...options });
 	} finally {
 		if (instance) {
 			instance.close();
-			instances.delete(viewId);
+			instances.delete(view.id);
 		}
 	}
 };

Original file line number	Diff line number	Diff line change
`@@ -133,14 +133,14 @@ export const triggerSubmitView = async ({ viewId, ...options }) => {`
`133`	`133`	`close();`
`134`	`134`	`}`
`135`	`135`	`};`
`136`		`-export const triggerCancel = async ({ viewId, ...options }) => {`
`137`		`- const instance = instances.get(viewId);`
	`136`	`+export const triggerCancel = async ({ view, ...options }) => {`
	`137`	`+ const instance = instances.get(view.id);`
`138`	`138`	`try {`
`139`		`- await triggerAction({ type: UIKitIncomingInteractionType.VIEW_CLOSED, viewId, ...options });`
	`139`	`+ await triggerAction({ type: UIKitIncomingInteractionType.VIEW_CLOSED, view, ...options });`
`140`	`140`	`} finally {`
`141`	`141`	`if (instance) {`
`142`	`142`	`instance.close();`
`143`		`- instances.delete(viewId);`
	`143`	`+ instances.delete(view.id);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`};`