diff --git a/navi-common/src/main/java/com/navi/common/uitron/model/action/ExecuteActionsCorrespondingToKey.kt b/navi-common/src/main/java/com/navi/common/uitron/model/action/ExecuteActionsCorrespondingToKey.kt index 1f8c58943f..114e805086 100644 --- a/navi-common/src/main/java/com/navi/common/uitron/model/action/ExecuteActionsCorrespondingToKey.kt +++ b/navi-common/src/main/java/com/navi/common/uitron/model/action/ExecuteActionsCorrespondingToKey.kt @@ -31,7 +31,9 @@ import org.mvel2.MVEL data class ExecuteActionsCorrespondingToKey( @SerializedName("key") var key: String? = null, @SerializedName("data") val data: HashMap? = null, - @SerializedName("mvelExpression") val mvelExpression: String? = null + @SerializedName("mvelExpression") val mvelExpression: String? = null, + @SerializedName("defaultAction") val defaultAction: UiTronActionData? = null, + @SerializedName("commonAction") val commonAction: UiTronActionData? = null, ) : UiTronAction(), Parcelable { override suspend fun manageAction(actionDetails: ActionDetails) { val action = actionDetails.uiTronAction as ExecuteActionsCorrespondingToKey @@ -56,10 +58,11 @@ data class ExecuteActionsCorrespondingToKey( } } actionDetails.actionCallbackFlow?.let { actionCallbackFlow -> - if (action.key != null) { - action.data?.get(action.key)?.let { - actionDetails.actionHandler.handleActions(it, actionCallbackFlow) - } + action.data?.get(action.key)?.let { + actionDetails.actionHandler.handleActions(commonAction, actionCallbackFlow) + actionDetails.actionHandler.handleActions(it, actionCallbackFlow) + } ?: run { + actionDetails.actionHandler.handleActions(defaultAction, actionCallbackFlow) } } }