diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 21:16:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 21:16:59 +0300 |
commit | 94299354d10c1c4758883eb92df56255f32dcbe9 (patch) | |
tree | fb5254b3ac33eb888e7a676ffa8234370026d7c9 /app/assets/javascripts/repository | |
parent | 12f988e7dcb038e82144fcd159b94839044c54cb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
5 files changed, 18 insertions, 12 deletions
diff --git a/app/assets/javascripts/repository/components/blob_button_group.vue b/app/assets/javascripts/repository/components/blob_button_group.vue index 857795c71b0..d79ccde61a8 100644 --- a/app/assets/javascripts/repository/components/blob_button_group.vue +++ b/app/assets/javascripts/repository/components/blob_button_group.vue @@ -7,6 +7,8 @@ import getRefMixin from '../mixins/get_ref'; import DeleteBlobModal from './delete_blob_modal.vue'; import UploadBlobModal from './upload_blob_modal.vue'; +const REPLACE_BLOB_MODAL_ID = 'modal-replace-blob'; + export default { i18n: { replace: __('Replace'), @@ -76,9 +78,6 @@ export default { }, }, computed: { - replaceModalId() { - return uniqueId('replace-modal'); - }, replaceModalTitle() { return sprintf(__('Replace %{name}'), { name: this.name }); }, @@ -95,13 +94,14 @@ export default { methods: { showModal(modalId) { if (this.showForkSuggestion) { - this.$emit('fork'); + this.$emit('fork', 'view'); return; } this.$refs[modalId].show(); }, }, + replaceBlobModalId: REPLACE_BLOB_MODAL_ID, }; </script> @@ -118,7 +118,7 @@ export default { data-testid="lock" :data-qa-selector="lockBtnQASelector" /> - <gl-button data-testid="replace" @click="showModal(replaceModalId)"> + <gl-button data-testid="replace" @click="showModal($options.replaceBlobModalId)"> {{ $options.i18n.replace }} </gl-button> <gl-button data-testid="delete" @click="showModal(deleteModalId)"> @@ -126,8 +126,8 @@ export default { </gl-button> </gl-button-group> <upload-blob-modal - :ref="replaceModalId" - :modal-id="replaceModalId" + :ref="$options.replaceBlobModalId" + :modal-id="$options.replaceBlobModalId" :modal-title="replaceModalTitle" :commit-message="replaceModalTitle" :target-branch="targetBranch || ref" diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 13fd4f1d1f5..799c4affa52 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -142,9 +142,13 @@ export default { return this.isLoggedIn && !canModifyBlob && createMergeRequestIn && forkProject; }, forkPath() { - return this.forkTarget === 'ide' - ? this.blobInfo.ideForkAndEditPath - : this.blobInfo.forkAndEditPath; + const forkPaths = { + ide: this.blobInfo.ideForkAndEditPath, + simple: this.blobInfo.forkAndEditPath, + view: this.blobInfo.forkAndViewPath, + }; + + return forkPaths[this.forkTarget]; }, isUsingLfs() { return this.blobInfo.storedExternally && this.blobInfo.externalStorage === LFS_STORAGE; @@ -249,7 +253,7 @@ export default { :is-locked="Boolean(pathLockedByUser)" :can-lock="canLock" :show-fork-suggestion="showForkSuggestion" - @fork="setForkTarget('ide')" + @fork="setForkTarget('view')" /> </template> </blob-header> diff --git a/app/assets/javascripts/repository/components/delete_blob_modal.vue b/app/assets/javascripts/repository/components/delete_blob_modal.vue index f3c9aea36f1..baf8449b188 100644 --- a/app/assets/javascripts/repository/components/delete_blob_modal.vue +++ b/app/assets/javascripts/repository/components/delete_blob_modal.vue @@ -87,7 +87,7 @@ export default { fields: { // fields key must match case of form name for validation directive to work commit_message: initFormField({ value: this.commitMessage }), - branch_name: initFormField({ value: this.targetBranch }), + branch_name: initFormField({ value: this.targetBranch, skipValidation: !this.canPushCode }), }, }; return { diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index e206d9bfbd2..aa2f2fa8f11 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -52,6 +52,7 @@ export const DEFAULT_BLOB_INFO = { ideEditPath: '', forkAndEditPath: '', ideForkAndEditPath: '', + forkAndViewPath: '', storedExternally: false, externalStorage: '', environmentFormattedExternalUrl: '', diff --git a/app/assets/javascripts/repository/queries/blob_info.query.graphql b/app/assets/javascripts/repository/queries/blob_info.query.graphql index 78323fdc5f4..14d7f903e75 100644 --- a/app/assets/javascripts/repository/queries/blob_info.query.graphql +++ b/app/assets/javascripts/repository/queries/blob_info.query.graphql @@ -31,6 +31,7 @@ query getBlobInfo( ideEditPath forkAndEditPath ideForkAndEditPath + forkAndViewPath environmentFormattedExternalUrl environmentExternalUrlForRouteMap canModifyBlob |