Merge pull request #3874 from LibreSign/backport/3864/stable30

[stable30] chore: remove lodash-es
LibreSign · Nov 1, 2024 · 5c3c167 · 5c3c167
2 parents 361750c + d4594ae
commit 5c3c167
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
     "blueimp-md5": "^2.19.0",
     "crypto-js": "^4.2.0",
     "js-confetti": "^0.12.0",
-    "lodash-es": "^4.17.21",
     "pinia": "^2.2.5",
     "v-perfect-signature": "^1.4.0",
     "vue": "^2.7.16",

diff --git a/src/Components/Draw/FileUpload.vue b/src/Components/Draw/FileUpload.vue
@@ -58,7 +58,6 @@
 </template>
 
 <script>
-import { isEmpty } from 'lodash-es'
 import { Cropper } from 'vue-advanced-cropper'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
@@ -89,7 +88,7 @@ export default {
 	},
 	computed: {
 		hasImage() {
-			return !isEmpty(this.image)
+			return !!this.image
 		},
 	},
 	methods: {

diff --git a/src/Components/Draw/TextInput.vue b/src/Components/Draw/TextInput.vue
@@ -41,7 +41,6 @@
 
 <script>
 import '@fontsource/dancing-script'
-import { isEmpty } from 'lodash-es'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
@@ -66,7 +65,7 @@ export default {
 	}),
 	computed: {
 		isValid() {
-			return !isEmpty(this.value)
+			return !!this.value
 		},
 	},
 	watch: {

diff --git a/src/Components/Request/SignDetail/partials/PageNavigation.vue b/src/Components/Request/SignDetail/partials/PageNavigation.vue
@@ -17,8 +17,6 @@
 </template>
 
 <script>
-import { size } from 'lodash-es'
-
 import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 
 export default {
@@ -40,7 +38,7 @@ export default {
 	},
 	computed: {
 		size() {
-			return size(this.pages)
+			return this.pages.length
 		},
 		actual() {
 			return this.value

diff --git a/src/domains/files/service.js b/src/domains/files/service.js
@@ -2,7 +2,6 @@
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { deburr } from 'lodash-es'
 
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
@@ -11,8 +10,10 @@ import { generateOcsUrl } from '@nextcloud/router'
 import '@nextcloud/password-confirmation/dist/style.css' // Required for dialog styles
 
 // from https://gist.github.com/codeguy/6684588
-const slugfy = val =>
-	deburr(val)
+const slugfy = (val) =>
+	val
+		.normalize('NFD')
+		.replace(/[\u0300-\u036f]/g, '')
 		.toLowerCase()
 		.replace(/[^a-z0-9 -]/g, '') // remove invalid chars
 		.replace(/\s+/g, '-') // collapse whitespace and replace by -

diff --git a/src/domains/settings/service.js b/src/domains/settings/service.js
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 /* eslint-disable valid-jsdoc */
-import { isEmpty } from 'lodash-es'
 
 import axios from '@nextcloud/axios'
 import { confirmPassword } from '@nextcloud/password-confirmation'
@@ -30,7 +29,7 @@ const buildService = (http) => ({
 
 		const { data: { data } } = await http.put(url, { phone })
 
-		return { data, success: !isEmpty(data.phone) }
+		return { data, success: !!data.phone }
 	},
 })
 

diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
@@ -2,7 +2,6 @@
  * SPDX-FileCopyrightText: 2020-2024 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { defaults } from 'lodash-es'
 
 import { loadState } from '@nextcloud/initial-state'
 
@@ -11,10 +10,13 @@ const libresignState = loadState('libresign', 'config', {})
 export default {
 	namespaced: true,
 
-	state: defaults({}, libresignState?.settings || {}, {
-		hasSignatureFile: false,
-		identificationDocumentsFlow: false,
-		isApprover: false,
-		phoneNumber: '',
-	}),
+	state: {
+		...{
+			hasSignatureFile: false,
+			identificationDocumentsFlow: false,
+			isApprover: false,
+			phoneNumber: '',
+		},
+		...(libresignState?.settings || {}),
+	},
 }
diff --git a/src/views/Account/partials/Documents.vue b/src/views/Account/partials/Documents.vue
@@ -58,8 +58,6 @@
 </template>
 
 <script>
-import { find, get } from 'lodash-es'
-
 import axios from '@nextcloud/axios'
 import { showError, showWarning, showSuccess } from '@nextcloud/dialogs'
 import { FilePickerVue as FilePicker } from '@nextcloud/dialogs/filepicker.js'
@@ -77,7 +75,7 @@ const FILE_TYPE_INFO = {
 }
 
 const findDocumentByType = (list, type) => {
-	return find(list, row => get(row, ['file_type', 'type']) === type) || {
+	return list.find(row => row?.file_type?.type === type) || {
 		nodeId: 0,
 		uuid: '',
 		status: -1,