@visns-studio/visns-components 5.7.5 → 5.7.7

package/package.json

@@ -20,12 +20,12 @@
         "dayjs": "^1.11.13",
         "fabric": "^6.6.4",
         "file-saver": "^2.0.5",
-        "framer-motion": "^12.9.2",
+        "framer-motion": "^12.9.4",
         "html-react-parser": "^5.2.3",
         "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
         "moment": "^2.30.1",
-        "motion": "^12.9.2",
+        "motion": "^12.9.4",
         "numeral": "^2.0.6",
         "pluralize": "^8.0.0",
         "qrcode.react": "^4.2.0",
@@ -63,10 +63,10 @@
         "yet-another-react-lightbox": "^3.23.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.26.10",
-        "@babel/plugin-transform-runtime": "^7.26.10",
-        "@babel/preset-env": "^7.26.9",
-        "@babel/preset-react": "^7.26.3",
+        "@babel/core": "^7.27.1",
+        "@babel/plugin-transform-runtime": "^7.27.1",
+        "@babel/preset-env": "^7.27.1",
+        "@babel/preset-react": "^7.27.1",
         "babel-loader": "^10.0.0",
         "copy-webpack-plugin": "^13.0.0",
         "css-loader": "^7.1.2",
@@ -82,7 +82,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.7.5",
+    "version": "5.7.7",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [
@@ -103,5 +103,5 @@
         "url": "https://github.com/visnsstudio/visns-components/issues"
     },
     "homepage": "https://github.com/visnsstudio/visns-components#readme",
-    "packageManager": "yarn@4.8.1"
+    "packageManager": "yarn@4.9.1"
 }

package/src/components/crm/Notification.jsx

@@ -7,6 +7,46 @@ import { Bell, CircleX, Check } from 'akar-icons';
 import CustomFetch from './Fetch';
 import styles from './styles/Notification.module.scss';
 
+// Helper function to sanitize HTML content and remove unwanted styling from anchor tags
+const sanitizeHtml = (html) => {
+    if (!html) return '';
+
+    // Create a temporary div to parse the HTML
+    const tempDiv = document.createElement('div');
+    tempDiv.innerHTML = html;
+
+    // Find all anchor tags and remove any styling attributes
+    const anchors = tempDiv.querySelectorAll('a');
+    anchors.forEach((anchor) => {
+        // Preserve href and target attributes, remove all others
+        const href = anchor.getAttribute('href');
+        const target = anchor.getAttribute('target');
+
+        // Clone the text content
+        const textContent = anchor.textContent;
+
+        // Create a clean anchor with only necessary attributes
+        const cleanAnchor = document.createElement('a');
+        cleanAnchor.textContent = textContent;
+
+        if (href) cleanAnchor.setAttribute('href', href);
+        if (target) cleanAnchor.setAttribute('target', target);
+
+        // Add a small icon after the link text to indicate it's a link
+        // We'll use CSS to style this instead of adding an actual icon
+        cleanAnchor.setAttribute('data-is-link', 'true');
+
+        // Set inline styles to ensure visibility against white background
+        cleanAnchor.style.color = '#0056b3';
+        cleanAnchor.style.fontWeight = '600';
+
+        // Replace the original anchor with the clean one
+        anchor.parentNode.replaceChild(cleanAnchor, anchor);
+    });
+
+    return tempDiv.innerHTML;
+};
+
 function Notification(props) {
     const navigate = useNavigate();
     const wrapperRef = useRef(null);
@@ -290,7 +330,11 @@ function Notification(props) {
                                                 <div
                                                     className={styles.notiText}
                                                 >
-                                                    {parse(item.data.label)}
+                                                    {parse(
+                                                        sanitizeHtml(
+                                                            item.data.label
+                                                        )
+                                                    )}
                                                 </div>
                                                 <div
                                                     className={styles.notiTime}

package/src/components/crm/TableFilter.jsx

@@ -5,6 +5,7 @@ function TableFilter({
     filters,
     setFilters,
     setSettings,
+    settings,
     type,
     onFilterChange,
 }) {
@@ -165,15 +166,36 @@ function TableFilter({
             }
             // For non-parent filters (backward compatibility)
             else {
+                const updatedChildren = isParent
+                    ? filter.children.map((child) => ({
+                          ...child,
+                          class: child.id === id ? 'subactivechildren' : '',
+                          show: child.id === id,
+                          active: child.id === id,
+                      }))
+                    : filter.children
+                    ? filter.children.map((child, childKey) => ({
+                          ...child,
+                          class:
+                              childKey === 0 && isActive
+                                  ? 'subactivechildren'
+                                  : '',
+                          show: childKey === 0 && isActive,
+                          active: childKey === 0 && isActive,
+                      }))
+                    : [];
+
                 return {
                     ...filter,
-                    class: isActive
-                        ? type === 'simple'
-                            ? 'activetab'
-                            : 'subactive'
-                        : '',
-                    show: isActive,
-                    active: isActive,
+                    class:
+                        isActive || isParent
+                            ? type === 'simple'
+                                ? 'activetab'
+                                : 'subactive'
+                            : '',
+                    show: isActive || isParent,
+                    active: isActive || isParent,
+                    children: updatedChildren,
                 };
             }
         };
@@ -199,27 +221,36 @@ function TableFilter({
         let updatedSettings = null;
 
         if (setSettings) {
-            // For child items or non-parent items, we need to update the filter value
+            // For child items, non-parent items, or parent items with a value property
+            // we need to update the filter value
             if (
                 filtertype === 'children' ||
                 (filtertype === 'parent' &&
-                    !filters.find((f) => f.id === id && f.isParent))
+                    (!filters.find((f) => f.id === id && f.isParent) ||
+                        filters.find(
+                            (f) => f.id === id && f.hasOwnProperty('value')
+                        )))
             ) {
-                // For child filters, we need to update the filter with the child's ID
+                // For filters, we need to update the filter with the ID and value
                 const filterId = id;
                 const filterValue = value || '';
 
                 // Start with the current settings
-                updatedSettings = { ...setSettings._currentValue };
+                // Check if _currentValue exists (React state setter) or use the object directly
+                updatedSettings = setSettings._currentValue
+                    ? { ...setSettings._currentValue }
+                    : { ...setSettings };
 
                 if (updatedSettings.ajaxSetting) {
                     // First, remove any existing filters that might conflict
-                    let _where = [...updatedSettings.ajaxSetting.where].filter(
-                        (item) => {
-                            // Keep items that don't match this filter ID
-                            return item.id !== filterId;
-                        }
-                    );
+                    let _where = updatedSettings.ajaxSetting.where
+                        ? [...updatedSettings.ajaxSetting.where].filter(
+                              (item) => {
+                                  // Keep items that don't match this filter ID
+                                  return item.id !== filterId;
+                              }
+                          )
+                        : [];
 
                     // Add the new filter
                     _where.push({ id: filterId, value: filterValue });
@@ -244,6 +275,15 @@ function TableFilter({
                     w.push({ id: filterId, value: filterValue });
 
                     updatedSettings = { ...updatedSettings, where: w };
+                } else {
+                    // If neither ajaxSetting.where nor where exists, create a new ajaxSetting
+                    updatedSettings = {
+                        ...settings,
+                        ajaxSetting: {
+                            ...(settings.ajaxSetting || {}),
+                            where: [{ id: filterId, value: filterValue }],
+                        },
+                    };
                 }
             }
         }

package/src/components/crm/generic/GenericIndex.jsx

@@ -576,6 +576,7 @@ function GenericIndex({
                                         filters={subnav}
                                         setFilters={setSubnav}
                                         setSettings={setConfig}
+                                        settings={config}
                                         type={layout}
                                         onFilterChange={handleFilterChange}
                                     />
@@ -598,6 +599,7 @@ function GenericIndex({
                                     filters={subnav}
                                     setFilters={setSubnav}
                                     setSettings={setConfig}
+                                    settings={config}
                                     type={layout}
                                     onFilterChange={handleFilterChange}
                                 />

package/src/components/crm/styles/Notification.module.scss

@@ -158,18 +158,62 @@
     line-height: 1.4;
     margin-bottom: 4px;
     word-break: break-word;
+
+    /* Target all elements inside notiText to ensure proper styling */
+    * {
+        background: inherit;
+        border: none;
+        border-radius: 0;
+        padding: 0;
+        margin: 0;
+        display: inline;
+        box-shadow: none;
+        text-shadow: none;
+        white-space: normal;
+    }
 }
 
 .notiText a {
-    color: var(--primary-color);
-    font-weight: 500;
+    /* Use a darker color that will be visible against white background */
+    color: #0056b3 !important; /* Fallback if var(--primary-color) is too light */
+    font-weight: 600 !important; /* Make it slightly bolder */
     text-decoration: none;
-    transition: color 0.2s;
+    transition: all 0.2s;
+    /* Reset any potential styling that could cause elliptical borders and white text */
+    background: transparent !important;
+    border: none !important;
+    border-radius: 0 !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    display: inline !important;
+    box-shadow: none !important;
+    text-shadow: none !important;
+    white-space: normal !important;
+    /* Add subtle bottom border to indicate it's a link */
+    border-bottom: 1px dotted #0056b3 !important;
+    position: relative !important;
+}
+
+/* Add a small external link icon after links with data-is-link attribute */
+.notiText a[data-is-link='true']::after {
+    content: '↗';
+    font-size: 10px;
+    position: relative;
+    top: -5px;
+    margin-left: 2px;
+    opacity: 0.9;
+    color: #0056b3 !important; /* Match the link color */
 }
 
 .notiText a:hover {
-    color: var(--secondary-color);
-    text-decoration: underline;
+    color: #003d80 !important; /* Darker shade for hover state */
+    text-decoration: none;
+    background: transparent !important;
+    border-bottom: 1px solid #003d80 !important;
+}
+
+.notiText a:hover[data-is-link='true']::after {
+    opacity: 1;
 }
 
 .notiTime {