mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed issues related to porting of properties collection and dashboard.
refs #7132
This commit is contained in:
committed by
Akshay Joshi
parent
c4d61f5a55
commit
b397ba7787
@@ -8,7 +8,7 @@
|
||||
//////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
import { getNodeAjaxOptions,getNodeListByName } from '../../../../../../static/js/node_ajax';
|
||||
import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../static/js/node_ajax';
|
||||
import ExtensionsSchema from './extension.ui';
|
||||
|
||||
define('pgadmin.node.extension', [
|
||||
@@ -99,6 +99,7 @@ define('pgadmin.node.extension', [
|
||||
let nodeObj = pgAdmin.Browser.Nodes['extension'];
|
||||
return new ExtensionsSchema(
|
||||
{
|
||||
role:()=>getNodeListByName('role', treeNodeInfo, itemNodeData),
|
||||
extensionsList:()=>getNodeAjaxOptions('avails', nodeObj, treeNodeInfo, itemNodeData, { cacheLevel: 'server'},
|
||||
(data)=>{
|
||||
let res = [];
|
||||
|
||||
@@ -24,11 +24,13 @@ export default class ExtensionsSchema extends BaseUISchema {
|
||||
});
|
||||
fieldOptions = {
|
||||
extensionsList: [],
|
||||
role:[],
|
||||
schemaList: [],
|
||||
...fieldOptions,
|
||||
};
|
||||
this.extensionsList = fieldOptions.extensionsList;
|
||||
this.schemaList = fieldOptions.schemaList;
|
||||
this.role = fieldOptions.role;
|
||||
}
|
||||
|
||||
get idAttribute() {
|
||||
@@ -89,6 +91,12 @@ export default class ExtensionsSchema extends BaseUISchema {
|
||||
id: 'oid', label: gettext('OID'), type: 'text',
|
||||
mode: ['properties'],
|
||||
},
|
||||
{
|
||||
id: 'owner', label: gettext('Owner'),
|
||||
options: this.role,
|
||||
type: 'select',
|
||||
mode: ['properties'], controlProps: { allowClear: false},
|
||||
},
|
||||
{
|
||||
id: 'schema', label: gettext('Schema'), type: 'select',
|
||||
mode: ['properties', 'create', 'edit'], group: gettext('Definition'),
|
||||
|
||||
@@ -24,6 +24,7 @@ define('pgadmin.node.operator', [
|
||||
columns: ['name', 'owner', 'description'],
|
||||
canDrop: false,
|
||||
canDropCascade: false,
|
||||
canSelect: false
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ function(
|
||||
label: gettext('Partitions'),
|
||||
type: 'coll-partition',
|
||||
columns: [
|
||||
'name', 'schema', 'partition_value', 'is_partitioned', 'description',
|
||||
'name', 'schema', 'partition_scheme', 'partition_value', 'is_partitioned', 'description',
|
||||
],
|
||||
canDrop: SchemaChildTreeNode.isTreeItemOfChildOfSchema,
|
||||
canDropCascade: SchemaChildTreeNode.isTreeItemOfChildOfSchema,
|
||||
|
||||
Reference in New Issue
Block a user