IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-26 02:30:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

1. Intermittently failing test cases.

Browse Source 
2. Dialog vertical position should be more on the upper side.
3. File not supported error is not showing.

refs #7313
This commit is contained in:
Aditya Toshniwal 2022-07-25 11:48:27 +05:30 committed by Akshay Joshi
parent 96c360e728
commit a7fd7d67b3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/static/js/helpers/ModalProvider.jsx
View File

@ -168,7 +168,7 @@ function PaperComponent(props) {
return props.isfullscreen == 'true' ? { x: 0, y: 0 } : dialogPosition && { x: dialogPosition.x, y: dialogPosition.y }; return props.isfullscreen == 'true' ? { x: 0, y: 0 } : dialogPosition && { x: dialogPosition.x, y: dialogPosition.y };
}; };
const y_position = props.height ? (window.innerHeight/2) - (props.height/2) : (window.innerHeight/2) - (MIN_HEIGHT/2); const y_position = window.innerHeight*0.02; // 2% of total height
const x_position = props.width ? (window.innerWidth/2) - (props.width/2) : (window.innerWidth/2) - (MIN_WIDTH/2); const x_position = props.width ? (window.innerWidth/2) - (props.width/2) : (window.innerWidth/2) - (MIN_WIDTH/2);
return ( return (

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

@ -349,7 +349,12 @@ export default function Query() {
eventBus.registerListener(QUERY_TOOL_EVENTS.LOAD_FILE, (fileName)=>{ eventBus.registerListener(QUERY_TOOL_EVENTS.LOAD_FILE, (fileName)=>{
queryToolCtx.api.post(url_for('sqleditor.load_file'), { queryToolCtx.api.post(url_for('sqleditor.load_file'), {
'file_name': decodeURI(fileName), 'file_name': decodeURI(fileName),
}, {transformResponse: [(data) => { return data; }]}).then((res)=>{ }, {transformResponse: [(data, headers) => {
if(headers['content-type'].includes('application/json')) {
return JSON.parse(data);
}
return data;
}]}).then((res)=>{
editor.current.setValue(res.data); editor.current.setValue(res.data);
//Check the file content for Trojan Source //Check the file content for Trojan Source
checkTrojanSource(res.data); checkTrojanSource(res.data);

6
web/regression/javascript/file_manager/FileManager.spec.js
View File

@ -98,7 +98,6 @@ describe('FileManger', ()=>{
beforeAll(()=>{ beforeAll(()=>{
mount = createMount(); mount = createMount();
networkMock = new MockAdapter(axios); networkMock = new MockAdapter(axios);
networkMock.onPost('/file_manager/init').reply(200, {'data': configData});
networkMock.onPost(`/file_manager/filemanager/${transId}/`).reply(200, {data: {result: files}}); networkMock.onPost(`/file_manager/filemanager/${transId}/`).reply(200, {data: {result: files}});
networkMock.onPost(`/file_manager/save_file_dialog_view/${transId}`).reply(200, {}); networkMock.onPost(`/file_manager/save_file_dialog_view/${transId}`).reply(200, {});
networkMock.onDelete(`/file_manager/delete_trans_id/${transId}`).reply(200, {}); networkMock.onDelete(`/file_manager/delete_trans_id/${transId}`).reply(200, {});
@ -130,14 +129,17 @@ describe('FileManger', ()=>{
}; };
it('init', (done)=>{ it('init', (done)=>{
networkMock.onPost('/file_manager/init').reply(200, {'data': configData});
let ctrl = ctrlMount({}); let ctrl = ctrlMount({});
setTimeout(()=>{ setTimeout(()=>{
ctrl.update();
ctrl.find('button[name="menu-options"]').simulate('click');
ctrl.find('Memo(MenuItem)[data-label="List View"]').simulate('click');
ctrl.update(); ctrl.update();
expect(ctrl.find('ListView').length).toBe(1); expect(ctrl.find('ListView').length).toBe(1);
expect(ctrl.find('GridView').length).toBe(0); expect(ctrl.find('GridView').length).toBe(0);
expect(ctrl.find('InputText[data-label="file-path"]').prop('value')).toBe('/home/current'); expect(ctrl.find('InputText[data-label="file-path"]').prop('value')).toBe('/home/current');
ctrl.find('button[name="menu-options"]').simulate('click'); ctrl.find('button[name="menu-options"]').simulate('click');
ctrl.update();
ctrl.find('Memo(MenuItem)[data-label="Grid View"]').simulate('click'); ctrl.find('Memo(MenuItem)[data-label="Grid View"]').simulate('click');
setTimeout(()=>{ setTimeout(()=>{
ctrl.update(); ctrl.update();