diff --git a/plugin/src/App/StatusPages/Confirming.lua b/plugin/src/App/StatusPages/Confirming.lua index 1535f045..9c05061a 100644 --- a/plugin/src/App/StatusPages/Confirming.lua +++ b/plugin/src/App/StatusPages/Confirming.lua @@ -90,21 +90,21 @@ function ConfirmingPage:render() }), }), - Reject = if Settings:get("twoWaySync") - then e(TextButton, { - text = "Reject", - style = "Warning", - transparency = self.props.transparency, - layoutOrder = 0, - onClick = function() - self:setState({ showingRejectConfirm = true }) - end, - }, { - Tip = e(Tooltip.Trigger, { - text = "Push Studio changes to the Rojo server", - }), - }) - else nil, + Reject = if Settings:get("twoWaySync") + then e(TextButton, { + text = "Reject", + style = "Warning", + transparency = self.props.transparency, + layoutOrder = 0, + onClick = function() + self:setState({ showingRejectConfirm = true }) + end, + }, { + Tip = e(Tooltip.Trigger, { + text = "Push Studio changes to the Rojo server", + }), + }) + else nil, Accept = e(TextButton, { text = "Accept", diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap index 4de31360..7b6775b8 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap index 97f5fc9c..fee20ff8 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap index bb9159c5..80d0851f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap index 0e5958ac..662f5e28 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap index 91712fcc..ccbced1b 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap index 0de57dcb..94c86937 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap index 692bae6f..b24c9107 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap index f8f2e14e..80a63161 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap index f7018efe..0f6da849 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap index 040c02f2..d5cc5420 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap index a7e293b7..40bf72c3 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap index 8777473c..86b237b1 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap index 8777473c..86b237b1 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap index bb598446..c00e18ad 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap index a1a8a801..b91bdb94 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap index cead5d7f..613c1b2f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap index 920f7b22..14062af6 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap index 2961cc7b..a78336bb 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap index 54915213..b8f77856 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap index b8fcc474..89db9723 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap @@ -10,4 +10,5 @@ protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" sessionId: id-1 +syncSourceOnly: true unexpectedPlaceIds: ~