@xh/hoist 67.0.0-SNAPSHOT.1725042567416 → 67.0.0-SNAPSHOT.1725046027559
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/admin/regroup/RegroupDialog.ts +2 -1
- package/admin/tabs/general/alertBanner/AlertBannerPanel.ts +2 -1
- package/admin/tabs/userData/roles/editor/RoleEditor.ts +9 -8
- package/admin/tabs/userData/roles/editor/RoleEditorModel.ts +2 -5
- package/admin/tabs/userData/roles/editor/form/RoleFormModel.ts +2 -0
- package/admin/tabs/userData/roles/recategorize/RecategorizeDialog.ts +2 -1
- package/desktop/cmp/rest/impl/RestForm.ts +2 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -50,9 +50,10 @@ const tbar = hoistCmp.factory<RegroupDialogModel>(({model}) => {
|
|
|
50
50
|
onClick: () => model.close()
|
|
51
51
|
}),
|
|
52
52
|
button({
|
|
53
|
-
text: 'Save',
|
|
53
|
+
text: 'Save Changes',
|
|
54
54
|
icon: Icon.check(),
|
|
55
55
|
intent: 'success',
|
|
56
|
+
outlined: true,
|
|
56
57
|
disabled: model.groupName == null,
|
|
57
58
|
onClick: () => model.saveAsync()
|
|
58
59
|
})
|
|
@@ -227,9 +227,10 @@ const formPanel = hoistCmp.factory<AlertBannerModel>(({model}) => {
|
|
|
227
227
|
onClick: () => model.resetForm()
|
|
228
228
|
}),
|
|
229
229
|
button({
|
|
230
|
-
text: 'Save',
|
|
230
|
+
text: 'Save Changes',
|
|
231
231
|
icon: Icon.check(),
|
|
232
232
|
intent: 'success',
|
|
233
|
+
outlined: true,
|
|
233
234
|
disabled: !isValid || !isDirty,
|
|
234
235
|
onClick: () => model.saveAsync()
|
|
235
236
|
})
|
|
@@ -33,23 +33,24 @@ export const roleEditor = hoistCmp.factory({
|
|
|
33
33
|
mask: savingTask,
|
|
34
34
|
bbar: [
|
|
35
35
|
button({
|
|
36
|
-
|
|
36
|
+
text: 'Delete',
|
|
37
37
|
icon: Icon.delete(),
|
|
38
38
|
intent: 'danger',
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
disabled: !role,
|
|
40
|
+
onClick: () => model.deleteAsync()
|
|
41
41
|
}),
|
|
42
42
|
filler(),
|
|
43
43
|
button({
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
text: 'Cancel',
|
|
45
|
+
onClick: () => model.cancel()
|
|
46
46
|
}),
|
|
47
47
|
button({
|
|
48
|
-
|
|
48
|
+
text: 'Save Changes',
|
|
49
49
|
icon: Icon.check(),
|
|
50
50
|
intent: 'success',
|
|
51
|
-
|
|
52
|
-
disabled: saveDisabled
|
|
51
|
+
outlined: true,
|
|
52
|
+
disabled: saveDisabled,
|
|
53
|
+
onClick: () => model.saveAsync()
|
|
53
54
|
})
|
|
54
55
|
]
|
|
55
56
|
})
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* Copyright © 2024 Extremely Heavy Industries Inc.
|
|
6
6
|
*/
|
|
7
7
|
import {HoistModel, managed, TaskObserver, XH} from '@xh/hoist/core';
|
|
8
|
-
import {Icon} from '@xh/hoist/icon';
|
|
9
8
|
import {action, computed, makeObservable, observable} from '@xh/hoist/mobx';
|
|
10
9
|
import {omit} from 'lodash';
|
|
11
10
|
import {RoleModel} from '../RoleModel';
|
|
@@ -78,15 +77,13 @@ export class RoleEditorModel extends HoistModel {
|
|
|
78
77
|
this.doCancel();
|
|
79
78
|
} else {
|
|
80
79
|
XH.confirm({
|
|
81
|
-
icon: Icon.warning(),
|
|
82
|
-
title: 'Discard unsaved changes?',
|
|
83
80
|
message: 'You have unsaved changes. Are you sure you wish to proceed?',
|
|
84
81
|
cancelProps: {
|
|
85
82
|
text: 'Keep editing'
|
|
86
83
|
},
|
|
87
84
|
confirmProps: {
|
|
88
|
-
|
|
89
|
-
|
|
85
|
+
text: 'Discard Changes',
|
|
86
|
+
intent: 'danger'
|
|
90
87
|
},
|
|
91
88
|
onConfirm: () => this.doCancel()
|
|
92
89
|
});
|
|
@@ -159,6 +159,7 @@ export class RoleFormModel extends HoistModel {
|
|
|
159
159
|
return new GridModel({
|
|
160
160
|
emptyText: 'None added.',
|
|
161
161
|
hideHeaders: true,
|
|
162
|
+
showHover: true,
|
|
162
163
|
selModel: 'multiple',
|
|
163
164
|
store: {
|
|
164
165
|
fields: [{name: 'error', type: 'string'}],
|
|
@@ -194,6 +195,7 @@ export class RoleFormModel extends HoistModel {
|
|
|
194
195
|
...props,
|
|
195
196
|
inputProps: {
|
|
196
197
|
enableCreate: entity !== 'ROLE',
|
|
198
|
+
createMessageFn: user => `Add ${user}`,
|
|
197
199
|
options: this.filterSelected(options, selected)
|
|
198
200
|
}
|
|
199
201
|
});
|
|
@@ -52,9 +52,10 @@ const bbar = hoistCmp.factory<RecategorizeDialogModel>(({model}) => {
|
|
|
52
52
|
onClick: () => model.close()
|
|
53
53
|
}),
|
|
54
54
|
button({
|
|
55
|
-
text: 'Save',
|
|
55
|
+
text: 'Save Changes',
|
|
56
56
|
icon: Icon.check(),
|
|
57
57
|
intent: 'success',
|
|
58
|
+
outlined: true,
|
|
58
59
|
disabled: model.categoryName == null,
|
|
59
60
|
onClick: () => model.saveAsync()
|
|
60
61
|
})
|
|
@@ -80,9 +80,10 @@ const tbar = hoistCmp.factory<RestFormModel>(({model}) => {
|
|
|
80
80
|
onClick: () => model.close()
|
|
81
81
|
}),
|
|
82
82
|
button({
|
|
83
|
-
text: 'Save',
|
|
83
|
+
text: 'Save Changes',
|
|
84
84
|
icon: Icon.check(),
|
|
85
85
|
intent: 'success',
|
|
86
|
+
outlined: true,
|
|
86
87
|
disabled: !model.isAdd && !formModel.isDirty,
|
|
87
88
|
onClick: () => model.validateAndSaveAsync(),
|
|
88
89
|
omit: formModel.readonly
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xh/hoist",
|
|
3
|
-
"version": "67.0.0-SNAPSHOT.
|
|
3
|
+
"version": "67.0.0-SNAPSHOT.1725046027559",
|
|
4
4
|
"description": "Hoist add-on for building and deploying React Applications.",
|
|
5
5
|
"repository": "github:xh/hoist-react",
|
|
6
6
|
"homepage": "https://xh.io",
|