Skip to content

Commit 0fe9877

Browse files
committed
refactor: align validation signing progress with OpenAPI
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent 8dc21db commit 0fe9877

1 file changed

Lines changed: 13 additions & 31 deletions

File tree

src/components/validation/SigningProgress.vue

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -71,30 +71,8 @@ import type { components } from '../../types/openapi/openapi'
7171
7272
type OpenApiNextcloudFile = components['schemas']['DetailedFileResponse']
7373
type OpenApiSigner = components['schemas']['SignerDetail']
74-
75-
type ProgressFile = {
76-
id: number
77-
name: string
78-
status: number
79-
statusText?: string
80-
error?: {
81-
message?: string
82-
code?: number
83-
timestamp?: string
84-
fileId?: number
85-
signRequestId?: number
86-
signRequestUuid?: string
87-
} | null
88-
}
89-
90-
type ProgressState = {
91-
total?: number
92-
signed?: number
93-
pending?: number
94-
inProgress?: number
95-
errors?: number
96-
files?: ProgressFile[]
97-
}
74+
type ProgressFile = components['schemas']['ProgressFile']
75+
type ProgressState = components['schemas']['ProgressPayload']
9876
9977
type ValidationDocument = {
10078
id?: OpenApiNextcloudFile['id'] | string | number
@@ -116,13 +94,11 @@ type StatusMeta = {
11694
}
11795
11896
type PollResponse = {
119-
status?: string
120-
statusCode?: number | null
97+
status?: components['schemas']['ProgressResponse']['status']
98+
statusCode?: components['schemas']['ProgressResponse']['statusCode'] | null
12199
progress?: ProgressState
122-
error?: {
123-
message?: string
124-
}
125-
file?: unknown
100+
error?: components['schemas']['ProgressResponse']['error']
101+
file?: components['schemas']['ProgressResponse']['file'] | unknown
126102
}
127103
128104
defineOptions({
@@ -301,7 +277,12 @@ function buildProgressFromValidation(doc: ValidationDocument | null | undefined)
301277
&& typeof file.name === 'string'
302278
&& typeof file.status === 'number'
303279
})
304-
.map(file => ({ id: file.id, name: file.name, status: file.status }))
280+
.map(file => ({
281+
id: file.id,
282+
name: file.name,
283+
status: file.status,
284+
statusText: getStatusMeta(file.status).label,
285+
}))
305286
const total = files.length
306287
const signed = files.filter(file => file.status === 3).length
307288
const inProgress = files.filter(file => file.status === 5).length
@@ -320,6 +301,7 @@ function buildProgressFromValidation(doc: ValidationDocument | null | undefined)
320301
return {
321302
total,
322303
signed,
304+
inProgress: 0,
323305
pending: total - signed,
324306
}
325307
}

0 commit comments

Comments
 (0)