From 03bf7016da12848ca62d345be7c306a41fb460be Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 2 Sep 2022 13:30:13 +0200 Subject: [PATCH 1/3] Decrease linter errors, keep commented tests warnings --- packages/web-app-external/tests/unit/app.spec.ts | 2 +- .../src/components/SideBar/Shares/FileLinks.vue | 4 ++-- .../src/components/SideBar/Shares/FileShares.vue | 2 +- packages/web-app-files/src/helpers/resource/copyMove.ts | 6 +++--- packages/web-app-files/src/store/actions.ts | 2 +- .../tests/unit/helpers/resource/copyMove.spec.ts | 4 ++-- packages/web-app-files/tests/unit/views/FilesDrop.spec.js | 2 +- packages/web-app-user-management/src/search/filter/index.ts | 2 +- .../src/composables/appDefaults/useAppFileHandling.ts | 1 - packages/web-runtime/src/container/bootstrap.ts | 4 ++-- packages/web-runtime/src/index.ts | 2 +- packages/web-runtime/src/services/uppyService.ts | 3 --- 12 files changed, 15 insertions(+), 19 deletions(-) diff --git a/packages/web-app-external/tests/unit/app.spec.ts b/packages/web-app-external/tests/unit/app.spec.ts index 39cf553c1c8..4994ce62287 100644 --- a/packages/web-app-external/tests/unit/app.spec.ts +++ b/packages/web-app-external/tests/unit/app.spec.ts @@ -113,7 +113,7 @@ describe('The app provider extension', () => { it('should show a loading spinner while loading', async () => { const makeRequest = jest.fn( () => - new Promise((resolve, reject) => { + new Promise((resolve) => { setTimeout(() => { resolve({ ok: true, diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue index 4d77e268c46..e527a9967c7 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue @@ -407,7 +407,7 @@ export default defineComponent({ const paramsToCreate = this.getParamsForLink(link) if (this.isPasswordEnforcedFor(link)) { - showQuickLinkPasswordModal({ store: this.$store }, async (newPassword) => { + showQuickLinkPasswordModal({ store: this.$store }, (newPassword) => { this.createLink({ params: { ...paramsToCreate, password: newPassword }, onError }) }) } else { @@ -419,7 +419,7 @@ export default defineComponent({ const params = this.getParamsForLink(link) if (!link.password && this.isPasswordEnforcedFor(link)) { - showQuickLinkPasswordModal({ store: this.$store }, async (newPassword) => { + showQuickLinkPasswordModal({ store: this.$store }, (newPassword) => { this.updatePublicLink({ params: { ...params, password: newPassword }, onSuccess }) }) } else { diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue index 8b38acb552a..7efa9e41a50 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue @@ -320,7 +320,7 @@ export default { ) } }, - async mounted() { + mounted() { if (this.showSpaceMembers) { this.loadSpaceMembersTask.perform() } diff --git a/packages/web-app-files/src/helpers/resource/copyMove.ts b/packages/web-app-files/src/helpers/resource/copyMove.ts index 4740d2bd29d..73243bf6522 100644 --- a/packages/web-app-files/src/helpers/resource/copyMove.ts +++ b/packages/web-app-files/src/helpers/resource/copyMove.ts @@ -269,7 +269,7 @@ export const resolveFileNameDuplicate = (name, extension, existingFiles, iterati return resolveFileNameDuplicate(name, extension, existingFiles, iteration + 1) } -const clientListFilesInFolder = async ( +const clientListFilesInFolder = ( client: any, webDavPath: string, depth: number, @@ -282,7 +282,7 @@ const clientListFilesInFolder = async ( return client.files.list(webDavPath, depth, DavProperties.Default) } -const clientMoveFilesInFolder = async ( +const clientMoveFilesInFolder = ( client: any, webDavPathSource: string, webDavPathTarget: string, @@ -301,7 +301,7 @@ const clientMoveFilesInFolder = async ( return client.files.move(webDavPathSource, webDavPathTarget, overwrite) } -const clientCopyFilesInFolder = async ( +const clientCopyFilesInFolder = ( client: any, webDavPathSource: string, webDavPathTarget: string, diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts index 0aa7f390b15..b2df13bbd6f 100644 --- a/packages/web-app-files/src/store/actions.ts +++ b/packages/web-app-files/src/store/actions.ts @@ -64,7 +64,7 @@ export default { { root: true } ) }, - async clearClipboardFiles(context) { + clearClipboardFiles(context) { context.commit('CLEAR_CLIPBOARD') }, async pasteSelectedFiles( diff --git a/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts index 35e10c91426..1af25d00314 100644 --- a/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts +++ b/packages/web-app-files/tests/unit/helpers/resource/copyMove.spec.ts @@ -42,14 +42,14 @@ describe('copyMove', () => { ])('should copy and move files if no conflicts exist', async (dataSet) => { const client = { files: { - list: async () => { + list: () => { return [] }, copy: jest.fn(), move: jest.fn() }, publicFiles: { - list: async () => { + list: () => { return [] }, copy: jest.fn(), diff --git a/packages/web-app-files/tests/unit/views/FilesDrop.spec.js b/packages/web-app-files/tests/unit/views/FilesDrop.spec.js index 990790a9133..86b086bd660 100644 --- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.js +++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.js @@ -15,7 +15,7 @@ localVue.use(GetTextPlugin, { localVue.prototype.$client.publicFiles = { PUBLIC_LINK_SHARE_OWNER: 'admin', // function is mocked because it should return a promise with a list of resources - list: async () => [ + list: () => [ { getProperty: jest.fn((val) => { if (val === DavProperty.PublicLinkPermission) { diff --git a/packages/web-app-user-management/src/search/filter/index.ts b/packages/web-app-user-management/src/search/filter/index.ts index 6fc9c964e3d..571908357b3 100644 --- a/packages/web-app-user-management/src/search/filter/index.ts +++ b/packages/web-app-user-management/src/search/filter/index.ts @@ -37,7 +37,7 @@ export default class Provider extends EventBus implements SearchProvider { } } - public activate(term: string): void { + public activate(): void { /* noop */ } diff --git a/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts b/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts index f0e492f5067..4e9714411fe 100644 --- a/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts +++ b/packages/web-pkg/src/composables/appDefaults/useAppFileHandling.ts @@ -13,7 +13,6 @@ interface AppFileHandlingOptions { publicLinkPassword: MaybeRef } -type QueryParameters = Record export interface AppFileHandlingResult { getUrlForResource(r: Resource): Promise revokeUrl(url: string): void diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts index d1ed25a0502..4bfb4266edf 100644 --- a/packages/web-runtime/src/container/bootstrap.ts +++ b/packages/web-runtime/src/container/bootstrap.ts @@ -305,7 +305,7 @@ export const announceUppyService = ({ vue }: { vue: VueConstructor }): void => { * @param store * @param router */ -export const announceAuthService = async ({ +export const announceAuthService = ({ vue, configurationManager, store, @@ -315,7 +315,7 @@ export const announceAuthService = async ({ configurationManager: ConfigurationManager store: Store router: VueRouter -}): Promise => { +}): void => { authService.initialize(configurationManager, clientService, store, router) set(vue, '$authService', authService) } diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts index bb7970f4ea0..d066a55fe44 100644 --- a/packages/web-runtime/src/index.ts +++ b/packages/web-runtime/src/index.ts @@ -82,7 +82,7 @@ export const renderSuccess = (): void => { (state, getters) => { return getters['runtime/auth/isUserContextReady'] }, - async (newValue, oldValue) => { + () => { // Load spaces to make them available across the application if (store.getters.capabilities?.spaces?.enabled) { const clientService = instance.$clientService diff --git a/packages/web-runtime/src/services/uppyService.ts b/packages/web-runtime/src/services/uppyService.ts index f132f61eeb0..23c1b630eff 100644 --- a/packages/web-runtime/src/services/uppyService.ts +++ b/packages/web-runtime/src/services/uppyService.ts @@ -35,16 +35,13 @@ export class UppyService { useTus({ tusMaxChunkSize, tusHttpMethodOverride, - tusExtension, onBeforeRequest }: { tusMaxChunkSize: number tusHttpMethodOverride: boolean - tusExtension: string onBeforeRequest: () => void }) { const chunkSize = tusMaxChunkSize || Infinity - const uploadDataDuringCreation = tusExtension.includes('creation-with-upload') const tusPluginOptions = { chunkSize: chunkSize, From 40d81f2d8b1c913e55d844eedab16d94f9f6cfb4 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 2 Sep 2022 13:43:42 +0200 Subject: [PATCH 2/3] Reset packages/web-runtime/src/services/uppyService.ts --- packages/web-runtime/src/services/uppyService.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/web-runtime/src/services/uppyService.ts b/packages/web-runtime/src/services/uppyService.ts index 23c1b630eff..f132f61eeb0 100644 --- a/packages/web-runtime/src/services/uppyService.ts +++ b/packages/web-runtime/src/services/uppyService.ts @@ -35,13 +35,16 @@ export class UppyService { useTus({ tusMaxChunkSize, tusHttpMethodOverride, + tusExtension, onBeforeRequest }: { tusMaxChunkSize: number tusHttpMethodOverride: boolean + tusExtension: string onBeforeRequest: () => void }) { const chunkSize = tusMaxChunkSize || Infinity + const uploadDataDuringCreation = tusExtension.includes('creation-with-upload') const tusPluginOptions = { chunkSize: chunkSize, From 28b307d9bf08974c179fbdf5857c207b41360826 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 2 Sep 2022 15:55:20 +0200 Subject: [PATCH 3/3] Fix tests --- .../web-app-files/src/views/FilesDrop.vue | 1 - .../tests/unit/views/FilesDrop.spec.js | 21 +++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue index 409691cc917..054566ee4de 100644 --- a/packages/web-app-files/src/views/FilesDrop.vue +++ b/packages/web-app-files/src/views/FilesDrop.vue @@ -133,7 +133,6 @@ export default defineComponent({ resolvePublicLink() { this.loading = true - this.$client.publicFiles .list(this.publicLinkToken, this.publicLinkPassword, DavProperties.PublicLink, '0') .then((files) => { diff --git a/packages/web-app-files/tests/unit/views/FilesDrop.spec.js b/packages/web-app-files/tests/unit/views/FilesDrop.spec.js index 86b086bd660..0d2910c5300 100644 --- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.js +++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.js @@ -15,16 +15,19 @@ localVue.use(GetTextPlugin, { localVue.prototype.$client.publicFiles = { PUBLIC_LINK_SHARE_OWNER: 'admin', // function is mocked because it should return a promise with a list of resources - list: () => [ - { - getProperty: jest.fn((val) => { - if (val === DavProperty.PublicLinkPermission) { - return linkRoleUploaderFolder.bitmask(false) + list: () => + new Promise((resolve) => { + resolve([ + { + getProperty: jest.fn((val) => { + if (val === DavProperty.PublicLinkPermission) { + return linkRoleUploaderFolder.bitmask(false) + } + return val + }) } - return val - }) - } - ], + ]) + }), // function takes token as an argument and is mocked because it should return some public link url getFileUrl: (token) => `http://some-url/${token}`, putFileContents: jest.fn()