You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

PullRequestMergeForm.vue 9.5KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252
  1. <script>
  2. import {SvgIcon} from '../svg.js';
  3. import {toggleElem} from '../utils/dom.js';
  4. const {csrfToken, pageData} = window.config;
  5. export default {
  6. components: {SvgIcon},
  7. data: () => ({
  8. csrfToken,
  9. mergeForm: pageData.pullRequestMergeForm,
  10. mergeTitleFieldValue: '',
  11. mergeMessageFieldValue: '',
  12. deleteBranchAfterMerge: false,
  13. autoMergeWhenSucceed: false,
  14. mergeStyle: '',
  15. mergeStyleDetail: { // dummy only, these values will come from one of the mergeForm.mergeStyles
  16. hideMergeMessageTexts: false,
  17. textDoMerge: '',
  18. mergeTitleFieldText: '',
  19. mergeMessageFieldText: '',
  20. hideAutoMerge: false,
  21. },
  22. mergeStyleAllowedCount: 0,
  23. showMergeStyleMenu: false,
  24. showActionForm: false,
  25. }),
  26. computed: {
  27. mergeButtonStyleClass() {
  28. if (this.mergeForm.allOverridableChecksOk) return 'primary';
  29. return this.autoMergeWhenSucceed ? 'primary' : 'red';
  30. },
  31. forceMerge() {
  32. return this.mergeForm.canMergeNow && !this.mergeForm.allOverridableChecksOk;
  33. },
  34. },
  35. watch: {
  36. mergeStyle(val) {
  37. this.mergeStyleDetail = this.mergeForm.mergeStyles.find((e) => e.name === val);
  38. for (const elem of document.querySelectorAll('[data-pull-merge-style]')) {
  39. toggleElem(elem, elem.getAttribute('data-pull-merge-style') === val);
  40. }
  41. },
  42. },
  43. created() {
  44. this.mergeStyleAllowedCount = this.mergeForm.mergeStyles.reduce((v, msd) => v + (msd.allowed ? 1 : 0), 0);
  45. let mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed && e.name === this.mergeForm.defaultMergeStyle)?.name;
  46. if (!mergeStyle) mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed)?.name;
  47. this.switchMergeStyle(mergeStyle, !this.mergeForm.canMergeNow);
  48. },
  49. mounted() {
  50. document.addEventListener('mouseup', this.hideMergeStyleMenu);
  51. },
  52. unmounted() {
  53. document.removeEventListener('mouseup', this.hideMergeStyleMenu);
  54. },
  55. methods: {
  56. hideMergeStyleMenu() {
  57. this.showMergeStyleMenu = false;
  58. },
  59. toggleActionForm(show) {
  60. this.showActionForm = show;
  61. if (!show) return;
  62. this.deleteBranchAfterMerge = this.mergeForm.defaultDeleteBranchAfterMerge;
  63. this.mergeTitleFieldValue = this.mergeStyleDetail.mergeTitleFieldText;
  64. this.mergeMessageFieldValue = this.mergeStyleDetail.mergeMessageFieldText;
  65. },
  66. switchMergeStyle(name, autoMerge = false) {
  67. this.mergeStyle = name;
  68. this.autoMergeWhenSucceed = autoMerge;
  69. },
  70. clearMergeMessage() {
  71. this.mergeMessageFieldValue = this.mergeForm.defaultMergeMessage;
  72. },
  73. },
  74. };
  75. </script>
  76. <template>
  77. <!--
  78. if this component is shown, either the user is an admin (can do a merge without checks), or they are a writer who has the permission to do a merge
  79. if the user is a writer and can't do a merge now (canMergeNow==false), then only show the Auto Merge for them
  80. How to test the UI manually:
  81. * Method 1: manually set some variables in pull.tmpl, eg: {{$notAllOverridableChecksOk = true}} {{$canMergeNow = false}}
  82. * Method 2: make a protected branch, then set state=pending/success :
  83. curl -X POST ${root_url}/api/v1/repos/${owner}/${repo}/statuses/${sha} \
  84. -H "accept: application/json" -H "authorization: Basic $base64_auth" -H "Content-Type: application/json" \
  85. -d '{"context": "test/context", "description": "description", "state": "${state}", "target_url": "http://localhost"}'
  86. -->
  87. <div>
  88. <!-- eslint-disable-next-line vue/no-v-html -->
  89. <div v-if="mergeForm.hasPendingPullRequestMerge" v-html="mergeForm.hasPendingPullRequestMergeTip" class="ui info message"/>
  90. <!-- another similar form is in pull.tmpl (manual merge)-->
  91. <form class="ui form form-fetch-action" v-if="showActionForm" :action="mergeForm.baseLink+'/merge'" method="post">
  92. <input type="hidden" name="_csrf" :value="csrfToken">
  93. <input type="hidden" name="head_commit_id" v-model="mergeForm.pullHeadCommitID">
  94. <input type="hidden" name="merge_when_checks_succeed" v-model="autoMergeWhenSucceed">
  95. <input type="hidden" name="force_merge" v-model="forceMerge">
  96. <template v-if="!mergeStyleDetail.hideMergeMessageTexts">
  97. <div class="field">
  98. <input type="text" name="merge_title_field" v-model="mergeTitleFieldValue">
  99. </div>
  100. <div class="field">
  101. <textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
  102. <template v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage">
  103. <button @click.prevent="clearMergeMessage" class="btn gt-mt-2 gt-p-2 interact-fg" :data-tooltip-content="mergeForm.textClearMergeMessageHint">
  104. {{ mergeForm.textClearMergeMessage }}
  105. </button>
  106. </template>
  107. </div>
  108. </template>
  109. <div class="field" v-if="mergeStyle === 'manually-merged'">
  110. <input type="text" name="merge_commit_id" :placeholder="mergeForm.textMergeCommitId">
  111. </div>
  112. <button class="ui button" :class="mergeButtonStyleClass" type="submit" name="do" :value="mergeStyle">
  113. {{ mergeStyleDetail.textDoMerge }}
  114. <template v-if="autoMergeWhenSucceed">
  115. {{ mergeForm.textAutoMergeButtonWhenSucceed }}
  116. </template>
  117. </button>
  118. <button class="ui button merge-cancel" @click="toggleActionForm(false)">
  119. {{ mergeForm.textCancel }}
  120. </button>
  121. <div class="ui checkbox gt-ml-2" v-if="mergeForm.isPullBranchDeletable && !autoMergeWhenSucceed">
  122. <input name="delete_branch_after_merge" type="checkbox" v-model="deleteBranchAfterMerge" id="delete-branch-after-merge">
  123. <label for="delete-branch-after-merge">{{ mergeForm.textDeleteBranch }}</label>
  124. </div>
  125. </form>
  126. <div v-if="!showActionForm" class="tw-flex">
  127. <!-- the merge button -->
  128. <div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'primary' : 'red']" @click="toggleActionForm(true)">
  129. <button class="ui button">
  130. <svg-icon name="octicon-git-merge"/>
  131. <span class="button-text">
  132. {{ mergeStyleDetail.textDoMerge }}
  133. <template v-if="autoMergeWhenSucceed">
  134. {{ mergeForm.textAutoMergeButtonWhenSucceed }}
  135. </template>
  136. </span>
  137. </button>
  138. <div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1">
  139. <svg-icon name="octicon-triangle-down" :size="14"/>
  140. <div class="menu" :class="{'show':showMergeStyleMenu}">
  141. <template v-for="msd in mergeForm.mergeStyles">
  142. <!-- if can merge now, show one action "merge now", and an action "auto merge when succeed" -->
  143. <div class="item" v-if="msd.allowed && mergeForm.canMergeNow" :key="msd.name" @click.stop="switchMergeStyle(msd.name)">
  144. <div class="action-text">
  145. {{ msd.textDoMerge }}
  146. </div>
  147. <div v-if="!msd.hideAutoMerge" class="auto-merge-small" @click.stop="switchMergeStyle(msd.name, true)">
  148. <svg-icon name="octicon-clock" :size="14"/>
  149. <div class="auto-merge-tip">
  150. {{ mergeForm.textAutoMergeWhenSucceed }}
  151. </div>
  152. </div>
  153. </div>
  154. <!-- if can NOT merge now, only show one action "auto merge when succeed" -->
  155. <div class="item" v-if="msd.allowed && !mergeForm.canMergeNow && !msd.hideAutoMerge" :key="msd.name" @click.stop="switchMergeStyle(msd.name, true)">
  156. <div class="action-text">
  157. {{ msd.textDoMerge }} {{ mergeForm.textAutoMergeButtonWhenSucceed }}
  158. </div>
  159. </div>
  160. </template>
  161. </div>
  162. </div>
  163. </div>
  164. <!-- the cancel auto merge button -->
  165. <form v-if="mergeForm.hasPendingPullRequestMerge" :action="mergeForm.baseLink+'/cancel_auto_merge'" method="post" class="gt-ml-4">
  166. <input type="hidden" name="_csrf" :value="csrfToken">
  167. <button class="ui button">
  168. {{ mergeForm.textAutoMergeCancelSchedule }}
  169. </button>
  170. </form>
  171. </div>
  172. </div>
  173. </template>
  174. <style scoped>
  175. /* to keep UI the same, at the moment we are still using some Fomantic UI styles, but we do not use their scripts, so we need to fine tune some styles */
  176. .ui.dropdown .menu.show {
  177. display: block;
  178. }
  179. .ui.checkbox label {
  180. cursor: pointer;
  181. }
  182. /* make the dropdown list left-aligned */
  183. .ui.merge-button {
  184. position: relative;
  185. }
  186. .ui.merge-button .ui.dropdown {
  187. position: static;
  188. }
  189. .ui.merge-button > .ui.dropdown:last-child > .menu:not(.left) {
  190. left: 0;
  191. right: auto;
  192. }
  193. .ui.merge-button .ui.dropdown .menu > .item {
  194. display: flex;
  195. align-items: stretch;
  196. padding: 0 !important; /* polluted by semantic.css: .ui.dropdown .menu > .item { !important } */
  197. }
  198. /* merge style list item */
  199. .action-text {
  200. padding: 0.8rem;
  201. flex: 1
  202. }
  203. .auto-merge-small {
  204. width: 40px;
  205. display: flex;
  206. align-items: center;
  207. justify-content: center;
  208. position: relative;
  209. }
  210. .auto-merge-small .auto-merge-tip {
  211. display: none;
  212. left: 38px;
  213. top: -1px;
  214. bottom: -1px;
  215. position: absolute;
  216. align-items: center;
  217. color: var(--color-info-text);
  218. background-color: var(--color-info-bg);
  219. border: 1px solid var(--color-info-border);
  220. border-left: none;
  221. padding-right: 1rem;
  222. }
  223. .auto-merge-small:hover {
  224. color: var(--color-info-text);
  225. background-color: var(--color-info-bg);
  226. border: 1px solid var(--color-info-border);
  227. }
  228. .auto-merge-small:hover .auto-merge-tip {
  229. display: flex;
  230. }
  231. </style>