Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Merge requests
!1098
Resolve "Make progress page and search bar use GraphQL"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Make progress page and search bar use GraphQL"
735-make-progress-page-and-search-bar-use-graphql
into
master
Overview
18
Commits
18
Pipelines
12
Changes
32
Merged
Jonathan Weth
requested to merge
735-make-progress-page-and-search-bar-use-graphql
into
master
2 years ago
Overview
5
Commits
18
Pipelines
12
Changes
32
Expand
Closes
#735 (closed)
Edited
2 years ago
by
Jonathan Weth
0
0
Merge request reports
Compare
master
version 10
d7187243
2 years ago
version 9
0afff857
2 years ago
version 8
773f4570
2 years ago
version 7
4f260e18
2 years ago
version 6
313f2077
2 years ago
version 5
55041e81
2 years ago
version 4
6cf19698
2 years ago
version 3
49e9980b
2 years ago
version 2
c4258ad0
2 years ago
version 1
3ffeaf1e
2 years ago
master (base)
and
latest version
latest version
a6d6479e
18 commits,
2 years ago
version 10
d7187243
17 commits,
2 years ago
version 9
0afff857
15 commits,
2 years ago
version 8
773f4570
15 commits,
2 years ago
version 7
4f260e18
13 commits,
2 years ago
version 6
313f2077
12 commits,
2 years ago
version 5
55041e81
9 commits,
2 years ago
version 4
6cf19698
6 commits,
2 years ago
version 3
49e9980b
5 commits,
2 years ago
version 2
c4258ad0
4 commits,
2 years ago
version 1
3ffeaf1e
1 commit,
2 years ago
32 files
+
754
−
214
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
32
Search (e.g. *.vue) (Ctrl+P)
aleksis/core/assets/components/celery_progress/CeleryProgress.vue
0 → 100644
+
130
−
0
Options
<
template
>
<v-row>
<v-col
sm=
"0"
md=
"1"
lg=
"2"
xl=
"3"
/>
<v-col
sm=
"12"
md=
"10"
lg=
"8"
xl=
"6"
>
<v-card
:loading=
"$apollo.loading"
>
<v-card-title
v-if=
"progress"
>
{{
progress
.
meta
.
title
}}
</v-card-title>
<v-card-text
v-if=
"progress"
>
<v-progress-linear
:value=
"progress.progress.percent"
buffer-value=
"0"
color=
"primary"
class=
"mb-2"
stream
/>
<div
class=
"text-center mb-4"
>
{{
progress
.
meta
.
progressTitle
?
progress
.
meta
.
progressTitle
:
$t
(
"
celery_progress.progress_title
"
)
}}
</div>
<div
v-if=
"progress"
>
<message-box
v-for=
"(message, idx) in progress.messages"
dense
:type=
"message.tag"
transition=
"slide-x-transition"
:key=
"idx"
>
{{
message
.
message
}}
</message-box>
</div>
<message-box
v-if=
"progress.state === 'ERROR'"
dense
type=
"error"
transition=
"slide-x-transition"
>
{{
progress
.
meta
.
errorMessage
?
progress
.
meta
.
errorMessage
:
$t
(
"
celery_progress.error_message
"
)
}}
</message-box>
<message-box
v-if=
"progress.state === 'SUCCESS'"
dense
type=
"success"
transition=
"slide-x-transition"
>
{{
progress
.
meta
.
successMessage
?
progress
.
meta
.
successMessage
:
$t
(
"
celery_progress.success_message
"
)
}}
</message-box>
</v-card-text>
<v-card-actions
v-if=
"
progress &&
(progress.state === 'ERROR' || progress.state === 'SUCCESS')
"
>
<back-button
:href=
"progress.meta.backUrl"
text
/>
<v-spacer
/>
<v-btn
v-if=
"progress.meta.additionalButton"
:href=
"progress.meta.additionalButton.url"
text
color=
"primary"
>
<v-icon
v-if=
"progress.meta.additionalButton.icon"
left
>
{{
progress
.
meta
.
additionalButton
.
icon
}}
</v-icon>
{{
progress
.
meta
.
additionalButton
.
title
}}
</v-btn>
</v-card-actions>
</v-card>
</v-col>
<v-col
sm=
"0"
md=
"1"
lg=
"2"
xl=
"3"
/>
</v-row>
</
template
>
<
script
>
import
BackButton
from
"
../BackButton.vue
"
;
import
MessageBox
from
"
../MessageBox.vue
"
;
export
default
{
name
:
"
CeleryProgress
"
,
components
:
{
BackButton
,
MessageBox
},
apollo
:
{
celeryProgressByTaskId
:
{
query
:
require
(
"
./celeryProgress.graphql
"
),
variables
()
{
return
{
taskId
:
this
.
$route
.
params
.
taskId
,
};
},
pollInterval
:
1000
,
},
},
computed
:
{
progress
()
{
return
this
.
celeryProgressByTaskId
;
},
state
()
{
return
this
.
progress
?
this
.
progress
.
state
:
null
;
},
},
watch
:
{
state
(
newState
)
{
if
(
newState
===
"
SUCCESS
"
||
newState
===
"
ERROR
"
)
{
this
.
$apollo
.
queries
.
celeryProgressByTaskId
.
stopPolling
();
this
.
$apollo
.
mutate
({
mutation
:
require
(
"
./celeryProgressFetched.graphql
"
),
variables
:
{
taskId
:
this
.
$route
.
params
.
taskId
,
},
});
}
if
(
newState
===
"
SUCCESS
"
&&
this
.
progress
.
meta
.
redirectOnSuccessUrl
)
{
window
.
location
.
replace
(
this
.
progress
.
meta
.
redirectOnSuccessUrl
);
// FIXME this.$router.push(this.progress.meta.redirectOnSuccessUrl);
}
},
},
};
</
script
>
Loading