Skip to content

Commit 60d1d82

Browse files
denis-tingaikindenis-tingaikin
committed
run svelte check, fast formating and apply templates
Signed-off-by: denis-tingaikin <[email protected]>
1 parent 9cb9e88 commit 60d1d82

File tree

9 files changed

+74
-94
lines changed

9 files changed

+74
-94
lines changed

‎common/config/rush/pnpm-lock.yaml

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/drive-resources/src/components/DriveSpaceHeader.svelte

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
import { FileUploadOptions, getUploadHandlers, UploadHandler } from '@hcengineering/uploader'
2121
import drive from '../plugin'
2222
import { getFolderIdFromFragment } from '../navigation'
23-
import { showCreateDrivePopup, showCreateFolderPopup, uploadFilesToDrivePopup, getUploadOptionsByFragment } from '../utils'
23+
import {
24+
showCreateDrivePopup,
25+
showCreateFolderPopup,
26+
uploadFilesToDrivePopup,
27+
getUploadOptionsByFragment
28+
} from '../utils'
2429
import { getResource } from '@hcengineering/platform'
2530
import { onMount } from 'svelte'
2631

‎plugins/recorder-resources/src/uploader.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ export class TusUploader extends Uploader {
7070
}
7171

7272
public async cancel (): Promise<void> {
73-
return this.upload.abort()
73+
await this.upload.abort()
7474
}
7575
}

‎plugins/uploader-resources/src/___tests___/upload.test.ts

-23
This file was deleted.

‎plugins/uploader-resources/src/components/FileUploadExt.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
{#if $uploads.size > 0}
2121
<div class="flex-row-center flex-gap-2">
22-
{#each $uploads as [,value]}
22+
{#each [...$uploads.values()] as value}
2323
<FileUploadStatusBar upload={value} />
2424
{/each}
2525
</div>

‎plugins/uploader-resources/src/components/FileUploadStatusBar.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
{#if upload.error}
4242
<IconError size={'small'} fill={'var(--negative-button-default)'} />
4343
{:else}
44-
<ProgressCircle value={(upload.progress / Math.max(upload.files.size, 1))} size={'small'} primary />
44+
<ProgressCircle value={upload.progress / Math.max(upload.files.size, 1)} size={'small'} primary />
4545
{/if}
4646
<span>{(upload.progress / Math.max(upload.files.size, 1)).toFixed(1)}%</span>
4747
</div>

‎plugins/uploader-resources/src/components/FileUploadStatusPopup.svelte

+53-61
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@
1515

1616
<script lang="ts">
1717
import { getEmbeddedLabel } from '@hcengineering/platform'
18-
import {
19-
Button,
20-
IconClose,
21-
Label,
22-
ProgressCircle,
23-
Scroller,
24-
tooltip
25-
} from '@hcengineering/ui'
18+
import { Button, IconClose, Label, ProgressCircle, Scroller, tooltip } from '@hcengineering/ui'
2619
import { ObjectPresenter } from '@hcengineering/view-resources'
2720
import { createEventDispatcher, onMount } from 'svelte'
2821
@@ -53,7 +46,7 @@
5346
}
5447
5548
function handleCancelAll (): void {
56-
upload?.files.forEach(element => {
49+
upload?.files.forEach((element) => {
5750
if (element.cancel !== undefined) {
5851
element.cancel()
5952
}
@@ -76,7 +69,6 @@
7669
onMount(() => {
7770
return uploads.subscribe(updateState)
7871
})
79-
8072
</script>
8173

8274
<div class="antiPopup upload-popup">
@@ -108,63 +100,63 @@
108100
<Scroller>
109101
<div class="upload-popup__content flex-col flex-no-shrink flex-gap-4">
110102
{#if upload}
111-
{#each upload.files as [_, file] }
112-
{#if file.progress}
113-
<div class="upload-file-row flex-row-center justify-start flex-gap-4">
114-
<div class="upload-file-row__status w-4">
115-
{#if file.error}
116-
<IconError size={'small'} fill={'var(--negative-button-default)'} />
117-
{:else if file.finished}
118-
<IconCompleted size={'small'} fill={'var(--positive-button-default)'} />
119-
{:else}
120-
<ProgressCircle value={file.progress} size={'small'} primary />
121-
{/if}
122-
</div>
123-
124-
<div class="upload-file-row__content flex-col flex-gap-1">
125-
<div class="label overflow-label" use:tooltip={{ label: getEmbeddedLabel(file.name) }}>{file.name}</div>
126-
<div class="flex-row-center flex-gap-2 text-sm">
103+
{#each [...upload.files.values()] as file}
104+
{#if file.progress}
105+
<div class="upload-file-row flex-row-center justify-start flex-gap-4">
106+
<div class="upload-file-row__status w-4">
127107
{#if file.error}
128-
<Label label={uploader.status.Error} />
129-
<span class="label overflow-label" use:tooltip={{ label: getEmbeddedLabel(error) }}>{error}</span>
130-
{:else if file.progress > 0}
131-
{#if file.finished}
132-
<Label label={uploader.status.Completed} />
133-
{:else}
134-
<Label label={uploader.status.Uploading} />
135-
<span>file.progress</span>
108+
<IconError size={'small'} fill={'var(--negative-button-default)'} />
109+
{:else if file.finished}
110+
<IconCompleted size={'small'} fill={'var(--positive-button-default)'} />
111+
{:else}
112+
<ProgressCircle value={file.progress} size={'small'} primary />
113+
{/if}
114+
</div>
115+
116+
<div class="upload-file-row__content flex-col flex-gap-1">
117+
<div class="label overflow-label" use:tooltip={{ label: getEmbeddedLabel(file.name) }}>{file.name}</div>
118+
<div class="flex-row-center flex-gap-2 text-sm">
119+
{#if file.error}
120+
<Label label={uploader.status.Error} />
121+
<span class="label overflow-label" use:tooltip={{ label: getEmbeddedLabel(file.error) }}>{file.error}</span>
122+
{:else if file.progress > 0}
123+
{#if file.finished}
124+
<Label label={uploader.status.Completed} />
125+
{:else}
126+
<Label label={uploader.status.Uploading} />
127+
<span>file.progress</span>
136128
{/if}
137129
{/if}
130+
</div>
138131
</div>
139-
</div>
140132

141-
<div class="upload-file-row__tools flex-row-center">
142-
{#if file.error}
143-
<Button
144-
kind={'icon'}
145-
icon={IconRetry}
146-
iconProps={{ size: 'small' }}
147-
showTooltip={{ label: uploader.string.Retry }}
148-
on:click={() => {
149-
handleRetryFile(file)
150-
}}
151-
/>
152-
{/if}
153-
{#if !file.finished}
154-
<Button
155-
kind={'icon'}
156-
icon={IconClose}
157-
iconProps={{ size: 'small' }}
158-
showTooltip={{ label: uploader.string.Cancel }}
159-
on:click={() => {
160-
handleCancelFile(file)
161-
}}
162-
/>
163-
{/if}
133+
<div class="upload-file-row__tools flex-row-center">
134+
{#if file.error}
135+
<Button
136+
kind={'icon'}
137+
icon={IconRetry}
138+
iconProps={{ size: 'small' }}
139+
showTooltip={{ label: uploader.string.Retry }}
140+
on:click={() => {
141+
handleRetryFile(file)
142+
}}
143+
/>
144+
{/if}
145+
{#if !file.finished}
146+
<Button
147+
kind={'icon'}
148+
icon={IconClose}
149+
iconProps={{ size: 'small' }}
150+
showTooltip={{ label: uploader.string.Cancel }}
151+
on:click={() => {
152+
handleCancelFile(file)
153+
}}
154+
/>
155+
{/if}
156+
</div>
164157
</div>
165-
</div>
166-
{/if}
167-
{/each}
158+
{/if}
159+
{/each}
168160
{/if}
169161
</div>
170162
</Scroller>

‎plugins/uploader-resources/src/store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export function trackUpload (upload: Upload): void {
5151

5252
/** @public */
5353
export function updateUploads (): void {
54-
uploads.update(m => m)
54+
uploads.update((m) => m)
5555
}
5656

5757
/** @public */

‎plugins/uploader-resources/src/utils.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ export async function uploadFiles (files: File[] | FileList, options: FileUpload
8181
if (items.length === 0) {
8282
return
8383
}
84-
const upload: Upload = { uuid: generateFileId(), progress: 0, target: options?.showProgress?.target, files: new Map<string, FileUpload>() }
84+
const upload: Upload = {
85+
uuid: generateFileId(),
86+
progress: 0,
87+
target: options?.showProgress?.target,
88+
files: new Map<string, FileUpload>()
89+
}
8590

8691
const limiter = new RateLimiter(options.maxNumberOfFiles ?? 10)
8792
for (let i = 0; i < files.length; i++) {
@@ -140,7 +145,7 @@ export async function uploadFile (
140145
const prev = fileUpload.progress
141146
const percentComplete = (event.loaded / event.total) * 100
142147
fileUpload.progress = percentComplete
143-
upload.progress += (fileUpload.progress - prev)
148+
upload.progress += fileUpload.progress - prev
144149
updateUploads()
145150
}
146151
}

0 commit comments

Comments
 (0)