From c63c36b526f67208ff625a0f3aa314980c5b6bfb Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 8 Aug 2024 17:57:37 +0200
Subject: [PATCH] refactor: Adjust code for some Typescript errors

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 src/actions/DownloadLimitAction.ts    |  6 +++---
 src/admin.ts                          |  4 ++--
 src/components/DownloadLimitEntry.vue | 19 +++++++++++--------
 src/public.ts                         |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/actions/DownloadLimitAction.ts b/src/actions/DownloadLimitAction.ts
index e3ab702b..c37c5011 100644
--- a/src/actions/DownloadLimitAction.ts
+++ b/src/actions/DownloadLimitAction.ts
@@ -4,7 +4,7 @@
  */
 
 import { getCurrentUser } from '@nextcloud/auth'
-import { Type as ShareType } from '@nextcloud/sharing'
+import { ShareType } from '@nextcloud/sharing'
 
 import DownloadLimitEntry from '../components/DownloadLimitEntry.vue'
 
@@ -22,8 +22,8 @@ export class DownloadLimitAction {
 
 	get shareType() {
 		return [
-			ShareType.SHARE_TYPE_LINK,
-			ShareType.SHARE_TYPE_EMAIL,
+			ShareType.Link,
+			ShareType.Email,
 		]
 	}
 
diff --git a/src/admin.ts b/src/admin.ts
index 778aa6ee..16deb063 100644
--- a/src/admin.ts
+++ b/src/admin.ts
@@ -7,7 +7,7 @@ import Vue from 'vue'
 
 import AdminSettings from './views/AdminSettings.vue'
 
-new Vue({
-	el: '#admin-download-limit',
+const instance = new Vue({
 	render: h => h(AdminSettings),
 })
+instance.$mount('#admin-download-limit')
diff --git a/src/components/DownloadLimitEntry.vue b/src/components/DownloadLimitEntry.vue
index 29076dae..720a581c 100644
--- a/src/components/DownloadLimitEntry.vue
+++ b/src/components/DownloadLimitEntry.vue
@@ -34,10 +34,11 @@
 </template>
 
 <script lang="ts">
+import { showError } from '@nextcloud/dialogs'
+import { loadState } from '@nextcloud/initial-state'
+import { n, t } from '@nextcloud/l10n'
 import { defineComponent } from 'vue'
 import { Fragment } from 'vue-frag'
-import { loadState } from '@nextcloud/initial-state'
-import { showError } from '@nextcloud/dialogs'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
@@ -74,9 +75,9 @@ export default defineComponent({
 	data() {
 		return {
 			limitEnabled: false,
-			initialLimit: null,
+			initialLimit: null as number | null,
 			limit,
-			count: null,
+			count: null as number | null,
 			loading: false,
 			hasError: false,
 		}
@@ -84,11 +85,11 @@ export default defineComponent({
 
 	computed: {
 		remainingCount() {
-			return this.initialLimit - this.count
+			return (this.initialLimit ?? 0) - (this.count ?? 0)
 		},
 
 		helperText() {
-			if (this.limit > 0) {
+			if (this.limit && this.limit > 0) {
 				return ''
 			}
 			return t('files_downloadlimit', 'The minimum limit is 1')
@@ -129,13 +130,15 @@ export default defineComponent({
 	},
 
 	methods: {
+		n,
+		t,
+
 		handleUpdateLimit(limit: string) {
 			this.limit = Number(limit) // emitted <input> value is string so we parse it to number
 		},
 
 		async onSave() {
-			const isValid = typeof this.limit === 'number' && this.limit > 0
-			if (!isValid) {
+			if (typeof this.limit !== 'number' || this.limit <= 0) {
 				return
 			}
 
diff --git a/src/public.ts b/src/public.ts
index f60192e3..4338b7e8 100644
--- a/src/public.ts
+++ b/src/public.ts
@@ -59,7 +59,7 @@ window.addEventListener('DOMContentLoaded', () => {
 	}
 
 	// Adding double-download warning
-	const downloadButtons = document.querySelectorAll<HTMLAnchorElement>('a[href*="/download/"]') || []
+	const downloadButtons = Array.from(document.querySelectorAll<HTMLAnchorElement>('a[href*="/download/"]'))
 	new Set(downloadButtons).forEach(button => {
 		button.addEventListener('click', (event) => {
 			// Warn about download limits