fixed up issues with saving

This commit is contained in:
ari committed 2022-06-04 22:10:41 -04:00
1 parent 25bb19dbe5
commit 911f867518
7 files changed
+54 -26

No files matched your search

-1
View File
@@ -11,7 +11,6 @@ const baseURL = new URL(
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
);
export const wsURL = baseURL + "socket"
console.log({ baseURL, wsURL })
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "automations"
);
+5 -1
View File
@@ -60,13 +60,17 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
// modal
let modalBody = <></>
console.log(modalState)
if (modalState) {
if (modalState.single) {
modalBody = <NodeEditor
node={modalState.node}
isErrored={modalState.isError}
onClose={() => setModalState(null)}
onSave={n => { modalState.update(n as any); setModalState(null); }}
onSave={n => {
modalState.update(n as any);
setModalState(null);
}}
allowedTypes={modalState.allowedTypes}
saveBtnCreateText={modalState.saveBtnCreateText}
/>
+13 -9
View File
@@ -27,19 +27,23 @@ export const makeSequenceUpdater = (
choose: [],
default: [],
},
update: n => onChange([
...sequence,
n,
]),
update: n => {
onChange([
...sequence,
n,
])
},
allowedTypes: ['action', 'condition']
})
},
updateNode(i: number, node: AutomationSequenceNode) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
return onChange([
...sequence.slice(0, i),
node,
...sequence.slice(i + 1),
])
}
},
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
@@ -33,4 +33,16 @@
.multinode-editor.modded .multinode-editor--total {
color: var(--green-light)
}
.multinode-editor.modded .node-editor--footer--save {
border-color: var(--green-opaque);
background-color: var(--green-light);
color: var(--primary);
}
.multinode-editor.modded .node-editor--footer--save:hover {
border-color: var(--green-light);
background-color: var(--green-opaque);
color: var(--green-light);
}
@@ -19,19 +19,18 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
</Button>;
// branch
if (state.isEmpty) {
return <div className='column center' style={{
return <div className={["multinode-editor", state.isModified ? "modded" : '', isMobile ? 'mobile' : ''].join(' ')} style={{
minWidth: '20vw',
}}>
<div style={{
flex: 1,
display: 'flex',
justifyContent: 'center',
alignItems: 'flex-start',
}}>
<div className="multinode-editor--navbar">
{nextOrAddBtn}
</div>
<div className='column center' style={{ marginTop: '1em' }}>
<div className='node-editor--footer' style={{ marginTop: '1em' }}>
<Button onClick={state.onClose}>Close</Button>
<Button onClick={state.onSaveEmpty} className="node-editor--footer--save">Save</Button>
</div>
<div className='column center'>
<span>{state.currentSlideNumber}/<u className="multinode-editor--total">{state.totalSlides}</u></span>
</div>
</div>
}
@@ -107,9 +107,9 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isModified: true,
isSaved: false,
}
},
})
},
onSave(node: AutomationNode) {
@@ -129,6 +129,17 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
internalNodeModified: false,
})
},
onSaveEmpty() {
justSaved.current = true
setState({
...state,
multiNode: {
isModified: multiNode.isModified,
isSaved: true,
},
internalNodeModified: false,
})
},
onClose() {
if (!multiNode.isSaved && multiNode.isModified) {
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
@@ -136,6 +147,9 @@ export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
}
props.onSave && props.onSave(slides)
}
if (justSaved.current) {
props.onSave && props.onSave(slides)
}
props.onClose && props.onClose()
}
}
+1 -5
View File
@@ -68,11 +68,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
className="node-editor--footer--save"
onClick={() => {
if (areYouSureNotReady('save')) {
if (JSON.stringify(state.data) !== JSON.stringify(node)) {
onSave(state.data)
} else {
onClose()
}
onSave(state.data)
}
}}
title={