Fix Query tool issues:

1. Warning/Confirm dialogs should be inside the query tool.
2. The Help button in View/Edit data should open the corresponding help page.
3. Disable execute options when query tool in transaction.
4. Grid not loading more than 10000 rows. react-data-grid issue, PR sent. Use a fork till then.
5. NOTICE messages should not be part of Notifier success popups.

Fixes #7350
This commit is contained in:
Aditya Toshniwal
2022-05-09 12:39:29 +05:30
committed by Akshay Joshi
parent 5ebc9d7d2e
commit 1135821870
8 changed files with 34 additions and 28 deletions

View File

@@ -445,6 +445,7 @@ function SchemaDialogView({
const isNew = schema.isNew(schema.origData);
const checkIsMounted = useIsMounted();
const preFormReadyQueue = useRef([]);
const Notifier = props.Notifier || Notify;
const depListenerObj = useRef(new DepListener());
/* The session data */
@@ -578,7 +579,7 @@ function SchemaDialogView({
};
/* Confirm before reset */
if(props.confirmOnCloseReset) {
Notify.confirm(
Notifier.confirm(
gettext('Warning'),
gettext('Changes will be lost. Are you sure you want to reset?'),
resetIt,
@@ -605,7 +606,7 @@ function SchemaDialogView({
changeData[schema.idAttribute] = schema.origData[schema.idAttribute];
}
if (schema.warningText) {
Notify.confirm(
Notifier.confirm(
gettext('Warning'),
schema.warningText,
()=> {
@@ -626,7 +627,7 @@ function SchemaDialogView({
props.onSave(isNew, changeData)
.then(()=>{
if(schema.informText) {
Notify.alert(
Notifier.alert(
gettext('Warning'),
schema.informText,
);
@@ -785,6 +786,7 @@ SchemaDialogView.propTypes = {
customSaveBtnName: PropTypes.string,
customSaveBtnIconType: PropTypes.string,
formClassName: CustomPropTypes.className,
Notifier: PropTypes.object,
};
const usePropsStyles = makeStyles((theme)=>({