Merge branch 'release/v1.11.4' into release/v1.11.3
This commit is contained in:
commit
40dd354b18
155 changed files with 2390 additions and 2080 deletions
|
@ -119,14 +119,14 @@ export default ({ database, className }: Props) => {
|
|||
<Can action={'database.view_password'}>
|
||||
<div css={tw`mt-6`}>
|
||||
<Label>Password</Label>
|
||||
<CopyOnClick text={database.password}>
|
||||
<CopyOnClick text={database.password} showInNotification={false}>
|
||||
<Input type={'text'} readOnly value={database.password} />
|
||||
</CopyOnClick>
|
||||
</div>
|
||||
</Can>
|
||||
<div css={tw`mt-6`}>
|
||||
<Label>JDBC Connection String</Label>
|
||||
<CopyOnClick text={jdbcConnectionString}>
|
||||
<CopyOnClick text={jdbcConnectionString} showInNotification={false}>
|
||||
<Input type={'text'} readOnly value={jdbcConnectionString} />
|
||||
</CopyOnClick>
|
||||
</div>
|
||||
|
|
|
@ -16,12 +16,13 @@ import { bytesToString } from '@/lib/formatters';
|
|||
import styles from './style.module.css';
|
||||
|
||||
const Clickable: React.FC<{ file: FileObject }> = memo(({ file, children }) => {
|
||||
const [canRead] = usePermissions(['file.read']);
|
||||
const [canReadContents] = usePermissions(['file.read-content']);
|
||||
const directory = ServerContext.useStoreState((state) => state.files.directory);
|
||||
|
||||
const match = useRouteMatch();
|
||||
|
||||
return !canReadContents || (file.isFile && !file.isEditable()) ? (
|
||||
return (file.isFile && (!file.isEditable() || !canReadContents)) || (!file.isFile && !canRead) ? (
|
||||
<div className={styles.details}>{children}</div>
|
||||
) : (
|
||||
<NavLink
|
||||
|
|
|
@ -93,7 +93,7 @@ const MassActionsBar = () => {
|
|||
/>
|
||||
)}
|
||||
<Portal>
|
||||
<div className={'fixed bottom-0 mb-6 flex justify-center w-full z-50'}>
|
||||
<div className={'pointer-events-none fixed bottom-0 mb-6 flex justify-center w-full z-50'}>
|
||||
<Fade timeout={75} in={selectedFiles.length > 0} unmountOnExit>
|
||||
<div css={tw`flex items-center space-x-4 pointer-events-auto rounded p-4 bg-black/50`}>
|
||||
<Button onClick={() => setShowMove(true)}>Move</Button>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue