refactor: Adjust code for some Typescript errors #344
Conversation
| ShareType.SHARE_TYPE_LINK, | ||
| ShareType.SHARE_TYPE_EMAIL, | ||
| ShareType.Link, | ||
| ShareType.Email, |
There was a problem hiding this comment.
Lets use the non deprecated variant :)
| render: h => h(AdminSettings), | ||
| }) | ||
| instance.$mount('#admin-download-limit') |
There was a problem hiding this comment.
Makes no technical difference, but silences ESLint without needing a comment
| @@ -74,21 +75,21 @@ export default defineComponent({ | |||
| data() { | |||
| return { | |||
| limitEnabled: false, | |||
| initialLimit: null, | |||
| initialLimit: null as number | null, | |||
There was a problem hiding this comment.
Otherwise the inferred type is just null
| loading: false, | ||
| hasError: false, | ||
| } | ||
| }, | ||
|
|
||
| computed: { | ||
| remainingCount() { | ||
| return this.initialLimit - this.count | ||
| return (this.initialLimit ?? 0) - (this.count ?? 0) |
There was a problem hiding this comment.
Math is not possible with null as null is an object in JavaScript
| }, | ||
|
|
||
| helperText() { | ||
| if (this.limit > 0) { | ||
| if (this.limit && this.limit > 0) { |
There was a problem hiding this comment.
Could be null, null can not be compared with number (strictly in TS)
| 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) { |
There was a problem hiding this comment.
With that helper Typescript can not type check the limit property, so directly using it in the if allows Typescript to narrow down the type further down the function :)
| @@ -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/"]')) | |||
There was a problem hiding this comment.
querySelectorAll does not return an array but a NodeList, so passing it to a Set works only if the browser likes you 😅
|
/compile rebase-amend / |
Signed-off-by: Ferdinand Thiessen <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
nextcloud-command
force-pushed
the
fix/typescript
branch
from
c63c36b
to
185fc97
Compare
No description provided.