diff options
Diffstat (limited to 'app/assets/javascripts/jobs')
7 files changed, 30 insertions, 24 deletions
diff --git a/app/assets/javascripts/jobs/components/artifacts_block.vue b/app/assets/javascripts/jobs/components/artifacts_block.vue index 0bce860df91..b2f9bf2a348 100644 --- a/app/assets/javascripts/jobs/components/artifacts_block.vue +++ b/app/assets/javascripts/jobs/components/artifacts_block.vue @@ -17,11 +17,14 @@ export default { }, computed: { isExpired() { - return this.artifact.expired; + return this.artifact?.expired && !this.isLocked; + }, + isLocked() { + return this.artifact?.locked; }, // Only when the key is `false` we can render this block willExpire() { - return this.artifact.expired === false; + return this.artifact?.expired === false && !this.isLocked; }, }, }; @@ -29,42 +32,45 @@ export default { <template> <div class="block"> <div class="title font-weight-bold">{{ s__('Job|Job artifacts') }}</div> - <p v-if="isExpired || willExpire" - :class="{ - 'js-artifacts-removed': isExpired, - 'js-artifacts-will-be-removed': willExpire, - }" class="build-detail-row" + data-testid="artifacts-remove-timeline" > <span v-if="isExpired">{{ s__('Job|The artifacts were removed') }}</span> <span v-if="willExpire">{{ s__('Job|The artifacts will be removed') }}</span> <timeago-tooltip v-if="artifact.expire_at" :time="artifact.expire_at" /> </p> - + <p v-else-if="isLocked" class="build-detail-row"> + <span data-testid="job-locked-message">{{ + s__( + 'Job|These artifacts are the latest. They will not be deleted (even if expired) until newer artifacts are available.', + ) + }}</span> + </p> <div class="btn-group d-flex prepend-top-10" role="group"> <gl-link v-if="artifact.keep_path" :href="artifact.keep_path" - class="js-keep-artifacts btn btn-sm btn-default" + class="btn btn-sm btn-default" data-method="post" + data-testid="keep-artifacts" >{{ s__('Job|Keep') }}</gl-link > - <gl-link v-if="artifact.download_path" :href="artifact.download_path" - class="js-download-artifacts btn btn-sm btn-default" + class="btn btn-sm btn-default" download rel="nofollow" + data-testid="download-artifacts" >{{ s__('Job|Download') }}</gl-link > - <gl-link v-if="artifact.browse_path" :href="artifact.browse_path" - class="js-browse-artifacts btn btn-sm btn-default" + class="btn btn-sm btn-default" + data-testid="browse-artifacts" >{{ s__('Job|Browse') }}</gl-link > </div> diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue index 88649ddbdb7..72a5ff01672 100644 --- a/app/assets/javascripts/jobs/components/commit_block.vue +++ b/app/assets/javascripts/jobs/components/commit_block.vue @@ -53,6 +53,6 @@ export default { </span> </p> - <p class="append-bottom-0">{{ commit.title }}</p> + <p class="gl-mb-0">{{ commit.title }}</p> </div> </template> diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue index 28cc03c88cb..c34a3488dbd 100644 --- a/app/assets/javascripts/jobs/components/environments_block.vue +++ b/app/assets/javascripts/jobs/components/environments_block.vue @@ -277,7 +277,7 @@ export default { <div class="prepend-top-default append-bottom-default js-environment-container"> <div class="environment-information"> <ci-icon :status="iconStatus" /> - <p class="inline append-bottom-0" v-html="environment"></p> + <p class="inline gl-mb-0" v-html="environment"></p> </div> </div> </template> diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue index ddcfc3d6db6..116331d9549 100644 --- a/app/assets/javascripts/jobs/components/stages_dropdown.vue +++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue @@ -81,7 +81,7 @@ export default { <button type="button" data-toggle="dropdown" - class="js-selected-stage dropdown-menu-toggle prepend-top-8" + class="js-selected-stage dropdown-menu-toggle gl-mt-3" > {{ selectedStage }} <i class="fa fa-chevron-down"></i> </button> diff --git a/app/assets/javascripts/jobs/components/stuck_block.vue b/app/assets/javascripts/jobs/components/stuck_block.vue index ec52d272168..da01269a50c 100644 --- a/app/assets/javascripts/jobs/components/stuck_block.vue +++ b/app/assets/javascripts/jobs/components/stuck_block.vue @@ -26,31 +26,31 @@ export default { </script> <template> <div class="bs-callout bs-callout-warning"> - <p v-if="tags.length" class="js-stuck-with-tags append-bottom-0"> + <p v-if="tags.length" class="js-stuck-with-tags gl-mb-0"> {{ s__(`This job is stuck because you don't have - any active runners online with any of these tags assigned to them:`) + any active runners online or available with any of these tags assigned to them:`) }} <span v-for="(tag, index) in tags" :key="index" class="badge badge-primary append-right-4"> {{ tag }} </span> </p> - <p v-else-if="hasNoRunnersForProject" class="js-stuck-no-runners append-bottom-0"> + <p v-else-if="hasNoRunnersForProject" class="js-stuck-no-runners gl-mb-0"> {{ s__(`Job|This job is stuck because the project doesn't have any runners online assigned to it.`) }} </p> - <p v-else class="js-stuck-no-active-runner append-bottom-0"> + <p v-else class="js-stuck-no-active-runner gl-mb-0"> {{ s__(`This job is stuck because you don't have any active runners that can run this job.`) }} </p> - {{ __('Go to') }} + {{ __('Go to project') }} <gl-link v-if="runnersPath" :href="runnersPath" class="js-runners-path"> - {{ __('Runners page') }} + {{ __('CI settings') }} </gl-link> </div> </template> diff --git a/app/assets/javascripts/jobs/components/trigger_block.vue b/app/assets/javascripts/jobs/components/trigger_block.vue index 7c9b2824a43..1a076249fe7 100644 --- a/app/assets/javascripts/jobs/components/trigger_block.vue +++ b/app/assets/javascripts/jobs/components/trigger_block.vue @@ -46,7 +46,7 @@ export default { <p v-if="trigger.short_token" class="js-short-token" - :class="{ 'append-bottom-5': hasVariables, 'append-bottom-0': !hasVariables }" + :class="{ 'append-bottom-5': hasVariables, 'gl-mb-0': !hasVariables }" > <span class="font-weight-bold">{{ __('Trigger token:') }}</span> {{ trigger.short_token }} </p> diff --git a/app/assets/javascripts/jobs/components/unmet_prerequisites_block.vue b/app/assets/javascripts/jobs/components/unmet_prerequisites_block.vue index 25a8da84873..633561c879e 100644 --- a/app/assets/javascripts/jobs/components/unmet_prerequisites_block.vue +++ b/app/assets/javascripts/jobs/components/unmet_prerequisites_block.vue @@ -17,7 +17,7 @@ export default { </script> <template> <div class="bs-callout bs-callout-danger"> - <p class="js-failed-unmet-prerequisites append-bottom-0"> + <p class="js-failed-unmet-prerequisites gl-mb-0"> {{ s__(`Job|This job failed because the necessary resources were not successfully created.`) }} |