mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-11-02 08:10:03 -06:00
Fixed the following SonarQube code smells:
1) Do not use Array index in keys. 2) Unnecessary escape character. 3) Rename this local variable to match the regular expression ^[_a-z][a-z0-9_]*$ 4) Remove the unused local variable.
This commit is contained in:
1 parent
3e713cf58b
commit
251bf05692
31 files changed
+136
-117
No files matched your search
@@ -175,11 +175,12 @@ export default function ProcessDetails({data}) {
|
||||
{logs == null && <span data-test="loading-logs">{gettext('Loading process logs...')}</span>}
|
||||
{logs?.length == 0 && gettext('No logs available.')}
|
||||
{logs?.map((log, i)=>{
|
||||
let id = logs.length-i;
|
||||
return <div ref={(el)=>{
|
||||
if(i==logs.length-1) {
|
||||
el?.scrollIntoView();
|
||||
}
|
||||
}} key={i} className={errRe.test(log) ? classes.logErr : ''}>{log}</div>;
|
||||
}} key={id} className={errRe.test(log) ? classes.logErr : ''}>{log}</div>;
|
||||
})}
|
||||
</Box>
|
||||
<Box display="flex" alignItems="center">
|
||||
|
||||
@@ -166,7 +166,7 @@ class DatabaseSchema extends BaseUISchema {
|
||||
}, {
|
||||
id: 'db_password', label: gettext('Password'), type: 'password',
|
||||
mode: ['create'], noEmpty: true,
|
||||
helpMessage: gettext('At least 8 printable ASCII characters. Cannot contain any of the following: / \(slash\), \'\(single quote\), "\(double quote\) and @ \(at sign\).')
|
||||
helpMessage: gettext('At least 8 printable ASCII characters. Cannot contain any of the following: / (slash), \'(single quote), "(double quote) and @ (at sign).')
|
||||
}, {
|
||||
id: 'db_confirm_password', label: gettext('Confirm password'),
|
||||
type: 'password',
|
||||
|
||||
@@ -104,7 +104,7 @@ export function FinalSummary(props) {
|
||||
|
||||
return summary.map((item, index) => {
|
||||
return (
|
||||
<Table key={index} className={clsx(tableClasses.table)}>
|
||||
<Table key={summaryHeader[index]} className={clsx(tableClasses.table)}>
|
||||
<TableHead>
|
||||
<TableRow>
|
||||
<TableCell colSpan={2}>{gettext(summaryHeader[index])}</TableCell>
|
||||
|
||||
@@ -311,7 +311,7 @@ class Filemanager():
|
||||
def __init__(self, trans_id, ss=''):
|
||||
self.trans_id = trans_id
|
||||
self.dir = get_storage_directory()
|
||||
self.sharedDir = get_storage_directory(shared_storage=ss)
|
||||
self.shared_dir = get_storage_directory(shared_storage=ss)
|
||||
|
||||
if self.dir is not None and isinstance(self.dir, list):
|
||||
self.dir = ""
|
||||
@@ -409,10 +409,10 @@ class Filemanager():
|
||||
last_ss_name = blueprint.last_storage.get()
|
||||
if last_ss_name and last_ss_name != MY_STORAGE \
|
||||
and len(config.SHARED_STORAGE) > 0:
|
||||
selectedDir = [sdir for sdir in config.SHARED_STORAGE if
|
||||
sdir['name'] == last_ss_name]
|
||||
last_ss = selectedDir[0]['path'] if len(
|
||||
selectedDir) == 1 else storage_dir
|
||||
selected_dir = [sdir for sdir in config.SHARED_STORAGE if
|
||||
sdir['name'] == last_ss_name]
|
||||
last_ss = selected_dir[0]['path'] if len(
|
||||
selected_dir) == 1 else storage_dir
|
||||
else:
|
||||
if last_ss_name != MY_STORAGE:
|
||||
last_dir = '/'
|
||||
@@ -770,8 +770,8 @@ class Filemanager():
|
||||
trans_data = Filemanager.get_trasaction_selection(self.trans_id)
|
||||
the_dir = None
|
||||
if config.SERVER_MODE:
|
||||
if self.sharedDir and len(config.SHARED_STORAGE) > 0:
|
||||
the_dir = self.sharedDir
|
||||
if self.shared_dir and len(config.SHARED_STORAGE) > 0:
|
||||
the_dir = self.shared_dir
|
||||
else:
|
||||
the_dir = self.dir
|
||||
|
||||
@@ -782,18 +782,16 @@ class Filemanager():
|
||||
the_dir, path, trans_data, file_type, show_hidden)
|
||||
return filelist
|
||||
|
||||
def check_access(self, ss, mode):
|
||||
if self.sharedDir:
|
||||
selectedDirList = [sdir for sdir in config.SHARED_STORAGE if
|
||||
sdir['name'] == ss]
|
||||
selectedDir = selectedDirList[0] if len(
|
||||
selectedDirList) == 1 else None
|
||||
def check_access(self, ss):
|
||||
if self.shared_dir:
|
||||
selected_dir_list = [sdir for sdir in config.SHARED_STORAGE if
|
||||
sdir['name'] == ss]
|
||||
selected_dir = selected_dir_list[0] if len(
|
||||
selected_dir_list) == 1 else None
|
||||
|
||||
if selectedDir:
|
||||
if selectedDir[
|
||||
'restricted_access'] and not current_user.has_role(
|
||||
"Administrator"):
|
||||
raise PermissionError(ACCESS_DENIED_MESSAGE)
|
||||
if selected_dir and selected_dir['restricted_access'] and \
|
||||
not current_user.has_role("Administrator"):
|
||||
raise PermissionError(ACCESS_DENIED_MESSAGE)
|
||||
|
||||
def rename(self, old=None, new=None):
|
||||
"""
|
||||
@@ -802,8 +800,8 @@ class Filemanager():
|
||||
if not self.validate_request('rename'):
|
||||
return unauthorized(self.ERROR_NOT_ALLOWED['Error'])
|
||||
|
||||
if self.sharedDir:
|
||||
the_dir = self.sharedDir
|
||||
if self.shared_dir:
|
||||
the_dir = self.shared_dir
|
||||
else:
|
||||
the_dir = self.dir if self.dir is not None else ''
|
||||
|
||||
@@ -848,8 +846,8 @@ class Filemanager():
|
||||
"""
|
||||
if not self.validate_request('delete'):
|
||||
return unauthorized(self.ERROR_NOT_ALLOWED['Error'])
|
||||
if self.sharedDir:
|
||||
the_dir = self.sharedDir
|
||||
if self.shared_dir:
|
||||
the_dir = self.shared_dir
|
||||
else:
|
||||
the_dir = self.dir if self.dir is not None else ''
|
||||
orig_path = "{0}{1}".format(the_dir, path)
|
||||
@@ -874,8 +872,8 @@ class Filemanager():
|
||||
if not self.validate_request('upload'):
|
||||
return unauthorized(self.ERROR_NOT_ALLOWED['Error'])
|
||||
|
||||
if self.sharedDir:
|
||||
the_dir = self.sharedDir
|
||||
if self.shared_dir:
|
||||
the_dir = self.shared_dir
|
||||
else:
|
||||
the_dir = self.dir if self.dir is not None else ''
|
||||
|
||||
@@ -1042,8 +1040,8 @@ class Filemanager():
|
||||
if not self.validate_request('create'):
|
||||
return unauthorized(self.ERROR_NOT_ALLOWED['Error'])
|
||||
|
||||
if self.sharedDir and len(config.SHARED_STORAGE) > 0:
|
||||
user_dir = self.sharedDir
|
||||
if self.shared_dir and len(config.SHARED_STORAGE) > 0:
|
||||
user_dir = self.shared_dir
|
||||
else:
|
||||
user_dir = self.dir if self.dir is not None else ''
|
||||
|
||||
@@ -1073,8 +1071,8 @@ class Filemanager():
|
||||
if not self.validate_request('download'):
|
||||
return unauthorized(self.ERROR_NOT_ALLOWED['Error'])
|
||||
|
||||
if self.sharedDir and len(config.SHARED_STORAGE) > 0:
|
||||
the_dir = self.sharedDir
|
||||
if self.shared_dir and len(config.SHARED_STORAGE) > 0:
|
||||
the_dir = self.shared_dir
|
||||
else:
|
||||
the_dir = self.dir if self.dir is not None else ''
|
||||
|
||||
@@ -1139,7 +1137,7 @@ def file_manager(trans_id):
|
||||
|
||||
if ss and mode in ['upload', 'rename', 'delete', 'addfolder', 'add',
|
||||
'permission']:
|
||||
my_fm.check_access(ss, mode)
|
||||
my_fm.check_access(ss)
|
||||
func = getattr(my_fm, mode)
|
||||
try:
|
||||
if mode in ['getfolder', 'download']:
|
||||
|
||||
@@ -81,7 +81,7 @@ export function ItemView({idx, row, selected, onItemSelect, onItemEnter, onEditC
|
||||
onEditComplete(row);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
let icon = <DescriptionIcon style={{fontSize: '2.5rem'}} />;
|
||||
if(row.file_type == 'dir') {
|
||||
icon = <FolderIcon style={{fontSize: '2.5rem'}} />;
|
||||
@@ -133,7 +133,7 @@ export default function GridView({items, operation, onItemSelect, onItemEnter})
|
||||
<Box flexGrow={1} overflow="hidden auto">
|
||||
<ul ref={gridRef} className={classes.grid}>
|
||||
{items.map((item, i)=>(
|
||||
<ItemView key={i} idx={i} row={item} selected={selectedIdx==i} onItemSelect={setSelectedIdx}
|
||||
<ItemView key={item.Filename} idx={i} row={item} selected={selectedIdx==i} onItemSelect={setSelectedIdx}
|
||||
onItemEnter={onItemEnter} onEditComplete={operation.idx==i ? onEditComplete : null} />)
|
||||
)}
|
||||
</ul>
|
||||
|
||||
Reference in new issue
Block a user