Merge pull request #372 from GREENRAT-K405/feat/json-import-export

Add support for JSON import/export

Author: pradeeban

src/GraphArea.jsx

@@ -4,7 +4,8 @@ import MyGraph from './graph-builder';
 import { actionType as T } from './reducer';
 
 function Graph({
-    el, superState, dispatcher, graphID, serverID, graphML, projectName, graphContainerRef, active, authorName,
+    el, superState, dispatcher, graphID, serverID, graphML, importedJson,
+    projectName, graphContainerRef, active, authorName,
 }) {
     const [instance, setInstance] = useState(null);
     const ref = useRef();
@@ -34,6 +35,7 @@ function Graph({
             myGraph.forcePullFromServer();
         }
         if (graphML) myGraph.setGraphML(graphML);
+        if (importedJson) myGraph.loadJson(importedJson);
         myGraph.setCurStatus();
         myGraph.cy.on('zoom', () => {
             dispatcher({ type: T.SET_ZOOM_LEVEL, payload: (myGraph.cy.zoom() * 100).toFixed(0) });

src/GraphWorkspace.jsx

@@ -70,6 +70,7 @@ const GraphComp = (props) => {
                         graphID={el.graphID}
                         serverID={el.serverID}
                         graphML={el.graphML}
+                        importedJson={el.importedJson || null}
                         projectName={el.projectName}
                         fileHandle={el.fileHandle}
                         fileName={el.fileName}
@@ -87,7 +88,10 @@ const GraphComp = (props) => {
                     if (superState.confirmModal.onConfirm) superState.confirmModal.onConfirm();
                     dispatcher({ type: T.SET_CONFIRM_MODAL, payload: { open: false, message: '', onConfirm: null } });
                 }}
-                onCancel={() => dispatcher({ type: T.SET_CONFIRM_MODAL, payload: { open: false, message: '', onConfirm: null } })}
+                onCancel={() => dispatcher({
+                    type: T.SET_CONFIRM_MODAL,
+                    payload: { open: false, message: '', onConfirm: null },
+                })}
             />
         </div>
     );

src/component/File-drag-drop.jsx

@@ -39,9 +39,10 @@ const app = ({ superState, dispatcher }) => {
         const onDrop = (e) => {
             e.preventDefault();
             fileRef.current.value = null;
-            if (e.dataTransfer.files.length === 1
-                && e.dataTransfer.files[0].name.split('.').slice(-1)[0] === 'graphml') {
-                readFile(superStateRef.current, dispatcherRef.current, e.dataTransfer.files[0]);
+            const droppedFile = e.dataTransfer.files[0];
+            const ext = droppedFile && droppedFile.name.split('.').slice(-1)[0];
+            if (e.dataTransfer.files.length === 1 && (ext === 'graphml' || ext === 'json')) {
+                readFile(superStateRef.current, dispatcherRef.current, droppedFile);
             }
         };
 
@@ -69,8 +70,8 @@ const app = ({ superState, dispatcher }) => {
                         ref={fileRef}
                         onClick={(e) => { e.target.value = null; }}
                         style={{ display: 'none' }}
-                        accept=".graphml"
-                        onChange={(e) => readFile(superState, dispatcher, e)}
+                        accept=".graphml,.json"
+                        onChange={(e) => readFile(superState, dispatcher, e.target.files[0])}
                     />
                     <span className="arrow">&#10230;</span>
                     <h1 className="text">Drop the File anywhere to open</h1>

src/component/SearchPanel.jsx

@@ -4,7 +4,9 @@ import './searchPanel.css';
 
 const SearchPanel = ({ superState, dispatcher }) => {
     const inputRef = useRef();
-    const { searchPanel, searchQuery, searchResults, searchIndex, curGraphInstance } = superState;
+    const {
+        searchPanel, searchQuery, searchResults, searchIndex, curGraphInstance,
+    } = superState;
 
     useEffect(() => {
         if (searchPanel && inputRef.current) inputRef.current.focus();
@@ -62,6 +64,11 @@ const SearchPanel = ({ superState, dispatcher }) => {
     const current = total > 0 ? searchIndex + 1 : 0;
     const hasQuery = searchQuery.trim().length > 0;
 
+    let searchCounterMessage = '';
+    if (hasQuery) {
+        searchCounterMessage = total > 0 ? `${current} of ${total}` : 'No results';
+    }
+
     return (
         <div className="search-panel">
             <input
@@ -72,9 +79,23 @@ const SearchPanel = ({ superState, dispatcher }) => {
                 onChange={handleChange}
                 onKeyDown={handleKeyDown}
             />
-            <span className="search-counter">{hasQuery ? (total > 0 ? `${current} of ${total}` : 'No results') : ''}</span>
-            <button type="button" onClick={() => step(-1)} disabled={total < 2} title="Previous (Shift+Enter)">▲</button>
-            <button type="button" onClick={() => step(1)} disabled={total < 2} title="Next (Enter)">▼</button>
+            <span className="search-counter">{searchCounterMessage}</span>
+            <button
+                type="button"
+                onClick={() => step(-1)}
+                disabled={total < 2}
+                title="Previous (Shift+Enter)"
+            >
+                ▲
+            </button>
+            <button
+                type="button"
+                onClick={() => step(1)}
+                disabled={total < 2}
+                title="Next (Enter)"
+            >
+                ▼
+            </button>
             <button type="button" onClick={close} title="Close (Esc)">✕</button>
         </div>
     );

src/component/TabBar.jsx

@@ -89,7 +89,8 @@ const TabBar = ({ superState, dispatcher }) => {
                     key={el.graphID}
                     className={`tab tab-graph ${superState.curGraphIndex === i ? 'selected' : 'none'}`}
                     onClick={() => dispatcher({ type: T.CHANGE_TAB, payload: i })}
-                    onKeyDown={(ev) => (ev.key === ' ' || ev.key === 'Enter') && dispatcher({ type: T.CHANGE_TAB, payload: i })}
+                    onKeyDown={(ev) => (ev.key === ' ' || ev.key === 'Enter')
+                        && dispatcher({ type: T.CHANGE_TAB, payload: i })}
                     role="button"
                     tabIndex={0}
                     id={`tab_${i}`}

src/component/fileBrowser.jsx

@@ -61,7 +61,7 @@ const LocalFileBrowser = ({ superState, dispatcher }) => {
             return;
         }
 
-        if (fileExt === 'graphml') {
+        if (fileExt === 'graphml' || fileExt === 'json') {
             let foundi = -1;
             superState.graphs.forEach((g, i) => {
                 if ((g.fileName === data.fileObj.name)) {
@@ -136,9 +136,10 @@ const LocalFileBrowser = ({ superState, dispatcher }) => {
         const pickerOpts = {
             types: [
                 {
-                    description: 'Graphml',
+                    description: 'Graph Files',
                     accept: {
                         'text/graphml': ['.graphml'],
+                        'application/json': ['.json'],
                     },
                 },
             ],
@@ -206,7 +207,7 @@ const LocalFileBrowser = ({ superState, dispatcher }) => {
                         ref={fileRef}
                         onClick={(e) => { e.target.value = null; }}
                         style={{ display: 'none' }}
-                        accept=".graphml"
+                        accept=".graphml,.json"
                         onChange={(e) => readFile(superState, dispatcher, e.target.files[0])}
                     />
                 )}

src/component/modals/History.jsx

@@ -156,42 +156,42 @@ const HistoryModal = ({ superState, dispatcher }) => {
                 closeModal={close}
                 title="History"
             >
-            <div className="hist-container">
-                <fieldset>
-                    <legend>Filters</legend>
-                    {
-                        actions.map((action) => (
-                            <label htmlFor={action} className="filter_checkbox" key={action}>
-                                <input
-                                    type="checkbox"
-                                    name="filter"
-                                    checked={filterAction[action]}
-                                    onChange={() => setFilterAction({
-                                        ...filterAction,
-                                        [action]: !filterAction[action],
-                                    })}
-                                />
-                                {stringifyActionType[action]}
-                            </label>
-                        ))
-                    }
-                </fieldset>
-                <div className="hist-list">
-                    <table style={{ listStyleType: 'circle' }}>
-                        <tbody>
-                            {historyView.map((h, i) => (
-                                <tr
-                                    className={`hist-element ${i === curState ? 'active' : ''}`}
-                                    // eslint-disable-next-line react/no-array-index-key
-                                    key={i}
-                                >
-                                    {h}
-                                </tr>
-                            ))}
-                        </tbody>
-                    </table>
+                <div className="hist-container">
+                    <fieldset>
+                        <legend>Filters</legend>
+                        {
+                            actions.map((action) => (
+                                <label htmlFor={action} className="filter_checkbox" key={action}>
+                                    <input
+                                        type="checkbox"
+                                        name="filter"
+                                        checked={filterAction[action]}
+                                        onChange={() => setFilterAction({
+                                            ...filterAction,
+                                            [action]: !filterAction[action],
+                                        })}
+                                    />
+                                    {stringifyActionType[action]}
+                                </label>
+                            ))
+                        }
+                    </fieldset>
+                    <div className="hist-list">
+                        <table style={{ listStyleType: 'circle' }}>
+                            <tbody>
+                                {historyView.map((h, i) => (
+                                    <tr
+                                        className={`hist-element ${i === curState ? 'active' : ''}`}
+                                        // eslint-disable-next-line react/no-array-index-key
+                                        key={i}
+                                    >
+                                        {h}
+                                    </tr>
+                                ))}
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
-            </div>
             </Modal>
         </>
     );

src/graph-builder/graph-core/5-load-save.js

@@ -205,11 +205,17 @@ class GraphLoadSave extends GraphUndoRedo {
         content.edges.forEach((edge) => {
             this.addEdge({ ...edge, sourceID: edge.source, targetID: edge.target }, 0);
         });
-        content.actionHistory.forEach(({
-            inverse, equivalent, tid,
-        }) => {
-            this.addAction(GraphLoadSave.parseAction(inverse), GraphLoadSave.parseAction(equivalent), tid);
-        });
+        if (content.actionHistory && content.actionHistory.length) {
+            content.actionHistory.forEach(({
+                inverse, equivalent, tid,
+            }) => {
+                this.addAction(
+                    GraphLoadSave.parseAction(inverse),
+                    GraphLoadSave.parseAction(equivalent),
+                    tid,
+                );
+            });
+        }
         this.setProjectName(content.projectName);
         this.setServerID(this.serverID || content.serverID);
         this.setProjectAuthor(content.authorName);

src/reducer/reducer.js

@@ -101,6 +101,7 @@ const reducer = (state, action) => {
                     graphID,
                     serverID: action.payload.serverID,
                     graphML: action.payload.graphML,
+                    importedJson: action.payload.importedJson || null,
                     fileHandle: action.payload.fileHandle || null,
                     fileName: action.payload.fileName,
                     authorName: action.payload.authorName || '',

src/toolbarActions/toolbarFunctions.js

@@ -1,3 +1,4 @@
+import { saveAs } from 'file-saver';
 import { toast } from 'react-toastify';
 import parser from '../graph-builder/graphml/parser';
 import { actionType as T } from '../reducer';
@@ -84,6 +85,41 @@ const saveAction = (state) => {
     getGraphFun(state).saveToDisk();
 };
 
+const saveAsJson = (state) => {
+    if (!getGraphFun(state)) {
+        toast.error('No graph open to export.');
+        return;
+    }
+    try {
+        const graphJson = getGraphFun(state).jsonifyGraph();
+        const cleanExport = {
+            projectName: graphJson.projectName || 'Untitled',
+            authorName: graphJson.authorName || '',
+            nodes: graphJson.nodes.map((n) => ({
+                id: n.id,
+                label: n.label,
+                position: n.position,
+                style: n.style,
+            })),
+            edges: graphJson.edges.map((e) => ({
+                id: e.id,
+                label: e.label,
+                source: e.source,
+                target: e.target,
+                style: e.style,
+            })),
+        };
+        const str = JSON.stringify(cleanExport, null, 2);
+        const bytes = new TextEncoder().encode(str);
+        const blob = new Blob([bytes], { type: 'application/json;charset=utf-8' });
+        const fileName = `${cleanExport.projectName}.json`;
+        saveAs(blob, fileName);
+        toast.success('Exported as JSON successfully!');
+    } catch (error) {
+        toast.error('Failed to export JSON.');
+    }
+};
+
 async function saveGraphMLFile(state) {
     if (state.curGraphInstance) {
         const graph = state.graphs[state.curGraphIndex];
@@ -114,7 +150,8 @@ const readFile = async (state, setState, file, fileHandle) => {
         }
         const fr = new FileReader();
         const projectName = file.name;
-        if (file.name.split('.').pop() === 'graphml') {
+        const ext = file.name.split('.').pop();
+        if (ext === 'graphml') {
             fr.onload = (x) => {
                 parser(x.target.result).then(({ authorName }) => {
                     setState({
@@ -127,6 +164,26 @@ const readFile = async (state, setState, file, fileHandle) => {
             };
             if (fileHandle) fr.readAsText(await fileHandle.getFile());
             else fr.readAsText(file);
+        } else if (ext === 'json') {
+            fr.onload = (x) => {
+                try {
+                    const parsed = JSON.parse(x.target.result);
+                    setState({
+                        type: T.ADD_GRAPH,
+                        payload: {
+                            projectName: parsed.projectName || file.name,
+                            graphML: null,
+                            fileHandle: null,
+                            fileName: file.name,
+                            authorName: parsed.authorName || '',
+                            importedJson: parsed,
+                        },
+                    });
+                } catch {
+                    toast.error('Invalid JSON file.');
+                }
+            };
+            fr.readAsText(file);
         }
     }
 };
@@ -232,5 +289,5 @@ export {
     createFile, readFile, readTextFile, newProject, clearAll, editDetails, undo, redo,
     openShareModal, openSettingModal, viewHistory, resetAfterClear, toggleLogs,
     copySelected, pasteClipboard,
-    toggleServer, optionModalToggle, contribute, openSearchPanel,
+    toggleServer, optionModalToggle, contribute, openSearchPanel, saveAsJson,
 };