inboxlookup_screen 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inboxlookup_screen",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "A React component using DevExtreme",
   "main": "dist/index.js",
   "homepage": "./",

package/src/components/Service/OrdersMasterDetail.js

@@ -13,23 +13,13 @@ import CustomStore from 'devextreme/data/custom_store';
 import Popup from 'devextreme-react/popup';
 import 'devextreme/dist/css/dx.light.css';
 
-const STORAGE_KEY = "ORDERS_MASTER_DETAIL_SEARCH_HISTORY";
-
 
 const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId }) => {
-    const DEFAULT_SERVICE = {
-        projectId: ProjectId,
-        id: 4,
-        status: "Active" // optional for left list rendering
-    };
-    console.log("token, BaseUrl, ProjectId", token, BaseUrl, ProjectId);
     const [orders, setOrders] = useState([]);
     const [selectedOrder, setSelectedOrder] = useState(null);
-    const [selectedService, setSelectedService] = useState(DEFAULT_SERVICE);
     const saveButtonRef = useRef(null);
     const [rowDetailsVisible, setRowDetailsVisible] = useState(false);
     const [selectedRow, setSelectedRow] = useState(null);
-    const [searchPopupVisible, setSearchPopupVisible] = useState(false);
     const [searchText, setSearchText] = useState("");
     const [category, setCategory] = useState(0);
     const [status, setStatus] = useState(0);
@@ -68,8 +58,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
     useEffect(() => {
         if (!ProjectId) return; // ⛔ guard
 
-        console.log("ProjectId", ProjectId, BaseUrl);
-
         axios.get(
             `${BaseUrl}api/LookupSheetMaster/GetLatestSheetsByProject/${ProjectId}`,
             {
@@ -97,6 +85,37 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
 
     }, [ProjectId, BaseUrl, token]); // ✅ FIXED
 
+    useEffect(() => {
+        // ⛔ Project changed → FULL RESET
+
+        setOrders([]);
+        setFilteredOrders([]);
+
+        setSelectedOrder(null);
+        setSelectedService(null);
+
+        setGridStore(null);
+        setColumns([]);
+
+        setSelectedRow(null);
+        setRowDetailsVisible(false);
+
+        setSearchText("");
+        setGridSearchText("");
+
+        setSelectedRowKeys([]);
+        setExcludedKeys([]);
+        setSelectAll(false);
+        setWasFullyDeselected(false);
+        setFinalCount(0);
+
+        if (gridInstance) {
+            gridInstance.clearSelection();
+            gridInstance.searchByText("");
+            gridInstance.pageIndex(0);
+        }
+
+    }, [ProjectId]); // 🔥 THIS is the key
 
     useEffect(() => {
         if (!orders) return;
@@ -123,7 +142,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
 
                 if (!sheet) return;
                 setSelectedOrder(sheet);
-                setSelectedService(sheet);
 
                 await loadColumns(sheet.id);
 
@@ -522,53 +540,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
     };
 
 
-    useEffect(() => {
-        fetch(`/api/search-history/1`)
-            .then(res => res.ok ? res.json() : [])
-            .then(data => {
-                if (data.length) {
-                    setSearchHistory(data);
-                    searchHistoryRef.current = data;
-                    sessionStorage.setItem(STORAGE_KEY, JSON.stringify(data));
-                } else {
-                    const stored = JSON.parse(sessionStorage.getItem(STORAGE_KEY)) || [];
-                    setSearchHistory(stored);
-                    searchHistoryRef.current = stored;
-                }
-            })
-            .catch(() => {
-                const stored = JSON.parse(sessionStorage.getItem(STORAGE_KEY)) || [];
-                setSearchHistory(stored);
-                searchHistoryRef.current = stored;
-            });
-    }, []);
-
-
-
-    useEffect(() => {
-        const handleStorageChange = (e) => {
-            if (e.key === STORAGE_KEY) {
-                const updated = JSON.parse(e.newValue) || [];
-                setSearchHistory(updated);
-                searchHistoryRef.current = updated;
-            }
-        };
-        window.addEventListener("storage", handleStorageChange);
-        return () => window.removeEventListener("storage", handleStorageChange);
-    }, []);
-
-    const updateSearchHistoryAPI = () => {
-        if (!searchHistoryRef.current.length) return;
-
-        navigator.sendBeacon(
-            "/api/search-history",
-            JSON.stringify({
-                userId: 1,
-                history: searchHistoryRef.current
-            })
-        );
-    };
-
     useEffect(() => {
         const handleVisibilityChange = () => {
             if (document.visibilityState === "hidden") {
@@ -637,7 +608,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
 
                             // ✅ Update selected service
                             setSelectedOrder(sheet);
-                            setSelectedService(sheet);
                             await loadColumns(sheet.id);
 
                             // ✅ Reset grid state BEFORE assigning new store
@@ -720,10 +690,7 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
                                 showBorders={true}
                                 allowColumnReordering={true}
                                 onColumnReordered={(e) => {
-                                    console.log("REORDER TRIGGERED");
-                                    console.log("From:", e.fromIndex);
-                                    console.log("To:", e.toIndex);
-                                    console.log("Field:", e.column.dataField);
+
                                 }}
                                 // onColumnReordered={handleColumnReorder}
                                 columnHidingEnabled={false}
@@ -822,92 +789,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId })
                                     </div>
                                 </Popup>
                             )}
-
-
-                            <Popup
-                                visible={searchPopupVisible}
-                                onHiding={() => setSearchPopupVisible(false)}
-                                showTitle
-                                title="Search History"
-                                width={360}
-                                height="100%"
-                                dragEnabled={false}
-                                closeOnOutsideClick
-                                showCloseButton
-                                position={{
-                                    my: "right top",
-                                    at: "right top",
-                                    of: window
-                                }}
-                                wrapperAttr={{ class: "right-search-popup" }}
-                            >
-                                <div style={{ padding: 16, height: "100%" }}>
-                                    {searchHistory.length > 0 ? (
-                                        <ul
-                                            style={{
-                                                listStyle: "none",
-                                                padding: 0,
-                                                margin: 0,
-                                                height: "100%",
-                                                overflowY: "auto"
-                                            }}
-                                        >
-                                            {searchHistory.map((s, i) => (
-                                                <li
-                                                    key={i}
-                                                    onClick={() => {
-                                                        setGridSearchText(s);
-                                                        setSearchPopupVisible(false);
-                                                    }}
-                                                    style={{
-                                                        display: "flex",
-                                                        alignItems: "center",
-                                                        gap: 10,
-                                                        padding: "10px 12px",
-                                                        marginBottom: 8,
-                                                        borderRadius: 8,
-                                                        cursor: "pointer",
-                                                        backgroundColor: "#f5f7fa",
-                                                        transition: "all 0.2s ease"
-                                                    }}
-                                                    onMouseEnter={e => e.currentTarget.style.background = "#e6f0ff"}
-                                                    onMouseLeave={e => e.currentTarget.style.background = "#f5f7fa"}
-                                                >
-                                                    <span style={{ fontSize: 16, color: "#1976d2" }}>🔍</span>
-                                                    <span
-                                                        style={{
-                                                            fontSize: 14,
-                                                            color: "#333",
-                                                            overflow: "hidden",
-                                                            textOverflow: "ellipsis",
-                                                            whiteSpace: "nowrap"
-                                                        }}
-                                                        title={s}
-                                                    >
-                                                        {s}
-                                                    </span>
-                                                </li>
-                                            ))}
-                                        </ul>
-                                    ) : (
-                                        <div
-                                            style={{
-                                                height: "100%",
-                                                display: "flex",
-                                                alignItems: "center",
-                                                justifyContent: "center",
-                                                color: "#999",
-                                                fontSize: 14
-                                            }}
-                                        >
-                                            🔍 No search history available
-                                        </div>
-                                    )}
-                                </div>
-                            </Popup>
-
-
-
                         </div>
                     )}
                 </div>