Merge branch 'master' into extendability

Make.bat

@@ -233,6 +233,8 @@ REM Main build sequence Ends
     RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
     ECHO Removing tools...
     RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\web\.yarn" 1> nul 2>&1
     ECHO Removing any existing configurations...
     DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
     DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1

docs/en_US/preferences.rst

@@ -11,9 +11,7 @@ The left pane of the *Preferences* dialog displays a tree control; each node of
 the tree control provides access to options that are related to the node under
 which they are displayed.
 
-* Use the plus sign (+) to the left of a node name to expand a segment of the
-  tree control.
-* Use the minus sign (-) to the left of a node name to close that node.
+* Click the *Reset all preferences* button to restore all preferences to their default values.
 
 The Browser Node
 ****************

docs/en_US/release_notes_8_12.rst

@@ -20,7 +20,8 @@ Bundled PostgreSQL Utilities
 New features
 ************
 
-  | `Issue #7293 <https://github.com/pgadmin-org/pgadmin4/issues/7293>`_ - Allow running non-continuous selected SQL code blocks in the query tool.
+  | `Issue #1900 <https://github.com/pgadmin-org/pgadmin4/issues/1900>`_ -  Added feature to restore preferences to their default values.
+  | `Issue #7293 <https://github.com/pgadmin-org/pgadmin4/issues/7293>`_ -  Allow running non-continuous selected SQL code blocks in the query tool.
 
 Housekeeping
 ************
@@ -29,4 +30,5 @@ Housekeeping
 Bug fixes
 *********
 
-  | `Issue #7076 <https://github.com/pgadmin-org/pgadmin4/issues/7076>`_ - Revamp the current password saving implementation to a keyring and reduce repeated OS user password prompts.
+  | `Issue #7076 <https://github.com/pgadmin-org/pgadmin4/issues/7076>`_ -  Revamp the current password saving implementation to a keyring and reduce repeated OS user password prompts.
+  | `Issue #7571 <https://github.com/pgadmin-org/pgadmin4/issues/7571>`_ -  Fixed an issue where users could not use pgAdmin if they did not have access to the management database.

pkg/linux/build-functions.sh

@@ -180,6 +180,8 @@ _build_runtime() {
         yarn plugin import workspace-tools
         yarn workspaces focus --production
 
+        # remove the yarn cache
+        rm -rf .yarn .yarn*
     popd > /dev/null || exit
 
     # Create the icon
@@ -232,7 +234,7 @@ _copy_code() {
     cp "${SOURCEDIR}/pkg/linux/config_distro.py" "${SERVERROOT}/usr/${APP_NAME}/web/"
     cd "${SERVERROOT}/usr/${APP_NAME}/web/" || exit
     rm -f pgadmin4.db config_local.*
-    rm -rf jest.config.js babel.* package.json node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
+    rm -rf jest.config.js babel.* package.json .yarn* yarn* .editorconfig .eslint* node_modules/ regression/ tools/ pgadmin/static/js/generated/.cache
     find . -name "tests" -type d -print0 | xargs -0 rm -rf
     find . -name "feature_tests" -type d -print0 | xargs -0 rm -rf
     find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf

pkg/mac/build-functions.sh

@@ -62,6 +62,8 @@ _build_runtime() {
         yarn plugin import workspace-tools
         yarn workspaces focus --production
 
+        # remove the yarn cache
+        rm -rf .yarn .yarn*
     popd > /dev/null || exit
 }
 

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/variables.sql

@@ -1,6 +1,6 @@
 SELECT
     name, vartype, min_val, max_val, enumvals
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 WHERE
     context in ('user', 'superuser');

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql

@@ -49,7 +49,7 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r
 	substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age,
 	rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname,
 	typ.typrelid AS typoid, am.amname,
-	(SELECT st.setting from pg_catalog.pg_settings st WHERE st.name = 'default_table_access_method') as default_amname,
+	(SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname,
 	(CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable,
 	(SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels,
 	(CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table,

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/properties.sql

@@ -49,7 +49,7 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r
 	substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age,
 	rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname,
 	typ.typrelid AS typoid, am.amname,
-	(SELECT st.setting from pg_catalog.pg_settings st WHERE st.name = 'default_table_access_method') as default_amname,
+	(SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname,
 	(CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable,
 	(SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels,
 	(CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table,

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql

@@ -32,7 +32,7 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r
       JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace
 		WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt,
 	(CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence,
-	(SELECT st.setting from pg_catalog.pg_settings st WHERE st.name = 'default_table_access_method') as default_amname,
+	(SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname,
 	substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor,
 	substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'parallel_workers=([0-9]*)') AS parallel_workers,
 	substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target,

web/pgadmin/browser/server_groups/servers/databases/schemas/templates/vacuum_settings/sql/vacuum_defaults.sql

@@ -1,2 +1,2 @@
 {# ============= Fetch list of default values for autovacuum parameters =============== #}
-SELECT name, setting::numeric AS setting FROM pg_catalog.pg_settings WHERE name IN({{ columns }}) ORDER BY name
+SELECT name, setting::numeric AS setting FROM pg_catalog.pg_show_all_settings() WHERE name IN({{ columns }}) ORDER BY name

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/properties.sql

@@ -11,7 +11,7 @@ SELECT
         JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid
         WHERE dtb.oid = {{ did }}::oid)
     END as spcname,
-    (SELECT st.setting from pg_catalog.pg_settings st
+    (SELECT st.setting from pg_catalog.pg_show_all_settings() st
     WHERE st.name = 'default_table_access_method') as default_amname,
     c.relacl,
     nsp.nspname as schema,

web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/properties.sql

@@ -11,7 +11,7 @@ SELECT
         JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid
         WHERE dtb.oid = {{ did }}::oid)
     END as spcname,
-    (SELECT st.setting from pg_catalog.pg_settings st
+    (SELECT st.setting from pg_catalog.pg_show_all_settings() st
     WHERE st.name = 'default_table_access_method') as default_amname,
     c.relacl,
     nsp.nspname as schema,

web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/variables.sql

@@ -1,2 +1,2 @@
 SELECT name, vartype, min_val, max_val, enumvals
-FROM pg_catalog.pg_settings WHERE context in ('user', 'superuser')
+FROM pg_catalog.pg_show_all_settings() WHERE context in ('user', 'superuser')

web/pgadmin/browser/server_groups/servers/roles/__init__.py

@@ -1261,7 +1261,7 @@ def voptions(self, gid, sid):
     name, vartype, min_val::numeric AS min_val, max_val::numeric AS max_val,
     enumvals
 FROM
-    pg_settings
+    pg_show_all_settings()
 WHERE
     context in ('user', 'superuser')
 ) a""")

web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/sql/default/variables.sql

@@ -1,4 +1,4 @@
 {### SQL to fetch tablespace object options ###}
 SELECT name, vartype, min_val, max_val, enumvals
-FROM pg_catalog.pg_settings
+FROM pg_catalog.pg_show_all_settings()
 WHERE name IN ('seq_page_cost', 'random_page_cost', 'effective_io_concurrency');

web/pgadmin/dashboard/templates/dashboard/sql/default/config.sql

@@ -6,6 +6,6 @@ SELECT
     unit,
     short_desc
 FROM
-    pg_catalog.pg_settings
+    pg_catalog.pg_show_all_settings()
 ORDER BY
     category

web/pgadmin/preferences/__init__.py

@@ -320,3 +320,17 @@ def update():
         data={'data': 'Success'},
         status=200
     )
+
+
+@blueprint.route("/", methods=['DELETE'], endpoint="reset_prefs")
+@pga_login_required
+def reset():
+    """
+    Reset preferences to default
+    """
+    res, msg = Preferences.reset()
+
+    if not res:
+        return internal_server_error(errormsg=msg)
+
+    return success_return()

web/pgadmin/preferences/static/js/components/PreferencesComponent.jsx

@@ -20,6 +20,7 @@ import getApiInstance from '../../../../static/js/api_instance';
 import CloseSharpIcon from '@mui/icons-material/CloseSharp';
 import HelpIcon from '@mui/icons-material/HelpRounded';
 import SaveSharpIcon from '@mui/icons-material/SaveSharp';
+import SettingsBackupRestoreIcon from'@mui/icons-material/SettingsBackupRestore';
 import pgAdmin from 'sources/pgadmin';
 import { DefaultButton, PgIconButton, PrimaryButton } from '../../../../static/js/components/Buttons';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
@@ -602,6 +603,64 @@ export default function PreferencesComponent({ ...props }) {
     window.open(url_for('help.static', { 'filename': 'preferences.html' }), 'pgadmin_help');
   };
 
+  const reset = () => {
+    pgAdmin.Browser.notifier.confirm(
+      gettext('Reset all preferences'),
+      `${gettext('All preferences will be reset to their default values.')}<br><br>${gettext('Do you want to proceed?')}<br><br>
+       ${gettext('Note:')}<br> <ul style="padding-left:20px"><li style="list-style-type:disc">${gettext('The object explorer tree will be refreshed automatically to reflect the changes.')}</li>
+       <li style="list-style-type:disc">${gettext('If the application language changes, a reload of the application will be required. You can choose to reload later at your convenience.')}</li></ul>`,
+      function () {},
+      function () {},
+      '',
+      'Cancel',
+      function (closeModal) {
+        return [
+          {
+            type: 'default',
+            icon: <SaveSharpIcon />,
+            label: gettext('Save & Reload'),
+            onclick: () => {
+              resetPrefsToDefault(true);
+              closeModal();
+            }
+          }, {
+            type: 'primary',
+            icon: <SaveSharpIcon />,
+            label: gettext('Save & Reload Later'),
+            onclick: () => {
+              resetPrefsToDefault(false);
+              closeModal();
+            }            
+          }
+        ];
+      }
+    );
+  };
+
+  const resetPrefsToDefault = (refresh = false) => {
+    api({
+      url: url_for('preferences.index'),
+      method: 'DELETE'
+    }).then(()=>{
+      if (refresh){
+        location.reload();
+        return true;
+      }
+      preferencesStore.cache();
+      pgAdmin.Browser.tree.destroy().then(
+        () => {
+          pgAdmin.Browser.Events.trigger(
+            'pgadmin-browser:tree:destroyed', undefined, undefined
+          );
+          return true;
+        }
+      );
+      props.closeModal();
+    }).catch((err) => {
+      pgAdmin.Browser.notifier.alert(err.response.data);
+    });
+  };
+
   return (
     <StyledBox height={'100%'}>
       <Box className='PreferencesComponent-root'>
@@ -639,6 +698,10 @@ export default function PreferencesComponent({ ...props }) {
             />
           </Box>
           <Box className='PreferencesComponent-actionBtn' marginLeft="auto">
+            <DefaultButton className='PreferencesComponent-buttonMargin' onClick={reset} startIcon={<SettingsBackupRestoreIcon />}>
+              {gettext('Reset all preferences')}
+            </DefaultButton>
+            <DefaultButton className='PreferencesComponent-buttonMargin' onClick={() => { props.closeModal();}} startIcon={<CloseSharpIcon onClick={() => { props.closeModal();}} />}>
             <DefaultButton className='PreferencesComponent-buttonMargin'
               onClick={() => { props.closeModal();}}
               startIcon={

web/pgadmin/static/js/helpers/ModalProvider.jsx

@@ -41,15 +41,31 @@ export function useModal() {
   return React.useContext(ModalContext);
 }
 
-function AlertContent({ text, confirm, okLabel = gettext('OK'), cancelLabel = gettext('Cancel'), onOkClick, onCancelClick }) {
+function renderExtraButtons(button) {
+  switch(button.type) {
+  case 'primary':
+    return <PrimaryButton className='Alert-margin' startIcon={button.icon} onClick={button.onclick}>{button.label}</PrimaryButton>;
+  case 'default':
+    return <DefaultButton className='Alert-margin' startIcon={button.icon} onClick={button.onclick}>{button.label}</DefaultButton>;
+  default:
+    return <DefaultButton className='Alert-margin' startIcon={button.icon} onClick={button.onclick}>{button.label}</DefaultButton>;
+  };
+}
+
+function AlertContent({ text, confirm, okLabel = gettext('OK'), cancelLabel = gettext('Cancel'), onOkClick, onCancelClick, extraButtons }) {
   return (
     <StyledBox display="flex" flexDirection="column" height="100%">
       <Box flexGrow="1" p={2}>{typeof (text) == 'string' ? HTMLReactParser(text) : text}</Box>
       <Box className='Alert-footer'>
         {confirm &&
           <DefaultButton startIcon={<CloseIcon />} onClick={onCancelClick} >{cancelLabel}</DefaultButton>
         }
-        <PrimaryButton className='Alert-margin' startIcon={<CheckRoundedIcon />} onClick={onOkClick} autoFocus={true} >{okLabel}</PrimaryButton>
+        {
+          extraButtons?.length ?
+            extraButtons.map(button=>renderExtraButtons(button))
+            :
+            <PrimaryButton className='Alert-margin' startIcon={<CheckRoundedIcon />} onClick={onOkClick} autoFocus={true} >{okLabel}</PrimaryButton>
+        }
       </Box>
     </StyledBox>
   );
@@ -61,6 +77,7 @@ AlertContent.propTypes = {
   onCancelClick: PropTypes.func,
   okLabel: PropTypes.string,
   cancelLabel: PropTypes.string,
+  extraButtons: PropTypes.array
 };
 
 function alert(title, text, onOkClick, okLabel = gettext('OK')) {
@@ -76,7 +93,7 @@ function alert(title, text, onOkClick, okLabel = gettext('OK')) {
   });
 }
 
-function confirm(title, text, onOkClick, onCancelClick, okLabel = gettext('Yes'), cancelLabel = gettext('No')) {
+function confirm(title, text, onOkClick, onCancelClick, okLabel = gettext('Yes'), cancelLabel = gettext('No'), extras = null) {
   // bind the modal provider before calling
   this.showModal(title, (closeModal) => {
     const onCancelClickClose = () => {
@@ -87,8 +104,9 @@ function confirm(title, text, onOkClick, onCancelClick, okLabel = gettext('Yes')
       onOkClick?.();
       closeModal();
     };
+    const extraButtons =  extras?.(closeModal);
     return (
-      <AlertContent text={text} confirm onOkClick={onOkClickClose} onCancelClick={onCancelClickClose} okLabel={okLabel} cancelLabel={cancelLabel} />
+      <AlertContent text={text} confirm onOkClick={onOkClickClose} onCancelClick={onCancelClickClose} okLabel={okLabel} cancelLabel={cancelLabel} extraButtons={extraButtons} />
     );
   });
 }

web/pgadmin/static/js/helpers/Notifier.jsx

@@ -175,10 +175,10 @@ class Notifier {
     this.modal.alert(title, text, onOkClick, okLabel);
   }
 
-  confirm(title, text, onOkClick, onCancelClick, okLabel=gettext('Yes'), cancelLabel=gettext('No')) {
+  confirm(title, text, onOkClick, onCancelClick, okLabel=gettext('Yes'), cancelLabel=gettext('No'), extras=null) {
     /* Use this if you want to use pgAdmin global notifier.
     Or else, if you want to use modal inside iframe only then use ModalProvider eg- query tool */
-    this.modal.confirm(title, text, onOkClick, onCancelClick, okLabel, cancelLabel);
+    this.modal.confirm(title, text, onOkClick, onCancelClick, okLabel, cancelLabel, extras);
   }
 
   showModal(title, content, modalOptions) {

web/pgadmin/utils/driver/psycopg3/connection.py

@@ -515,7 +515,8 @@ def _initialize(self, conn_id, **kwargs):
             cur,
             "SET DateStyle=ISO; "
             "SET client_min_messages=notice; "
-            "SELECT set_config('bytea_output','hex',false) FROM pg_settings"
+            "SELECT set_config('bytea_output','hex',false)"
+            " FROM pg_show_all_settings()"
             " WHERE name = 'bytea_output'; "
             "SET client_encoding='{0}';".format(postgres_encoding)
         )

web/pgadmin/utils/preferences.py

@@ -694,3 +694,20 @@ def migrate_user_preferences(self, pid, converter_func):
             pref.value = converter_func(pref.value)
 
         db.session.commit()
+
+    @classmethod
+    def reset(cls):
+        """
+        reset
+        Reset the preferences for the current user in the configuration table.
+        """
+        try:
+            db.session.query(UserPrefTable).filter(
+                UserPrefTable.uid == current_user.id).delete()
+            db.session.commit()
+        except Exception as e:
+            db.session.rollback()
+            current_app.logger.exception(e)
+            return False, str(e)
+
+        return True, None