mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-02-23 03:45:47 -05:00
fix(ui): hide extra PR property labels on title edit (#6898)
* hide labels [AGit](https://codeberg.org/forgejo/forgejo/pulls/2444) and [Editable](https://codeberg.org/forgejo/forgejo/pulls/6863) on title edit mode: they make layout broken and are not really needed at edit state * make the code slightly less boring Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6898 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Panagiotis "Ivory" Vasilopoulos <git@n0toose.net> Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org>
This commit is contained in:
parent
90adede20b
commit
a6e0d3e37c
3 changed files with 33 additions and 4 deletions
|
@ -64,6 +64,7 @@
|
||||||
base_branch: branch2
|
base_branch: branch2
|
||||||
merge_base: 985f0301dba5e7b34be866819cd15ad3d8f508ee
|
merge_base: 985f0301dba5e7b34be866819cd15ad3d8f508ee
|
||||||
has_merged: false
|
has_merged: false
|
||||||
|
allow_maintainer_edit: true
|
||||||
|
|
||||||
-
|
-
|
||||||
id: 6
|
id: 6
|
||||||
|
|
25
tests/e2e/pr-title.test.e2e.ts
Normal file
25
tests/e2e/pr-title.test.e2e.ts
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
// @watch start
|
||||||
|
// templates/repo/issue/view_title.tmpl
|
||||||
|
// web_src/js/features/repo-issue.js
|
||||||
|
// @watch end
|
||||||
|
|
||||||
|
import {expect} from '@playwright/test';
|
||||||
|
import {save_visual, test} from './utils_e2e.ts';
|
||||||
|
|
||||||
|
test.use({user: 'user2'});
|
||||||
|
|
||||||
|
test('PR: title edit', async ({page}) => {
|
||||||
|
const response = await page.goto('/user2/repo1/pulls/5');
|
||||||
|
expect(response?.status()).toBe(200);
|
||||||
|
|
||||||
|
await expect(page.locator('#editable-label')).toBeVisible();
|
||||||
|
await save_visual(page);
|
||||||
|
|
||||||
|
// Labels AGit and Editable are hidden when title is in edit mode
|
||||||
|
await page.locator('#issue-title-edit-show').click();
|
||||||
|
await expect(page.locator('#editable-label')).toBeHidden();
|
||||||
|
await save_visual(page);
|
||||||
|
});
|
|
@ -631,9 +631,11 @@ export function initRepoIssueTitleEdit() {
|
||||||
|
|
||||||
const issueTitleInput = issueTitleEditor.querySelector('input');
|
const issueTitleInput = issueTitleEditor.querySelector('input');
|
||||||
const oldTitle = issueTitleInput.getAttribute('data-old-title');
|
const oldTitle = issueTitleInput.getAttribute('data-old-title');
|
||||||
|
const normalModeElements = [issueTitleDisplay, '#pull-desc-display', '#agit-label', '#editable-label'];
|
||||||
issueTitleDisplay.querySelector('#issue-title-edit-show').addEventListener('click', () => {
|
issueTitleDisplay.querySelector('#issue-title-edit-show').addEventListener('click', () => {
|
||||||
hideElem(issueTitleDisplay);
|
for (const element of normalModeElements) {
|
||||||
hideElem('#pull-desc-display');
|
hideElem(element);
|
||||||
|
}
|
||||||
showElem(issueTitleEditor);
|
showElem(issueTitleEditor);
|
||||||
showElem('#pull-desc-editor');
|
showElem('#pull-desc-editor');
|
||||||
if (!issueTitleInput.value.trim()) {
|
if (!issueTitleInput.value.trim()) {
|
||||||
|
@ -644,8 +646,9 @@ export function initRepoIssueTitleEdit() {
|
||||||
issueTitleEditor.querySelector('.ui.cancel.button').addEventListener('click', () => {
|
issueTitleEditor.querySelector('.ui.cancel.button').addEventListener('click', () => {
|
||||||
hideElem(issueTitleEditor);
|
hideElem(issueTitleEditor);
|
||||||
hideElem('#pull-desc-editor');
|
hideElem('#pull-desc-editor');
|
||||||
showElem(issueTitleDisplay);
|
for (const element of normalModeElements) {
|
||||||
showElem('#pull-desc-display');
|
showElem(element);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
|
const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
|
||||||
|
|
Loading…
Add table
Reference in a new issue