♻️ front: minor cleanup and refactoring (#50)
This commit is contained in:
committed by
ericlinagora
parent
cf35692f06
commit
e6234f97e4
+3
-3
@@ -25,7 +25,7 @@ export const AccessLevelDropdown = ({
|
||||
labelOverrides,
|
||||
className,
|
||||
size,
|
||||
noRedBobMode,
|
||||
noRedWhenLevelNone,
|
||||
}: {
|
||||
disabled?: boolean;
|
||||
level: DriveFileAccessLevel | null;
|
||||
@@ -34,7 +34,7 @@ export const AccessLevelDropdown = ({
|
||||
labelOverrides?: { [key: string]: string };
|
||||
hiddenLevels?: DriveFileAccessLevelOrRemove[] | string[];
|
||||
size?: SelectSize,
|
||||
noRedBobMode?: boolean,
|
||||
noRedWhenLevelNone?: boolean,
|
||||
}) => {
|
||||
const createOption = (level: DriveFileAccessLevelOrRemove) =>
|
||||
!hiddenLevels?.includes(level) && <option value={level}>{(labelOverrides || {})[level] || translateAccessLevel(level)}</option>;
|
||||
@@ -43,7 +43,7 @@ export const AccessLevelDropdown = ({
|
||||
disabled={disabled}
|
||||
size={size}
|
||||
className={className + ' w-auto'}
|
||||
theme={(!noRedBobMode && level === 'none') ? 'rose' : 'outline'}
|
||||
theme={(!noRedWhenLevelNone && level === 'none') ? 'rose' : 'outline'}
|
||||
value={level || 'none'}
|
||||
onChange={e => onChange(e.target.value as DriveFileAccessLevel & 'remove')}
|
||||
>
|
||||
|
||||
@@ -74,7 +74,7 @@ const ChangePublicLinkAccessLevelRow = (props: {
|
||||
className='!p-0 leading-tight text-end !pr-8 border-none bg-transparent dark:bg-transparent'
|
||||
disabled={props.disabled}
|
||||
size={'sm'}
|
||||
noRedBobMode={true}
|
||||
noRedWhenLevelNone={true}
|
||||
level={props.level}
|
||||
hiddenLevels={['remove']}
|
||||
onChange={props.onChange}
|
||||
|
||||
@@ -2,13 +2,12 @@ import { Modal, ModalContent } from '@atoms/modal';
|
||||
import { useDriveItem } from '@features/drive/hooks/use-drive-item';
|
||||
import { useEffect } from 'react';
|
||||
import { atom, useRecoilState } from 'recoil';
|
||||
import { InternalAccessManager } from './internal-access';
|
||||
import { InternalUsersAccessManager } from './internal-users-access';
|
||||
import { useCurrentCompany } from '@features/companies/hooks/use-companies';
|
||||
import Languages from 'features/global/services/languages-service';
|
||||
import FeatureTogglesService, {
|
||||
FeatureNames,
|
||||
} from '@features/global/services/feature-toggles-service';
|
||||
import { changePublicLink, hasAnyPublicLinkAccess } from '@features/files/utils/access-info-helpers';
|
||||
|
||||
export type AccessModalType = {
|
||||
open: boolean;
|
||||
@@ -60,7 +59,7 @@ const AccessModalContent = (props: {
|
||||
>
|
||||
<div className={loading ? 'opacity-50' : ''}>
|
||||
{FeatureTogglesService.isActiveFeatureName(FeatureNames.COMPANY_SEARCH_USERS) && (
|
||||
<InternalAccessManager id={id} disabled={access !== 'manage'} onCloseModal={props.onCloseModal} />
|
||||
<InternalUsersAccessManager id={id} disabled={access !== 'manage'} onCloseModal={props.onCloseModal} />
|
||||
)}
|
||||
</div>
|
||||
</ModalContent>
|
||||
|
||||
+3
-3
@@ -17,7 +17,7 @@ import { InputDecorationIcon } from '@atoms/input/input-decoration-icon';
|
||||
import { AccessLevelDropdown } from '../../components/access-level-dropdown';
|
||||
import UserBlock from '@molecules/grouped-rows/user';
|
||||
|
||||
export const InternalAccessManager = ({
|
||||
export const InternalUsersAccessManager = ({
|
||||
id,
|
||||
disabled,
|
||||
onCloseModal,
|
||||
@@ -121,7 +121,7 @@ export const InternalAccessManager = ({
|
||||
<div className="shrink-0">
|
||||
<AccessLevelDropdown
|
||||
className="rounded-l-none !p-0 leading-tight text-end !pr-8 !pl-2 border-none bg-zinc-100 dark:bg-zinc-800"
|
||||
noRedBobMode={true}
|
||||
noRedWhenLevelNone={true}
|
||||
disabled={loading || disabled}
|
||||
hiddenLevels={['remove']}
|
||||
level={level}
|
||||
@@ -217,7 +217,7 @@ const UserAccessLevel = (props: {
|
||||
|
||||
: <AccessLevelDropdown
|
||||
disabled={loading || props.disabled || user?.id === currentUser?.id}
|
||||
noRedBobMode={true}
|
||||
noRedWhenLevelNone={true}
|
||||
level={(item && getUserAccessLevel(item, props.userId)) || "none"}
|
||||
onChange={level => item && update(changeUserAccess(item, props.userId, level === 'remove' ? false : level))}
|
||||
/>
|
||||
Reference in New Issue
Block a user