IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-07-04 11:33:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect handling of the code smell for the reject API call

Browse Source
This commit is contained in:
Akshay Joshi 2024-06-17 18:22:38 +05:30
parent 3706c3126a
commit 2b04f3ca1d
26 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en_US/release_notes_8_9.rst
View File

@ -35,8 +35,10 @@ Bug fixes
| `Issue #7295 <https://github.com/pgadmin-org/pgadmin4/issues/7295>`_ - Fixed new line indentation in query editor and add a user preference to disable it.
| `Issue #7306 <https://github.com/pgadmin-org/pgadmin4/issues/7306>`_ - Ensure that a user can connect to a server using SSL certificates and identity files from a shared storage.
| `Issue #7414 <https://github.com/pgadmin-org/pgadmin4/issues/7414>`_ - Add support for comments on RLS policy object.
| `Issue #7476 <https://github.com/pgadmin-org/pgadmin4/issues/7476>`_ - Fixed an issue where changing a column name should reflect in all the constraints in table object dialog and ERD table dialog.
| `Issue #7481 <https://github.com/pgadmin-org/pgadmin4/issues/7481>`_ - Fixed an issue where dark theme shows white background when all tabs are closed.
| `Issue #7516 <https://github.com/pgadmin-org/pgadmin4/issues/7516>`_ - Ensure preferences can be loaded using preferences.json.
| `Issue #7528 <https://github.com/pgadmin-org/pgadmin4/issues/7528>`_ - Fixed an issue where backslash breaks syntax highlighting.
| `Issue #7536 <https://github.com/pgadmin-org/pgadmin4/issues/7536>`_ - Search Objects dialog should focus on search input on open.
| `Issue #7555 <https://github.com/pgadmin-org/pgadmin4/issues/7555>`_ - Fixed an issue where query tool shortcuts for find/replace are not working.
| `Issue #7556 <https://github.com/pgadmin-org/pgadmin4/issues/7556>`_ - Fixed migration failure while using external database.

2
web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
View File

@ -91,7 +91,7 @@ define('pgadmin.node.cast', [
resolve(data);
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} else {
data = [];

6
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
View File

@ -100,7 +100,7 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
data = res.data.data;
resolve(data);
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} else {
resolve(data);
@ -127,7 +127,7 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
data = res.data.data;
resolve(data);
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} else {
resolve(data);
@ -155,7 +155,7 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
data = res.data.data;
resolve(data);
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} else {
resolve(data);

2
web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js
View File

@ -112,7 +112,7 @@ define('pgadmin.node.subscription', [
}
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});

2
web/pgadmin/browser/static/js/node_ajax.js
View File

@ -124,7 +124,7 @@ export function getNodeAjaxOptions(url, nodeObj, treeNodeInfo, itemNodeData, par
otherParams.useCache && cacheNode.cache(nodeObj.type + '#' + url, treeNodeInfo, cacheLevel, data);
resolve(transform(data));
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error('Something went wrong'));
});
} else {
// To fetch only options from cache, we do not need time from 'at'

2
web/pgadmin/misc/cloud/static/js/aws.js
View File

@ -82,7 +82,7 @@ export function AwsInstanceDetails(props) {
resolve(data);
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} else {
resolve(options);

2
web/pgadmin/misc/cloud/static/js/azure.js
View File

@ -72,7 +72,7 @@ export function AzureCredentials(props) {
})
.catch((error)=>{
clearInterval(interval);
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
});
}, 1000);
});

4
web/pgadmin/misc/cloud/static/js/azure_schema.ui.js
View File

@ -122,7 +122,7 @@ class AzureCredSchema extends BaseUISchema {
}));
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});
@ -152,7 +152,7 @@ class AzureCredSchema extends BaseUISchema {
});
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});

2
web/pgadmin/misc/cloud/static/js/google.js
View File

@ -87,7 +87,7 @@ export function GoogleCredentials(props) {
})
.catch((error)=>{
clearInterval(interval);
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
});
countdown = countdown - 1;
}, 1000);

4
web/pgadmin/misc/cloud/static/js/google_schema.ui.js
View File

@ -68,13 +68,13 @@ class GoogleCredSchema extends BaseUISchema{
resolve();
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});

6
web/pgadmin/misc/properties/ObjectNodeProperties.jsx
View File

@ -87,7 +87,7 @@ export default function ObjectNodeProperties({panelId, node, treeNodeInfo, nodeD
} else if (msg == 'CRYPTKEY_NOT_SET') {
reject(new Error(gettext('The master password is not set.')));
}
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
})
@ -116,7 +116,7 @@ export default function ObjectNodeProperties({panelId, node, treeNodeInfo, nodeD
} else if (msg == 'CRYPTKEY_NOT_SET') {
reject(new Error(gettext('The master password is not set.')));
}
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
});
@ -133,7 +133,7 @@ export default function ObjectNodeProperties({panelId, node, treeNodeInfo, nodeD
resolve(res.data.data);
}).catch((err)=>{
onError(err);
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
};

2
web/pgadmin/preferences/static/js/components/PreferencesComponent.jsx
View File

@ -114,7 +114,7 @@ function RightPanel({ schema, ...props }) {
try {
resolve(props.initValues);
} catch (error) {
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
});

8
web/pgadmin/static/js/Dialogs/index.jsx
View File

@ -210,7 +210,7 @@ export function showChangeServerPassword() {
onClose();
})
.catch((error)=>{
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
});
});
}}
@ -237,7 +237,7 @@ export function showChangeUserPassword(url) {
resolve(res.data);
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
}}
@ -263,7 +263,7 @@ export function showChangeUserPassword(url) {
onClose();
pgAdmin.Browser.notifier.success(res.data.info);
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
}}
@ -336,7 +336,7 @@ export function showChangeOwnership() {
resolve(respData.data);
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}
});

6
web/pgadmin/static/js/UtilityView.jsx
View File

@ -95,7 +95,7 @@ function UtilityViewContent({panelId, schema, treeNodeInfo, actionType, formType
onSave?.(res.data);
onClose();
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
@ -111,7 +111,7 @@ function UtilityViewContent({panelId, schema, treeNodeInfo, actionType, formType
resolve(res.data.data);
}).catch((err)=>{
onError(err);
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
};
@ -161,7 +161,7 @@ function UtilityViewContent({panelId, schema, treeNodeInfo, actionType, formType
} else if(err.message){
console.error('error msg', err.message);
}
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}

2
web/pgadmin/static/js/csrf.js
View File

@ -22,7 +22,7 @@ export function setPGCSRFToken(header, token) {
return config;
}, function (error) {
return Promise.reject(new Error(error));
return Promise.reject(error instanceof Error ? error : Error('Something went wrong'));
});
}

4
web/pgadmin/static/js/socket_instance.js
View File

@ -27,10 +27,10 @@ export function openSocket(namespace, options) {
resolve(socketObj);
});
socketObj.on('connect_error', (err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
socketObj.on('disconnect', (err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
}

2
web/pgadmin/tools/backup/static/js/backup.js
View File

@ -265,7 +265,7 @@ define([
}).then((response)=> {
resolve(response.data.data);
}).catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
}}

2
web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
View File

@ -429,7 +429,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
try {
resolve(debuggerArgsData.current);
} catch (error) {
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
});

2
web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx
View File

@ -486,7 +486,7 @@ export default class ERDTool extends React.Component {
})
.catch((err)=>{
console.error(err);
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
const {x, y} = this.diagram.getEngine().getRelativeMousePoint(e);

4
web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx
View File

@ -388,11 +388,11 @@ export default function SearchObjects({nodeData}) {
})
.catch((err)=>{
pgAdmin.Browser.notifier.error(parseApiError(err));
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} catch (error) {
pgAdmin.Browser.notifier.error(parseApiError(error));
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
});
};

4
web/pgadmin/tools/sqleditor/static/js/components/QueryToolComponent.jsx
View File

@ -721,7 +721,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
});
} else {
selectConn(currSelectedConn, currConnected, false);
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
});
});
@ -763,7 +763,7 @@ export default function QueryToolComponent({params, pgWindow, pgAdmin, selectedN
}
updateQueryToolConnection(connectionData, true)
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
}).then(()=>{
resolve();
onClose();

4
web/pgadmin/tools/sqleditor/static/js/components/dialogs/FilterDialog.jsx
View File

@ -88,7 +88,7 @@ export default function FilterDialog({onClose, onSave}) {
filterSchemaObj.setColumnOptions((columns||[]).map((c)=>({label: c, value: c})));
resolve(filterData);
} catch (error) {
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
};
getFilterData();
@ -109,7 +109,7 @@ export default function FilterDialog({onClose, onSave}) {
reject(new Error(respData.data.result));
}
} catch (error) {
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
};
setFilterData();

2
web/pgadmin/tools/sqleditor/static/js/components/dialogs/MacrosDialog.jsx
View File

@ -169,7 +169,7 @@ export default function MacrosDialog({onClose, onSave}) {
onSave(respData.filter((m) => Boolean(m.name)));
onClose();
} catch (error) {
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
}
};
setMacros();

4
web/pgadmin/tools/sqleditor/static/js/components/dialogs/NewConnectionDialog.jsx
View File

@ -75,7 +75,7 @@ class NewConnectionSchema extends BaseUISchema {
resolve(groupedOptions);
})
.catch((error)=>{
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
});
});
}
@ -97,7 +97,7 @@ class NewConnectionSchema extends BaseUISchema {
resolve(respData.data.result.data);
})
.catch((error)=>{
reject(new Error(error));
reject(error instanceof Error ? error : Error(gettext('Something went wrong')));
});
});
}

2
web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx
View File

@ -50,7 +50,7 @@ async function registerAutocomplete(editor, api, transId) {
})
.catch((err) => {
onAvailable();
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
});
});

4
web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx
View File

@ -364,7 +364,7 @@ function UserManagementDialog({onClose}) {
onClose();
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
} catch (error) {
reject(parseApiError(error));
@ -402,7 +402,7 @@ function UserManagementDialog({onClose}) {
resolve({userManagement:res.data});
})
.catch((err)=>{
reject(new Error(err));
reject(err instanceof Error ? err : Error(gettext('Something went wrong')));
});
}); }}
schema={new UserManagementSchema(authSourcesOptions, roleOptions)}