-
- {
- hasCheckbox ?
:
}
- onChange={onCheckboxSelection} /> :
-
- }
-
{node.data.name}
+
+
+
+
+
+
+ {node.data.name}
+
+
);
}
@@ -197,7 +219,31 @@ DefaultNode.propTypes = {
onNodeSelectionChange: PropTypes.func
};
-function CollectionArrow({ node, tree, selectedNodeIds }) {
+function IndentIcon({node, hasCheckbox, isSelected, isIndeterminate, onCheckboxSelection}) {
+ if(hasCheckbox) {
+ return (
+
:
}
+ onChange={onCheckboxSelection}
+ />
+ );
+ }
+ if(hasExpand(node)) {
+ return <>;
+ }
+ return
;
+}
+
+IndentIcon.propTypes = {
+ node: PropTypes.object,
+ hasCheckbox: PropTypes.bool,
+ isSelected: PropTypes.bool,
+ isIndeterminate: PropTypes.bool,
+ onCheckboxSelection: PropTypes.func
+};
+
+function ExpandIcon({ node, tree, selectedNodeIds }) {
const toggleNode = () => {
node.isInternal && node.toggle();
if (node.isSelected && node.isOpen) {
@@ -205,14 +251,17 @@ function CollectionArrow({ node, tree, selectedNodeIds }) {
selectAllChild(node, tree, 'expand', selectedNodeIds);
}
};
- return (
-
{/* handled by parent */ }}>
- {node.isInternal && node?.children.length > 0 ? : null}
-
- );
+ if(hasExpand(node)) {
+ return (
+
{/* handled by parent */ }}>
+ {node.isOpen ? : }
+
+ );
+ }
+ return (
);
}
-CollectionArrow.propTypes = {
+ExpandIcon.propTypes = {
node: PropTypes.object,
tree: PropTypes.object,
selectedNodeIds: PropTypes.array
@@ -251,9 +300,9 @@ function checkAndSelectParent(chNode) {
}
}
-checkAndSelectParent.propTypes = {
- chNode: PropTypes.object
-};
+function hasExpand(node) {
+ return node.isInternal && node?.children.length > 0;
+}
function delectPrentNode(chNode) {
if (chNode) {
diff --git a/web/pgadmin/static/js/SchemaView/SchemaDialogView.jsx b/web/pgadmin/static/js/SchemaView/SchemaDialogView.jsx
index cb7468c44..b17bdd067 100644
--- a/web/pgadmin/static/js/SchemaView/SchemaDialogView.jsx
+++ b/web/pgadmin/static/js/SchemaView/SchemaDialogView.jsx
@@ -43,7 +43,8 @@ import { WORKSPACES } from '../../../browser/static/js/constants';
/* If its the dialog */
export default function SchemaDialogView({
getInitData, viewHelperProps, loadingText, schema={}, showFooter=true,
- isTabView=true, checkDirtyOnEnableSave=false, customCloseBtnName=gettext('Close'), ...props
+ isTabView=true, checkDirtyOnEnableSave=false, customCloseBtnName=gettext('Close'), focusOnFirstInput=true,
+ ...props
}) {
// View helper properties
const onDataChange = props.onDataChange;
@@ -190,7 +191,7 @@ export default function SchemaDialogView({
isTabView={isTabView}
className={props.formClassName}
showError={true} resetKey={resetKey}
- focusOnFirstInput={true}
+ focusOnFirstInput={focusOnFirstInput}
/>
{showFooter &&
@@ -268,4 +269,5 @@ SchemaDialogView.propTypes = {
Notifier: PropTypes.object,
checkDirtyOnEnableSave: PropTypes.bool,
customCloseBtnName: PropTypes.string,
+ focusOnFirstInput: PropTypes.bool,
};
diff --git a/web/pgadmin/static/js/components/Buttons.jsx b/web/pgadmin/static/js/components/Buttons.jsx
index 972acacb7..f30384254 100644
--- a/web/pgadmin/static/js/components/Buttons.jsx
+++ b/web/pgadmin/static/js/components/Buttons.jsx
@@ -8,7 +8,7 @@
//////////////////////////////////////////////////////////////
import { Button, ButtonGroup, Tooltip } from '@mui/material';
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import CustomPropTypes from '../custom_prop_types';
import ShortcutTitle from './ShortcutTitle';
@@ -174,20 +174,37 @@ DefaultButton.propTypes = {
/* pgAdmin Icon button, takes Icon component as input */
-export const PgIconButton = forwardRef(({icon, title, shortcut, className, splitButton, style, color, accesskey, isDropdown, tooltipPlacement, ...props}, ref)=>{
+export const PgIconButton = forwardRef(({icon, title, shortcut, className, splitButton, style, color, isDropdown, tooltipPlacement, ...props}, ref)=>{
+ const [tooltipOpen, setTooltipOpen] = useState(false);
let shortcutTitle = null;
- if(accesskey || shortcut) {
- shortcutTitle =
;
+ if(shortcut) {
+ shortcutTitle = ;
}
+ useEffect(() => {
+ // If the button is disabled changes, we should close the tooltip
+ // as the old button is unmounted.
+ setTooltipOpen(false);
+ }, [props.disabled]);
+
+ const tooltipProps = {
+ title: shortcutTitle || title || '',
+ 'aria-label': title || '',
+ open: tooltipOpen,
+ onOpen: () => setTooltipOpen(true),
+ onClose: () => setTooltipOpen(false),
+ enterDelay: isDropdown ? 1500 : undefined,
+ placement: tooltipPlacement,
+ };
+
if(props.disabled) {
if(color == 'primary') {
return (
-
+
+ data-label={title || ''} {...props}>
{icon}
@@ -195,11 +212,11 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
);
} else {
return (
-
+
+ data-label={title || ''} {...props}>
{icon}
@@ -208,10 +225,10 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
}
} else if(color == 'primary') {
return (
-
+
+ data-label={title || ''} {...props}>
{icon}
@@ -219,10 +236,10 @@ export const PgIconButton = forwardRef(({icon, title, shortcut, className, split
);
} else {
return (
-
+
+ data-label={title || ''} {...props}>
{icon}
diff --git a/web/pgadmin/static/js/components/FormComponents.jsx b/web/pgadmin/static/js/components/FormComponents.jsx
index ea517f1f1..a40ccbe52 100644
--- a/web/pgadmin/static/js/components/FormComponents.jsx
+++ b/web/pgadmin/static/js/components/FormComponents.jsx
@@ -1366,6 +1366,7 @@ export function InputTree({hasCheckbox, treeData, onChange, ...props}){
});
return () => umounted = true;
}, []);
+
return <>{isLoading ? : };
}
diff --git a/web/pgadmin/static/js/utils.js b/web/pgadmin/static/js/utils.js
index 40cfcfa66..0b8b99ab7 100644
--- a/web/pgadmin/static/js/utils.js
+++ b/web/pgadmin/static/js/utils.js
@@ -278,12 +278,12 @@ export function CSVToArray(strData, strDelimiter, quoteChar){
export function hasBinariesConfiguration(pgBrowser, serverInformation) {
const module = 'paths';
let preference_name = 'pg_bin_dir';
- let msg = gettext('Please configure the PostgreSQL Binary Path in the Preferences dialog.');
+ let msg = gettext('Please configure the PostgreSQL Binary Path in the Preferences.');
if ((serverInformation.type && serverInformation.type === 'ppas') ||
serverInformation.server_type === 'ppas') {
preference_name = 'ppas_bin_dir';
- msg = gettext('Please configure the EDB Advanced Server Binary Path in the Preferences dialog.');
+ msg = gettext('Please configure the EDB Advanced Server Binary Path in the Preferences.');
}
const preference = usePreferences.getState().getPreferences(module, preference_name);
diff --git a/web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx b/web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx
index 8e007d5af..ae5713f38 100644
--- a/web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx
+++ b/web/pgadmin/tools/search_objects/static/js/SearchObjects.jsx
@@ -301,7 +301,7 @@ export default function SearchObjects({nodeData}) {
if(!rowData.show_node) {
setErrorMsg(
- gettext('%s objects are disabled in the browser. You can enable them in the preferences dialog.', rowData.type_label));
+ gettext('%s objects are disabled in the browser. You can enable them in the preferences.', rowData.type_label));
setTimeout(()=> {
document.getElementById('prefdlgid').addEventListener('click', ()=>{
diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py
index 647191268..019403532 100644
--- a/web/pgadmin/utils/__init__.py
+++ b/web/pgadmin/utils/__init__.py
@@ -339,18 +339,18 @@ def does_utility_exist(file):
if file is None:
error_msg = gettext("Utility file not found. Please correct the Binary"
- " Path in the Preferences dialog")
+ " Path in the Preferences")
return error_msg
if Path(config.STORAGE_DIR) == Path(file) or \
Path(config.STORAGE_DIR) in Path(file).parents:
- error_msg = gettext("Please correct the Binary Path in the Preferences"
- " dialog. pgAdmin storage directory can not be a"
- " utility binary directory.")
+ error_msg = gettext("Please correct the Binary Path in the "
+ "Preferences. pgAdmin storage directory can not "
+ "be a utility binary directory.")
if not os.path.exists(file):
error_msg = gettext("'%s' file not found. Please correct the Binary"
- " Path in the Preferences dialog" % file)
+ " Path in the Preferences" % file)
return error_msg
diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py
index c26c71cb0..8d9077d73 100644
--- a/web/pgadmin/utils/preferences.py
+++ b/web/pgadmin/utils/preferences.py
@@ -49,11 +49,11 @@ class _Preference():
:param label: Display name of the options/preference
:param _type: Type for proper validation on value
:param default: Default value
- :param help_str: Help string to be shown in preferences dialog.
+ :param help_str: Help string to be shown in preferences.
:param min_val: minimum value
:param max_val: maximum value
:param options: options (Array of list objects)
- :param select2: select2 options (object)
+ :param select: select options (object)
:param fields: field schema (if preference has more than one field to
take input from user e.g. keyboardshortcut preference)
:param allow_blanks: Flag specify whether to allow blank value.
@@ -305,7 +305,7 @@ class Preferences():
:param name: Name of the module
:param label: Display name of the module, it will be displayed in the
- preferences dialog.
+ preferences.
:returns nothing
"""
@@ -506,7 +506,7 @@ class Preferences():
:param module: Name of the module
:param category: Name of category
:param name: Name of the option
- :param label: Label of the option, shown in the preferences dialog.
+ :param label: Label of the option, shown in the preferences.
:param _type: Type of the option.
Allowed type of options are as below:
boolean, integer, numeric, date, datetime,
diff --git a/web/regression/feature_tests/keyboard_shortcut_test.py b/web/regression/feature_tests/keyboard_shortcut_test.py
index 9c7cd23f5..9d11d0b6d 100644
--- a/web/regression/feature_tests/keyboard_shortcut_test.py
+++ b/web/regression/feature_tests/keyboard_shortcut_test.py
@@ -16,7 +16,8 @@ from selenium.webdriver.common.by import By
from selenium.webdriver import ActionChains
from selenium.webdriver.common.keys import Keys
from regression.feature_utils.base_feature_test import BaseFeatureTest
-from regression.feature_utils.locators import NavMenuLocators
+from regression.feature_utils.locators import NavMenuLocators, \
+ PreferencesLocaltors
class KeyboardShortcutFeatureTest(BaseFeatureTest):
@@ -88,32 +89,21 @@ class KeyboardShortcutFeatureTest(BaseFeatureTest):
NavMenuLocators.preference_menu_item_css)
pref_menu_item.click()
- self.page.find_by_xpath(
- NavMenuLocators.specified_preference_tree_node.format('Browser'))
+ wait = WebDriverWait(self.page.driver, 10)
- display_node = self.page.find_by_xpath(
- NavMenuLocators.specified_sub_node_of_pref_tree_node.format(
- 'Browser', 'Display'))
- attempt = 5
- while attempt > 0:
- display_node.click()
- # After clicking the element gets loaded in to the dom but still
- # not visible, hence sleeping for a sec.
- time.sleep(1)
- if self.page.wait_for_element_to_be_visible(
- self.driver,
- NavMenuLocators.show_system_objects_pref_label_xpath, 3):
- break
- else:
- attempt -= 1
+ self.page.click_tab("Preferences")
- maximize_button = self.page.find_by_css_selector(
- NavMenuLocators.maximize_pref_dialogue_css)
- maximize_button.click()
+ # Wait till the preference dialogue box is displayed by checking the
+ # visibility of Show System Object label
+ wait.until(EC.presence_of_element_located(
+ (By.XPATH,
+ PreferencesLocaltors.show_system_objects_pref_label_xpath))
+ )
keyboard_node = self.page.find_by_xpath(
- NavMenuLocators.specified_sub_node_of_pref_tree_node.format(
- 'Browser', 'Keyboard shortcuts'))
+ PreferencesLocaltors.specified_preference_tree_node_xpath.format(
+ 'Keyboard shortcuts'))
+
keyboard_node.click()
for s in self.new_shortcuts:
@@ -125,7 +115,11 @@ class KeyboardShortcutFeatureTest(BaseFeatureTest):
"input".format(locator))
file_menu.click()
+ time.sleep(1)
file_menu.send_keys(key)
# save and close the preference dialog.
- self.page.click_modal('Save')
+ self.page.find_by_css_selector(PreferencesLocaltors.save_btn) \
+ .click()
+ time.sleep(3)
+ self.page.close_active_tab()
diff --git a/web/regression/feature_tests/pg_utilities_backup_restore_test.py b/web/regression/feature_tests/pg_utilities_backup_restore_test.py
index c438040ab..b475ab526 100644
--- a/web/regression/feature_tests/pg_utilities_backup_restore_test.py
+++ b/web/regression/feature_tests/pg_utilities_backup_restore_test.py
@@ -9,16 +9,15 @@
import os
-from selenium.common.exceptions import TimeoutException
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.by import By
from selenium.webdriver.support import expected_conditions as EC
from regression.feature_utils.base_feature_test import BaseFeatureTest
from regression.python_test_utils import test_utils
from regression.python_test_utils import test_gui_helper
-from regression.feature_utils.locators import NavMenuLocators
-from regression.feature_utils.tree_area_locators import TreeAreaLocators
-from selenium.webdriver import ActionChains
+from regression.feature_utils.locators import NavMenuLocators, \
+ PreferencesLocaltors
+import time
class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
@@ -256,26 +255,18 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
wait = WebDriverWait(self.page.driver, 10)
+ self.page.click_tab("Preferences")
+
# Wait till the preference dialogue box is displayed by checking the
# visibility of Show System Object label
wait.until(EC.presence_of_element_located(
- (By.XPATH, NavMenuLocators.show_system_objects_pref_label_xpath))
+ (By.XPATH, PreferencesLocaltors.
+ show_system_objects_pref_label_xpath))
)
- maximize_button = self.page.find_by_css_selector(
- NavMenuLocators.maximize_pref_dialogue_css)
- maximize_button.click()
-
- path = self.page.find_by_xpath(
- NavMenuLocators.specified_preference_tree_node.format('Paths'))
- if self.page.find_by_xpath(
- NavMenuLocators.specified_pref_node_exp_status.format('Paths')).\
- get_attribute('aria-expanded') == 'false':
- ActionChains(self.driver).double_click(path).perform()
-
binary_path = self.page.find_by_xpath(
- NavMenuLocators.specified_sub_node_of_pref_tree_node.format(
- 'Paths', 'Binary paths'))
+ PreferencesLocaltors.specified_preference_tree_node_xpath.
+ format('Binary paths'))
binary_path.click()
default_binary_path = self.server['default_binary_paths']
@@ -313,10 +304,9 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
# save and close the preference dialog.
if path_already_set:
- self.page.click_modal('Cancel')
+ self.page.close_active_tab()
else:
- self.page.click_modal('Save')
-
- self.page.wait_for_element_to_disappear(
- lambda driver: driver.find_element(By.CSS_SELECTOR, ".ajs-modal")
- )
+ self.page.find_by_css_selector(PreferencesLocaltors.save_btn) \
+ .click()
+ time.sleep(3)
+ self.page.close_active_tab()
diff --git a/web/regression/feature_tests/test_copy_sql_to_query_tool.py b/web/regression/feature_tests/test_copy_sql_to_query_tool.py
index c40a3387d..ff0798068 100644
--- a/web/regression/feature_tests/test_copy_sql_to_query_tool.py
+++ b/web/regression/feature_tests/test_copy_sql_to_query_tool.py
@@ -13,7 +13,7 @@ from regression.feature_utils.base_feature_test import BaseFeatureTest
from regression.python_test_utils import test_utils
from regression.feature_utils.tree_area_locators import TreeAreaLocators
from regression.feature_utils.locators import NavMenuLocators, \
- QueryToolLocators
+ QueryToolLocators, PreferencesLocaltors
from selenium.webdriver import ActionChains
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.by import By
@@ -30,11 +30,10 @@ class CopySQLFeatureTest(BaseFeatureTest):
test_table_name = ""
def before(self):
-
+ self._update_preferences_setting()
self.page.add_server(self.server)
def runTest(self):
- self._update_preferences_setting()
self._create_table()
sql_query = self._get_sql_query()
query_tool_result = self._get_query_tool_result()
@@ -97,44 +96,24 @@ class CopySQLFeatureTest(BaseFeatureTest):
NavMenuLocators.file_menu_css)
file_menu.click()
- self.page.retry_click(
- (By.CSS_SELECTOR, NavMenuLocators.preference_menu_item_css),
- (By.XPATH, NavMenuLocators.specified_preference_tree_node
- .format('Browser'))
- )
+ pref_menu_item = self.page.find_by_css_selector(
+ NavMenuLocators.preference_menu_item_css)
+ pref_menu_item.click()
wait = WebDriverWait(self.page.driver, 10)
- self.page.retry_click(
- (By.XPATH,
- NavMenuLocators.specified_sub_node_of_pref_tree_node.
- format('Browser', 'Display')),
- (By.XPATH,
- NavMenuLocators.show_system_objects_pref_label_xpath))
+ self.page.click_tab("Preferences")
# Wait till the preference dialogue box is displayed by checking the
# visibility of Show System Object label
wait.until(EC.presence_of_element_located(
- (By.XPATH, NavMenuLocators.show_system_objects_pref_label_xpath))
+ (By.XPATH,
+ PreferencesLocaltors.show_system_objects_pref_label_xpath))
)
- maximize_button = self.page.find_by_css_selector(
- NavMenuLocators.maximize_pref_dialogue_css)
- maximize_button.click()
-
- specified_preference_tree_node_name = 'Query Tool'
- sql_editor = self.page.find_by_xpath(
- NavMenuLocators.specified_preference_tree_node.format(
- specified_preference_tree_node_name))
- sql_editor.click()
- if self.page.find_by_xpath(
- NavMenuLocators.specified_pref_node_exp_status.
- format(specified_preference_tree_node_name)).get_attribute(
- 'aria-expanded') == 'false':
- ActionChains(self.driver).double_click(sql_editor).perform()
option_node = self.page.find_by_xpath(
- "//*[@id='treeContainer']//div//span[text()="
- "'Results grid']//preceding::span[text()='Options'][1]")
+ "//*[@id='treeContainer']//div//div[text()="
+ "'Results grid']//preceding::div[text()='Options'][1]")
# self.page.check_if_element_exists_with_scroll(option_node)
self.page.driver.execute_script("arguments[0].scrollIntoView(false)",
option_node)
@@ -147,4 +126,7 @@ class CopySQLFeatureTest(BaseFeatureTest):
switch_box_element.click()
# save and close the preference dialog.
- self.page.click_modal('Save')
+ self.page.find_by_css_selector(PreferencesLocaltors.save_btn) \
+ .click()
+ time.sleep(3)
+ self.page.close_active_tab()
diff --git a/web/regression/feature_utils/locators.py b/web/regression/feature_utils/locators.py
index aa861381e..503fdb07c 100644
--- a/web/regression/feature_utils/locators.py
+++ b/web/regression/feature_utils/locators.py
@@ -48,22 +48,6 @@ class NavMenuLocators:
maintenance_obj_css = "li[data-label='Maintenance...']"
- show_system_objects_pref_label_xpath = \
- "//label[contains(text(), 'Show system objects?')]"
-
- maximize_pref_dialogue_css = "button[data-label='Maximize']"
-
- maximize_pref_dialogue_css = "button[data-label='Maximize']"
-
- specified_pref_node_exp_status = \
- "//*[@id='treeContainer']//div//span[text()='{0}']"
-
- specified_preference_tree_node = \
- "//*[@id='treeContainer']//div//span[text()='{0}']" \
-
- specified_sub_node_of_pref_tree_node = \
- "//*[@id='treeContainer']//div//span[text()='{1}']"
-
insert_bracket_pair_switch_btn = \
("//div[label[text()='Insert bracket pairs?']]/"
"following-sibling::div//input")
@@ -112,6 +96,18 @@ class NavMenuLocators:
".btn.btn-sm-sq.btn-primary.pg-bg-close > i"
+class PreferencesLocaltors:
+ show_system_objects_pref_label_xpath = \
+ "//label[contains(text(), 'Show system objects?')]"
+
+ specified_preference_tree_node_xpath = \
+ ("//*[@id='treeContainer']//div[contains(@class,'PgTree-nodeLabel')]"
+ "[text()='{0}']")
+
+ save_btn = \
+ "#id-preferences button[data-label='Save']"
+
+
class QueryToolLocators:
btn_save_file = "button[data-label='Save File']"
diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py
index 69e9e6757..3e0c442e0 100644
--- a/web/regression/feature_utils/pgadmin_page.py
+++ b/web/regression/feature_utils/pgadmin_page.py
@@ -219,6 +219,11 @@ class PgadminPage:
else:
assert False, "'Tools -> Query Tool' menu did not enable."
+ def close_active_tab(self):
+ self.find_by_css_selector(f"div[data-dockid='id-main'] "
+ ".dock-tab.dock-tab-active "
+ "button[data-label='Close']").click()
+
def close_query_tool(self, prompt=True):
self.driver.switch_to.default_content()
time.sleep(.5)
diff --git a/web/regression/javascript/processes/BgProcessManager.spec.js b/web/regression/javascript/processes/BgProcessManager.spec.js
index 845eb714b..fe71ff08a 100644
--- a/web/regression/javascript/processes/BgProcessManager.spec.js
+++ b/web/regression/javascript/processes/BgProcessManager.spec.js
@@ -103,22 +103,4 @@ describe('BgProcessManager', ()=>{
obj.checkPending();
expect(nSpy).toHaveBeenCalled();
});
-
-
- it('openProcessesPanel', ()=>{
- const panel = {};
- jest.spyOn(pgBrowser.docker.default_workspace, 'openTab').mockReturnValue(panel);
-
- /* panel open */
- jest.spyOn(pgBrowser.docker.default_workspace, 'find').mockReturnValue(panel);
- jest.spyOn(pgBrowser.docker.default_workspace, 'focus');
- obj.openProcessesPanel();
- expect(pgBrowser.docker.default_workspace.focus).toHaveBeenCalled();
- expect(pgBrowser.docker.default_workspace.openTab).not.toHaveBeenCalled();
-
- /* panel closed */
- jest.spyOn(pgBrowser.docker.default_workspace, 'find').mockReturnValue(null);
- obj.openProcessesPanel();
- expect(pgBrowser.docker.default_workspace.openTab).toHaveBeenCalled();
- });
});
diff --git a/web/regression/javascript/schema_ui_files/binary_path.ui.spec.js b/web/regression/javascript/schema_ui_files/binary_path.ui.spec.js
index 6904e1c35..f304ab0d8 100644
--- a/web/regression/javascript/schema_ui_files/binary_path.ui.spec.js
+++ b/web/regression/javascript/schema_ui_files/binary_path.ui.spec.js
@@ -1,4 +1,3 @@
-
/////////////////////////////////////////////////////////////
//
// pgAdmin 4 - PostgreSQL Tools
@@ -10,8 +9,8 @@
import {genericBeforeEach, getEditView} from '../genericFunctions';
-import {getBinaryPathSchema} from '../../../pgadmin/browser/server_groups/servers/static/js/binary_path.ui';
import pgAdmin from '../fake_pgadmin';
+import { getBinaryPathSchema } from '../../../pgadmin/preferences/static/js/components/binary_path.ui';
describe('BinaryPathschema', ()=>{
diff --git a/web/yarn.lock b/web/yarn.lock
index 6f3e572f7..a9bea0e4f 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -1413,7 +1413,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.27.1, @babel/runtime@npm:^7.27.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.27.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+ version: 7.27.4
+ resolution: "@babel/runtime@npm:7.27.4"
+ checksum: 10c0/ca99e964179c31615e1352e058cc9024df7111c829631c90eec84caba6703cc32acc81503771847c306b3c70b815609fe82dde8682936debe295b0b283b2dc6e
+ languageName: node
+ linkType: hard
+
+"@babel/runtime@npm:^7.27.4":
version: 7.27.6
resolution: "@babel/runtime@npm:7.27.6"
checksum: 10c0/89726be83f356f511dcdb74d3ea4d873a5f0cf0017d4530cb53aa27380c01ca102d573eff8b8b77815e624b1f8c24e7f0311834ad4fb632c90a770fda00bd4c8
@@ -1446,7 +1453,17 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.27.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+ version: 7.27.3
+ resolution: "@babel/types@npm:7.27.3"
+ dependencies:
+ "@babel/helper-string-parser": "npm:^7.27.1"
+ "@babel/helper-validator-identifier": "npm:^7.27.1"
+ checksum: 10c0/bafdfc98e722a6b91a783b6f24388f478fd775f0c0652e92220e08be2cc33e02d42088542f1953ac5e5ece2ac052172b3dadedf12bec9aae57899e92fb9a9757
+ languageName: node
+ linkType: hard
+
+"@babel/types@npm:^7.27.6":
version: 7.27.6
resolution: "@babel/types@npm:7.27.6"
dependencies:
@@ -2290,6 +2307,13 @@ __metadata:
languageName: node
linkType: hard
+"@juggle/resize-observer@npm:^3.3.1":
+ version: 3.4.0
+ resolution: "@juggle/resize-observer@npm:3.4.0"
+ checksum: 10c0/12930242357298c6f2ad5d4ec7cf631dfb344ca7c8c830ab7f64e6ac11eb1aae486901d8d880fd08fb1b257800c160a0da3aee1e7ed9adac0ccbb9b7c5d93347
+ languageName: node
+ linkType: hard
+
"@kurkle/color@npm:^0.3.0":
version: 0.3.4
resolution: "@kurkle/color@npm:0.3.4"
@@ -2598,6 +2622,13 @@ __metadata:
languageName: node
linkType: hard
+"@nozbe/microfuzz@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "@nozbe/microfuzz@npm:1.0.0"
+ checksum: 10c0/16ce1b36b521f3990b83b08d2a6d1f6eb43fe240d0ebfb600e8f469187a1303c6aa576925b6c0bebee8a8df2f8e8e768e12b1c67d4ac50133468b7a02c46efa9
+ languageName: node
+ linkType: hard
+
"@npmcli/agent@npm:^3.0.0":
version: 3.0.0
resolution: "@npmcli/agent@npm:3.0.0"
@@ -13656,6 +13687,7 @@ __metadata:
"@mui/icons-material": "npm:^7.1.1"
"@mui/material": "npm:^7.1.0"
"@mui/x-date-pickers": "npm:^8.5.0"
+ "@nozbe/microfuzz": "npm:^1.0.0"
"@projectstorm/react-diagrams": "npm:^7.0.4"
"@simonwep/pickr": "npm:^1.5.1"
"@svgr/webpack": "npm:^8.1.0"
@@ -13767,6 +13799,7 @@ __metadata:
uplot: "npm:^1.6.32"
uplot-react: "npm:^1.1.4"
url-loader: "npm:^4.1.1"
+ use-resize-observer: "npm:^9.1.0"
valid-filename: "npm:^4.0.0"
vanilla-jsoneditor: "npm:^3.3.1"
webfonts-loader: "npm:^8.0.1"
@@ -15703,6 +15736,18 @@ __metadata:
languageName: node
linkType: hard
+"use-resize-observer@npm:^9.1.0":
+ version: 9.1.0
+ resolution: "use-resize-observer@npm:9.1.0"
+ dependencies:
+ "@juggle/resize-observer": "npm:^3.3.1"
+ peerDependencies:
+ react: 16.8.0 - 18
+ react-dom: 16.8.0 - 18
+ checksum: 10c0/6ccdeb09fe20566ec182b1635a22f189e13d46226b74610432590e69b31ef5d05d069badc3306ebd0d2bb608743b17981fb535763a1d7dc2c8ae462ee8e5999c
+ languageName: node
+ linkType: hard
+
"use-sync-external-store@npm:^1.2.0":
version: 1.5.0
resolution: "use-sync-external-store@npm:1.5.0"