Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add basic node store #1098

Open
wants to merge 1 commit into
base: podesta/build-safety
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions app/cdap/components/hydrator/components/Canvas/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import { IComment } from 'components/AbstractWidget/Comment/CommentConstants';
import IconSVG from 'components/shared/IconSVG';
import { copyToClipBoard } from 'services/Clipboard';
import { INodePosition, ISelectedElements } from './types';
import { useDispatch, useSelector } from 'react-redux';

interface ICanvasProps {
angularNodes: any;
Expand Down Expand Up @@ -222,6 +223,10 @@ const Canvas = ({
return reactflowNode;
});
};
const {angularNodes2} = useSelector((state) => ({
angularNodes2: state.nodesStore.nodes
}))
const dispatch = useDispatch();

const [nodes, setNodes, onNodesChange] = useNodesState([]);
const [edges, setEdges, onEdgesChange] = useEdgesState([]);
Expand Down Expand Up @@ -380,14 +385,17 @@ const Canvas = ({
};

const updateNodesUIPosition = (node: Node) => {
updateNodePositions({
id: node.data.node.id,
position: {
_uiPosition: {
top: node.position.y + 'px',
left: node.position.x + 'px',
dispatch({
type: 'UPDATE_NODE_UI_POSITION',
payload: {
id: node.data.node.id,
position: {
_uiPosition: {
top: node.position.y + 'px',
left: node.position.x + 'px',
},
},
},
}
});
};

Expand Down Expand Up @@ -417,9 +425,9 @@ const Canvas = ({

useEffect(() => {
setNodes((nds) => {
return [].concat(getNodesForDisplay(getAngularNodes(), nds));
return [].concat(getNodesForDisplay(angularNodes2, nds));
});
}, [JSON.stringify(angularNodes), previewMode, metricsData]);
}, [JSON.stringify(angularNodes2), previewMode, metricsData]);

useEffect(() => {
setEdges(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ export interface IStudioCreateState {

export const Studio = ({leftPanelCtrl, topPanelCtrl, canvasCtrl, dagCtrl, metadataExpanded}: IStudioCreateState) => {
return (
<div>
<Provider store={configureStores}>
<div className="react-version">
<div className="canvas-wrapper">
<div className="left-control">
<Provider store={configureStores}>

<LeftPanel
onArtifactChange={leftPanelCtrl.onArtifactChangeV2}
pluginsMap={leftPanelCtrl.pluginsMap}
Expand All @@ -51,7 +51,6 @@ export const Studio = ({leftPanelCtrl, topPanelCtrl, canvasCtrl, dagCtrl, metada
isEdit={leftPanelCtrl.isEdit}
createPluginTemplate={leftPanelCtrl.createPluginTemplateV2}
/>
</Provider>
</div>
<div className="top-panel">
<TopPanel
Expand Down Expand Up @@ -156,6 +155,6 @@ export const Studio = ({leftPanelCtrl, topPanelCtrl, canvasCtrl, dagCtrl, metada
</div>
</div>
</div>
</div>
</Provider>
);
};
118 changes: 118 additions & 0 deletions app/cdap/components/hydrator/reducers/DAGNodesStore.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/*
* Copyright © 2023 Cask Data, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

import { createAction, createReducer, current } from '@reduxjs/toolkit';
import { GLOBALS } from 'services/global-constants';
import uuidV4 from 'uuid/v4';
import { santizeStringForHTMLID } from 'services/helpers';

const addNode = createAction<any>('ADD_NODE')
const updateNodeUIPosition = createAction<any>('UPDATE_NODE_UI_POSITION')
const reset = createAction<any>('LEFTPANELSTORE_RESET');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there anything we can do to add a more specific type than any? Even a simple base type?


const getInitialState = () => {
return {
nodes: [],
connections: [],
activeNodeId: null,
currentSourceCount: 0,
currentTransformCount: 0,
currentSinkCount: 0,
canvasPanning: {
top: 0,
left: 0
},
}
}

const setNodeInitialPosition = (config, state) => {
const canvasPanning = state.canvasPanning;

const sourcePosition = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add comments on transformations here

top: 150 - canvasPanning.top,
left: (10/100 * document.documentElement.clientWidth) - canvasPanning.left
};
const transformPosition = {
top: 150 - canvasPanning.top,
left: (30/100 * document.documentElement.clientWidth) - canvasPanning.left
};
const sinkPosition = {
top: 150 - canvasPanning.top,
left: (50/100 * document.documentElement.clientWidth) - canvasPanning.left
};

const offset = 35;

// set initial position
switch (GLOBALS.pluginConvert[config.type]) {
case 'source':
const sourceOffset = state.currentSourceCount * offset;
config._uiPosition = {
top: (sourcePosition.top + sourceOffset) + 'px',
left: (sourcePosition.left + sourceOffset) + 'px'
};
break;
case 'sink':
const sinkOffset = state.currentSinkCount * offset;
config._uiPosition = {
top: (sinkPosition.top + sinkOffset) + 'px',
left: (sinkPosition.left + sinkOffset) + 'px'
};
break;
default:
const transformOffset = state.currentTransformCount * offset;
config._uiPosition = {
top: (transformPosition.top + transformOffset) + 'px',
left: (transformPosition.left + transformOffset) + 'px'
};
break;
}
if (!config.name) {
config.name = config.plugin.label + '-' + uuidV4();
}
if (!config.id) {
config.id = santizeStringForHTMLID(config.plugin.label) + '-' + uuidV4();
}
return config;
}

export const nodeReducer = createReducer({
...getInitialState()
}, (builder) => {
builder.addCase(addNode, (state, action) => {
const config = setNodeInitialPosition(action.payload.config, state)
switch (GLOBALS.pluginConvert[config.type]) {
case 'source':
state.currentSourceCount++
break;
case 'sink':
state.currentSinkCount++
break;
default:
state.currentTransformCount++
break;
}
state.nodes.push(config);
})
.addCase(updateNodeUIPosition, (state, action) => {
const {id, position} = action.payload
const nodeToUpdate = state.nodes.filter(node => node.id === id)[0]
nodeToUpdate._uiPosition = position._uiPosition
})
.addCase(reset, (state, action) => {
state = getInitialState()
})
})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the formatting on this file is odd - add a new line and then 2 character tabs.

2 changes: 2 additions & 0 deletions app/cdap/components/hydrator/reducers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
*/
import { configureStore } from '@reduxjs/toolkit';
import reduxThunk from 'redux-thunk';
import { nodeReducer } from './DAGNodesStore';
import { pluginReducer, extensionsReducer, artifactReducer } from './leftPanelStore';

export const configureStores = configureStore({
reducer: {
artifact: artifactReducer,
extensions: extensionsReducer,
plugins: pluginReducer,
nodesStore: nodeReducer,
},
middleware: (getDefaultMiddleware) => getDefaultMiddleware({
serializableCheck: {
Expand Down
6 changes: 3 additions & 3 deletions app/directives/dag-plus/services/stores/nodes-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ class DAGPlusPlusNodesStore {

resetActiveNode() {
this.state.activeNodeId = null;
angular.forEach(this.state.nodes, (node) => {
node.selected = false;
});
// angular.forEach(this.state.nodes, (node) => {
// node.selected = false;
// });
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be removed?

this.emitChange();
}

Expand Down
6 changes: 6 additions & 0 deletions app/hydrator/controllers/create/leftpanel-ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,12 @@ export class HydratorPlusPlusLeftPanelCtrl {
};
}
this.DAGPlusPlusNodesActionsFactory.addNode(config);
this.ReactStores.dispatch({
type: 'ADD_NODE',
payload: {
config
}
})
}
}

Expand Down