Skip to content

fix: no image from the cloud in the text editor on public links #3632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexAndBear merged 1 commit into from
Oct 12, 2026
Merged

fix: no image from the cloud in the text editor on public links #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions packages/web-pkg/src/editor/composables/useEditorActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useGettext } from 'vue3-gettext'
import { storeToRefs } from 'pinia'
import type { Resource } from '@opencloud-eu/web-client'
import { OcEmojiPicker } from '@opencloud-eu/design-system/components'
import { useModals, useThemeStore } from '../../composables'
import { useAuthStore, useModals, useThemeStore } from '../../composables'
import { useClientService, useGetMatchingSpace, useFolderLink } from '../../composables'
import FilePickerModal from '../../components/Modals/FilePickerModal.vue'
import EmojiPickerModal from '../../components/Modals/EmojiPickerModal.vue'
Expand Down Expand Up @@ -66,6 +66,8 @@ export function useEditorActions(state: TextEditorState) {
const { dispatchModal } = useModals()
const themeStore = useThemeStore()
const { currentTheme } = storeToRefs(themeStore)
// On public links, the file picker only shows the shared files.
const { publicLinkContextReady: isPublicLinkContext } = storeToRefs(useAuthStore())
const clientService = useClientService()
const { getMatchingSpace } = useGetMatchingSpace()
const { getParentFolderLink } = useFolderLink()
Expand Down Expand Up @@ -738,7 +740,7 @@ export function useEditorActions(state: TextEditorState) {
description: $gettext('Insert an image from your cloud files'),
icon: 'cloud-line',
keywords: ['image', 'picture', 'cloud'],
showInSlashCommands: true,
showInSlashCommands: !unref(isPublicLinkContext),
showInToolbar: false,
toolbarAction: (editor) => openCloudImagePicker(editor),
slashCommandAction: ({ editor, range }) => {
Expand All @@ -754,7 +756,11 @@ export function useEditorActions(state: TextEditorState) {
icon: 'image-line',
keywords: ['image', 'picture', 'upload', 'url', 'cloud'],
showInSlashCommands: false,
childActions: [imageUpload(), imageUrl(), imageCloud()],
childActions: [
imageUpload(),
imageUrl(),
...(unref(isPublicLinkContext) ? [] : [imageCloud()])
],
isActive: () => false
})

Expand Down
17 changes: 16 additions & 1 deletion packages/web-pkg/tests/unit/editor/composables/useEditorActions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { useEditorActions } from '../../../../src/editor/composables/useEditorAc
import type { TextEditorLinkPanelRequest, TextEditorState } from '../../../../src/editor/types'
import type { Resource } from '@opencloud-eu/web-client'
import { createTestingPinia } from '@opencloud-eu/web-test-helpers'
import { useModals } from '../../../../src/composables/piniaStores'
import { useAuthStore, useModals } from '../../../../src/composables/piniaStores'
import { createLinkExtension } from '../../../../src/editor/extensions/link'

function createState(): TextEditorState {
Expand Down Expand Up @@ -1090,6 +1090,21 @@ describe('useEditorActions', () => {
expect(childIds).toEqual(['image-upload', 'image-url', 'image-cloud'])
})

it('hides the cloud action on public links', () => {
const authStore = useAuthStore()
authStore.setPublicLinkContext({
publicLinkContextReady: true,
publicLinkToken: 'token',
publicLinkPassword: '',
publicLinkType: 'public-link'
})
const publicLinkActions = useEditorActions(createState())

const childIds = publicLinkActions.image().childActions?.map(({ id }) => id) || []
expect(childIds).toEqual(['image-upload', 'image-url'])
expect(publicLinkActions.imageCloud().showInSlashCommands).toBe(false)
})

it('provides "Insert from cloud" action for current resource', () => {
const cloudState = createState()
const cloudActions = useEditorActions(cloudState)
Expand Down
Loading