inboxlookup_screen 1.0.7 → 1.0.9

package/package.json

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

package/src/components/Service/OrdersMasterDetail.css

@@ -146,9 +146,9 @@
     margin-bottom: 4px;
 }
 
-.lookupscreenpopup-contentt input {
-    height: 36px;
-    padding: 6px 8px;
+.lookupscreenpopup-content>.form-group>input {
+    height: 36px !important;
+    padding: 6px 8px !important;
     border: 1px solid #dcdcdc;
     border-radius: 4px;
     background: #f9f9f9;

package/src/components/Service/OrdersMasterDetail.js

@@ -9,27 +9,19 @@ import DataGrid, {
     Item,
     GroupItem, HeaderFilter, FilterRow,
 } from 'devextreme-react/data-grid';
-import Button from 'devextreme-react/button';  // <-- THIS import MUST be here
 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 DEFAULT_SERVICE = {
-    CustomerId: 10,
-    projectId: 147,
-    id: 4,      // any unique id for the list
-    status: "Active" // optional for left list rendering
-};
 
-const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiIwMDAwMDAwMy0wMDAwLTAwMDAtYzAwMC0wMDAwMDAwMDAwMDAiLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC9lNjZmMWU2Yi05Y2I5LTQyNTgtYTQyOS0xNzhjZWUzNTlhYTkvIiwiaWF0IjoxNzQ3NjI2MDM0LCJuYmYiOjE3NDc2MjYwMzQsImV4cCI6MTc0NzYyOTk1MCwiYWNjdCI6MCwiYWNyIjoiMSIsImFjcnMiOlsicDEiXSwiYWlvIjoiQVpRQWEvOFpBQUFBbGJ3R3dWeVZteXA3THJKZ0ZiRUFzTFhGQ3ZDRE9mOVBHRFZmVkhDTVIyTU9PVkUyaXNOdmtPVG9JWmdZSXg2Yi9tQkYyYnVTUmwrVW5jZVFkZ3E1RVlFSDNGWmFRYkxOMGFZK05YV2l2d2pLakdzcEJkQVREQTE3WDduQ0pmS0k5RUVtNVczTnFLNXY2QUdlZnpZRzBXMkp5d1pueVhwbVBSaEpZREpGbFdzaE9OWk1XSVNQaVdjN05Fb3gvc1IrIiwiYW1yIjpbInB3ZCIsIm1mYSJdLCJhcHBfZGlzcGxheW5hbWUiOiJmbG93LVNTTy1pbnRlZ3JhdGlvbiIsImFwcGlkIjoiOTAwN2UyYzQtM2VlOS00MWQ4LWJlNzEtM2FiZGQ0ZTc5MzIxIiwiYXBwaWRhY3IiOiIxIiwiZmFtaWx5X25hbWUiOiJNIiwiZ2l2ZW5fbmFtZSI6IkdhbnRoaW1hdGhpIiwiaWR0eXAiOiJ1c2VyIiwiaXBhZGRyIjoiMTU3LjUxLjEyNS43NSIsIm5hbWUiOiJHYW50aGltYXRoaSBNIiwib2lkIjoiNmJkNDZkNGEtNGM0ZS00Y2RlLWI5MDItNTJlN2FkYzE5NGRmIiwib25wcmVtX3NpZCI6IlMtMS01LTIxLTE3NzEzODE2ODEtMjQ0NzgzODAwMi0zNTE0ODIwOTgxLTE3MjA3OCIsInBsYXRmIjoiNSIsInB1aWQiOiIxMDAzMjAwMjJDMDlEQzgyIiwicmgiOiIxLkFWTUFheDV2NXJtY1dFS2tLUmVNN2pXYXFRTUFBQUFBQUFBQXdBQUFBQUFBQUFCVEFIeFRBQS4iLCJzY3AiOiJEaXJlY3RvcnkuUmVhZC5BbGwgVXNlci5SZWFkIFVzZXIuUmVhZC5BbGwgcHJvZmlsZSBvcGVuaWQgZW1haWwiLCJzaWQiOiIwMDRmMzk1OS0wYjE5LWZhMjUtNGUyNS0zNDI0MWU0NjljZTkiLCJzdWIiOiItV1gtSXQ5NGFDaUozN1l6UEszemdXYWxTYS1MMmJ4MDhsempxUzEyb1JRIiwidGVuYW50X3JlZ2lvbl9zY29wZSI6IkFTIiwidGlkIjoiZTY2ZjFlNmItOWNiOS00MjU4LWE0MjktMTc4Y2VlMzU5YWE5IiwidW5pcXVlX25hbWUiOiJnYW50aGltYXRoaS5tQGFjY2Vzc2hlYWx0aGNhcmUuY29tIiwidXBuIjoiZ2FudGhpbWF0aGkubUBhY2Nlc3NoZWFsdGhjYXJlLmNvbSIsInV0aSI6IjlfZDJSOGJjRFVlZERaeFdJaHdvQUEiLCJ2ZXIiOiIxLjAiLCJ3aWRzIjpbImI3OWZiZjRkLTNlZjktNDY4OS04MTQzLTc2YjE5NGU4NTUwOSJdLCJ4bXNfZnRkIjoiSVFudjZvNlNiS1FUbEpIT05mV1FXQWFxWW9XUHRnMmFoM19lX1VpbjlHa0JhMjl5WldGemIzVjBhQzFrYzIxeiIsInhtc19pZHJlbCI6IjEgMjIiLCJ4bXNfc3QiOnsic3ViIjoiQ2hwWms3bVpSX2N3UGdVUnV4ZndTb0tVQkVMNlJCaWZxMkJ5c1RhSTFyZyJ9LCJ4bXNfdGNkdCI6MTQwMTQ2MzYyNSwiVXNlclR5cGUiOjEsIlVzZXJJZCI6Nzc3NzIsIkVtcElkIjoiTTA5NDgwNTciLCJFbWFpbElkIjoiZ2FudGhpbWF0aGkubUBhY2Nlc3NoZWFsdGhjYXJlLmNvbSIsIk5hbWUiOiJHYW50aGltYXRoaSBNIiwiQXBwS2V5IjoiMjllMWEyYTAtOGU0My00NDNhLTk4MDQtMTM3MGIwN2I3ZWRkIiwiU2Vzc2lvbklkIjoiMGM5NzU3ZjktYTA1OC00MWE1LWE5M2YtOWY5MTZhMWU2ZmQxIiwiSWFtVVJMIjoiaHR0cHM6Ly91YXRfaWFtYXBpLmFjY2Vzc2hlYWx0aGNhcmUuY29tL2FwaSJ9.YPFSayPCfTBDaB2vEHhwR3TnvvstT5G3z3yIWYny_Sc'; // Replace with your token
-const getFieldMetaAPI = (sheetId) =>
-    `http://localhost:5017/api/excel-sheets/${sheetId}/columns`;
 
-let lastAppliedFilter = null;
-
-const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
+const OrdersMasterDetail = ({ dataSource, keyExpr, token, BaseUrl, ProjectId }) => {
+    const DEFAULT_SERVICE = {
+        projectId: ProjectId,
+        id: 4,
+        status: "Active" // optional for left list rendering
+    };
     const [orders, setOrders] = useState([]);
     const [selectedOrder, setSelectedOrder] = useState(null);
     const [selectedService, setSelectedService] = useState(DEFAULT_SERVICE);
@@ -41,7 +33,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
     const [category, setCategory] = useState(0);
     const [status, setStatus] = useState(0);
     const [filteredOrders, setFilteredOrders] = useState([]);
-    const [gridData, setGridData] = useState([]);
     const searchTimeoutRef = useRef(null);
     const [gridStore, setGridStore] = useState(null);
 
@@ -56,16 +47,9 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
     const [readOnlyFilters, setReadOnlyFilters] = useState(false);
     const [gridInstance, setGridInstance] = useState(null);
     const [autoExpandAll, setAutoExpandAll] = useState(true);
-    const [popupVisible, setPopupVisible] = useState(false);
-    const [actionValue, setActionValue] = useState(null);
-    const [assignPopupVisible, setAssignPopupVisible] = useState(false);
-    const [proceedEnabled, setProceedEnabled] = useState(false); // ✅ NEW: control button enabled state
-    const [popupSummary, setPopupSummary] = useState({
-        type: '',
-        count: 0,
-        ids: [],
-        filters: []
-    });
+    const [proceedEnabled, setProceedEnabled] = useState(false);
+    const getFieldMetaAPI = (sheetId) =>
+        `${BaseUrl}api/LookupSheetMaster/GetColumns/${sheetId}`;
 
     // ✅ Toast state
     const [toastConfig, setToastConfig] = useState({
@@ -81,21 +65,26 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
 
 
     useEffect(() => {
-        if (!selectedService) return; // do nothing if no service is selected
+        if (!selectedService) return;
 
         const { projectId } = selectedService;
 
-        axios.get(`http://localhost:5017/api/excel-sheets/latest-sheets/${projectId}`,)
+        axios.get(`${BaseUrl}api/LookupSheetMaster/GetLatestSheetsByProject/${projectId}`, {
+            headers: {
+                Authorization: `Bearer ${token}`,
+                "Content-Type": "application/json",
+            },
+        })
             .then(response => {
                 const data = response.data.map(item => ({
                     id: item.Id,
                     sheetName: item.SheetName,
                     fileId: item.FileId,
                     ProjectId: item.ProjectId,
-                    status: "Active" // optional UI status
+                    status: "Active"
                 }));
                 setOrders(data);
-                setFilteredOrders(data);   // ✅ show ALL by default
+                setFilteredOrders(data);
                 // setSelectedOrder(data.length ? data[0] : null);
 
             })
@@ -111,11 +100,15 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         const openLastViewedSheet = async () => {
             try {
                 const res = await axios.get(
-                    "http://localhost:5017/api/excel-sheets/last-viewed",
+                    `${BaseUrl}api/LookupSheetMaster/GetLastViewedSheet`,
                     {
                         params: {
                             userId: 1,
-                            projectId: 147   // ✅ FIXED (do NOT read from selectedService)
+                            projectId: ProjectId
+                        },
+                        headers: {
+                            Authorization: `Bearer ${token}`,
+                            "Content-Type": "application/json"
                         }
                     }
                 );
@@ -126,7 +119,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
                 const sheet = orders.find(o => o.id === lastViewedSheetId);
 
                 if (!sheet) return;
-                // ✅ EXACT SAME FLOW AS MANUAL CLICK
                 setSelectedOrder(sheet);
                 setSelectedService(sheet);
 
@@ -174,7 +166,7 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
                     .map(p => `${p}=${encodeURIComponent(JSON.stringify(loadOptions[p]))}`)
                     .join("&");
 
-                const requestUrl = `http://localhost:5017/api/excel-sheets/${sheetId}/data?${queryString}`;
+                const requestUrl = `${BaseUrl}api/LookupSheetMaster/GetData/${sheetId}?${queryString}`;
 
                 const response = await fetch(requestUrl, {
                     method: "POST",
@@ -211,13 +203,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         [toastConfig, setToastConfig],
     );
 
-    const onHiding = useCallback(() => {
-        setToastConfig({
-            ...toastConfig,
-            isVisible: false,
-        });
-    }, [toastConfig, setToastConfig]);
-
     const handleSearchChange = (value) => {
         const safeValue = typeof value === "string" ? value : "";
 
@@ -250,8 +235,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
             });
 
             const data = await res.json();
-
-            // Always keep FlowTaskId first
             const flowTaskColumn = {
                 dataField: "RowNumber",
                 caption: "Sheet Row",
@@ -327,9 +310,9 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
 
         else if (selectAll && noneVisibleSelected) {
             // ✅ "Deselect All"
-            e.component.clearSelection(); // ensures DevExtreme state resets
+            e.component.clearSelection();
             setSelectAll(false);
-            setWasFullyDeselected(true); // flag for Scenario 6
+            setWasFullyDeselected(true);
             setExcludedKeys([]);
             setSelectedRowKeys([]);
             setFinalCount(0);
@@ -392,58 +375,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         }, 0);
     }, [selectAll, excludedKeys, selectedRowKeys, gridInstance]);
 
-
-    const getFinalSelectedIds = async (extraPayload = {}) => {
-        const appliedFilters = Array.isArray(lastAppliedFilter) ? lastAppliedFilter : [];
-        const totalRows = gridInstance?.totalCount() || 0;
-
-        // Determine selectType and ids
-        let selectType = '';
-        let selectedIds = [];
-        let deselectedIds = [];
-        let selectionLabel = '';
-        let selectedCount = 0;
-
-        if (selectAll && excludedKeys.length === 0) {
-            selectType = 'ALL';
-            selectionLabel = 'All Rows Selected';
-            selectedCount = totalRows;
-        } else if (selectAll && excludedKeys.length > 0) {
-            selectType = 'EXCLUDE';
-            deselectedIds = excludedKeys;
-            selectionLabel = 'Deselected Rows';
-            selectedCount = excludedKeys.length;
-        } else {
-            selectType = 'INCLUDE';
-            selectedIds = selectedRowKeys;
-            selectionLabel = 'Selected Rows';
-            selectedCount = selectedRowKeys.length;
-        }
-
-        const payload = {
-            selectType,
-            selectedIds,
-            deselectedIds,
-            totalSelectedCount: selectedCount,
-            filters: appliedFilters.length > 0 ? appliedFilters : [],
-            ...extraPayload,  // Inject workspaceId, userId, etc.
-        };
-
-        console.log("📦 Final Selection Payload:", payload);
-
-        setPopupSummary(payload);
-        setPopupVisible(true);
-        setActionValue(null);
-
-        // Reset selection state
-        setSelectAll(false);
-        setExcludedKeys([]);
-        setSelectedRowKeys([]);
-        setFinalCount(0);
-        getUnSelected();
-
-        return selectedIds;
-    };
     const formatRawFilterToReadableText = (filter) => {
         if (!filter) return '';
 
@@ -547,50 +478,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         }
     };
 
-    const getUnSelected = () => {
-        const gridInstance = gridRef.current?.instance?.();
-
-        if (!gridInstance) return;
-
-        // ✅ Clear selection only (do not clear filters)
-        gridInstance.deselectAll();
-
-        // ✅ Reset your internal state
-        setSelectAll(false);
-        setExcludedKeys([]);
-        setSelectedRowKeys([]);
-        setShowCheckboxes(false);
-        setFinalCount(0);
-        setReadOnlyFilters(false);
-    };
-
-    const getClearSelected = () => {
-        const gridInstance = gridRef.current?.instance?.();
-
-        if (!gridInstance) return;
-
-        // ✅ Clear selection
-        gridInstance.deselectAll();
-
-        // ✅ Clear all filters (FilterRow + HeaderFilter)
-        const columns = gridInstance.getVisibleColumns();
-        columns.forEach((col) => {
-            gridInstance.columnOption(col.dataField, 'filterValue', null);     // FilterRow
-            gridInstance.columnOption(col.dataField, 'filterValues', null);    // HeaderFilter
-        });
-
-        gridInstance.clearFilter(); // apply filter clearing
-
-        // ✅ Reset your internal state
-        setSelectAll(false);
-        setExcludedKeys([]);
-        setSelectedRowKeys([]);
-        // setShowCheckboxes(false);
-        setFinalCount(0);
-        setReadOnlyFilters(false);
-        setActionValue(null);
-
-    };
 
     useEffect(() => {
         if (readOnlyFilters) {
@@ -613,33 +500,21 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
     const saveLastViewedSheet = async (sheet) => {
         try {
             await axios.post(
-                "http://localhost:5017/api/excel-sheets/last-viewed",
+                `${BaseUrl}api/LookupSheetMaster/UpdateLastViewedSheet`,
                 {
                     userId: 1,               // replace with logged-in user id later
-                    projectId: 147,
+                    projectId: ProjectId,
                     sheetId: sheet.id
-                }
-            );
-        } catch (error) {
-            console.error("Failed to save last viewed sheet", error);
-        }
-    };
-    // ✅ GET LAST VIEWED SHEET
-    const getLastViewedSheet = async (projectId) => {
-        try {
-            const response = await axios.get(
-                "http://localhost:5017/api/excel-sheets/last-viewed",
+                },
                 {
-                    params: {
-                        userId: 1, // replace later with logged-in user
-                        projectId: projectId
+                    headers: {
+                        Authorization: `Bearer ${token}`,
+                        "Content-Type": "application/json"
                     }
                 }
             );
-            return response.data; // expected: { sheetId: number }
         } catch (error) {
-            console.error("Failed to get last viewed sheet", error);
-            return null;
+            console.error("Failed to save last viewed sheet", error);
         }
     };
 
@@ -679,12 +554,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         return () => window.removeEventListener("storage", handleStorageChange);
     }, []);
 
-
-
-
-    /* ----------------------------
-       API call (tab close / logout only)
-    ----------------------------- */
     const updateSearchHistoryAPI = () => {
         if (!searchHistoryRef.current.length) return;
 
@@ -697,9 +566,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         );
     };
 
-    /* ----------------------------
-       Tab switch & close
-    ----------------------------- */
     useEffect(() => {
         const handleVisibilityChange = () => {
             if (document.visibilityState === "hidden") {
@@ -725,35 +591,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
 
         gridInstance.searchByText(searchText);
     };
-    const clearSearch = () => {
-        if (!gridInstance) return;
-        setSearchText("");
-        gridInstance.searchByText("");
-    };
-
-    const gridDataWithId = gridData.map((row, index) => ({
-        ...row,
-        rowId: index + 1
-    }));
-
-    const handleColumnReorder = (e) => {
-        alert("bsvdchg")
-        console.log("selectedOrder", selectedOrder)
-        if (!selectedOrder) return;
-
-        const payload = {
-            sheetId: selectedOrder.id,
-            fieldName: e.column.dataField,
-            fromIndex: e.fromIndex,
-            toIndex: e.toIndex
-        };
-
-        axios.post(
-            "http://localhost:5017/api/excel-sheets/columns/reorder",
-            payload
-        ).catch(err => console.error("Column reorder save failed", err));
-    };
-
 
     useEffect(() => {
         // If all filters are cleared → show all records
@@ -773,13 +610,9 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
         if (!key) return "";
 
         return key
-            // Handle snake_case first
             .replace(/_/g, " ")
-            // Add space between lowerCase -> UpperCase
             .replace(/([a-z])([A-Z])/g, "$1 $2")
-            // Add space before last capital in acronyms (ID, URL, etc.)
             .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2")
-            // Capitalize first letter of each word
             .replace(/\b\w/g, (c) => c.toUpperCase());
     };
 
@@ -951,39 +784,6 @@ const OrdersMasterDetail = ({ dataSource, keyExpr }) => {
                                     <GroupItem column="sheetId" summaryType="count" displayFormat="Count: {0}" />
                                 </Summary>
 
-                                {/* <Toolbar>
-                                    <Item name="groupPanel" location="before" />
-
-                                    <Item
-                                        location="after"
-                                        render={() => (
-                                            <Button
-                                                icon="arrowright"
-                                                text={`(${finalCount})`}
-                                                onClick={() => {
-                                                    if (actionValue === "Assigned") {
-                                                        setAssignPopupVisible(true);
-                                                    } else {
-                                                        getFinalSelectedIds();
-                                                        setPopupVisible(true);
-                                                    }
-                                                }}
-                                                disabled={!proceedEnabled}
-                                            />
-                                        )}
-                                    />
-
-                                    <Item
-                                        location="after"
-                                        render={() => (
-                                            <Button
-                                                icon="clearformat"
-                                                text="Clear"
-                                                onClick={getClearSelected}
-                                            />
-                                        )}
-                                    />
-                                </Toolbar> */}
                             </DataGrid>