Set type for submitting from views

RocketChat · Sep 30, 2023 · ee1dc56 · ee1dc56
1 parent 2dc0f8a
commit ee1dc56
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/apps/meteor/client/views/banners/UiKitBanner.tsx b/apps/meteor/client/views/banners/UiKitBanner.tsx
@@ -39,7 +39,6 @@ const UiKitBanner = ({ initialView }: UiKitBannerProps) => {
 				view: {
 					...view,
 					id: view.viewId,
-					state: {},
 				},
 				isCleared: true,
 			})

diff --git a/packages/ui-contexts/src/ActionManagerContext.ts b/packages/ui-contexts/src/ActionManagerContext.ts
@@ -29,10 +29,23 @@ type ViewClosedTriggerOptions = {
 	type: 'viewClosed';
 	appId: string;
 	viewId: UiKit.View['viewId'];
-	view: UiKit.View & { id: UiKit.View['viewId']; state: Record<string, unknown> };
+	view: UiKit.View & { id: UiKit.View['viewId']; state?: Record<string, unknown> };
 	isCleared: boolean;
 };
 
+type ViewSubmitTriggerOptions = {
+	type: 'viewSubmit';
+	appId: string;
+	viewId: UiKit.View['viewId'];
+	actionId?: string;
+	triggerId?: string;
+	payload: {
+		view: UiKit.View & { id: UiKit.View['viewId']; state?: Record<string, unknown> };
+	};
+};
+
+type TriggerOptions = BlockActionTriggerOptions | ViewClosedTriggerOptions | ViewSubmitTriggerOptions;
+
 /**
  * Utility type to remove the `type` property from an **union** of objects.
  */
@@ -58,7 +71,7 @@ type ActionManagerContextValue = {
 			triggerId: any;
 		},
 	) => any;
-	triggerAction(action: BlockActionTriggerOptions | ViewClosedTriggerOptions): Promise<void>;
+	triggerAction(action: TriggerOptions): Promise<void>;
 	triggerAction({
 		type,
 		actionId,
@@ -81,9 +94,9 @@ type ActionManagerContextValue = {
 		tmid: any;
 	}): Promise<any>;
 	triggerBlockAction(options: WithoutType<BlockActionTriggerOptions>): Promise<void>;
-	triggerActionButtonAction: (options: any) => Promise<any>;
-	triggerSubmitView: ({ viewId, ...options }: { [x: string]: any; viewId: any }) => Promise<void>;
 	triggerCancel(options: WithoutType<ViewClosedTriggerOptions>): Promise<void>;
+	triggerSubmitView(options: WithoutType<ViewSubmitTriggerOptions>): Promise<void>;
+	triggerActionButtonAction: (options: any) => Promise<any>;
 	getUserInteractionPayloadByViewId: (viewId: any) => any;
 };