2022-01-29 02:30:11 +05:30
|
|
|
import $ from 'jquery';
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
import {useLightTextOnBackground} from '../utils.js';
|
2022-01-29 02:30:11 +05:30
|
|
|
|
2021-10-21 13:07:43 +05:30
|
|
|
const {csrfToken} = window.config;
|
2020-08-17 08:37:38 +05:30
|
|
|
|
2022-03-08 22:12:28 +05:30
|
|
|
function updateIssueCount(cards) {
|
|
|
|
const parent = cards.parentElement;
|
|
|
|
const cnt = parent.getElementsByClassName('board-card').length;
|
2023-05-09 08:05:49 +05:30
|
|
|
parent.getElementsByClassName('board-card-cnt')[0].textContent = cnt;
|
2022-03-08 22:12:28 +05:30
|
|
|
}
|
|
|
|
|
2021-12-08 12:27:18 +05:30
|
|
|
function moveIssue({item, from, to, oldIndex}) {
|
|
|
|
const columnCards = to.getElementsByClassName('board-card');
|
2022-03-08 22:12:28 +05:30
|
|
|
updateIssueCount(from);
|
|
|
|
updateIssueCount(to);
|
2021-12-08 12:27:18 +05:30
|
|
|
|
|
|
|
const columnSorting = {
|
|
|
|
issues: [...columnCards].map((card, i) => ({
|
|
|
|
issueID: parseInt($(card).attr('data-issue')),
|
|
|
|
sorting: i
|
|
|
|
}))
|
|
|
|
};
|
|
|
|
|
|
|
|
$.ajax({
|
|
|
|
url: `${to.getAttribute('data-url')}/move`,
|
|
|
|
data: JSON.stringify(columnSorting),
|
|
|
|
headers: {
|
|
|
|
'X-Csrf-Token': csrfToken,
|
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
|
|
|
type: 'POST',
|
|
|
|
error: () => {
|
|
|
|
from.insertBefore(item, from.children[oldIndex]);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2021-11-09 14:57:25 +05:30
|
|
|
async function initRepoProjectSortable() {
|
2021-11-22 17:10:17 +05:30
|
|
|
const els = document.querySelectorAll('#project-board > .board');
|
2021-11-18 22:15:00 +05:30
|
|
|
if (!els.length) return;
|
|
|
|
|
2020-08-17 08:37:38 +05:30
|
|
|
const {Sortable} = await import(/* webpackChunkName: "sortable" */'sortablejs');
|
2021-02-11 22:02:27 +05:30
|
|
|
|
2021-11-22 17:10:17 +05:30
|
|
|
// the HTML layout is: #project-board > .board > .board-column .board.cards > .board-card.card .content
|
|
|
|
const mainBoard = els[0];
|
|
|
|
let boardColumns = mainBoard.getElementsByClassName('board-column');
|
|
|
|
new Sortable(mainBoard, {
|
2021-11-22 13:49:01 +05:30
|
|
|
group: 'board-column',
|
|
|
|
draggable: '.board-column',
|
2021-11-22 17:10:17 +05:30
|
|
|
filter: '[data-id="0"]',
|
2021-11-22 13:49:01 +05:30
|
|
|
animation: 150,
|
|
|
|
ghostClass: 'card-ghost',
|
2022-12-21 10:26:58 +05:30
|
|
|
delayOnTouchOnly: true,
|
|
|
|
delay: 500,
|
2021-11-22 13:49:01 +05:30
|
|
|
onSort: () => {
|
2021-11-22 17:10:17 +05:30
|
|
|
boardColumns = mainBoard.getElementsByClassName('board-column');
|
|
|
|
for (let i = 0; i < boardColumns.length; i++) {
|
|
|
|
const column = boardColumns[i];
|
2021-11-22 13:49:01 +05:30
|
|
|
if (parseInt($(column).data('sorting')) !== i) {
|
|
|
|
$.ajax({
|
|
|
|
url: $(column).data('url'),
|
|
|
|
data: JSON.stringify({sorting: i, color: rgbToHex($(column).css('backgroundColor'))}),
|
2020-08-17 08:37:38 +05:30
|
|
|
headers: {
|
2021-10-21 13:07:43 +05:30
|
|
|
'X-Csrf-Token': csrfToken,
|
2020-08-17 08:37:38 +05:30
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
2021-11-22 13:49:01 +05:30
|
|
|
method: 'PUT',
|
2020-08-17 08:37:38 +05:30
|
|
|
});
|
2021-11-22 13:49:01 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2021-11-22 17:10:17 +05:30
|
|
|
for (const boardColumn of boardColumns) {
|
|
|
|
const boardCardList = boardColumn.getElementsByClassName('board')[0];
|
|
|
|
new Sortable(boardCardList, {
|
2021-11-22 13:49:01 +05:30
|
|
|
group: 'shared',
|
|
|
|
animation: 150,
|
|
|
|
ghostClass: 'card-ghost',
|
2021-12-08 12:27:18 +05:30
|
|
|
onAdd: moveIssue,
|
|
|
|
onUpdate: moveIssue,
|
2022-12-21 10:26:58 +05:30
|
|
|
delayOnTouchOnly: true,
|
|
|
|
delay: 500,
|
2021-11-22 13:49:01 +05:30
|
|
|
});
|
2020-08-17 08:37:38 +05:30
|
|
|
}
|
2021-11-09 14:57:25 +05:30
|
|
|
}
|
|
|
|
|
2022-12-23 21:33:11 +05:30
|
|
|
export function initRepoProject() {
|
2021-11-09 14:57:25 +05:30
|
|
|
if (!$('.repository.projects').length) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2021-11-12 18:07:45 +05:30
|
|
|
const _promise = initRepoProjectSortable();
|
2020-08-17 08:37:38 +05:30
|
|
|
|
|
|
|
$('.edit-project-board').each(function () {
|
2021-09-30 02:23:12 +05:30
|
|
|
const projectHeader = $(this).closest('.board-column-header');
|
|
|
|
const projectTitleLabel = projectHeader.find('.board-label');
|
2023-03-12 16:39:20 +05:30
|
|
|
const projectTitleInput = $(this).find('.project-board-title');
|
|
|
|
const projectColorInput = $(this).find('#new_board_color');
|
2021-09-30 02:23:12 +05:30
|
|
|
const boardColumn = $(this).closest('.board-column');
|
|
|
|
|
|
|
|
if (boardColumn.css('backgroundColor')) {
|
|
|
|
setLabelColor(projectHeader, rgbToHex(boardColumn.css('backgroundColor')));
|
|
|
|
}
|
2020-08-17 08:37:38 +05:30
|
|
|
|
2023-03-12 16:39:20 +05:30
|
|
|
$(this).find('.edit-column-button').on('click', function (e) {
|
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
$.ajax({
|
|
|
|
url: $(this).data('url'),
|
|
|
|
data: JSON.stringify({title: projectTitleInput.val(), color: projectColorInput.val()}),
|
|
|
|
headers: {
|
|
|
|
'X-Csrf-Token': csrfToken,
|
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
|
|
|
method: 'PUT',
|
|
|
|
}).done(() => {
|
|
|
|
projectTitleLabel.text(projectTitleInput.val());
|
|
|
|
projectTitleInput.closest('form').removeClass('dirty');
|
|
|
|
if (projectColorInput.val()) {
|
|
|
|
setLabelColor(projectHeader, projectColorInput.val());
|
|
|
|
}
|
|
|
|
boardColumn.attr('style', `background: ${projectColorInput.val()}!important`);
|
|
|
|
$('.ui.modal').modal('hide');
|
2020-08-17 08:37:38 +05:30
|
|
|
});
|
2023-03-12 16:39:20 +05:30
|
|
|
});
|
2020-08-17 08:37:38 +05:30
|
|
|
});
|
|
|
|
|
2023-04-19 19:58:28 +05:30
|
|
|
$('.default-project-board-modal').each(function () {
|
|
|
|
const boardColumn = $(this).closest('.board-column');
|
|
|
|
const showButton = $(boardColumn).find('.default-project-board-show');
|
2023-04-23 14:54:19 +05:30
|
|
|
const commitButton = $(this).find('.actions > .ok.button');
|
2021-01-16 01:59:32 +05:30
|
|
|
|
2023-04-19 19:58:28 +05:30
|
|
|
$(commitButton).on('click', (e) => {
|
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
$.ajax({
|
|
|
|
method: 'POST',
|
|
|
|
url: $(showButton).data('url'),
|
|
|
|
headers: {
|
|
|
|
'X-Csrf-Token': csrfToken,
|
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
|
|
|
}).done(() => {
|
|
|
|
window.location.reload();
|
|
|
|
});
|
|
|
|
});
|
2021-01-16 01:59:32 +05:30
|
|
|
});
|
2021-02-11 22:02:27 +05:30
|
|
|
|
2023-04-23 14:54:19 +05:30
|
|
|
$('.show-delete-column-modal').each(function () {
|
|
|
|
const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
|
|
|
|
const deleteColumnButton = deleteColumnModal.find('.actions > .ok.button');
|
|
|
|
const deleteUrl = $(this).attr('data-url');
|
|
|
|
|
|
|
|
deleteColumnButton.on('click', (e) => {
|
2020-08-17 08:37:38 +05:30
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
$.ajax({
|
2023-04-23 14:54:19 +05:30
|
|
|
url: deleteUrl,
|
2020-08-17 08:37:38 +05:30
|
|
|
headers: {
|
2021-10-21 13:07:43 +05:30
|
|
|
'X-Csrf-Token': csrfToken,
|
2020-08-17 08:37:38 +05:30
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
|
|
|
method: 'DELETE',
|
|
|
|
}).done(() => {
|
2021-01-16 01:59:32 +05:30
|
|
|
window.location.reload();
|
2020-08-17 08:37:38 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2023-04-20 14:58:27 +05:30
|
|
|
$('#new_board_submit').on('click', function (e) {
|
2020-08-17 08:37:38 +05:30
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
const boardTitle = $('#new_board');
|
2021-09-30 02:23:12 +05:30
|
|
|
const projectColorInput = $('#new_board_color_picker');
|
2020-08-17 08:37:38 +05:30
|
|
|
|
|
|
|
$.ajax({
|
|
|
|
url: $(this).data('url'),
|
2021-09-30 02:23:12 +05:30
|
|
|
data: JSON.stringify({title: boardTitle.val(), color: projectColorInput.val()}),
|
2020-08-17 08:37:38 +05:30
|
|
|
headers: {
|
2021-10-21 13:07:43 +05:30
|
|
|
'X-Csrf-Token': csrfToken,
|
2020-08-17 08:37:38 +05:30
|
|
|
},
|
|
|
|
contentType: 'application/json',
|
|
|
|
method: 'POST',
|
|
|
|
}).done(() => {
|
|
|
|
boardTitle.closest('form').removeClass('dirty');
|
2021-01-16 01:59:32 +05:30
|
|
|
window.location.reload();
|
2020-08-17 08:37:38 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
2021-09-30 02:23:12 +05:30
|
|
|
|
|
|
|
function setLabelColor(label, color) {
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
if (useLightTextOnBackground(color)) {
|
2021-09-30 02:23:12 +05:30
|
|
|
label.removeClass('dark-label').addClass('light-label');
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
} else {
|
|
|
|
label.removeClass('light-label').addClass('dark-label');
|
2021-09-30 02:23:12 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function rgbToHex(rgb) {
|
Fixed colour transparency regex matching in project board sorting (#22091) (#22092)
As described in the linked issue (#22091), semi-transparent UI elements
would result in JS errors due to the fact that the CSS `backgroundColor`
element was being matched by the pattern
`^rgb\((\d+),\s*(\d+),\s*(\d+)\)$`, which does not take the alpha
channel into account.
I changed the pattern to `^rgba?\((\d+),\s*(\d+),\s*(\d+).*\)$`.
This new pattern accepts both `rgb` and `rgba` tuples, and ignores the
alpha channel (that little `.*` at the end) from the sorting criteria.
The reason why I chose to ignore alpha is because when it comes to
kanban colour sorting, only the hue is important; the order of the
panels should stay the same, even if some of them are transparent.
Alternative solutions were discussed in the bug report and are included
here for completeness:
1. Change the regex from ^rgb\((\d+),\s*(\d+),\s*(\d+)\)$ to
^rgba?\((\d+),\s*(\d+),\s*(\d+)(,\s*(\d+(\.\d+)?))?\)$ (alpha channel is
a float or NaN on 5th group) and include the alpha channel in the
sorting criteria.
2. Rethink on why you're reading colours out of the CSS in the first
place, then reformat this sorting procedure.
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2022-12-21 17:49:04 +05:30
|
|
|
rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+).*\)$/);
|
2021-09-30 02:23:12 +05:30
|
|
|
return `#${hex(rgb[1])}${hex(rgb[2])}${hex(rgb[3])}`;
|
|
|
|
}
|
|
|
|
|
|
|
|
function hex(x) {
|
|
|
|
const hexDigits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
|
|
|
|
return Number.isNaN(x) ? '00' : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
|
|
|
|
}
|