ui-soxo-bootstrap-core 2.6.1-dev.3 → 2.6.1-dev.31

package/core/modules/reporting/components/reporting-dashboard/adavance-search/advance-search.js

@@ -0,0 +1,174 @@
+
+import React, { useState, useEffect, useRef } from "react";
+import { Select, Checkbox, Input, Spin } from "antd";
+import { CoreScripts } from "../../../../../models";
+import "./advance-search.scss";
+
+const { Search } = Input;
+
+export default function AdvancedSearchSelect({ reportId, onReset, field, value, onChange, style, ...rest }) {
+  // Normalize the configuration. 
+  // If 'field' is an object, we are in "legacy" mode. If it's a string, we are using the spread props from rest.
+  const isObjectMode = typeof field === "object";
+  const config = isObjectMode ? field : { ...rest, field };
+  
+  const finalReportId = reportId || config.reportId;
+  const finalOnReset = onReset || config.onReset;
+  const isSearchQuery = !!config.search_query;
+  const fieldName = isObjectMode ? field.field : field;
+  const caption = config.caption;
+
+  const safeValue = Array.isArray(value) ? value : [];
+
+  const [searchResults, setSearchResults] = useState([]);
+  const [displayOptions, setDisplayOptions] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const debounceRef = useRef(null);
+
+  const loadOptions = async (searchText = "") => {
+    try {
+      setLoading(true);
+
+      const formBody = {
+        script_id: finalReportId,
+        search_field: fieldName,
+        search_condition: searchText,
+      };
+
+      const res = await CoreScripts.getQuerySeacch(formBody);
+      const data = Array.isArray(res.data) ? res.data : [];
+      const apiValues = data?.map((r) => r[fieldName]) || [];
+
+      setSearchResults(apiValues);
+      // Refresh display options only when new search results arrive to keep the list stable during interaction
+      setDisplayOptions([
+        ...safeValue,
+        ...apiValues.filter((item) => !safeValue.includes(item)),
+      ]);
+    } catch (error) {
+      console.error("Search API error", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    // Clear search results when the field or report context changes, 
+    // but do not load automatically on mount.
+    setSearchResults([]);
+  }, [fieldName, finalReportId]);
+
+  const handleSearch = (text) => {
+    if (debounceRef.current) clearTimeout(debounceRef.current);
+    debounceRef.current = setTimeout(() => loadOptions(text), 400);
+  };
+
+  const toggleValue = (checked, item) => {
+    let newValues;
+
+    if (checked) newValues = [...safeValue, item];
+    else newValues = safeValue.filter((v) => v !== item);
+
+    onChange(newValues);
+  };
+
+  const handleReset = () => {
+    onChange([]);
+    if (finalOnReset) {
+      finalOnReset();   // 🔥 trigger dashboard refresh
+    }
+  };
+
+  const isActive = safeValue.length > 0;
+
+  // -------- INPUT MODE --------
+  if (!isSearchQuery) {
+    return (
+      <Input
+        allowClear
+        className={`advanced-search-input ${isActive ? "advanced-search-active" : ""}`}
+        placeholder={`Search ${caption}`}
+      style={style}
+        // The parent provides an array for `value`.
+        // We take the first element for the input's display value.
+        value={safeValue[0] || ""}
+        onChange={(e) => {
+          const text = e?.target?.value;
+          // Always pass an array back to the parent to be consistent with the Select mode.
+          onChange(text ? [text] : []);
+          if (!text && finalOnReset) {
+            finalOnReset();
+          }
+        }}
+      />
+    );
+  }
+
+  // -------- SELECT MODE --------
+  return (
+    <Select
+      className={`advanced-search-select ${isActive ? "advanced-search-active" : ""}`}
+      style={style}
+      mode="multiple"
+      value={safeValue}
+      placeholder={caption}
+      onDropdownVisibleChange={(open) => {
+        if (open) {
+          loadOptions("");
+        } else {
+          // When closing, re-sort selected items to the top so they are visible next time it opens
+          const currentResults = searchResults.length > 0 ? searchResults : displayOptions;
+          setDisplayOptions([
+            ...safeValue,
+            ...currentResults.filter((item) => !safeValue.includes(item)),
+          ]);
+        }
+      }}
+      allowClear
+      maxTagCount={1}
+      onChange={onChange}
+      maxTagPlaceholder={(omittedValues) => (
+        <span className="tag-placeholder-count">
+          +{omittedValues.length}
+        </span>
+      )}
+      dropdownRender={() => (
+        <div className="dropdown-content">
+          <Search
+            placeholder={`Search ${caption}`}
+            onChange={(e) => handleSearch(e.target.value)}
+          />
+
+          <div className="dropdown-options-list">
+            {loading ? (
+              <Spin />
+            ) : (
+              displayOptions.map((item, idx) => (
+                <div 
+                  key={`${item}-${idx}`} 
+                  className="dropdown-option-item"
+                  onClick={() => toggleValue(!safeValue.includes(item), item)}
+                  style={{ cursor: 'pointer' }}
+                >
+                  <Checkbox
+                    checked={safeValue.includes(item)}
+                    onClick={(e) => e.stopPropagation()} // Prevent double trigger when clicking the checkbox box specifically
+                    onChange={(e) => toggleValue(e.target.checked, item)}
+                  >
+                    {item}
+                  </Checkbox>
+                </div>
+              ))
+            )}
+          </div>
+
+          <div className="dropdown-footer">
+            <span className="dropdown-reset-button" onClick={handleReset}>
+              Reset
+            </span>
+          </div>
+        </div>
+      )}
+    />
+  );
+}

package/core/modules/reporting/components/reporting-dashboard/adavance-search/advance-search.scss

@@ -0,0 +1,76 @@
+// .advanced-search-select,
+/* Base select width */
+.advanced-search-select {
+  width: 160px;
+  // width: 100%;
+}
+.advanced-search-input {
+  width: 160px;
+}
+/* Active state (when value selected) */
+.advanced-search-select.advanced-search-active .ant-select-selector {
+  border-color: #1677ff !important;
+  box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.2) !important;
+  border-radius: 6px !important;
+}
+
+/* Input active state */
+.advanced-search-input.advanced-search-active {
+  border-color: #1677ff !important;
+  box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.2);
+  border-radius: 6px;
+}
+// .advanced-search-input {
+//   width: 250px;
+
+//   &.advanced-search-active {
+//     // Antd Select and Input don't share the same border-radius property,
+//     // so we apply a wrapper style that works for both.
+//     // For more specific control, you might need to target internal antd classes.
+//     border: 1px solid #91caff !important;
+//     box-shadow: 0 0 0 1px #91caff;
+//     border-radius: 6px;
+//   }
+
+.tag-placeholder {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  .tag-placeholder-count {
+    background: #e6f0ff;
+    color: #1677ff;
+    border-radius: 10px;
+    padding: 0 8px;
+    font-weight: 600;
+    font-size: 12px;
+  }
+}
+
+.dropdown-content {
+  padding: 10px;
+
+  .dropdown-options-list {
+    max-height: 200px;
+    overflow-y: auto;
+    margin-top: 10px;
+
+    .dropdown-option-item {
+      margin-bottom: 6px;
+    }
+  }
+
+  .dropdown-footer {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 10px;
+    border-top: 1px solid #f0f0f0;
+    padding-top: 8px;
+
+    .dropdown-reset-button {
+      color: #1677ff;
+      cursor: pointer;
+      font-weight: 500;
+    }
+  }
+}

package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.js

@@ -0,0 +1,90 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { renderDisplayCell } from './display-cell-renderer';
+
+/**
+ * Resolves export value definition for a configured display column.
+ *
+ * @param {Object} entry
+ * @param {Object} record
+ * @returns {*}
+ */
+function getExportDefinition(entry, record) {
+  if (entry.field === 'custom') {
+    const description = entry.props?.find((p) => p.value === 'description')?.field;
+    return description && record[description] ? record[description] : null;
+  }
+
+  return record[entry.field];
+}
+
+/**
+ * Builds Ant Design table columns from display column configuration.
+ *
+ * @param {Object} root0
+ * @param {Array} root0.columns
+ * @param {Array} root0.patients
+ * @param {boolean} root0.isFixedIndex
+ * @param {Object.<string, React.ComponentType<any>>} root0.CustomComponents
+ * @param {Function} root0.refresh
+ * @param {Object} [root0.otherDetails={}] - Optional details from the report configuration.
+ * @param {boolean} [root0.otherDetails.isFilterEnabled] - Fallback to enable filtering on all columns.
+ * @param {boolean} [root.otherDetails.isSortingEnabled] - Fallback to enable sorting on all columns.
+ * @param {boolean} [root0.otherDetails.isHeaderWrapEnabled] - Fallback to enable header text wrapping for all columns.
+ * @returns {Array}
+ */
+export default function buildDisplayColumns({ columns = [], patients = [], isFixedIndex, CustomComponents, refresh, otherDetails = {} }) {
+  const displayColumns = [
+    {
+      title: '#',
+      dataIndex: 'index',
+      render: (value, item, index) => index + 1,
+      key: 'ColumnIndex',
+      fixed: isFixedIndex ? 'left' : null,
+      width: 2,
+    },
+  ];
+
+  columns.forEach((entry, index) => {
+    const isFilterEnabled = entry.isFilterEnabled || otherDetails?.isFilterEnabled;
+    const isSortingEnabled = entry.isSortingEnabled || otherDetails?.isSortingEnabled;
+    const isHeaderWrapEnabled = otherDetails?.isHeaderWrapEnabled;
+
+    const titleStyle = isHeaderWrapEnabled ? { whiteSpace: 'pre-wrap', overflowWrap: 'break-word' } : {};
+    displayColumns.push({
+      render: (record) =>
+        renderDisplayCell({
+          entry,
+          record,
+          CustomComponents,
+          refresh,
+        }),
+      field: entry.field,
+      title: (
+        <Tooltip
+          title={entry.tooltip || entry.title}
+          overlayInnerStyle={{
+            whiteSpace: 'normal',
+            overflowWrap: 'break-word',
+          }}
+        >
+          <span style={titleStyle}>{entry.title}</span>
+        </Tooltip>
+      ),
+      key: entry.field || `display_column_${index}`,
+      width: entry.width ? parseInt(entry.width, 10) : 160,
+      fixed: entry.isFixedColumn ? entry.isFixedColumn : null,
+      filters:
+        isFilterEnabled && Array.isArray(patients)
+          ? [...new Set(patients.map((item) => item[entry.field]).filter(Boolean))].map((value) => ({ text: value, value }))
+          : null,
+      onFilter: isFilterEnabled ? (value, record) => record[entry.field] === value : null,
+      sorter: isSortingEnabled ? (a, b) => String(a[entry.field]).localeCompare(String(b[entry.field])) : null,
+      filterSearch: isFilterEnabled ? isFilterEnabled : false,
+      exportDefinition: (record) => getExportDefinition(entry, record),
+      align: entry.type === 'number' ? 'right' : 'left',
+    });
+  });
+
+  return displayColumns;
+}

package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.test.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import buildDisplayColumns from './build-display-columns';
+
+describe('build-display-columns', () => {
+  test('creates index column plus configured columns', () => {
+    const columns = buildDisplayColumns({
+      columns: [{ title: 'OP NO', field: 'opno' }],
+      patients: [{ opno: 'OP-1' }],
+      isFixedIndex: true,
+      CustomComponents: {},
+      refresh: jest.fn(),
+    });
+
+    expect(columns.length).toBe(2);
+    expect(columns[0].key).toBe('ColumnIndex');
+    expect(columns[0].fixed).toBe('left');
+    expect(columns[1].field).toBe('opno');
+  });
+
+  test('preserves legacy action behavior and supports new action dynamic label', () => {
+    const refresh = jest.fn();
+    const columns = buildDisplayColumns({
+      columns: [
+        {
+          title: 'Legacy Action',
+          field: 'action',
+          redirect_link: '/legacy/@opb_id;',
+          replace_variables: [{ field: 'opb_id' }],
+          display_name_link: 'Open',
+        },
+        {
+          title: 'New Action',
+          type: 'action',
+          field: 'action_text',
+          redirect_link: '/new/@opb_id;',
+          replace_variables: [{ field: 'opb_id' }],
+          label: 'Fallback',
+        },
+      ],
+      patients: [{ opb_id: 10, action: 'Should not replace legacy label', action_text: 'Review' }],
+      isFixedIndex: false,
+      CustomComponents: {},
+      refresh,
+    });
+
+    const row = { opb_id: 10, action: 'Should not replace legacy label', action_text: 'Review' };
+
+    const legacyElement = columns[1].render(row);
+    const newLayerElement = columns[2].render(row);
+
+    expect(legacyElement.props.children).toBe('Open');
+    expect(newLayerElement.props.children).toBe('Review');
+  });
+
+  test('custom exportDefinition returns mapped description field value', () => {
+    const columns = buildDisplayColumns({
+      columns: [
+        {
+          title: 'Info',
+          field: 'custom',
+          props: [{ field: 'status_text', value: 'description' }],
+        },
+      ],
+      patients: [],
+      isFixedIndex: false,
+      CustomComponents: {},
+      refresh: jest.fn(),
+    });
+
+    const exportValue = columns[1].exportDefinition({ status_text: 'Ready' });
+    expect(exportValue).toBe('Ready');
+  });
+});
+