@visns-studio/visns-components 4.10.43 → 4.10.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"react-dom": "^17.0.0 || ^18.0.0"
|
|
78
78
|
},
|
|
79
79
|
"name": "@visns-studio/visns-components",
|
|
80
|
-
"version": "4.10.
|
|
80
|
+
"version": "4.10.44",
|
|
81
81
|
"description": "Various packages to assist in the development of our Custom Applications.",
|
|
82
82
|
"main": "src/index.js",
|
|
83
83
|
"files": [
|
|
@@ -94,6 +94,7 @@ const loadData = async (
|
|
|
94
94
|
id: identifier,
|
|
95
95
|
value: fv.value,
|
|
96
96
|
operator: fv.operator,
|
|
97
|
+
whereHas: fv.whereHas || [],
|
|
97
98
|
});
|
|
98
99
|
}
|
|
99
100
|
} else {
|
|
@@ -2638,6 +2639,7 @@ const DataGrid = forwardRef(
|
|
|
2638
2639
|
name: filterName,
|
|
2639
2640
|
operator: column.filter.operator,
|
|
2640
2641
|
type: column.filter.type,
|
|
2642
|
+
whereHas: column.filter.whereHas || [],
|
|
2641
2643
|
value: filterValue,
|
|
2642
2644
|
reset: column.filter.reset
|
|
2643
2645
|
? column.filter.reset
|
|
@@ -51,8 +51,12 @@ const GenericAuth = ({
|
|
|
51
51
|
const updateAuthStatus = async () => {
|
|
52
52
|
try {
|
|
53
53
|
const { data } = await CustomFetch('/ajax/user/profile', 'GET');
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
|
|
55
|
+
if (data && data.id) {
|
|
56
|
+
setUserProfile(data);
|
|
57
|
+
setIsAuthenticated(true);
|
|
58
|
+
}
|
|
59
|
+
|
|
56
60
|
setIsLoading(false);
|
|
57
61
|
|
|
58
62
|
if (location.pathname.split('/')[1] === 'login') {
|
|
@@ -4,6 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
|
4
4
|
import { Outlet } from 'react-router-dom';
|
|
5
5
|
import { toast } from 'react-toastify';
|
|
6
6
|
import { saveAs } from 'file-saver';
|
|
7
|
+
import parse from 'html-react-parser';
|
|
7
8
|
import _ from 'lodash';
|
|
8
9
|
import moment from 'moment';
|
|
9
10
|
|
|
@@ -387,7 +388,7 @@ function GenericIndex({
|
|
|
387
388
|
: styles.crmtitleSimple
|
|
388
389
|
}`}
|
|
389
390
|
>
|
|
390
|
-
<h1>{setting.page?.title}</h1>
|
|
391
|
+
<h1>{parse(setting.page?.title)}</h1>
|
|
391
392
|
<div className={styles.titleInfo}>
|
|
392
393
|
<span>
|
|
393
394
|
[<strong>{total}</strong> Total{' '}
|