ui-soxo-bootstrap-core 2.6.1-dev.25 → 2.6.1-dev.27
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/core/lib/components/global-header/global-header.js +21 -7
- package/core/lib/models/forms/components/form-creator/form-creator.js +525 -468
- package/core/lib/models/forms/components/form-creator/form-creator.scss +29 -26
- package/core/lib/modules/generic/generic-list/ExportReactCSV.js +28 -2
- package/core/lib/utils/api/api.utils.js +22 -21
- package/core/lib/utils/generic/generic.utils.js +2 -1
- package/core/lib/utils/http/http.utils.js +15 -7
- package/core/modules/reporting/components/reporting-dashboard/adavance-search/advance-search.js +70 -43
- package/core/modules/reporting/components/reporting-dashboard/adavance-search/advance-search.scss +2 -2
- package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js +134 -250
- package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.scss +36 -0
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@ import { GlobalContext } from './../../Store';
|
|
|
13
13
|
|
|
14
14
|
import { Link, useLocation } from 'react-router-dom';
|
|
15
15
|
|
|
16
|
-
import { Typography, Avatar, Input } from
|
|
16
|
+
import { Typography, Avatar, Input, Tooltip } from "antd";
|
|
17
17
|
|
|
18
18
|
import ProgressBar from '../progress-bar/progress-bar'; // Adjust the path as needed
|
|
19
19
|
|
|
@@ -21,7 +21,7 @@ import { Button } from '../../elements';
|
|
|
21
21
|
|
|
22
22
|
import GenericHeader from '../header/generic-header';
|
|
23
23
|
|
|
24
|
-
import { MenuOutlined, UserOutlined, SettingOutlined } from '@ant-design/icons';
|
|
24
|
+
import { MenuOutlined, UserOutlined, SettingOutlined, QuestionCircleOutlined } from '@ant-design/icons';
|
|
25
25
|
|
|
26
26
|
import { Drawer } from 'antd';
|
|
27
27
|
|
|
@@ -70,10 +70,12 @@ export default function GlobalHeader({
|
|
|
70
70
|
|
|
71
71
|
// const [searchModalVisible, setSearchModalVisible] = useState(false);
|
|
72
72
|
|
|
73
|
-
const { globalCustomerHeader = () => {} } = appSettings;
|
|
73
|
+
const { globalCustomerHeader = () => { } } = appSettings;
|
|
74
74
|
|
|
75
75
|
const { t, i18n } = useTranslation();
|
|
76
76
|
|
|
77
|
+
const helpDeskUrl = process.env.REACT_APP_HELP_DESK_URL
|
|
78
|
+
|
|
77
79
|
const spotlightRef = useRef();
|
|
78
80
|
|
|
79
81
|
useEffect(() => {
|
|
@@ -133,7 +135,7 @@ export default function GlobalHeader({
|
|
|
133
135
|
animate();
|
|
134
136
|
}, []);
|
|
135
137
|
|
|
136
|
-
useEffect(() => {}, [state.theme]);
|
|
138
|
+
useEffect(() => { }, [state.theme]);
|
|
137
139
|
|
|
138
140
|
return (
|
|
139
141
|
<>
|
|
@@ -152,7 +154,7 @@ export default function GlobalHeader({
|
|
|
152
154
|
//whileHover="hover"
|
|
153
155
|
//whileTap="tap"
|
|
154
156
|
className={`left-bar ${!isConnected && !isMobile ? '' : 'hide'}${!collapsed ? 'open' : 'close'}${kiosk && !isConnected ? 'kioskon' : ''}`}
|
|
155
|
-
|
|
157
|
+
// style={{ background: state.theme.colors.leftSectionBackground }}
|
|
156
158
|
>
|
|
157
159
|
{!isMobile && !isConnected ? (
|
|
158
160
|
<motion.div
|
|
@@ -199,7 +201,7 @@ export default function GlobalHeader({
|
|
|
199
201
|
{!isConnected && !kiosk ? (
|
|
200
202
|
<div
|
|
201
203
|
className={`page-wrapper ${!collapsed ? 'open' : 'close'}`}
|
|
202
|
-
|
|
204
|
+
// style={{ background: state.theme.colors.headerBg }}
|
|
203
205
|
>
|
|
204
206
|
{/* */}
|
|
205
207
|
<div className="page-header-name">
|
|
@@ -280,6 +282,18 @@ export default function GlobalHeader({
|
|
|
280
282
|
|
|
281
283
|
{/* Reload Button Ends */}
|
|
282
284
|
|
|
285
|
+
{/* Help-desk-btn */}
|
|
286
|
+
{helpDeskUrl ? <Tooltip title="Application support">
|
|
287
|
+
<span>
|
|
288
|
+
<Button
|
|
289
|
+
onClick={() => window.open(helpDeskUrl, '_blank')}
|
|
290
|
+
icon={<QuestionCircleOutlined />}
|
|
291
|
+
type="default"
|
|
292
|
+
size="small"
|
|
293
|
+
/>
|
|
294
|
+
</span>
|
|
295
|
+
</Tooltip> : null}
|
|
296
|
+
|
|
283
297
|
{/** Switch Languages starts */}
|
|
284
298
|
{process.env.REACT_APP_ENABLE_LANGUAGE_SWITCHER ? <LanguageSwitcher /> : null}
|
|
285
299
|
{/** Switch Languages ends */}
|
|
@@ -328,7 +342,7 @@ export default function GlobalHeader({
|
|
|
328
342
|
function ProfileAvatar() {
|
|
329
343
|
const { user = { locations: [] } } = useContext(GlobalContext);
|
|
330
344
|
|
|
331
|
-
useEffect(() => {}, []);
|
|
345
|
+
useEffect(() => { }, []);
|
|
332
346
|
|
|
333
347
|
return (
|
|
334
348
|
<Link className="profile-avatar" to="/profile">
|