diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 21:11:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-26 21:11:17 +0300 |
| commit | 51ba1dfa3bed95ec8c3fdee9b682a7941c4c34cc (patch) | |
| tree | 9c59e7b5749341c43badbadf3685b1c51150d0f2 /app/assets/javascripts/artifacts | |
| parent | c86ec1d072338034a312bb4be0ff175892fa01b7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/artifacts')
| -rw-r--r-- | app/assets/javascripts/artifacts/components/job_artifacts_table.vue | 16 | ||||
| -rw-r--r-- | app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/artifacts/components/job_artifacts_table.vue b/app/assets/javascripts/artifacts/components/job_artifacts_table.vue index 7b11e4f17f3..1bbc38138e6 100644 --- a/app/assets/javascripts/artifacts/components/job_artifacts_table.vue +++ b/app/assets/javascripts/artifacts/components/job_artifacts_table.vue @@ -143,6 +143,15 @@ export default { if (!hasArtifacts) return; toggleDetails(); }, + downloadPath(job) { + return job.archive?.downloadPath; + }, + downloadButtonDisabled(job) { + return !job.archive?.downloadPath; + }, + browseButtonDisabled(job) { + return !job.browseArtifactsPath; + }, }, fields: [ { @@ -271,18 +280,19 @@ export default { <gl-button-group> <gl-button icon="download" - :disabled="!item.archive.downloadPath" - :href="item.archive.downloadPath" + :disabled="downloadButtonDisabled(item)" + :href="downloadPath(item)" :title="$options.i18n.download" :aria-label="$options.i18n.download" data-testid="job-artifacts-download-button" /> <gl-button icon="folder-open" + :disabled="browseButtonDisabled(item)" + :href="item.browseArtifactsPath" :title="$options.i18n.browse" :aria-label="$options.i18n.browse" data-testid="job-artifacts-browse-button" - disabled /> <gl-button icon="remove" diff --git a/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql b/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql index 685196e28d5..89a24d7891e 100644 --- a/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql +++ b/app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql @@ -37,6 +37,7 @@ query getJobArtifacts( shortSha commitPath finishedAt + browseArtifactsPath artifacts { nodes { id |