Skip to content
This repository was archived by the owner on Aug 31, 2023. It is now read-only.

Commit e9cd957

Browse files
EpocDotFrEpocDotFr
committed
Move from WIP to Draft prefix
1 parent adeebb9 commit e9cd957

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A browser extension that enhance all Merge Requests lists on any instance of Git
2222
- Ticket ID is automatically detected in source branch name or Merge Request title
2323
- Base Jira URL is configured in extension preferences
2424
- The ticket ID or an icon can be displayed as the link label (configured in extension preferences)
25-
- WIP toggle button (can be enabled/disabled in the extension preferences)
25+
- Draft toggle button (can be enabled/disabled in the extension preferences)
2626
- Show an indicator when there's unresolved discussions left on Merge Requests
2727
- Can be enabled/disabled in the extension preferences
2828
- Note the **All discussions must be resolved** option must be enabled for this feature to be working as expected. This option is enabled per project and is located in **Settings > General > Merge Requests > Merge checks**

‎html/options.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
</div>
5454
<div class="pts row">
5555
<div class="w40p txt-center browser-style">
56-
<input type="checkbox" id="enable_button_to_toggle_wip_status">
56+
<input type="checkbox" id="enable_button_to_toggle_draft_status">
5757
</div>
5858
<div class="fluid">
59-
<label for="enable_button_to_toggle_wip_status">Enable button allowing to toggle WIP status</label>
59+
<label for="enable_button_to_toggle_draft_status">Enable button allowing to toggle Draft status</label>
6060
</div>
6161
</div>
6262
<div class="pbs pll">

‎js/content.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@
250250
self.attachClickEventToCopyMergeRequestInfoButtons();
251251
}
252252

253-
if (self.userAuthenticated && self.preferences.enable_button_to_toggle_wip_status) {
254-
self.attachClickEventToToggleWipStatusButtons();
253+
if (self.userAuthenticated && self.preferences.enable_button_to_toggle_draft_status) {
254+
self.attachClickEventToToggleDraftStatusButtons();
255255
}
256256
});
257257
}
@@ -316,16 +316,16 @@
316316
this.setDataAttributesToMergeRequestNode(mergeRequestNode, mergeRequest);
317317

318318
// -----------------------------------------------
319-
// Toggle WIP status button
319+
// Toggle Draft status button
320320

321-
if (this.userAuthenticated && this.preferences.enable_button_to_toggle_wip_status) {
322-
let toggleWipStatusButton = '<button class="btn btn-secondary btn-md btn-default btn-transparent btn-clipboard has-tooltip gmrle-toggle-wip-status" title="Toggle WIP status" style="padding-left: 0">' +
321+
if (this.userAuthenticated && this.preferences.enable_button_to_toggle_draft_status) {
322+
let toggleDraftStatusButton = '<button class="btn btn-secondary btn-md btn-default btn-transparent btn-clipboard has-tooltip gmrle-toggle-draft-status" title="Toggle Draft status" style="padding-left: 0">' +
323323
this.buildSpriteIcon('lock') +
324324
'</button> ';
325325

326326
this.parseHtmlAndPrepend(
327327
mergeRequestNode.querySelector('.merge-request-title'),
328-
toggleWipStatusButton
328+
toggleDraftStatusButton
329329
);
330330
}
331331

@@ -443,7 +443,7 @@
443443
mergeRequestNode.dataset.status = mergeRequest.state;
444444
mergeRequestNode.dataset.sourceBranchName = mergeRequest.source_branch;
445445
mergeRequestNode.dataset.targetBranchName = mergeRequest.target_branch;
446-
mergeRequestNode.dataset.isWip = mergeRequest.work_in_progress;
446+
mergeRequestNode.dataset.isDraft = mergeRequest.work_in_progress;
447447

448448
if (this.preferences.enable_jira_ticket_link) {
449449
let jiraTicketId = this.findFirstJiraTicketId(mergeRequest);
@@ -537,33 +537,33 @@
537537
}
538538

539539
/**
540-
* Attach a click event to all buttons inserted by the extension allowing to toggle Merge Request WIP status.
540+
* Attach a click event to all buttons inserted by the extension allowing to toggle Merge Request Draft status.
541541
*/
542-
attachClickEventToToggleWipStatusButtons() {
542+
attachClickEventToToggleDraftStatusButtons() {
543543
let self = this;
544544

545-
document.querySelectorAll('button.gmrle-toggle-wip-status').forEach(function(el) {
545+
document.querySelectorAll('button.gmrle-toggle-draft-status').forEach(function(el) {
546546
el.addEventListener('click', function(e) {
547547
e.preventDefault();
548548

549-
self.toggleMergeRequestWipStatus(this.closest('.merge-request'), this);
549+
self.toggleMergeRequestDraftStatus(this.closest('.merge-request'), this);
550550
});
551551
});
552552
}
553553

554554
/**
555-
* Actually toggle a given Merge Request WIP status.
555+
* Actually toggle a given Merge Request Draft status.
556556
*/
557-
toggleMergeRequestWipStatus(mergeRequestNode, toggleButton) {
557+
toggleMergeRequestDraftStatus(mergeRequestNode, toggleButton) {
558558
toggleButton.disabled = true;
559559

560-
let isWip = mergeRequestNode.dataset.isWip == 'true';
560+
let isDraft = mergeRequestNode.dataset.isDraft == 'true';
561561
let newTitle = '';
562562

563-
if (isWip) {
564-
newTitle = mergeRequestNode.dataset.title.replace(new RegExp('^WIP:'), '').trim();
563+
if (isDraft) {
564+
newTitle = mergeRequestNode.dataset.title.replace(new RegExp('^Draft:'), '').trim();
565565
} else {
566-
newTitle = 'WIP: ' + mergeRequestNode.dataset.title.trim();
566+
newTitle = 'Draft: ' + mergeRequestNode.dataset.title.trim();
567567
}
568568

569569
this.apiClient.updateProjectMergeRequest(
@@ -573,7 +573,7 @@
573573
title: newTitle
574574
}
575575
).then(function(responseData) {
576-
mergeRequestNode.dataset.isWip = responseData.work_in_progress;
576+
mergeRequestNode.dataset.isDraft = responseData.work_in_progress;
577577
mergeRequestNode.dataset.title = responseData.title;
578578

579579
mergeRequestNode.querySelector('.merge-request-title-text a').textContent = responseData.title;

‎js/options.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
this.baseJiraUrlInput = document.querySelector('input#base_jira_url');
3737
this.jiraTicketLinkLabelTypeRadioButtons = Array.from(document.querySelectorAll('input[name="jira_ticket_link_label_type"]'));
3838

39-
this.enableButtonToToggleWipStatusCheckbox = document.querySelector('input#enable_button_to_toggle_wip_status');
39+
this.enableButtonToToggleDraftStatusCheckbox = document.querySelector('input#enable_button_to_toggle_draft_status');
4040

4141
this.enableUnresolvedDiscussionsIndicatorCheckbox = document.querySelector('input#enable_unresolved_discussions_indicator');
4242
}
@@ -67,8 +67,8 @@
6767
return el.value == preferences.jira_ticket_link_label_type;
6868
}).checked = true;
6969

70-
self.enableButtonToToggleWipStatusCheckbox.checked = preferences.enable_button_to_toggle_wip_status;
71-
self.enableButtonToToggleWipStatusCheckbox.dispatchEvent(new CustomEvent('change'));
70+
self.enableButtonToToggleDraftStatusCheckbox.checked = preferences.enable_button_to_toggle_draft_status;
71+
self.enableButtonToToggleDraftStatusCheckbox.dispatchEvent(new CustomEvent('change'));
7272

7373
self.enableUnresolvedDiscussionsIndicatorCheckbox.checked = preferences.enable_unresolved_discussions_indicator;
7474
self.enableUnresolvedDiscussionsIndicatorCheckbox.dispatchEvent(new CustomEvent('change'));
@@ -119,7 +119,7 @@
119119
self.forceUserToEnableAtLeastOneFeatureIfNecessarily();
120120
});
121121

122-
this.enableButtonToToggleWipStatusCheckbox.addEventListener('change', function() {
122+
this.enableButtonToToggleDraftStatusCheckbox.addEventListener('change', function() {
123123
self.forceUserToEnableAtLeastOneFeatureIfNecessarily();
124124
});
125125

@@ -147,7 +147,7 @@
147147
enable_jira_ticket_link: this.enableJiraTicketLinkCheckbox.checked,
148148
base_jira_url: this.baseJiraUrlInput.value,
149149
jira_ticket_link_label_type: jira_ticket_link_label_type,
150-
enable_button_to_toggle_wip_status: this.enableButtonToToggleWipStatusCheckbox.checked,
150+
enable_button_to_toggle_draft_status: this.enableButtonToToggleDraftStatusCheckbox.checked,
151151
enable_unresolved_discussions_indicator: this.enableUnresolvedDiscussionsIndicatorCheckbox.checked
152152
},
153153
function() {
@@ -183,7 +183,7 @@
183183
return !this.displaySourceAndTargetBranchesCheckbox.checked
184184
&& !this.enableButtonToCopyMrInfoCheckbox.checked
185185
&& !this.enableJiraTicketLinkCheckbox.checked
186-
&& !this.enableButtonToToggleWipStatusCheckbox.checked
186+
&& !this.enableButtonToToggleDraftStatusCheckbox.checked
187187
&& !this.enableUnresolvedDiscussionsIndicatorCheckbox.checked;
188188
}
189189

‎js/preferences.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
enable_jira_ticket_link: false,
1414
base_jira_url: '',
1515
jira_ticket_link_label_type: 'ticket_id',
16-
enable_button_to_toggle_wip_status: true,
16+
enable_button_to_toggle_draft_status: true,
1717
enable_unresolved_discussions_indicator: true
1818
};
1919
}

0 commit comments

Comments
 (0)