IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Continue fixing multiple UI issues found when testing wcDocker changes. #6479

Browse Source
This commit is contained in:
Aditya Toshniwal
2023-11-06 18:08:16 +05:30
parent 0d8adf9ced
commit ef0b30b1ca
11 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/pgadmin/tools/schema_diff/static/js/SchemaDiffModule.js
View File

@@ -22,6 +22,7 @@ import { BROWSER_PANELS } from '../../../../browser/static/js/constants';
import { NotifierProvider } from '../../../../static/js/helpers/Notifier';
import usePreferences from '../../../../preferences/static/js/store';
import pgAdmin from 'sources/pgadmin';
import { PgAdminContext } from '../../../../static/js/BrowserComponent';
export default class SchemaDiff {
@@ -102,10 +103,12 @@ export default class SchemaDiff {
load(container, trans_id) {
ReactDOM.render(
<Theme>
<ModalProvider>
<NotifierProvider pgAdmin={pgAdmin} pgWindow={pgWindow} />
<SchemaDiffComponent params={{ transId: trans_id, pgAdmin: pgWindow.pgAdmin }}></SchemaDiffComponent>
</ModalProvider>
<PgAdminContext.Provider value={pgAdmin}>
<ModalProvider>
<NotifierProvider pgAdmin={pgAdmin} pgWindow={pgWindow} />
<SchemaDiffComponent params={{ transId: trans_id, pgAdmin: pgWindow.pgAdmin }}></SchemaDiffComponent>
</ModalProvider>
</PgAdminContext.Provider>
</Theme>,
container
);

8
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx
View File

@@ -310,13 +310,17 @@ export function SchemaDiffCompare({ params }) {
try {
setCompareOptions(compareParams);
socket = await openSocket('/schema_diff');
socket.on('compare_status', res=>{
const compareStatus = _.debounce(res=>{
let msg = res.compare_msg;
msg = msg + gettext(` (this may take a few minutes)... ${Math.round(res.diff_percentage)} %`);
setLoaderText(msg);
});
}, 250);
socket.on('compare_status', compareStatus);
resData = await socketApiGet(socket, socketEndpoint, url_params);
setShowResultGrid(true);
// stop the listeners
socket.off('compare_status', compareStatus);
compareStatus.cancel();
setLoaderText(null);
setFilterOptions(filterParams);
getResultGridData(resData, filterParams);