ui-soxo-bootstrap-core 2.6.5 → 2.6.7
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/Store.js +3 -3
- package/core/lib/components/global-header/global-header.js +2 -2
- package/core/lib/elements/basic/menu-tree/menu-tree.js +26 -13
- package/core/lib/models/forms/components/form-creator/form-creator.scss +5 -4
- package/core/lib/models/menus/components/menu-list/menu-list.js +424 -467
- package/core/lib/pages/login/login.js +1 -1
- package/core/lib/pages/login/login.scss +9 -0
- package/core/lib/pages/login/reset-password.js +2 -3
- package/core/lib/pages/login/reset-password.scss +10 -1
- package/core/lib/pages/profile/themes.json +4 -4
- package/core/models/menus/components/menu-add/menu-add.js +1 -1
- package/core/models/menus/components/menu-lists/menu-lists.js +3 -7
- package/core/models/roles/components/role-add/role-add.js +92 -59
- package/core/models/roles/components/role-list/role-list.js +1 -1
- package/core/models/users/components/assign-role/assign-role.js +9 -2
- package/core/models/users/components/user-add/user-add.js +12 -20
- package/core/models/users/components/user-add/user-edit.js +2 -1
- package/core/modules/dashboard/components/dashboard-card/menu-dashboard-card.js +1 -1
- package/core/modules/reporting/components/reporting-dashboard/README.md +316 -0
- package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.js +74 -0
- package/core/modules/reporting/components/reporting-dashboard/display-columns/build-display-columns.test.js +74 -0
- package/core/modules/reporting/components/reporting-dashboard/display-columns/display-cell-renderer.js +252 -0
- package/core/modules/reporting/components/reporting-dashboard/display-columns/display-cell-renderer.test.js +126 -0
- package/core/modules/reporting/components/reporting-dashboard/reporting-dashboard.js +12 -338
- package/core/modules/steps/action-buttons.js +42 -44
- package/core/modules/steps/action-buttons.scss +35 -6
- package/core/modules/steps/steps.js +12 -10
- package/core/modules/steps/steps.scss +229 -31
- package/core/modules/steps/timeline.js +21 -19
- package/package.json +1 -1
package/core/lib/Store.js
CHANGED
|
@@ -50,7 +50,7 @@ const initialTheme = () => {
|
|
|
50
50
|
// manage theme with env
|
|
51
51
|
const isEnvThemeTrue = process.env.REACT_APP_THEME;
|
|
52
52
|
|
|
53
|
-
console.log('REACT_APP_THEME:', isEnvThemeTrue);
|
|
53
|
+
// console.log('REACT_APP_THEME:', isEnvThemeTrue);
|
|
54
54
|
const matchedTheme = themes.find((t) => t.name === isEnvThemeTrue);
|
|
55
55
|
|
|
56
56
|
if (matchedTheme) return matchedTheme;
|
|
@@ -64,7 +64,7 @@ const initialTheme = () => {
|
|
|
64
64
|
// Fallback to default
|
|
65
65
|
return themes[0];
|
|
66
66
|
} catch (e) {
|
|
67
|
-
console.error('Error loading theme:', e);
|
|
67
|
+
// console.error('Error loading theme:', e);
|
|
68
68
|
return themes[0];
|
|
69
69
|
}
|
|
70
70
|
};
|
|
@@ -94,7 +94,7 @@ export const GlobalProvider = ({ children, CustomModels,CustomComponents, appSet
|
|
|
94
94
|
|
|
95
95
|
const [state, dispatch] = useReducer(AppReducer, initialState);
|
|
96
96
|
|
|
97
|
-
console.log(state);
|
|
97
|
+
// console.log(state);
|
|
98
98
|
|
|
99
99
|
const { isMobile } = useDeviceDetect();
|
|
100
100
|
|
|
@@ -49,7 +49,7 @@ import { useTranslation } from "react-i18next";
|
|
|
49
49
|
import BorderStyle from "pdf-lib/cjs/core/annotation/BorderStyle";
|
|
50
50
|
|
|
51
51
|
import SettingsUtil from "../../../utils/settings.utils";
|
|
52
|
-
import
|
|
52
|
+
import SpotlightSearch from "../spotlight-search/spotlight-search.component";
|
|
53
53
|
|
|
54
54
|
|
|
55
55
|
|
|
@@ -410,4 +410,4 @@ function ProfileAvatar() {
|
|
|
410
410
|
{/* {user.name} */}
|
|
411
411
|
</Link>
|
|
412
412
|
);
|
|
413
|
-
}
|
|
413
|
+
}
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
import React from 'react';
|
|
26
|
-
import { Checkbox, Collapse } from 'antd';
|
|
26
|
+
import { Checkbox, Collapse, Tag } from 'antd';
|
|
27
27
|
|
|
28
28
|
const { Panel } = Collapse;
|
|
29
29
|
|
|
@@ -73,11 +73,15 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
|
|
|
73
73
|
background: '#fff',
|
|
74
74
|
display: 'flex',
|
|
75
75
|
alignItems: 'center',
|
|
76
|
-
|
|
76
|
+
justifyContent: 'space-between',
|
|
77
77
|
}}
|
|
78
78
|
>
|
|
79
|
-
{
|
|
80
|
-
<
|
|
79
|
+
{/* Left Side */}
|
|
80
|
+
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
|
81
|
+
{showCheckbox && <Checkbox checked={selectedMenus.includes(menu.id)} onChange={(e) => onParentChange(e.target.checked)} />}
|
|
82
|
+
<span>{menu.title || menu.caption}</span>
|
|
83
|
+
</div>
|
|
84
|
+
<Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'NOT VISIBLE'}</Tag>{' '}
|
|
81
85
|
</div>
|
|
82
86
|
);
|
|
83
87
|
}
|
|
@@ -91,15 +95,24 @@ export const MenuTree = ({ menus, selectedMenus = [], toggleMenu, parentId = nul
|
|
|
91
95
|
<Panel
|
|
92
96
|
key={menu.id}
|
|
93
97
|
header={
|
|
94
|
-
<div
|
|
95
|
-
{
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
98
|
+
<div
|
|
99
|
+
style={{
|
|
100
|
+
display: 'flex',
|
|
101
|
+
alignItems: 'center',
|
|
102
|
+
justifyContent: 'space-between',
|
|
103
|
+
}}
|
|
104
|
+
>
|
|
105
|
+
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
|
106
|
+
{showCheckbox && (
|
|
107
|
+
<Checkbox
|
|
108
|
+
checked={children.every((c) => selectedMenus.includes(c.id))}
|
|
109
|
+
indeterminate={children.some((c) => selectedMenus.includes(c.id)) && !children.every((c) => selectedMenus.includes(c.id))}
|
|
110
|
+
onChange={(e) => onParentChange(e.target.checked)}
|
|
111
|
+
/>
|
|
112
|
+
)}
|
|
113
|
+
<span>{menu.title || menu.caption}</span>
|
|
114
|
+
</div>
|
|
115
|
+
<Tag color={menu.is_visible === true ? 'green' : 'blue'}>{menu.is_visible === true ? 'VISIBLE' : 'NOT VISIBLE'}</Tag>{' '}
|
|
103
116
|
</div>
|
|
104
117
|
}
|
|
105
118
|
>
|
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
}
|
|
5
5
|
|
|
6
6
|
.new-record {
|
|
7
|
-
|
|
7
|
+
gap: 10px !important;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
.form-item-element {
|
|
11
11
|
position: relative;
|
|
12
12
|
padding: 8px;
|
|
13
13
|
border-radius: 4px;
|
|
14
|
-
border: 1px solid #e3e3e3;
|
|
14
|
+
// border: 1px solid #e3e3e3;
|
|
15
15
|
margin-bottom: 3px;
|
|
16
16
|
|
|
17
17
|
.field-customizer {
|
|
@@ -22,9 +22,10 @@
|
|
|
22
22
|
// right: 0px;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
|
|
28
|
+
.submit-button {
|
|
28
29
|
margin-top: 10px;
|
|
29
30
|
}
|
|
30
31
|
}
|