update close tab pop up logic

Author: GREENRAT-K405

src/GraphArea.jsx

@@ -44,7 +44,8 @@ function Graph({
     useEffect(() => active && instance && instance.setCurStatus(), [active && instance]);
     useEffect(() => {
         if (active && instance) dispatcher({ type: T.SET_CUR_INSTANCE, payload: instance });
-    }, [active && instance]);
+        if (instance) dispatcher({ type: T.SET_GRAPH_INSTANCE, payload: { graphID, instance } });
+    }, [active, instance, graphID, dispatcher]);
 
     useEffect(() => {
         if (ref.current) {

src/component/TabBar.jsx

@@ -14,22 +14,30 @@ const TabBar = ({ superState, dispatcher }) => {
     const [confirmOpen, setConfirmOpen] = useState(false);
     const [tabToClose, setTabToClose] = useState(null);
 
+    const closeTab = (i) => {
+        localStorageManager.remove(superState.graphs[i] ? superState.graphs[i].graphID : null);
+        dispatcher({ type: T.REMOVE_GRAPH, payload: i });
+        if (!superState.curGraphIndex && superState.graphs.length === 1) {
+            dispatcher({ type: T.SET_CUR_INSTANCE, payload: null });
+            dispatcher({ type: T.SET_CUR_INDEX, payload: -1 });
+        }
+    };
+
     const handleRequestCloseTab = (i, e) => {
         e.stopPropagation();
-        setTabToClose(i);
-        setConfirmOpen(true);
+        const graph = superState.graphs[i];
+        if (graph && graph.instance && !graph.instance.isSaved) {
+            setTabToClose(i);
+            setConfirmOpen(true);
+        } else {
+            closeTab(i);
+        }
     };
 
     const handleConfirmClose = () => {
-        const i = tabToClose;
+        closeTab(tabToClose);
         setConfirmOpen(false);
         setTabToClose(null);
-        localStorageManager.remove(superState.graphs[i] ? superState.graphs[i].graphID : null);
-        dispatcher({ type: T.REMOVE_GRAPH, payload: i });
-        if (!superState.curGraphIndex && superState.graphs.length === 1) {
-            dispatcher({ type: T.SET_CUR_INSTANCE, payload: null });
-            dispatcher({ type: T.SET_CUR_INDEX, payload: -1 });
-        }
     };
 
     const handleCancelClose = () => {

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

@@ -13,6 +13,11 @@ class GraphLoadSave extends GraphUndoRedo {
     constructor(...args) {
         super(...args);
         this.autoSaveIntervalId = null;
+        this.lastSavedActionIndex = 0;
+    }
+
+    get isSaved() {
+        return this.curActionIndex === this.lastSavedActionIndex;
     }
 
     registerEvents() {
@@ -132,6 +137,7 @@ class GraphLoadSave extends GraphUndoRedo {
                     fileHandle: handle,
                 }]);
                 this.dispatcher({ type: T.SET_FILE_STATE, payload: fS });
+                this.lastSavedActionIndex = this.curActionIndex;
                 toast.success('File saved Successfully');
             } catch (error) {
                 // AbortError is silently ignored (user cancelled)
@@ -140,6 +146,7 @@ class GraphLoadSave extends GraphUndoRedo {
             // eslint-disable-next-line no-alert
             const fileName = prompt('Filename:');
             saveAs(blob, `${fileName || `${this.getName()}-concore`}.graphml`);
+            this.lastSavedActionIndex = this.curActionIndex;
             toast.success('File saved Successfully');
         }
     }
@@ -172,6 +179,7 @@ class GraphLoadSave extends GraphUndoRedo {
             const stream = await handle.createWritable();
             await stream.write(blob);
             await stream.close();
+            this.lastSavedActionIndex = this.curActionIndex;
             toast.success('File saved Successfully');
         } catch (error) {
             // AbortError is silently ignored (user cancelled)
@@ -213,6 +221,7 @@ class GraphLoadSave extends GraphUndoRedo {
         graphMLParser(graphML).then((graphObject) => {
             localStorageManager.save(this.id, graphObject);
             this.loadGraphFromLocalStorage();
+            this.lastSavedActionIndex = this.curActionIndex;
         });
     }
 
@@ -225,6 +234,10 @@ class GraphLoadSave extends GraphUndoRedo {
         const graphContent = localStorageManager.get(this.id);
         if (!graphContent) return false;
         this.loadJson(graphContent);
+        // If loaded from localStorage, assume UNSAVED unless actions are 0.
+        // Actually, loadJson sets curActionIndex based on history.
+        // If we want to support recovering unsaved work, we should leave lastSavedActionIndex as 0 (unless graph is empty and curActionIndex is 0).
+        if (this.curActionIndex === 0) this.lastSavedActionIndex = 0;
         return true;
     }
 

src/reducer/actionType.js

@@ -44,6 +44,7 @@ const actionType = {
     SET_FUNCTIONS: 'SET_FUNCTIONS',
     SET_LOGS: 'SET_LOGS',
     SET_LOGS_MESSAGE: 'SET_LOGS_MESSAGE',
+    SET_GRAPH_INSTANCE: 'SET_GRAPH_INSTANCE',
 };
 
 export default zealit(actionType);

src/reducer/reducer.js

@@ -243,6 +243,14 @@ const reducer = (state, action) => {
         return { ...newState };
     }
 
+    case T.SET_GRAPH_INSTANCE: {
+        const newState = { ...state };
+        newState.graphs = newState.graphs.map((g) => (
+            g.graphID === action.payload.graphID ? { ...g, instance: action.payload.instance } : g
+        ));
+        return { ...newState };
+    }
+
     default:
         return state;
     }