IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 23:15:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue in search objects where objects were unable to locate occasionally. #5916

Browse Source
This commit is contained in:
Aditya Toshniwal 2023-04-04 18:29:54 +05:30 committed by GitHub
parent fdf7a459eb
commit a18d469c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,7 +348,7 @@ export class Tree {
let onCorrectPath = function (matchPath) {
return (matchPath !== undefined && path !== undefined
&& (basepath.startsWith(matchPath) || path === matchPath));
&& (basepath.startsWith(`${matchPath}/`) || path === matchPath));
};
return (function findInNode(currentNode) {

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

@ -973,7 +973,7 @@ class ERDTool extends React.Component {
<ERDCanvasSettings.Provider value={{
cardinality_notation: this.state.cardinality_notation
}}>
{this.diagram.getEngine() && <CanvasWidget className={this.props.classes.diagramCanvas} ref={(ele)=>{this.canvasEle = ele?.ref?.current;}} engine={this.diagram.getEngine()} />}
{!this.props.inTest && <CanvasWidget className={this.props.classes.diagramCanvas} ref={(ele)=>{this.canvasEle = ele?.ref?.current;}} engine={this.diagram.getEngine()} />}
</ERDCanvasSettings.Provider>
</div>
</Box>
@ -1001,6 +1001,7 @@ ERDTool.propTypes = {
pgAdmin: PropTypes.object.isRequired,
panel: PropTypes.object,
classes: PropTypes.object,
inTest: PropTypes.bool,
};
export const ERDCanvasSettings = React.createContext({});

2
web/regression/javascript/erd/ui_components/ERDTool.spec.js
View File

@ -125,7 +125,7 @@ describe('ERDTool', ()=>{
erd = mount(
<Theme>
<ModalProvider>
<ERDTool params={params} pgAdmin={pgAdmin} pgWindow={pgWindow} />
<ERDTool params={params} pgAdmin={pgAdmin} pgWindow={pgWindow} isTest={true} />
</ModalProvider>
</Theme>
);