Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/app/PersistableValues.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Certificate } from 'electron';

import { DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB } from '../constants';
import type { Download } from '../downloads/common';
import type { Server } from '../servers/common';
import type { WindowState } from '../ui/common';
Expand Down Expand Up @@ -106,9 +107,13 @@ type PersistableValues_4_13_0 = PersistableValues_4_11_0 & {
isDebugLoggingEnabled: boolean;
};

type PersistableValues_4_14_0 = PersistableValues_4_13_0 & {
e2ePdfPreviewSizeLimit: number;
};

export type PersistableValues = Pick<
PersistableValues_4_13_0,
keyof PersistableValues_4_13_0
PersistableValues_4_14_0,
keyof PersistableValues_4_14_0
>;

export const migrations = {
Expand Down Expand Up @@ -201,4 +206,8 @@ export const migrations = {
...before,
isDebugLoggingEnabled: false,
}),
'>=4.14.0': (before: PersistableValues_4_13_0): PersistableValues_4_14_0 => ({
...before,
e2ePdfPreviewSizeLimit: DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB,
}),
Comment thread
nazabucciarelli marked this conversation as resolved.
};
2 changes: 2 additions & 0 deletions src/app/selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,6 @@ export const selectPersistableValues = createStructuredSelector({
}: RootState) => isDetailedEventsLoggingEnabled,
isDebugLoggingEnabled: ({ isDebugLoggingEnabled }: RootState) =>
isDebugLoggingEnabled,
e2ePdfPreviewSizeLimit: ({ e2ePdfPreviewSizeLimit }: RootState) =>
e2ePdfPreviewSizeLimit,
});
1 change: 1 addition & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB = 10;
15 changes: 11 additions & 4 deletions src/documentViewer/ipc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ export const startDocumentViewerHandler = (): void => {
'document-viewer/open-window',
async (event, url, format, _options) => {
const validUrl = new URL(url);
const allowedProtocols = ['http:', 'https:'];
const allowedProtocols = ['http:', 'https:', 'blob:'];
if (!allowedProtocols.includes(validUrl.protocol)) {
return;
Comment thread
nazabucciarelli marked this conversation as resolved.
}

const eventOrigin = new URL(event.getURL()).origin;

if (validUrl.protocol === 'blob:') {
if (validUrl.origin === 'null' || validUrl.origin !== eventOrigin) {
return;
}
}

const server = select(({ servers }) =>
servers.find(
(s) => new URL(s.url).origin === new URL(event.getURL()).origin
)
servers.find((s) => new URL(s.url).origin === eventOrigin)
);
if (!server) {
return;
Expand Down
4 changes: 4 additions & 0 deletions src/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,10 @@
"debugLogging": {
"title": "Verbose Logging",
"description": "Writes all console output to the log file. When disabled, only errors and important messages are saved, keeping logs smaller and focused."
},
"e2ePdfPreviewSizeLimit": {
"title": "PDF preview size limit in encrypted rooms (MB)",
"description": "Encrypted files are loaded into memory for previews. Files larger than this limit will be downloaded directly."
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions src/servers/preload/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { setUserPresenceDetection } from '../../userPresence/preload';
import { setBadge } from './badge';
import { writeTextToClipboard } from './clipboard';
import { openDocumentViewer } from './documentViewer';
import { getE2ePdfPreviewSizeLimit } from './e2ePdfPreviewSizeLimit';
import { setFavicon } from './favicon';
import { setGitCommitHash } from './gitCommitHash';
import {
Expand Down Expand Up @@ -49,6 +50,7 @@ type ExtendedIRocketChatDesktop = IRocketChatDesktop & {
) => Promise<unknown>;
closeCustomNotification: (id: unknown) => void;
openInBrowser: (url: string) => void;
getE2ePdfPreviewSizeLimit: () => number;
};

declare global {
Expand Down Expand Up @@ -95,4 +97,5 @@ export const RocketChatDesktop: Window['RocketChatDesktop'] = {
openDocumentViewer,
openInBrowser,
reloadServer,
getE2ePdfPreviewSizeLimit,
};
6 changes: 6 additions & 0 deletions src/servers/preload/e2ePdfPreviewSizeLimit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB } from '../../constants';
import { safeSelect } from '../../store';

export const getE2ePdfPreviewSizeLimit = (): number =>
safeSelect(({ e2ePdfPreviewSizeLimit }) => e2ePdfPreviewSizeLimit) ??
DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB;
2 changes: 2 additions & 0 deletions src/store/rootReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { servers } from '../servers/reducers';
import { availableBrowsers } from '../ui/reducers/availableBrowsers';
import { currentView } from '../ui/reducers/currentView';
import { dialogs } from '../ui/reducers/dialogs';
import { e2ePdfPreviewSizeLimit } from '../ui/reducers/e2ePdfPreviewSizeLimit';
import { hasHideOnTrayNotificationShown } from '../ui/reducers/hasHideOnTrayNotificationShown';
import { isAddNewServersEnabled } from '../ui/reducers/isAddNewServersEnabled';
import { isDebugLoggingEnabled } from '../ui/reducers/isDebugLoggingEnabled';
Expand Down Expand Up @@ -111,6 +112,7 @@ export const rootReducer = combineReducers({
isVideoCallWindowPersistenceEnabled,
isDeveloperModeEnabled,
isDebugLoggingEnabled,
e2ePdfPreviewSizeLimit,
isDetailedEventsLoggingEnabled,
isVerboseOutlookLoggingEnabled,
updateChannel,
Expand Down
3 changes: 3 additions & 0 deletions src/ui/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ export const SETTINGS_SET_DETAILED_EVENTS_LOGGING_CHANGED =
'settings/set-detailed-events-logging-changed';
export const SETTINGS_SET_DEBUG_LOGGING_CHANGED =
'settings/set-debug-logging-changed';
export const SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED =
'settings/set-e2e-pdf-preview-size-limit-changed';
export const SET_HAS_TRAY_MINIMIZE_NOTIFICATION_SHOWN =
'notifications/set-has-tray-minimize-notification-shown';
export const VIDEO_CALL_WINDOW_OPEN_URL = 'video-call-window/open-url';
Expand Down Expand Up @@ -266,6 +268,7 @@ export type UiActionTypeToPayloadMap = {
[SETTINGS_SET_VERBOSE_OUTLOOK_LOGGING_CHANGED]: boolean;
[SETTINGS_SET_DETAILED_EVENTS_LOGGING_CHANGED]: boolean;
[SETTINGS_SET_DEBUG_LOGGING_CHANGED]: boolean;
[SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED]: number;
[SET_HAS_TRAY_MINIMIZE_NOTIFICATION_SHOWN]: boolean;
[VIDEO_CALL_WINDOW_OPEN_URL]: { url: string };
[DOWNLOADS_BACK_BUTTON_CLICKED]: string;
Expand Down
2 changes: 2 additions & 0 deletions src/ui/components/SettingsView/GeneralTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Box, FieldGroup } from '@rocket.chat/fuselage';

import { AvailableBrowsers } from './features/AvailableBrowsers';
import { ClearPermittedScreenCaptureServers } from './features/ClearPermittedScreenCaptureServers';
import { E2ePdfPreviewSizeLimit } from './features/E2ePdfPreviewSizeLimit';
import { FlashFrame } from './features/FlashFrame';
import { HardwareAcceleration } from './features/HardwareAcceleration';
import { InternalVideoChatWindow } from './features/InternalVideoChatWindow';
Expand Down Expand Up @@ -35,6 +36,7 @@ export const GeneralTab = () => (
<ThemeAppearance />
<AvailableBrowsers />
<OutlookCalendarSyncInterval />
<E2ePdfPreviewSizeLimit />
{!process.mas && <ClearPermittedScreenCaptureServers />}
</FieldGroup>
</Box>
Expand Down
74 changes: 74 additions & 0 deletions src/ui/components/SettingsView/features/E2ePdfPreviewSizeLimit.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import {
Field,
FieldLabel,
FieldHint,
InputBox,
Box,
} from '@rocket.chat/fuselage';
import type { ChangeEvent } from 'react';
import { useCallback, useId } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
import type { Dispatch } from 'redux';

import type { RootAction } from '../../../../store/actions';
import type { RootState } from '../../../../store/rootReducer';
import { SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED } from '../../../actions';

type E2ePdfPreviewSizeLimitProps = {
className?: string;
};

export const E2ePdfPreviewSizeLimit = (props: E2ePdfPreviewSizeLimitProps) => {
const e2ePdfPreviewSizeLimit = useSelector(
({ e2ePdfPreviewSizeLimit }: RootState) => e2ePdfPreviewSizeLimit
);
const dispatch = useDispatch<Dispatch<RootAction>>();
const { t } = useTranslation();

const handleChange = useCallback(
(event: ChangeEvent<HTMLInputElement>) => {
const value = parseInt(event.currentTarget.value, 10);
if (!isNaN(value) && value > 0) {
dispatch({
type: SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED,
payload: value,
});
}
},
[dispatch]
);

const id = useId();

return (
<Field className={props.className} marginBlock='x16'>
<Box
display='flex'
flexDirection='row'
justifyContent='space-between'
alignItems='flex-start'
>
<Box display='flex' flexDirection='column'>
<FieldLabel htmlFor={id}>
{t('settings.options.e2ePdfPreviewSizeLimit.title')}
</FieldLabel>
<FieldHint>
{t('settings.options.e2ePdfPreviewSizeLimit.description')}
</FieldHint>
</Box>
<Box display='flex' alignItems='center' style={{ paddingTop: '4px' }}>
<InputBox
id={id}
type='number'
min={1}
step={1}
value={e2ePdfPreviewSizeLimit}
onChange={handleChange}
style={{ maxWidth: '5rem' }}
/>
Comment thread
nazabucciarelli marked this conversation as resolved.
</Box>
</Box>
</Field>
);
};
21 changes: 21 additions & 0 deletions src/ui/reducers/e2ePdfPreviewSizeLimit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import type { Reducer } from 'redux';

import { APP_SETTINGS_LOADED } from '../../app/actions';
import { DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB } from '../../constants';
import type { ActionOf } from '../../store/actions';
import { SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED } from '../actions';

export const e2ePdfPreviewSizeLimit: Reducer<
number,
| ActionOf<typeof SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED>
| ActionOf<typeof APP_SETTINGS_LOADED>
> = (state = DEFAULT_E2E_PDF_PREVIEW_SIZE_LIMIT_MB, action) => {
switch (action.type) {
case APP_SETTINGS_LOADED:
return action.payload.e2ePdfPreviewSizeLimit ?? state;
case SETTINGS_SET_E2E_PDF_PREVIEW_SIZE_LIMIT_CHANGED:
return action.payload;
Comment thread
coderabbitai[bot] marked this conversation as resolved.
default:
return state;
}
};
Loading