Skip to content

Commit 438876e

Browse files
vitormattosvitormattos
authored
Merge pull request #7005 from LibreSign/backport/7004/stable33
[stable33] fix: nextcloud vue v9 compat
2 parents 6dc3b2b + 06311ef commit 438876e

18 files changed

Lines changed: 60 additions & 61 deletions

‎src/components/Draw/FileUpload.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
image-restriction="none"
3131
@change="change" />
3232
<div class="zoom-controls">
33-
<NcButton type="tertiary"
33+
<NcButton variant="tertiary"
3434
:aria-label="t('libresign', 'Decrease zoom level')"
3535
:title="t('libresign', 'Decrease zoom level')"
3636
:disabled="!hasImage"
@@ -39,7 +39,7 @@
3939
<NcIconSvgWrapper :path="mdiMagnifyMinusOutline" :size="20" />
4040
</template>
4141
</NcButton>
42-
<NcButton type="tertiary"
42+
<NcButton variant="tertiary"
4343
:aria-label="t('libresign', 'Increase zoom level')"
4444
:title="t('libresign', 'Increase zoom level')"
4545
:disabled="!hasImage"
@@ -48,7 +48,7 @@
4848
<NcIconSvgWrapper :path="mdiMagnifyPlusOutline" :size="20" />
4949
</template>
5050
</NcButton>
51-
<NcButton type="tertiary"
51+
<NcButton variant="tertiary"
5252
:aria-label="t('libresign', 'Fit image to frame')"
5353
:title="t('libresign', 'Fit image to frame')"
5454
:disabled="!hasImage"

‎src/components/FooterTemplateEditor.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="footer-template-section">
77
<p v-linkify="{ linkify: true, text: footerDescription }" class="footer-template-description" />
88
<div class="footer-template-header">
9-
<NcButton type="tertiary"
9+
<NcButton variant="tertiary"
1010
:aria-label="t('libresign', 'Show available variables')"
1111
@click="showVariablesDialog = true">
1212
<template #icon>
@@ -65,7 +65,7 @@
6565
@input="debouncedSaveDimensions" />
6666
<NcButton v-if="showResetDimensions"
6767
:aria-label="t('libresign', 'Reset dimensions')"
68-
type="tertiary"
68+
variant="tertiary"
6969
@click="resetDimensions">
7070
<template #icon>
7171
<NcIconSvgWrapper :path="mdiUndoVariant" :size="20" />

‎src/components/Request/IdentifySigner.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
:required="true"
3030
:error="nameHaveError"
3131
:helper-text="nameHelperText"
32-
@update:value="onNameChange" />
32+
@update:modelValue="onNameChange" />
3333

3434
<div v-if="signerSelected && showCustomMessage && !disabled" class="description-wrapper">
3535
<NcCheckboxRadioSwitch v-model="enableCustomMessage"

‎src/components/RightSidebar/EnvelopeFilesList.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
:helper-text="nameHelperText"
2525
:minlength="ENVELOPE_NAME_MIN_LENGTH"
2626
:maxlength="ENVELOPE_NAME_MAX_LENGTH"
27-
@update:value="onEnvelopeNameChange" />
27+
@update:modelValue="onEnvelopeNameChange" />
2828
<span v-if="isSavingName" class="saving-indicator">
2929
<NcLoadingIcon :size="20" />
3030
</span>
@@ -47,12 +47,12 @@
4747
</NcEmptyContent>
4848
<div v-else ref="scrollContainer" class="files-list" @scroll="onScroll">
4949
<div v-if="canDelete" class="files-list__header">
50-
<NcCheckboxRadioSwitch :checked="allSelected"
51-
@update:checked="toggleSelectAll">
50+
<NcCheckboxRadioSwitch :modelValue="allSelected"
51+
@update:modelValue="toggleSelectAll">
5252
{{ selectedCount > 0 ? t('libresign', '{count} selected', { count: selectedCount }) : t('libresign', 'Select all') }}
5353
</NcCheckboxRadioSwitch>
5454
<NcButton v-if="selectedCount > 0"
55-
type="error"
55+
variant="error"
5656
:disabled="hasLoading"
5757
@click="handleDeleteSelected">
5858
<template #icon>
@@ -67,8 +67,8 @@
6767
:details="file.statusText">
6868
<template #icon>
6969
<NcCheckboxRadioSwitch v-if="canDelete"
70-
:checked="isSelected(file.id)"
71-
@update:checked="toggleSelect(file.id)" />
70+
:modelValue="isSelected(file.id)"
71+
@update:modelValue="toggleSelect(file.id)" />
7272
<img v-if="getPreviewUrl(file)"
7373
:src="getPreviewUrl(file)"
7474
alt=""
@@ -114,7 +114,7 @@
114114
</div>
115115
<template #actions>
116116
<NcButton v-if="canAddFile"
117-
type="primary"
117+
variant="primary"
118118
:disabled="hasLoading"
119119
@click="addFileToEnvelope">
120120
<template #icon>

‎src/components/RightSidebar/RequestSignatureTab.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<NcCheckboxRadioSwitch v-if="showPreserveOrder && !isOriginalFileDeleted"
2525
v-model="preserveOrder"
2626
type="switch"
27-
@update:checked="onPreserveOrderChange">
27+
@update:modelValue="onPreserveOrderChange">
2828
{{ t('libresign', 'Sign in order') }}
2929
</NcCheckboxRadioSwitch>
3030
<NcButton v-if="showViewOrderButton && !isOriginalFileDeleted"
31-
type="tertiary"
31+
variant="tertiary"
3232
@click="showOrderDiagram = true">
3333
<template #icon>
3434
<NcIconSvgWrapper :path="mdiChartGantt" :size="20" />
@@ -43,7 +43,7 @@
4343
:label="t('libresign', 'Signing order')"
4444
type="number"
4545
:value="signer.signingOrder || 1"
46-
@update:value="updateSigningOrder(signer, $event)"
46+
@update:modelValue="updateSigningOrder(signer, $event)"
4747
@submit="confirmSigningOrder(signer); closeActions()"
4848
@blur="confirmSigningOrder(signer)">
4949
<template #icon>
@@ -89,7 +89,7 @@
8989
<NcFormBox v-if="isEnvelope" class="action-form-box">
9090
<NcButton
9191
wide
92-
type="secondary"
92+
variant="secondary"
9393
:disabled="hasLoading"
9494
@click="openManageFiles">
9595
<template #icon>

‎src/components/UploadProgress.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</p>
1515
</div>
1616
<NcButton class="upload-picker__cancel"
17-
type="tertiary"
17+
variant="tertiary"
1818
:aria-label="t('libresign', 'Cancel upload')"
1919
@click="$emit('cancel')">
2020
<template #icon>

‎src/env.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ declare module '*.vue' {
1111
export default component
1212
}
1313

14-
declare module '@nextcloud/vue/dist/Components/*.js' {
14+
declare module '@nextcloud/vue/components/*' {
1515
import type { DefineComponent } from 'vue'
1616
const component: DefineComponent
1717
export default component

‎src/views/Account/partials/Documents.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</div>
2626
<div class="document-actions">
2727
<NcButton v-if="doc.status === -1 && isAuthenticatedUser"
28-
type="tertiary"
28+
variant="tertiary"
2929
:aria-label="t('libresign', 'Choose from Files')"
3030
@click="toggleFilePicker(doc.file_type.key)">
3131
<template #icon>
@@ -34,7 +34,7 @@
3434
{{ t('libresign', 'Choose from Files') }}
3535
</NcButton>
3636
<NcButton v-if="doc.status === -1"
37-
type="tertiary"
37+
variant="tertiary"
3838
:aria-label="t('libresign', 'Upload file')"
3939
@click="inputFile(doc.file_type.key)">
4040
<template #icon>
@@ -43,7 +43,7 @@
4343
{{ t('libresign', 'Upload file') }}
4444
</NcButton>
4545
<NcButton v-if="doc.status !== -1"
46-
type="tertiary"
46+
variant="tertiary"
4747
:aria-label="t('libresign', 'Delete file')"
4848
@click="deleteFile(doc)">
4949
<template #icon>

‎src/views/CrlManagement/CrlManagement.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
</template>
1515
<NcActionInput v-model="filters.serialNumber"
1616
:label="t('libresign', 'Serial Number')"
17-
@update:value="onFilterChange">
17+
@update:modelValue="onFilterChange">
1818
<template #icon>
1919
<NcIconSvgWrapper :path="mdiMagnify" :size="20" />
2020
</template>
2121
</NcActionInput>
2222

2323
<NcActionInput v-model="filters.owner"
2424
:label="t('libresign', 'Owner')"
25-
@update:value="onFilterChange">
25+
@update:modelValue="onFilterChange">
2626
<template #icon>
2727
<NcIconSvgWrapper :path="mdiAccount" :size="20" />
2828
</template>
@@ -191,7 +191,7 @@
191191
</td>
192192
<td class="crl-table__cell--frozen-right">
193193
<NcButton v-if="entry.status === 'issued'"
194-
type="error"
194+
variant="error"
195195
@click="openRevokeDialog(entry)">
196196
{{ t('libresign', 'Revoke') }}
197197
</NcButton>
@@ -232,7 +232,7 @@
232232
<NcButton @click="closeCaWarningDialog">
233233
{{ t('libresign', 'Cancel') }}
234234
</NcButton>
235-
<NcButton type="error" @click="proceedToRevokeDialog">
235+
<NcButton variant="error" @click="proceedToRevokeDialog">
236236
{{ t('libresign', 'Yes, revoke CA') }}
237237
</NcButton>
238238
</div>
@@ -241,7 +241,7 @@
241241

242242
<NcDialog v-if="revokeDialog.open"
243243
:name="t('libresign', 'Revoke Certificate')"
244-
:can-close="!revokeDialog.loading"
244+
:no-close="revokeDialog.loading"
245245
@update:open="closeRevokeDialog">
246246
<div class="revoke-dialog">
247247
<NcNoteCard type="warning">
@@ -277,7 +277,7 @@
277277
@click="closeRevokeDialog">
278278
{{ t('libresign', 'Cancel') }}
279279
</NcButton>
280-
<NcButton type="error"
280+
<NcButton variant="error"
281281
:disabled="revokeDialog.loading"
282282
@click="confirmRevoke">
283283
<template #icon>

‎src/views/FilesList/FileEntry/FileEntryActions.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:boundaries-element="boundariesElement"
1010
:container="boundariesElement"
1111
:force-name="true"
12-
type="tertiary"
12+
variant="tertiary"
1313
v-model:open="openedMenu"
1414
@close="openedMenu = null"
1515
@closed="onMenuClosed">

0 commit comments

Comments
 (0)