Skip to content
Draft
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ konnector-dev-config.json

# SWC
.swc

# CryptPad OnlyOffice vendor assets (installed via scripts/install-cryptpad-vendor.sh)
vendor/
4 changes: 4 additions & 0 deletions rsbuild.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ const mergedConfig = mergeRsbuildConfig(config, {
{
from: 'src/assets/favicons',
to: 'favicons'
},
{
from: 'vendor/cryptpad-onlyoffice',
to: 'vendor/cryptpad-onlyoffice'
}
]
}
Expand Down
37 changes: 37 additions & 0 deletions scripts/install-cryptpad-vendor.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash
set -euo pipefail

EDITOR_VERSION="v8.3.3.23+5"
X2T_VERSION="v8.3.0+0"

EDITOR_URL="https://github.com/cryptpad/onlyoffice-editor/releases/download/${EDITOR_VERSION}/onlyoffice-editor.zip"
X2T_URL="https://github.com/cryptpad/onlyoffice-x2t-wasm/releases/download/${X2T_VERSION}/x2t.zip"

VENDOR_DIR="vendor/cryptpad-onlyoffice"

# Resolve paths relative to project root
cd "$(dirname "$0")/.."

if [ -d "$VENDOR_DIR/editor" ] && [ -d "$VENDOR_DIR/x2t" ]; then
echo "vendor/cryptpad-onlyoffice/ already exists. Remove it first to re-install."
exit 0
fi

TMP_DIR=$(mktemp -d)
trap 'rm -rf "$TMP_DIR"' EXIT

echo "Downloading OnlyOffice editor ${EDITOR_VERSION}..."
curl -L -o "$TMP_DIR/editor.zip" "$EDITOR_URL"

echo "Downloading x2t-wasm ${X2T_VERSION}..."
curl -L -o "$TMP_DIR/x2t.zip" "$X2T_URL"

mkdir -p "$VENDOR_DIR"

echo "Extracting editor..."
unzip -q "$TMP_DIR/editor.zip" -d "$VENDOR_DIR/editor"

echo "Extracting x2t..."
unzip -q "$TMP_DIR/x2t.zip" -d "$VENDOR_DIR/x2t"

echo "Done. Installed to $VENDOR_DIR/"
1 change: 1 addition & 0 deletions src/lib/flags.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ const flagsList = () => {
flag('drive.hide-nextcloud-dev')
flag('drive.keyboard-shortcuts.enabled', true)
flag('drive.highlight-new-items.enabled', true)
flag('drive.office.cryptpad.enabled', true)
}
41 changes: 32 additions & 9 deletions src/modules/views/OnlyOffice/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
import { useOnlyOfficeContext } from '@/modules/views/OnlyOffice/OnlyOfficeProvider'
import Title from '@/modules/views/OnlyOffice/Title'
import View from '@/modules/views/OnlyOffice/View'
import CryptPadView from '@/modules/views/OnlyOffice/cryptpad/CryptPadView'

Check warning on line 13 in src/modules/views/OnlyOffice/Editor.jsx

View workflow job for this annotation

GitHub Actions / Build and publish

`@/modules/views/OnlyOffice/cryptpad/CryptPadView` import should occur after import of `@/modules/views/OnlyOffice/config`
import useCryptPadConfig from '@/modules/views/OnlyOffice/cryptpad/useCryptPadConfig'
import { FileDeletedModal } from '@/modules/views/OnlyOffice/components/FileDeletedModal'
import { FileDivergedModal } from '@/modules/views/OnlyOffice/components/FileDivergedModal'
import {
DEFAULT_EDITOR_TOOLBAR_HEIGHT_IOS,
DEFAULT_EDITOR_TOOLBAR_HEIGHT
} from '@/modules/views/OnlyOffice/config'
import useConfig from '@/modules/views/OnlyOffice/useConfig'
import { isCryptPadEnabled } from '@/modules/views/OnlyOffice/helpers'

const getEditorToolbarHeight = editorToolbarHeightFlag => {
if (Number.isInteger(editorToolbarHeightFlag)) {
Expand All @@ -28,8 +31,7 @@
}
}

export const Editor = () => {
const { config, status } = useConfig()
const EditorContent = ({ config, status, isCryptPad }) => {
const {
isEditorModeView,
hasFileDiverged,
Expand All @@ -42,7 +44,7 @@
if (status === 'error') return <Error />
if (status !== 'loaded' || !config) return <Loading />

const { serverUrl, apiUrl, docEditorConfig } = config
const { apiUrl, docEditorConfig } = config

const editorToolbarHeight = getEditorToolbarHeight(
flag('drive.onlyoffice.editorToolbarHeight')
Expand All @@ -60,16 +62,37 @@
}
className="u-flex u-flex-column u-p-0"
>
<View
id={new URL(serverUrl).hostname}
apiUrl={apiUrl}
docEditorConfig={docEditorConfig}
/>
{hasFileDiverged ? <FileDivergedModal /> : null}
{isCryptPad ? (
<CryptPadView apiUrl={apiUrl} docEditorConfig={docEditorConfig} />
) : (
<View
id={new URL(config.serverUrl).hostname}
apiUrl={apiUrl}
docEditorConfig={docEditorConfig}
/>
)}
{hasFileDiverged && !isCryptPad ? <FileDivergedModal /> : null}
{hasFileDeleted ? <FileDeletedModal /> : null}
</DialogContent>
</ViewerProvider>
)
}

const CryptPadEditor = () => {
const { config, status } = useCryptPadConfig()
return <EditorContent config={config} status={status} isCryptPad={true} />
}

const ServerEditor = () => {
const { config, status } = useConfig()
return <EditorContent config={config} status={status} isCryptPad={false} />
}

export const Editor = () => {
if (isCryptPadEnabled()) {
return <CryptPadEditor />
}
return <ServerEditor />
}

export default Editor
3 changes: 2 additions & 1 deletion src/modules/views/OnlyOffice/Editor.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jest.mock('cozy-client/dist/hooks/useFetchJSON', () => ({
jest.mock('modules/views/OnlyOffice/helpers', () => ({
...jest.requireActual('modules/views/OnlyOffice/helpers'),
isOfficeEnabled: jest.fn(),
isOfficeEditingEnabled: jest.fn()
isOfficeEditingEnabled: jest.fn(),
isCryptPadEnabled: jest.fn().mockReturnValue(false)
}))

jest.mock('cozy-ui/transpiled/react/providers/Breakpoints', () => ({
Expand Down
Loading
Loading