mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-23 05:51:39 +00:00
730cdbda28
- Adjusted the layout of the reject button in ConfirmingPage for improved UI consistency. - Updated multiple snapshot files to include the new syncSourceOnly flag, enhancing the server's sync capabilities in tests.
318 lines
8.6 KiB
Lua
318 lines
8.6 KiB
Lua
local Rojo = script:FindFirstAncestor("Rojo")
|
|
local Plugin = Rojo.Plugin
|
|
local Packages = Rojo.Packages
|
|
|
|
local Roact = require(Packages.Roact)
|
|
|
|
local Settings = require(Plugin.Settings)
|
|
local Theme = require(Plugin.App.Theme)
|
|
local TextButton = require(Plugin.App.Components.TextButton)
|
|
local StudioPluginGui = require(Plugin.App.Components.Studio.StudioPluginGui)
|
|
local Tooltip = require(Plugin.App.Components.Tooltip)
|
|
local PatchVisualizer = require(Plugin.App.Components.PatchVisualizer)
|
|
local StringDiffVisualizer = require(Plugin.App.Components.StringDiffVisualizer)
|
|
local TableDiffVisualizer = require(Plugin.App.Components.TableDiffVisualizer)
|
|
|
|
local e = Roact.createElement
|
|
|
|
local ConfirmingPage = Roact.Component:extend("ConfirmingPage")
|
|
|
|
function ConfirmingPage:init()
|
|
self.contentSize, self.setContentSize = Roact.createBinding(0)
|
|
self.containerSize, self.setContainerSize = Roact.createBinding(Vector2.new(0, 0))
|
|
|
|
self:setState({
|
|
showingStringDiff = false,
|
|
currentString = "",
|
|
incomingString = "",
|
|
showingTableDiff = false,
|
|
oldTable = {},
|
|
newTable = {},
|
|
showingRejectConfirm = false,
|
|
})
|
|
end
|
|
|
|
function ConfirmingPage:render()
|
|
return Theme.with(function(theme)
|
|
local pageContent = Roact.createFragment({
|
|
Title = e("TextLabel", {
|
|
Text = string.format(
|
|
"Sync changes for project '%s':",
|
|
self.props.confirmData.serverInfo.projectName or "UNKNOWN"
|
|
),
|
|
FontFace = theme.Font.Thin,
|
|
LineHeight = 1.2,
|
|
TextSize = theme.TextSize.Body,
|
|
TextColor3 = theme.TextColor,
|
|
TextXAlignment = Enum.TextXAlignment.Left,
|
|
TextTransparency = self.props.transparency,
|
|
Size = UDim2.new(1, 0, 0, theme.TextSize.Large + 2),
|
|
BackgroundTransparency = 1,
|
|
}),
|
|
|
|
PatchVisualizer = e(PatchVisualizer, {
|
|
size = UDim2.new(1, 0, 1, -100),
|
|
transparency = self.props.transparency,
|
|
layoutOrder = 3,
|
|
|
|
patchTree = self.props.patchTree,
|
|
|
|
showStringDiff = function(currentString: string, incomingString: string)
|
|
self:setState({
|
|
showingStringDiff = true,
|
|
currentString = currentString,
|
|
incomingString = incomingString,
|
|
})
|
|
end,
|
|
showTableDiff = function(oldTable: { [any]: any? }, newTable: { [any]: any? })
|
|
self:setState({
|
|
showingTableDiff = true,
|
|
oldTable = oldTable,
|
|
newTable = newTable,
|
|
})
|
|
end,
|
|
}),
|
|
|
|
Buttons = e("Frame", {
|
|
Size = UDim2.new(1, 0, 0, 34),
|
|
LayoutOrder = 4,
|
|
BackgroundTransparency = 1,
|
|
}, {
|
|
Abort = e(TextButton, {
|
|
text = "Abort",
|
|
style = "Bordered",
|
|
transparency = self.props.transparency,
|
|
layoutOrder = 1,
|
|
onClick = self.props.onAbort,
|
|
}, {
|
|
Tip = e(Tooltip.Trigger, {
|
|
text = "Stop the connection process",
|
|
}),
|
|
}),
|
|
|
|
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",
|
|
style = "Solid",
|
|
transparency = self.props.transparency,
|
|
layoutOrder = 3,
|
|
onClick = self.props.onAccept,
|
|
}, {
|
|
Tip = e(Tooltip.Trigger, {
|
|
text = "Pull Rojo server changes to Studio",
|
|
}),
|
|
}),
|
|
|
|
Layout = e("UIListLayout", {
|
|
HorizontalAlignment = Enum.HorizontalAlignment.Right,
|
|
FillDirection = Enum.FillDirection.Horizontal,
|
|
SortOrder = Enum.SortOrder.LayoutOrder,
|
|
Padding = UDim.new(0, 10),
|
|
}),
|
|
}),
|
|
|
|
Padding = e("UIPadding", {
|
|
PaddingLeft = UDim.new(0, 8),
|
|
PaddingRight = UDim.new(0, 8),
|
|
}),
|
|
|
|
Layout = e("UIListLayout", {
|
|
HorizontalAlignment = Enum.HorizontalAlignment.Center,
|
|
VerticalAlignment = Enum.VerticalAlignment.Center,
|
|
FillDirection = Enum.FillDirection.Vertical,
|
|
SortOrder = Enum.SortOrder.LayoutOrder,
|
|
Padding = UDim.new(0, 10),
|
|
}),
|
|
|
|
StringDiff = e(StudioPluginGui, {
|
|
id = "Rojo_ConfirmingStringDiff",
|
|
title = "String diff",
|
|
active = self.state.showingStringDiff,
|
|
isEphemeral = true,
|
|
|
|
initDockState = Enum.InitialDockState.Float,
|
|
overridePreviousState = true,
|
|
floatingSize = Vector2.new(500, 350),
|
|
minimumSize = Vector2.new(400, 250),
|
|
|
|
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
|
|
|
onClose = function()
|
|
self:setState({
|
|
showingStringDiff = false,
|
|
})
|
|
end,
|
|
}, {
|
|
TooltipsProvider = e(Tooltip.Provider, nil, {
|
|
Tooltips = e(Tooltip.Container, nil),
|
|
Content = e("Frame", {
|
|
Size = UDim2.fromScale(1, 1),
|
|
BackgroundTransparency = 1,
|
|
}, {
|
|
e(StringDiffVisualizer, {
|
|
size = UDim2.new(1, -10, 1, -10),
|
|
position = UDim2.new(0, 5, 0, 5),
|
|
anchorPoint = Vector2.new(0, 0),
|
|
transparency = self.props.transparency,
|
|
|
|
currentString = self.state.currentString,
|
|
incomingString = self.state.incomingString,
|
|
}),
|
|
}),
|
|
}),
|
|
}),
|
|
|
|
TableDiff = e(StudioPluginGui, {
|
|
id = "Rojo_ConfirmingTableDiff",
|
|
title = "Table diff",
|
|
active = self.state.showingTableDiff,
|
|
isEphemeral = true,
|
|
|
|
initDockState = Enum.InitialDockState.Float,
|
|
overridePreviousState = true,
|
|
floatingSize = Vector2.new(500, 350),
|
|
minimumSize = Vector2.new(400, 250),
|
|
|
|
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
|
|
|
onClose = function()
|
|
self:setState({
|
|
showingTableDiff = false,
|
|
})
|
|
end,
|
|
}, {
|
|
TooltipsProvider = e(Tooltip.Provider, nil, {
|
|
Tooltips = e(Tooltip.Container, nil),
|
|
Content = e("Frame", {
|
|
Size = UDim2.fromScale(1, 1),
|
|
BackgroundTransparency = 1,
|
|
}, {
|
|
e(TableDiffVisualizer, {
|
|
size = UDim2.new(1, -10, 1, -10),
|
|
position = UDim2.new(0, 5, 0, 5),
|
|
anchorPoint = Vector2.new(0, 0),
|
|
transparency = self.props.transparency,
|
|
|
|
oldTable = self.state.oldTable,
|
|
newTable = self.state.newTable,
|
|
}),
|
|
}),
|
|
}),
|
|
}),
|
|
|
|
RejectConfirm = e(StudioPluginGui, {
|
|
id = "Rojo_RejectConfirm",
|
|
title = "Confirm Reject",
|
|
active = self.state.showingRejectConfirm,
|
|
isEphemeral = true,
|
|
|
|
initDockState = Enum.InitialDockState.Float,
|
|
overridePreviousState = true,
|
|
floatingSize = Vector2.new(340, 120),
|
|
minimumSize = Vector2.new(300, 100),
|
|
|
|
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
|
|
|
onClose = function()
|
|
self:setState({ showingRejectConfirm = false })
|
|
end,
|
|
}, {
|
|
Content = e("Frame", {
|
|
Size = UDim2.fromScale(1, 1),
|
|
BackgroundColor3 = theme.BackgroundColor,
|
|
}, {
|
|
Message = e("TextLabel", {
|
|
Text = "Are you sure you want to reject incoming changes and push Studio changes to the server?",
|
|
FontFace = theme.Font.Main,
|
|
TextSize = theme.TextSize.Body,
|
|
TextColor3 = theme.TextColor,
|
|
TextWrapped = true,
|
|
Size = UDim2.new(1, -20, 0, 50),
|
|
Position = UDim2.new(0, 10, 0, 10),
|
|
BackgroundTransparency = 1,
|
|
}),
|
|
|
|
Buttons = e("Frame", {
|
|
Size = UDim2.new(1, -20, 0, 34),
|
|
Position = UDim2.new(0, 10, 1, -44),
|
|
BackgroundTransparency = 1,
|
|
}, {
|
|
Layout = e("UIListLayout", {
|
|
HorizontalAlignment = Enum.HorizontalAlignment.Right,
|
|
FillDirection = Enum.FillDirection.Horizontal,
|
|
SortOrder = Enum.SortOrder.LayoutOrder,
|
|
Padding = UDim.new(0, 10),
|
|
}),
|
|
|
|
Cancel = e(TextButton, {
|
|
text = "Cancel",
|
|
style = "Bordered",
|
|
transparency = self.props.transparency,
|
|
layoutOrder = 1,
|
|
onClick = function()
|
|
self:setState({ showingRejectConfirm = false })
|
|
end,
|
|
}),
|
|
|
|
Confirm = e(TextButton, {
|
|
text = "Reject",
|
|
style = "Warning",
|
|
transparency = self.props.transparency,
|
|
layoutOrder = 2,
|
|
onClick = function()
|
|
self:setState({ showingRejectConfirm = false })
|
|
self.props.onReject()
|
|
end,
|
|
}),
|
|
}),
|
|
}),
|
|
}),
|
|
})
|
|
|
|
if self.props.createPopup then
|
|
return e(StudioPluginGui, {
|
|
id = "Rojo_DiffSync",
|
|
title = string.format(
|
|
"Confirm sync for project '%s':",
|
|
self.props.confirmData.serverInfo.projectName or "UNKNOWN"
|
|
),
|
|
active = true,
|
|
isEphemeral = true,
|
|
|
|
initDockState = Enum.InitialDockState.Float,
|
|
overridePreviousState = false,
|
|
floatingSize = Vector2.new(500, 350),
|
|
minimumSize = Vector2.new(400, 250),
|
|
|
|
zIndexBehavior = Enum.ZIndexBehavior.Sibling,
|
|
|
|
onClose = self.props.onAbort,
|
|
}, {
|
|
Tooltips = e(Tooltip.Container, nil),
|
|
Content = e("Frame", {
|
|
Size = UDim2.fromScale(1, 1),
|
|
BackgroundTransparency = 1,
|
|
}, pageContent),
|
|
})
|
|
end
|
|
|
|
return pageContent
|
|
end)
|
|
end
|
|
|
|
return ConfirmingPage
|