Fix directory owner update & UI issues. #8034

Author: RohitBhati8269

docs/en_US/directory_dialog.rst

@@ -4,7 +4,7 @@
 `Directory Dialog`:index:
 *************************
 
-Use the Directory dialog to Create an alias for a file system directory path.
+Use the Directory dialog to create an alias for a file system directory path.
 To create directories, you must have the CREATE ANY DIRECTORY system privilege.
 When you create a directory, you are automatically granted READ and WRITE privileges
 on the directory, and you can grant READ and WRITE privileges to other users and roles.

docs/en_US/images/directory_definition.png

@@ -303,7 +303,7 @@ def create(self, gid, sid):
 
             # To fetch the oid of newly created directory
             SQL = render_template(
-                "/".join([self.template_path, self._ALTER_SQL]),
+                "/".join([self.template_path, self._CREATE_SQL]),
                 directory=data['name'], conn=self.conn
             )
 
@@ -312,31 +312,6 @@ def create(self, gid, sid):
             if not status:
                 return internal_server_error(errormsg=dr_id)
 
-            SQL = render_template(
-                "/".join([self.template_path, self._ALTER_SQL]),
-                data=data, conn=self.conn
-            )
-
-            # Checking if we are not executing empty query
-            if SQL and SQL.strip('\n') and SQL.strip(' '):
-                status, res = self.conn.execute_scalar(SQL)
-                if not status:
-                    return jsonify(
-                        node=self.blueprint.generate_browser_node(
-                            dr_id,
-                            sid,
-                            data['name'],
-                            icon="icon-directory"
-                        ),
-                        success=0,
-                        errormsg=gettext(
-                            'Directory created successfully.'
-                        ),
-                        info=gettext(
-                            res
-                        )
-                    )
-
             return jsonify(
                 node=self.blueprint.generate_browser_node(
                     dr_id,
@@ -359,7 +334,7 @@ def update(self, gid, sid, dr_id):
         )
 
         try:
-            SQL, name = self.get_sql(gid, sid, data, dr_id)
+            SQL, diruser = self.get_sql(gid, sid, data, dr_id)
             # Most probably this is due to error
             if not isinstance(SQL, str):
                 return SQL
@@ -373,7 +348,7 @@ def update(self, gid, sid, dr_id):
                 node=self.blueprint.generate_browser_node(
                     dr_id,
                     sid,
-                    name,
+                    diruser,
                     icon="icon-%s" % self.node_type,
                 )
             )
@@ -524,13 +499,9 @@ def get_sql(self, gid, sid, data, dr_id=None):
                 "/".join([self.template_path, self._CREATE_SQL]),
                 data=data, conn=self.conn
             )
-            SQL += "\n"
-            SQL += render_template(
-                "/".join([self.template_path, self._ALTER_SQL]),
-                data=data, conn=self.conn
-            )
         SQL = re.sub('\n{2,}', '\n\n', SQL)
-        return SQL, data['name'] if 'name' in data else old_data['name']
+        diruser = data['diruser'] if 'diruser' in data else old_data['diruser']
+        return SQL, diruser
 
     @check_precondition
     def sql(self, gid, sid, dr_id):
@@ -565,11 +536,6 @@ def sql(self, gid, sid, dr_id):
                 "/".join([self.template_path, self._CREATE_SQL]),
                 data=old_data, conn=self.conn
             )
-            SQL += "\n"
-        SQL += render_template(
-            "/".join([self.template_path, self._ALTER_SQL]),
-            data=old_data, conn=self.conn
-        )
 
         sql_header = """
 -- Directory: {0}

docs/en_US/images/directory_general.png

@@ -14,8 +14,8 @@ import { isEmptyString } from '../../../../../../static/js/validators';
 export default class DirectorySchema extends BaseUISchema {
   constructor(getPrivilegeRoleSchema, treeNodeInfo, fieldOptions={}, initValues={}) {
     super({
+      diruser: undefined,
       name: undefined,
-      owner: undefined,
       path: undefined,
       diracl: [],
       ...initValues,

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

@@ -1,4 +1,24 @@
 {### SQL to create directory object ###}
 {% if data %}
+
 CREATE DIRECTORY {{ conn|qtIdent(data.name) }} AS {{ data.path|qtLiteral(conn) }};
-{% endif %}
+
+{### Owner on directory ###}
+{% if data.diruser %}
+ALTER DIRECTORY {{ conn|qtIdent(data.name) }}
+  OWNER TO {{ conn|qtIdent(data.diruser) }};
+{% endif %}
+
+{###  ACL on directory ###}
+{% if data.diracl %}
+{% for priv in data.diracl %}
+{{ PRIVILEGE.APPLY(conn, 'DIRECTORY', priv.grantee, data.name, priv.without_grant, priv.with_grant) }}
+{% endfor %}
+{% endif %}
+
+{% endif %}
+
+{# ======== The SQl Below will fetch id for given dataspace ======== #}
+{% if directory %}
+SELECT dir.oid FROM pg_catalog.edb_dir dir WHERE dirname = {{directory|qtLiteral(conn)}};
+{% endif %}