github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix TS errors in utils (#18463)

Browse Source
This commit is contained in:
Rijk van Zanten
2023-05-03 13:13:23 -04:00
committed by GitHub
parent 0e09186c5c
commit 5185006849
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/utils/is-permission-empty.ts
View File

@@ -1,4 +1,4 @@
import { Permission } from '../../../packages/shared/types';
import type { Permission } from '@directus/types';
export function isPermissionEmpty(perm: Permission): boolean {
return (

4
app/src/utils/parse-filter.ts
View File

@@ -1,12 +1,12 @@
import { useUserStore } from '@/stores/user';
import { Accountability } from '@directus/types';
import { Accountability, Filter } from '@directus/types';
import { parseFilter as parseFilterShared } from '@directus/utils';
import { Filter } from '@directus/types';
export function parseFilter(filter: Filter | null): Filter {
const userStore = useUserStore();
if (!userStore.currentUser) return filter ?? {};
if (!('id' in userStore.currentUser)) return filter ?? {};
const accountability: Accountability = {
role: userStore.currentUser.role.id,

1
app/src/utils/parse-preset.ts
View File

@@ -6,6 +6,7 @@ export function parsePreset(preset: Record<string, any> | null): Record<string,
const { currentUser } = useUserStore();
if (!currentUser) return preset ?? {};
if (!('id' in currentUser)) return preset ?? {};
const accountability: Accountability = {
role: currentUser.role.id,

5
app/src/utils/upload-file.ts
View File

@@ -2,6 +2,7 @@ import api from '@/api';
import emitter, { Events } from '@/events';
import { i18n } from '@/lang';
import { notify } from '@/utils/notify';
import type { AxiosProgressEvent } from 'axios';
import { unexpectedError } from './unexpected-error';
export async function uploadFile(
@@ -50,8 +51,8 @@ export async function uploadFile(
unexpectedError(err);
}
function onUploadProgress(progressEvent: { loaded: number; total: number }) {
const percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
function onUploadProgress(progressEvent: AxiosProgressEvent) {
const percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total!);
progressHandler(percentCompleted);
}
}