Merge pull request #7128 from LibreSign/fix/pending-code-from-main

vitormattos · web-flow · commit 0b6fcabdbc41 · 2026-03-05T13:31:11.000-03:00
fix: add pending code from main
diff --git a/src/components/Request/RequestPicker.vue b/src/components/Request/RequestPicker.vue
@@ -4,10 +4,32 @@
 -->
 <template>
 	<div v-if="canRequestSign">
-		<NcActions :menu-name="t('libresign', 'Request')"
-			:inline="inline ? 3 : 0"
-			:force-name="inline"
-			:class="{column: inline}"
+		<div v-if="inline" class="request-picker-buttons">
+			<NcButton variant="secondary"
+				@click="showModalUploadFromUrl()">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiLink" :size="20" />
+				</template>
+				{{ t('libresign', 'Upload from URL') }}
+			</NcButton>
+			<NcButton variant="secondary"
+				:title="envelopeEnabled ? t('libresign', 'Multiple files allowed') : null"
+				@click="openFilePicker">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiFolder" :size="20" />
+				</template>
+				{{ t('libresign', 'Choose from Files') }}
+			</NcButton>
+			<NcButton variant="secondary"
+				@click="uploadFile">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiUpload" :size="20" />
+				</template>
+				{{ t('libresign', 'Upload') }}
+			</NcButton>
+		</div>
+		<NcActions v-else
+			:menu-name="t('libresign', 'Request')"
 			:variant="variant"
 			v-model:open="openedMenu">
 			<template #icon>
@@ -16,22 +38,22 @@
 			<NcActionButton :wide="true"
 				@click="showModalUploadFromUrl()">
 				<template #icon>
-				<NcIconSvgWrapper :path="mdiLink" :size="20" />
+					<NcIconSvgWrapper :path="mdiLink" :size="20" />
 				</template>
 				{{ t('libresign', 'Upload from URL') }}
 			</NcActionButton>
 			<NcActionButton :wide="true"
 				:title="envelopeEnabled ? t('libresign', 'Multiple files allowed') : null"
 				@click="openFilePicker">
 				<template #icon>
-				<NcIconSvgWrapper :path="mdiFolder" :size="20" />
+					<NcIconSvgWrapper :path="mdiFolder" :size="20" />
 				</template>
 				{{ t('libresign', 'Choose from Files') }}
 			</NcActionButton>
 			<NcActionButton :wide="true"
 				@click="uploadFile">
 				<template #icon>
-				<NcIconSvgWrapper :path="mdiUpload" :size="20" />
+					<NcIconSvgWrapper :path="mdiUpload" :size="20" />
 				</template>
 				{{ t('libresign', 'Upload') }}
 			</NcActionButton>
@@ -451,9 +473,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.column {
+.request-picker-buttons {
 	display: flex;
-	gap: 12px; flex: 1;
+	gap: 12px;
 	flex-direction: column;
 	align-items: stretch;
 
diff --git a/src/services/SigningRequirementValidator.ts b/src/services/SigningRequirementValidator.ts
@@ -35,7 +35,6 @@ interface ValidatorConfig {
 	errors?: Array<{ code?: number; [key: string]: unknown }>
 	hasSignatures?: boolean
 	canCreateSignature?: boolean
-	signerHasSignRequest?: boolean
 	[key: string]: unknown
 }
 
@@ -122,10 +121,6 @@ export class SigningRequirementValidator {
 			return false
 		}
 
-		if (config.signerHasSignRequest) {
-			return true
-		}
-
 		const visibleElements = this.signStore.document?.visibleElements || []
 		return visibleElements.some(row => String(row.signRequestId) === String(signRequestId))
 	}
diff --git a/src/tests/services/SigningRequirementValidator.spec.ts b/src/tests/services/SigningRequirementValidator.spec.ts
@@ -162,9 +162,9 @@ describe('SigningRequirementValidator', () => {
 		expect(result).toBe(false)
 	})
 
-	it('requires createSignature even when document has no placed elements but canCreateSignature is true and user is signer', () => {
-		// When admin configures GRAPHIC_ONLY mode, canCreateSignature=true.
-		// The signer must draw their signature even if no element box was placed on the document.
+	it('does not require createSignature when signer has no placed visibleElements (clickToSign scenario)', () => {
+		// Regression: signerHasSignRequest shortcut was bypassing the visibleElements check,
+		// causing the draw modal to appear for clickToSign documents with no placed element boxes.
 		const stores = createStores({
 			signStore: {
 				document: {
@@ -179,10 +179,10 @@ describe('SigningRequirementValidator', () => {
 			stores.identificationDocumentStore,
 		)
 
-		// With no placed element AND canCreateSignature=true, we still need to create the signature
-		const result = validator.needsCreateSignature({ hasSignatures: false, canCreateSignature: true, signerHasSignRequest: true })
+		// No placed element → should NOT require createSignature, so the sign button is reachable
+		const result = validator.needsCreateSignature({ hasSignatures: false, canCreateSignature: true })
 
-		expect(result).toBe(true)
+		expect(result).toBe(false)
 	})
 
 	it('returns createSignature before clickToSign when no signature exists', () => {
diff --git a/src/tests/views/FilesList/FilesList.spec.ts b/src/tests/views/FilesList/FilesList.spec.ts
@@ -13,7 +13,6 @@ import { useUserConfigStore } from '../../../store/userconfig.js'
 
 vi.mock('@nextcloud/l10n', () => ({
 	t: vi.fn((_app: string, text: string) => text),
-	isRTL: vi.fn(() => false),
 }))
 
 vi.mock('@nextcloud/logger', () => ({
@@ -115,6 +114,13 @@ vi.mock('../../../views/FilesList/FilesListVirtual.vue', () => ({
 	},
 }))
 
+vi.mock('../../../views/FilesList/FileListFilters.vue', () => ({
+	default: {
+		name: 'FileListFilters',
+		template: '<div class="file-list-filters-stub" />',
+	},
+}))
+
 vi.mock('../../../components/Request/RequestPicker.vue', () => ({
 	default: {
 		name: 'RequestPicker',
@@ -150,8 +156,8 @@ describe('FilesList.vue rendering rules', () => {
 		await flushPromises()
 
 		expect(wrapper.vm.mdiFolder).toBeTruthy()
-		expect(wrapper.vm.mdiViewGrid).toBeTruthy()
-		expect(wrapper.vm.mdiViewList).toBeTruthy()
+		expect(wrapper.vm.mdiViewGridOutline).toBeTruthy()
+		expect(wrapper.vm.mdiFormatListBulletedSquare).toBeTruthy()
 		expect(wrapper.vm.mdiChevronDown).toBeTruthy()
 		expect(wrapper.vm.mdiChevronUp).toBeTruthy()
 		expect(wrapper.vm.mdiReload).toBeTruthy()
@@ -179,6 +185,27 @@ describe('FilesList.vue rendering rules', () => {
 		expect(firstChild.classList.contains('request-picker-stub')).toBe(true)
 	})
 
+	it('renders FileListFilters in the header before the grid toggle button', async () => {
+		const filesStore = useFilesStore()
+		vi.spyOn(filesStore, 'getAllFiles').mockResolvedValue({})
+
+		const wrapper = mountComponent()
+		await flushPromises()
+
+		const header = wrapper.find('.files-list__header')
+		const filterStub = header.find('.file-list-filters-stub')
+		const gridButton = header.find('.files-list__header-grid-button')
+
+		expect(filterStub.exists()).toBe(true)
+		expect(gridButton.exists()).toBe(true)
+
+		// FileListFilters must appear before the grid button in the DOM
+		const children = Array.from(header.element.children)
+		const filterIndex = children.findIndex(el => el.classList.contains('file-list-filters-stub'))
+		const gridIndex = children.findIndex(el => el.classList.contains('files-list__header-grid-button'))
+		expect(filterIndex).toBeLessThan(gridIndex)
+	})
+
 	it('calls filesStore.updateAllFiles once more when reload button is clicked', async () => {
 		const filesStore = useFilesStore()
 		vi.spyOn(filesStore, 'getAllFiles').mockResolvedValue({})
@@ -238,7 +265,7 @@ describe('FilesList.vue rendering rules', () => {
 
 		const gridButton = wrapper.find('.files-list__header-grid-button')
 		const iconWithPath = gridButton.findAll('.nc-icon').find((node) => !!node.attributes('data-path'))
-		expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewGrid)
+		expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewGridOutline)
 	})
 
 	it('renders list toggle icon path when in grid mode', async () => {
@@ -252,6 +279,6 @@ describe('FilesList.vue rendering rules', () => {
 
 		const gridButton = wrapper.find('.files-list__header-grid-button')
 		const iconWithPath = gridButton.findAll('.nc-icon').find((node) => !!node.attributes('data-path'))
-		expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiViewList)
+		expect(iconWithPath?.attributes('data-path')).toBe(wrapper.vm.mdiFormatListBulletedSquare)
 	})
 })
diff --git a/src/views/FilesList/FilesList.vue b/src/views/FilesList/FilesList.vue
@@ -49,8 +49,8 @@
 				variant="tertiary"
 				@click="toggleGridView">
 				<template #icon>
-					<NcIconSvgWrapper v-if="userConfigStore.files_list_grid_view" :path="mdiViewList" />
-					<NcIconSvgWrapper v-else :path="mdiViewGrid" />
+					<NcIconSvgWrapper v-if="userConfigStore.files_list_grid_view" :path="mdiFormatListBulletedSquare" />
+					<NcIconSvgWrapper v-else :path="mdiViewGridOutline" />
 				</template>
 			</NcButton>
 		</div>
@@ -96,9 +96,9 @@ import {
 	mdiChevronDown,
 	mdiChevronUp,
 	mdiFolder,
+	mdiFormatListBulletedSquare,
 	mdiReload,
-	mdiViewGrid,
-	mdiViewList,
+	mdiViewGridOutline,
 } from '@mdi/js'
 
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
@@ -147,9 +147,9 @@ export default {
 			mdiChevronDown,
 			mdiChevronUp,
 			mdiFolder,
+			mdiFormatListBulletedSquare,
 			mdiReload,
-			mdiViewGrid,
-			mdiViewList,
+			mdiViewGridOutline,
 		}
 	},
 	data() {
diff --git a/src/views/Settings/SignatureEngine.vue b/src/views/Settings/SignatureEngine.vue
@@ -42,7 +42,8 @@ export default {
 		options() {
 			return [
 				{ id: 'JSignPdf', label: 'JSignPdf' },
-				{ id: 'PhpNative', label: t('libresign', 'PHP native') },
+				// TRANSLATORS "Native" refers to a signature engine that runs directly with PHP, without requiring external runtimes like Java
+				{ id: 'PhpNative', label: t('libresign', 'Native') },
 			]
 		},
 		selectedOption: {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ interface ValidatorConfig {`
`35`	`35`	`errors?: Array<{ code?: number; [key: string]: unknown }>`
`36`	`36`	`hasSignatures?: boolean`
`37`	`37`	`canCreateSignature?: boolean`
`38`		`- signerHasSignRequest?: boolean`
`39`	`38`	`[key: string]: unknown`
`40`	`39`	`}`
`41`	`40`
`@@ -122,10 +121,6 @@ export class SigningRequirementValidator {`
`122`	`121`	`return false`
`123`	`122`	`}`
`124`	`123`
`125`		`- if (config.signerHasSignRequest) {`
`126`		`- return true`
`127`		`- }`
`128`		`-`
`129`	`124`	`const visibleElements = this.signStore.document?.visibleElements \|\| []`
`130`	`125`	`return visibleElements.some(row => String(row.signRequestId) === String(signRequestId))`
`131`	`126`	`}`