ui-soxo-bootstrap-core 2.6.40-dev.16 → 2.6.40

package/core/lib/modules/generic/generic-list/ExportReactCSV.js

@@ -6,62 +6,24 @@
  * @param {Array<{ label: string, key: string }>} [headers] - Optional column headers and field mappings.
  * @param {string} [fileName='Report.xlsx'] - Optional name for the downloaded Excel file.
  */
- 
-import React, { useState } from 'react';
+
+import React from 'react';
 // Import XLSX library to handle Excel file creation
 import * as XLSX from 'xlsx';
-import { PDFDocument, StandardFonts, rgb } from 'pdf-lib';
 // import * as XLSX from 'xlsx-js-style';
 // import * as XLSX from 'xlsx-js-style';
 // Import saveAs from file-saver to trigger file download in browser
 import { saveAs } from 'file-saver';
-import { Button, Dropdown, Form, Input, Menu, Modal, Radio, message } from 'antd';
-import { DownOutlined, FileExcelFilled, FilePdfFilled, MailFilled, DownloadOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
 import { Trans } from 'react-i18next';
-import { CoreScripts } from '../../../../models';
-import './generic-list.scss';
-
-const normalizeScriptId = (value) => {
-  if (value === undefined || value === null || value === '') return value;
-
-  const numberValue = Number(value);
-  return Number.isNaN(numberValue) ? value : numberValue;
-};
-
-const getRecipients = (value) => {
-  if (Array.isArray(value)) return value.filter(Boolean);
-
-  return String(value || '')
-    .split(/[\n,;]+/)
-    .map((email) => email.trim())
-    .filter(Boolean);
-};
-
-
-export const ExportReactCSV = ({
-  csvData,
-  headers,
-  fileName,
-  pdfFileName,
-  title,
-  format = 'excel',
-  buttonText,
-  dropdown = false,
-  onSendReportToMail,
-  scriptId,
-  inputParameters,
-}) => {
-  const [mailModalVisible, setMailModalVisible] = useState(false);
-  const [sendingMail, setSendingMail] = useState(false);
-  const [selectedFormat, setSelectedFormat] = useState('excel');
-  const [mailForm] = Form.useForm();
 
+export const ExportReactCSV = ({ csvData, headers, fileName,title }) => {
   /**
    * exportToExcel function
    * Triggered on button click, generates and downloads an Excel file
    */
 
-  const exportToExcel = (downloadFileName) => {
+  const exportToExcel = () => {
     // if (!csvData?.length) return;
 
     let worksheet;
@@ -113,302 +75,14 @@ export const ExportReactCSV = ({
     const blob = new Blob([excelBuffer], {
       type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
     });
-    const flName = downloadFileName || fileName || 'Report.xlsx';
+    const flName = fileName || 'Report.xlsx';
     // Trigger download using file-saver
     saveAs(blob, flName);
   };
-
-  const exportToPdf = async (downloadFileName) => {
-    const pdfDoc = await PDFDocument.create();
-    const font = await pdfDoc.embedFont(StandardFonts.Helvetica);
-    const boldFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
-    const pageSize = [842, 595];
-    const margin = 30;
-    const rowHeight = 20;
-    const titleHeight = 38;
-    const fontSize = 8;
-    const headerFontSize = 8;
-    const headersToUse = headers?.length
-      ? headers
-      : Object.keys(csvData?.[0] || {}).map((key) => ({ label: key, key }));
-    const availableWidth = pageSize[0] - margin * 2;
-    const columnWidth = headersToUse.length ? availableWidth / headersToUse.length : availableWidth;
-    let page;
-    let y;
-
-    const sanitizeValue = (value) => {
-      if (value === undefined || value === null) return '';
-      if (typeof value === 'object') return JSON.stringify(value);
-      return String(value);
-    };
-
-    const fitText = (text, width, textFont, size) => {
-      const sanitizedText = sanitizeValue(text);
-      if (textFont.widthOfTextAtSize(sanitizedText, size) <= width) return sanitizedText;
-
-      let fittedText = sanitizedText;
-      while (fittedText.length && textFont.widthOfTextAtSize(`${fittedText}...`, size) > width) {
-        fittedText = fittedText.slice(0, -1);
-      }
-      return fittedText ? `${fittedText}...` : '';
-    };
-
-    const addPage = () => {
-      page = pdfDoc.addPage(pageSize);
-      y = pageSize[1] - margin;
-
-      page.drawText(title || 'Report', {
-        x: margin,
-        y,
-        size: 14,
-        font: boldFont,
-        color: rgb(0.1, 0.1, 0.1),
-      });
-
-      y -= titleHeight;
-
-      headersToUse.forEach((header, index) => {
-        const x = margin + index * columnWidth;
-        page.drawRectangle({
-          x,
-          y: y - 5,
-          width: columnWidth,
-          height: rowHeight,
-          color: rgb(0.92, 0.94, 0.96),
-          borderColor: rgb(0.72, 0.75, 0.78),
-          borderWidth: 0.5,
-        });
-        page.drawText(fitText(header.label, columnWidth - 8, boldFont, headerFontSize), {
-          x: x + 4,
-          y: y + 1,
-          size: headerFontSize,
-          font: boldFont,
-          color: rgb(0.1, 0.1, 0.1),
-        });
-      });
-
-      y -= rowHeight;
-    };
-
-    addPage();
-
-    (csvData || []).forEach((row) => {
-      if (y < margin + rowHeight) addPage();
-
-      headersToUse.forEach((header, index) => {
-        const x = margin + index * columnWidth;
-        page.drawRectangle({
-          x,
-          y: y - 5,
-          width: columnWidth,
-          height: rowHeight,
-          color: row.isSummaryRow ? rgb(0.97, 0.97, 0.97) : rgb(1, 1, 1),
-          borderColor: rgb(0.82, 0.84, 0.86),
-          borderWidth: 0.5,
-        });
-        page.drawText(fitText(row[header.key], columnWidth - 8, row.isSummaryRow ? boldFont : font, fontSize), {
-          x: x + 4,
-          y: y + 1,
-          size: fontSize,
-          font: row.isSummaryRow ? boldFont : font,
-          color: rgb(0.12, 0.12, 0.12),
-        });
-      });
-
-      y -= rowHeight;
-    });
-
-    const pdfBytes = await pdfDoc.save();
-    const blob = new Blob([pdfBytes], { type: 'application/pdf' });
-    const flName = downloadFileName || pdfFileName || fileName || 'Report.pdf';
-    saveAs(blob, flName);
-  };
-
-  const handleDownloadMenuClick = ({ key }) => {
-    if (key === 'excel') {
-      exportToExcel(fileName);
-      return;
-    }
-
-    if (key === 'pdf') {
-      exportToPdf(pdfFileName);
-      return;
-    }
-
-    if (key === 'mail') {
-      setMailModalVisible(true);
-    }
-  };
-
-  const handleMailModalClose = () => {
-    setMailModalVisible(false);
-    mailForm.resetFields();
-    setSelectedFormat('excel');
-  };
-
-  const handleFormatToggle = (value) => {
-    const nextValue = selectedFormat === value ? null : value;
-    setSelectedFormat(nextValue);
-    mailForm.setFieldsValue({ format: nextValue });
-  };
-
-  // const handleSendReportToMail = async (values) => {
-  //   setSendingMail(true);
-
-  //   try {
-  //     const mailFormat = values.format || selectedFormat || 'excel';
-  //     const isBoth = mailFormat === 'both';
-  //     const payload = {
-  //       script_id: normalizeScriptId(scriptId),
-  //       input_parameters: inputParameters || {},
-  //       is_pdf: mailFormat === 'pdf' || isBoth,
-  //       is_excel: mailFormat === 'excel' || isBoth,
-  //       is_both: isBoth,
-  //       recipients: getRecipients(values.email),
-  //     };
-  //     const data = onSendReportToMail
-  //       ? await onSendReportToMail(payload)
-  //       : await CoreScripts.sentToReportMail(payload);
-
-  //     if (data?.success === false) throw data;
-
-  //     message.success(data?.message || 'Report mail sent successfully');
-  //     handleMailModalClose();
-  //   } catch (error) {
-  //     message.error(error?.message || 'Unable to send report mail');
-  //   } finally {
-  //     setSendingMail(false);
-  //   }
-  // };
-
-  const downloadMenu = (
-    <Menu className="export-download-menu" onClick={handleDownloadMenuClick}>
-      <Menu.Item
-        key="excel"
-        icon={<FileExcelFilled className="export-download-menu__icon export-download-menu__icon--excel" />}
-      >
-        Download Excel Sheet
-      </Menu.Item>
-      <Menu.Item
-        key="pdf"
-        icon={<FilePdfFilled className="export-download-menu__icon export-download-menu__icon--pdf" />}
-      >
-        Download PDF
-      </Menu.Item>
-      {/* <Menu.Item
-        key="mail"
-        icon={<MailFilled className="export-download-menu__icon export-download-menu__icon--mail" />}
-      >
-        Send report to mail
-      </Menu.Item> */}
-    </Menu>
-  );
-
-  const isPdf = format === 'pdf';
-  const handleExportButtonClick = () => {
-    if (isPdf) {
-      exportToPdf();
-      return;
-    }
-
-    exportToExcel();
-  };
-
-  if (dropdown) {
-    return (
-      <>
-        <Dropdown overlay={downloadMenu} trigger={['click']} placement="bottomRight">
-          <Button type="primary" size="small" className="export-download-button">
-            <Trans i18nKey={buttonText || 'Download'} /> <DownloadOutlined className="export-download-button__icon" />
-          </Button>
-        </Dropdown>
-{/* 
-        <Modal
-          title="Send report to mail"
-          open={mailModalVisible}
-          onCancel={handleMailModalClose}
-          footer={null}
-          destroyOnClose
-          width={460}
-        >
-          <Form
-            form={mailForm}
-            layout="vertical"
-            initialValues={{ format: 'excel' }}
-            onFinish={handleSendReportToMail}
-          >
-            <Form.Item
-              name="format"
-              style={{ marginBottom: 16 }}
-              rules={[
-                {
-                  validator: () =>
-                    selectedFormat
-                      ? Promise.resolve()
-                      : Promise.reject(new Error('Please select a format')),
-                },
-              ]}
-            >
-              <div
-                className="export-mail-format-options"
-                style={{ display: 'flex', alignItems: 'center', columnGap: 24 }}
-              >
-                <Radio
-                  checked={selectedFormat === 'excel'}
-                  style={{ marginRight: 0 }}
-                  onClick={() => handleFormatToggle('excel')}
-                >
-                  Excel
-                </Radio>
-                <Radio
-                  checked={selectedFormat === 'pdf'}
-                  style={{ marginRight: 0 }}
-                  onClick={() => handleFormatToggle('pdf')}
-                >
-                  PDF
-                </Radio>
-                <Radio
-                  checked={selectedFormat === 'both'}
-                  style={{ marginRight: 0 }}
-                  onClick={() => handleFormatToggle('both')}
-                >
-                  Both
-                </Radio>
-              </div>
-            </Form.Item>
-
-            <Form.Item
-              name="email"
-              label="EMAIL ID"
-              rules={[
-                { required: true, message: 'Please enter email id' },
-                { type: 'email', message: 'Please enter a valid email id' },
-              ]}
-            >
-              <Input placeholder="Enter Mail Id" />
-            </Form.Item>
-
-            <Form.Item
-              name="remarks"
-              label="REMARKS"
-              rules={[{ required: true, message: 'Please enter remarks' }]}
-            >
-              <Input.TextArea placeholder="Enter Remarks" rows={4} />
-            </Form.Item>
-
-            <Button type="primary" htmlType="submit" loading={sendingMail}>
-              Send
-            </Button>
-          </Form>
-        </Modal> */}
-      </>
-    );
-  }
-
   // Render an Ant Design Button that triggers the Excel export
   return (
-    <Button type="secondary" size="small" onClick={handleExportButtonClick} className="export-download-button">
-      <Trans i18nKey={buttonText || (isPdf ? 'PDF Download' : 'Download')} /> <DownloadOutlined className="export-download-button__icon" />
+    <Button type="secondary" size="small" onClick={exportToExcel}>
+      <Trans i18nKey="Download" />
     </Button>
   );
 };

package/core/lib/modules/generic/generic-list/generic-list.scss

@@ -32,37 +32,3 @@
         }
     }
 }
-
-.export-download-button {
-    &.ant-btn-primary {
-        background: #2f80ed;
-        border-color: #2f80ed;
-        color: #fff;
-
-        &:hover,
-        &:focus {
-            background: #1c7ed6;
-            border-color: #1c7ed6;
-            color: #fff;
-        }
-    }
-}
-
-.export-download-menu {
-    &__icon {
-        font-size: 16px;
-        vertical-align: -0.15em;
-
-        &--excel {
-            color: #18a058;
-        }
-
-        &--pdf {
-            color: #e03131;
-        }
-
-        &--mail {
-            color: #1c7ed6;
-        }
-    }
-}

package/core/models/core-scripts/core-scripts.js

@@ -69,6 +69,7 @@ class CoreScript extends Base {
     // Settings db pointer
     if (!dbPtr) dbPtr = localStorage.db_ptr;
     return ApiUtils.post({
+        // baseUrl: 'http://localhost:8002/dev/',  
       url: `core-scripts/dashboardquery/${id}`,
       formBody,
       headers: {
@@ -79,14 +80,6 @@ class CoreScript extends Base {
     });
   };
 
-  // sentToReportMail = (formBody) => {
-  //   return ApiUtils.post({
-  //     baseUrl: 'http://localhost:8002/dev/',
-  //     url: `core-scripts/send-to-report-mail`,
-  //     formBody,
-  //   });
-  // };
-
   /**
    *Updating user details
    * @returns
@@ -98,20 +91,6 @@ class CoreScript extends Base {
     });
   };
 
-  getCorescript = (formBody,dbPtr) => {
-   
-    if (!dbPtr) dbPtr = localStorage.db_ptr;
-    return ApiUtils.post({
-    //   baseUrl: 'http://localhost:8002/dev/',
-      url: `core-scripts/get-core-script`,
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: 'Bearer ' + localStorage.access_token,
-        db_ptr: dbPtr,
-      },
-      formBody,
-    });
-  };
   getQuery = (formBody) => {
     return ApiUtils.post({
       url: `core-scripts/execute-script-api`,

package/core/models/menus/components/menu-add/menu-add.js

@@ -116,13 +116,6 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
       values.step = formContent.step || step;
     }
 
-    //  Cleared selects come back as undefined; send null so the backend clears them
-    ['model_id', 'page_id', 'header_id'].forEach((field) => {
-      if (values[field] === undefined) {
-        values[field] = null;
-      }
-    });
-
     if (values.attributes && typeof values === 'object') {
       values = {
         ...values,
@@ -190,7 +183,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               {/* Model */}
               <Form.Item label="Models" name={'model_id'}>
                 {/* <ReferenceSelect value={model.id} label={model.name} model={Models} /> */}
-                <Select showSearch style={{ width: '100%' }} placeholder="Select a Page" optionFilterProp="label" allowClear>
+                <Select showSearch style={{ width: '100%' }} placeholder="Select a Page" optionFilterProp="label">
                   {models.map((model, key) => (
                     <Option key={key} label={model.name} value={model.id}>
                       {model.name}
@@ -205,7 +198,7 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               <Form.Item label="Pages" name={'page_id'}>
                 {/* <ReferenceSelect value={pages.id} label={pages.name} model={Pages} /> */}
 
-                <Select showSearch optionFilterProp="children" style={{ width: '100%' }} allowClear>
+                <Select showSearch optionFilterProp="children" style={{ width: '100%' }}>
                   {pages.map((model, key) => (
                     <Option key={key} value={model.id}>
                       {model.name}
@@ -236,33 +229,13 @@ const MenuAdd = ({ model, callback, edit, history, formContent, match, additiona
               {/* Pages Ends */}
 
               {/* Path */}
-              <Form.Item
-                name="path"
-                label="Path"
-                rules={[
-                  { required: true, message: 'Path is required' },
-                  {
-                    pattern: /^\//,
-                    message: 'Path must start with /',
-                  },
-                ]}
-              >
+              <Form.Item name="path" label="Path" rules={[{ required: true, message: 'Path is required' }]}>
                 <Input placeholder="Enter path" />
               </Form.Item>
               {/* Path Ends */}
 
               {/* Route */}
-              <Form.Item
-                name="route"
-                label="Route"
-                rules={[
-                  { required: false, message: 'Route is required' },
-                  {
-                    pattern: /^\//,
-                    message: 'Route must start with /',
-                  },
-                ]}
-              >
+              <Form.Item name="route" label="Route" rules={[{ required: true, message: 'Route is required' }]}>
                 <Input placeholder="Enter route" />
               </Form.Item>
               {/* Route Ends */}

package/core/models/menus/components/menu-lists/menu-lists.js

@@ -30,9 +30,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
   const [query, setQuery] = useState('');
   const [dragMode, setDragMode] = useState(false);
   const [orderChanged, setOrderChanged] = useState(false);
-  // keys of currently-expanded top-level panels. Seeded from the search results
-  // when the query changes, but the user can freely toggle panels afterwards.
-  const [openKeys, setOpenKeys] = useState([]);
 
   const [nextId, setNextId] = useState(10000);
 
@@ -184,16 +181,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
         return;
       }
 
-      // Prevent moving a menu into one of its own descendants
-      // (e.g. A > B, C — A cannot be dropped under B or C).
-      if (targetParentId) {
-        const draggedNode = findMenuById(records, draggedItem.id);
-        if (draggedNode && findMenuById(draggedNode.sub_menus || [], targetParentId)) {
-          message.warning('Cannot move a menu into its own sub menu');
-          return;
-        }
-      }
-
       // Remove item from original location
       const { newItems: itemsAfterRemove, foundItem } = findAndRemoveItem(records, draggedItem.id);
 
@@ -207,7 +194,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
 
       setRecords(finalItems);
       setOrderChanged(true);
-      message.success(`Moved "${foundItem.caption}" to level ${targetLevel}`);
+      message.success(`Moved "${foundItem.name}" to level ${targetLevel}`);
     },
     [records]
   );
@@ -216,42 +203,9 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     model.delete(rec).then(loadMenus);
   };
 
-  // Recursively filter the menu tree by caption. A menu is kept if its own
-  // caption matches OR any descendant matches. When the menu itself matches we
-  // keep its full subtree; when only a descendant matches we keep just the
-  // pruned path so the matching item stays reachable.
-  const filterMenus = (menus, q) => {
-    if (!q) return menus || [];
-    const lower = q.toLowerCase();
-
-    return (menus || []).reduce((acc, menu) => {
-      const selfMatch = (menu.caption || '').toLowerCase().includes(lower);
-      if (selfMatch) {
-        acc.push({ ...menu });
-        return acc;
-      }
-      const subFiltered = filterMenus(menu.sub_menus || [], q);
-      if (subFiltered.length) {
-        acc.push({ ...menu, sub_menus: subFiltered });
-      }
-      return acc;
-    }, []);
-  };
-
-  // Ids of items (at one level) that have sub_menus — used to auto-expand
-  // every branch leading to a search match.
-  const expandableKeys = (items) => (items || []).filter((m) => m.sub_menus && m.sub_menus.length > 0).map((m) => String(m.id));
-
-  const searchActive = !!query;
-  const visibleItems = filterMenus(records, query);
+  const filtered = records.filter((r) => r.caption?.toUpperCase().includes(query.toUpperCase()));
 
-  // When the query changes, seed the open panels from the search results (every
-  // branch on the path to a match) so the matched sub-menu is revealed. After
-  // that the user can collapse/expand freely via the Collapse onChange below.
-  useEffect(() => {
-    setOpenKeys(query ? expandableKeys(filterMenus(records, query)) : []);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [query]);
+  const visibleItems = filtered;
 
   const onSearch = (event) => {
     setQuery(event.target.value);
@@ -351,7 +305,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
     <Card className="generic-list">
       <div style={{ marginBottom: 16 }}>
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
-          <Search placeholder="Search menus & sub-menus…" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
+          <Search placeholder="Enter Search Value" allowClear style={{ width: 300, marginBottom: '0px' }} onChange={onSearch} />
 
           <Space size="small">
             <Button onClick={getRecords} size={'small'} type="default">
@@ -407,11 +361,7 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
             {/* {!view ? ( */}
             <Card>
               <DndProvider backend={HTML5Backend}>
-                <Collapse
-                  accordion={!searchActive}
-                  activeKey={openKeys}
-                  onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}
-                >
+                <Collapse accordion>
                   {visibleItems && visibleItems.length > 0 ? (
                     visibleItems.map((item, index) => (
                       <Panel
@@ -439,8 +389,6 @@ const MenuLists = ({ model, match, relativeAdd = false, additional_queries = [],
                             items={item.sub_menus || []}
                             model={model}
                             dragMode={dragMode}
-                            searchActive={searchActive}
-                            query={query}
                             setSelectedRecord={setSelectedRecord}
                             setDrawerTitle={setDrawerTitle}
                             setDrawerVisible={setDrawerVisible}
@@ -552,8 +500,6 @@ function NestedMenu({
   items,
   model,
   dragMode,
-  searchActive,
-  query,
   setSelectedRecord,
   setDrawerTitle,
   setDrawerVisible,
@@ -562,22 +508,15 @@ function NestedMenu({
   onCrossLevelMove,
   onChange,
 }) {
+  // do not render Collapse
+  if (!items || items.length === 0) return null;
+
   const [localItems, setLocalItems] = useState(items);
-  // keys of currently-expanded sub-panels. Seeded from the search results when
-  // the query changes, but the user can freely toggle panels afterwards.
-  const [openKeys, setOpenKeys] = useState([]);
 
   useEffect(() => {
     setLocalItems(items);
   }, [items]);
 
-  // Seed the open sub-panels from the search path when the query changes; keep
-  // the user's toggles otherwise so a search-opened panel can be closed.
-  useEffect(() => {
-    setOpenKeys(searchActive ? (items || []).filter((c) => c.sub_menus && c.sub_menus.length > 0).map((c) => String(c.id)) : []);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [query, searchActive]);
-
   const moveSubMenu = useCallback(
     (from, to) => {
       if (!dragMode || from === to) return;
@@ -597,11 +536,7 @@ function NestedMenu({
   }
 
   return (
-    <Collapse
-      accordion={!searchActive}
-      activeKey={openKeys}
-      onChange={(keys) => setOpenKeys(Array.isArray(keys) ? keys : keys ? [keys] : [])}
-    >
+    <Collapse accordion>
       {localItems.map((child, index) => (
         <Panel
           key={child.id}
@@ -628,8 +563,6 @@ function NestedMenu({
             step={step + 1}
             items={child.sub_menus || []}
             dragMode={dragMode}
-            searchActive={searchActive}
-            query={query}
             setSelectedRecord={setSelectedRecord}
             setDrawerTitle={setDrawerTitle}
             setDrawerVisible={setDrawerVisible}